diff options
Diffstat (limited to 'system')
91 files changed, 1116 insertions, 1329 deletions
diff --git a/system/brasero/brasero.SlackBuild b/system/brasero/brasero.SlackBuild index cd1f003c30..32abd17b58 100644 --- a/system/brasero/brasero.SlackBuild +++ b/system/brasero/brasero.SlackBuild @@ -75,7 +75,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=format-nonliteral -Wno-error=format-y2k" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/bulk_extractor/bulk_extractor.SlackBuild b/system/bulk_extractor/bulk_extractor.SlackBuild index 2a7e955d4f..627aed32d5 100644 --- a/system/bulk_extractor/bulk_extractor.SlackBuild +++ b/system/bulk_extractor/bulk_extractor.SlackBuild @@ -25,7 +25,7 @@ # edited for v 1.5.5 November 2014 - added LightGrep option. PRGNAM=bulk_extractor -VERSION=${VERSION:-1.5.5} +VERSION=${VERSION:-20170403_779dbe1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,9 +62,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION cd $TMP -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/system/bulk_extractor/bulk_extractor.info b/system/bulk_extractor/bulk_extractor.info index 09b76412bb..d4a31c3dd4 100644 --- a/system/bulk_extractor/bulk_extractor.info +++ b/system/bulk_extractor/bulk_extractor.info @@ -1,8 +1,8 @@ PRGNAM="bulk_extractor" -VERSION="1.5.5" +VERSION="20170403_779dbe1" HOMEPAGE="https://github.com/simsong/bulk_extractor/wiki" -DOWNLOAD="http://digitalcorpora.org/downloads/bulk_extractor/bulk_extractor-1.5.5.tar.gz" -MD5SUM="7155ce6938876be91416def15e44d585" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/bulk_extractor-20170403_779dbe1.tar.xz" +MD5SUM="96f0c04052c51e6746ba83dae9de145e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/caprice32/caprice32.SlackBuild b/system/caprice32/caprice32.SlackBuild index ac27dd4df4..5eb64c1059 100644 --- a/system/caprice32/caprice32.SlackBuild +++ b/system/caprice32/caprice32.SlackBuild @@ -70,6 +70,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +sed -i "s|-O2|$SLKCFLAGS -Wno-narrowing|" makefile.unix + make -f makefile.unix RELEASE=TRUE mkdir -p $PKG/usr/share/$PRGNAM $PKG/usr/bin diff --git a/system/colord/colord.SlackBuild b/system/colord/colord.SlackBuild index 2ac2cabcf3..5112df3e32 100644 --- a/system/colord/colord.SlackBuild +++ b/system/colord/colord.SlackBuild @@ -95,6 +95,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Since polkit in current apply upstream git +# we have to reduce the polkit version used to test +# https://github.com/hughsie/colord/issues/36 +sed -i "s|114|113|g" configure + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/conky/conky-1.10.6-gcc7.patch b/system/conky/conky-1.10.6-gcc7.patch new file mode 100644 index 0000000000..dcbc3bc8a5 --- /dev/null +++ b/system/conky/conky-1.10.6-gcc7.patch @@ -0,0 +1,11 @@ +diff -Naur conky-1.10.6.orig/src/luamm.hh conky-1.10.6/src/luamm.hh +--- conky-1.10.6.orig/src/luamm.hh 2016-12-04 16:13:57.000000000 +0100 ++++ conky-1.10.6/src/luamm.hh 2017-05-05 12:44:37.525676651 +0200 +@@ -27,6 +27,7 @@ + #include <mutex> + #include <exception> + #include <stdexcept> ++#include <functional> + #include <string> + + #include <lua.hpp> diff --git a/system/conky/conky.SlackBuild b/system/conky/conky.SlackBuild index c3f4948c36..395bcdce69 100644 --- a/system/conky/conky.SlackBuild +++ b/system/conky/conky.SlackBuild @@ -87,6 +87,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix for the newer gcc +patch -p1 < $CWD/conky-1.10.6-gcc7.patch + # fix MANDIR sed -i 's,share/man/man1,man/man1,g' CMakeLists.txt diff --git a/system/dymo-cups-drivers/cups-ppd-header.patch b/system/dymo-cups-drivers/cups-ppd-header.patch new file mode 100644 index 0000000000..46b366915d --- /dev/null +++ b/system/dymo-cups-drivers/cups-ppd-header.patch @@ -0,0 +1,40 @@ +diff -ur dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h +--- dymo-cups-drivers-1.4.0.5/src/common/CupsFilter.h 2012-02-07 08:22:37.000000000 -0500 ++++ dymo-cups-drivers-1.4.0.5-patch/src/common/CupsFilter.h 2016-10-27 20:13:46.267013540 -0400 +@@ -23,6 +23,7 @@ + + #include <cups/cups.h> + #include <cups/raster.h> ++#include <cups/ppd.h> + #include <memory> + #include <string> + #include "CupsPrintEnvironment.h" +diff -ur dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h +--- dymo-cups-drivers-1.4.0.5/src/lm/CupsFilterLabelManager.h 2012-02-07 08:22:38.000000000 -0500 ++++ dymo-cups-drivers-1.4.0.5-patch/src/lm/CupsFilterLabelManager.h 2016-10-27 20:14:00.407310094 -0400 +@@ -23,6 +23,7 @@ + + #include <cups/cups.h> + #include <cups/raster.h> ++#include <cups/ppd.h> + #include "LabelManagerDriver.h" + #include "LabelManagerLanguageMonitor.h" + #include "DummyLanguageMonitor.h" +@@ -50,4 +51,4 @@ + + /* + * End of "$Id: CupsFilterLabelManager.h 14880 2011-03-31 16:29:05Z aleksandr $". +- */ +\ No newline at end of file ++ */ +diff -ur dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h +--- dymo-cups-drivers-1.4.0.5/src/lw/CupsFilterLabelWriter.h 2012-02-07 08:22:37.000000000 -0500 ++++ dymo-cups-drivers-1.4.0.5-patch/src/lw/CupsFilterLabelWriter.h 2016-10-27 20:14:23.717798963 -0400 +@@ -23,6 +23,7 @@ + + #include <cups/cups.h> + #include <cups/raster.h> ++#include <cups/ppd.h> + #include "LabelWriterDriver.h" + #include "LabelWriterLanguageMonitor.h" + #include "DummyLanguageMonitor.h" diff --git a/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild b/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild index d75cb09fca..e647c5209e 100644 --- a/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild +++ b/system/dymo-cups-drivers/dymo-cups-drivers.SlackBuild @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Patch for the newer cups - thanks archlinux! +patch -p1 < $CWD/cups-ppd-header.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/dynamips/dynamips.SlackBuild b/system/dynamips/dynamips.SlackBuild index a9edf005e9..76345e6758 100644 --- a/system/dynamips/dynamips.SlackBuild +++ b/system/dynamips/dynamips.SlackBuild @@ -75,6 +75,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ sed -i 's/^\(\.PHONY: all dynamips\)/# \1/' Makefile +sed -i "s/-L\/usr\/lib\ -L\.\ -ldl/-L\/usr\/lib${LIBDIRSUFFIX} -L. -ldl -lz/" stable/Makefile if [ $ARCH == "x86_64" ] then diff --git a/system/efitools/efitools.SlackBuild b/system/efitools/efitools.SlackBuild index b2f041bed3..844fc759b4 100644 --- a/system/efitools/efitools.SlackBuild +++ b/system/efitools/efitools.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=efitools -VERSION=${VERSION:-1.5.3} +VERSION=${VERSION:-1.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -32,7 +32,7 @@ USE_KEYS=${USE_KEYS:-no} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -44,8 +44,8 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} # It's not safe to specify build flags since some EFI programs are built. -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" EFI_ARCH=ia32 elif [ "$ARCH" = "i686" ]; then diff --git a/system/efitools/efitools.info b/system/efitools/efitools.info index 8946a7cacf..e496e0d12e 100644 --- a/system/efitools/efitools.info +++ b/system/efitools/efitools.info @@ -1,8 +1,8 @@ PRGNAM="efitools" -VERSION="1.5.3" +VERSION="1.8.1" HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/efitools.git" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.5.3.tar.gz" -MD5SUM="19ed4d83cfbb10987b84fca5a744715a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/efitools-1.8.1.tar.gz" +MD5SUM="830988a246c7c0359eaea24233cbfb76" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-File-Slurp sbsigntools" diff --git a/system/evilvte/evilvte.info b/system/evilvte/evilvte.info index e4cd913dd5..76d6079d62 100644 --- a/system/evilvte/evilvte.info +++ b/system/evilvte/evilvte.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/caleb-/evilvte/archive/8dfa41e26bc640dd8d8c7317ff7d MD5SUM="e09c34ac7d5afaf6ca785b7984df70ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="vte2" MAINTAINER="Edinaldo P. Silva" EMAIL="edps.mundognu@gmail.com" diff --git a/system/extundelete/extundelete-e2fsprogs-1.44.1.patch b/system/extundelete/extundelete-e2fsprogs-1.44.1.patch new file mode 100644 index 0000000000..61c078bfb8 --- /dev/null +++ b/system/extundelete/extundelete-e2fsprogs-1.44.1.patch @@ -0,0 +1,12 @@ +diff -ru extundelete-0.2.4.orig/src/insertionops.cc extundelete-0.2.4/src/insertionops.cc +--- extundelete-0.2.4.orig/src/insertionops.cc 2018-06-04 22:19:22.460051515 +0000 ++++ extundelete-0.2.4/src/insertionops.cc 2018-06-04 22:19:49.256717673 +0000 +@@ -33,7 +33,7 @@ + os << "File flags: " << inode.i_flags << std::endl; + os << "File version (for NFS): " << inode.i_generation << std::endl; + os << "File ACL: " << inode.i_file_acl << std::endl; +- os << "Directory ACL: " << inode.i_dir_acl << std::endl; ++ os << "Directory ACL: " << inode.i_size_high << std::endl; + os << "Fragment address: " << inode.i_faddr << std::endl; + os << "Direct blocks: "; + for (int n = 0; n < EXT2_NDIR_BLOCKS; n++) diff --git a/system/extundelete/extundelete.SlackBuild b/system/extundelete/extundelete.SlackBuild index 5707b90896..ad08fe39e7 100644 --- a/system/extundelete/extundelete.SlackBuild +++ b/system/extundelete/extundelete.SlackBuild @@ -72,6 +72,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/extundelete-e2fsprogs-1.44.1.patch + mkdir -p $PKG/usr/bin $PKG/usr/doc DFLAGS=$LDFLAGS \ diff --git a/system/facter/facter.SlackBuild b/system/facter/facter.SlackBuild index 7788f94801..03f1919ac8 100644 --- a/system/facter/facter.SlackBuild +++ b/system/facter/facter.SlackBuild @@ -77,7 +77,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -Wno-error=misleading-indentation" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/system/gnome-terminal/gnome-terminal.info b/system/gnome-terminal/gnome-terminal.info index e9dce86924..e28f430da0 100644 --- a/system/gnome-terminal/gnome-terminal.info +++ b/system/gnome-terminal/gnome-terminal.info @@ -5,6 +5,6 @@ DOWNLOAD="https://ftp.gnome.org/pub/gnome/sources/gnome-terminal/2.32/gnome-term MD5SUM="cb7843b97a78a3bbaac9381f78bb8569" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libgnome rarian" +REQUIRES="libgnome rarian vte2" MAINTAINER="Thorn Inurcide" EMAIL="thorn-inurcide@hotmail.com" diff --git a/system/gnome-vfs/gnome-vfs.SlackBuild b/system/gnome-vfs/gnome-vfs.SlackBuild index 2a2e087339..7d8a3dfb57 100644 --- a/system/gnome-vfs/gnome-vfs.SlackBuild +++ b/system/gnome-vfs/gnome-vfs.SlackBuild @@ -72,6 +72,8 @@ find -L . \ # Fix for the newer glib sed -i "/-DG_DISABLE_DEPRECATED/d" */Makefile.* +LIBS="-L/usr/lib$LIBDIRSUFFIX/openssl-1.0" \ +CPPFLAGS="-I/usr/include/openssl-1.0" \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/guake/guake.info b/system/guake/guake.info index 60ba890865..3255991887 100644 --- a/system/guake/guake.info +++ b/system/guake/guake.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Guake/guake/archive/0.8.13/guake-0.8.13.tar.gz" MD5SUM="2d79ecb3b593ac054e60e62610b6fc6b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pyxdg python-keybinder gnome-python2-gconf gnome-common" +REQUIRES="pyxdg python-keybinder gnome-python2-gconf gnome-common vte2" MAINTAINER="Donald Cooley" EMAIL="chytraeu@sdf.org" diff --git a/system/guefi/README b/system/guefi/README new file mode 100644 index 0000000000..63caa688ed --- /dev/null +++ b/system/guefi/README @@ -0,0 +1,3 @@ +GUEFI is a Python/GTK+3 application that acts as a frontend for +efibootmgr. It provides an easy to use interface for managing +UEFI boot options. diff --git a/system/t1utils/t1utils.SlackBuild b/system/guefi/guefi.SlackBuild index ab9ef7ba50..a515d4ceb6 100644 --- a/system/t1utils/t1utils.SlackBuild +++ b/system/guefi/guefi.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for t1utils +# Slackware build script for guefi -# Copyright 2013-2017 Kyle Guinn <elyk03@gmail.com>, USA +# Copyright 2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,30 +22,25 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=t1utils -VERSION=${VERSION:-1.41} +PRGNAM=guefi +VERSION=${VERSION:-0.1.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then - case "$(uname -m)" in + case "$( uname -m )" in i?86) ARCH=i586 ;; arm*) ARCH=arm ;; - *) ARCH=$(uname -m) ;; + *) ARCH=$( uname -m ) ;; esac fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM-$VERSION +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="INSTALL LICENSE NEWS.md README.md" - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then +if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then @@ -59,35 +54,31 @@ else LIBDIRSUFFIX="" fi +DOCS="AUTHORS COPYING README.md" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -chmod -R u+w,go-w,a+rX-st . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# -D_GNU_SOURCE is to fix https://github.com/kohler/t1utils/issues/8 -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-dependency-tracking \ - --build=$ARCH-slackware-linux \ - CFLAGS="$SLKCFLAGS" \ - CPPFLAGS="-D_GNU_SOURCE" \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +make prefix=/usr -make -make install-strip DESTDIR=$PKG +make install DESTDIR=$PKG -find $PKG/usr/man -type f -exec gzip -9 {} + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/guefi/guefi.info b/system/guefi/guefi.info new file mode 100644 index 0000000000..b91af7b998 --- /dev/null +++ b/system/guefi/guefi.info @@ -0,0 +1,10 @@ +PRGNAM="guefi" +VERSION="0.1.3" +HOMEPAGE="https://github.com/gapan/guefi" +DOWNLOAD="https://github.com/gapan/guefi/archive/0.1.3.tar.gz" +MD5SUM="08355512dd019d93f8809c66fb00132b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/lbzip2/slack-desc b/system/guefi/slack-desc index fb3286dd7e..e0df51a295 100644 --- a/system/lbzip2/slack-desc +++ b/system/guefi/slack-desc @@ -5,15 +5,15 @@ # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - |-----handy-ruler------------------------------------------------------| -lbzip2: lbzip2 (a pthreads-based parallel bzip2/bunzip2) -lbzip2: -lbzip2: Lbzip2 is a Pthreads-based parallel bzip2/bunzip2 filter passable to -lbzip2: GNU tar with the --use-compress-program option. It isn't restricted -lbzip2: to regular files on input, nor output. -lbzip2: -lbzip2: -lbzip2: -lbzip2: -lbzip2: -lbzip2: + |-----handy-ruler------------------------------------------------------| +guefi: guefi (GTK+3 frontend for efibootmgr) +guefi: +guefi: GUEFI is a Python/GTK+3 application that acts as a frontend for +guefi: efibootmgr. It provides an easy to use interface for managing +guefi: UEFI boot options. +guefi: +guefi: homepage: https://github.com/gapan/guefi +guefi: +guefi: +guefi: +guefi: diff --git a/system/innotop/README b/system/innotop/README deleted file mode 100644 index 91cdb498ac..0000000000 --- a/system/innotop/README +++ /dev/null @@ -1,6 +0,0 @@ -MySQL and InnoDB transaction/status monitor. Like 'top' for MySQL. - -Displays queries, InnoDB transactions, lock waits, deadlocks, foreign key -errors, open tables, replication status, buffer information, row -operations, logs, I/O operations, load graph, and more. -You can monitor many servers at once with innotop. diff --git a/system/innotop/innotop.SlackBuild b/system/innotop/innotop.SlackBuild deleted file mode 100644 index feebb18fe5..0000000000 --- a/system/innotop/innotop.SlackBuild +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh - -# Slackware build script for innotop - -# Copyright 2010-2013 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=innotop -VERSION=${VERSION:-1.9.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH="noarch" - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -perl Makefile.PL INSTALLDIRS=vendor -make -make test -make install DESTDIR=$PKG - -#Move man-pages to appropriate place -mv $PKG/usr/share/man $PKG/usr/ - -find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true -find $PKG -depth -type d -empty -exec rm -rf {} \; - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Changelog COPYING INSTALL MANIFEST \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/innotop/innotop.info b/system/innotop/innotop.info deleted file mode 100644 index 5db755263b..0000000000 --- a/system/innotop/innotop.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="innotop" -VERSION="1.9.1" -HOMEPAGE="https://github.com/innotop/innotop" -DOWNLOAD="https://distfiles.macports.org/innotop/innotop-1.9.1.tar.gz" -MD5SUM="7979b7a074e43fe1f0d032034e234bac" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/system/innotop/slack-desc b/system/innotop/slack-desc deleted file mode 100644 index 889a1b9c46..0000000000 --- a/system/innotop/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -innotop: innotop (MySQL / InnoDB monitor application) -innotop: -innotop: MySQL and InnoDB transaction/status monitor. Like 'top' for MySQL. -innotop: Displays queries, InnoDB transactions, lock waits, deadlocks, foreign -innotop: key errors, open tables, replication status, buffer information, row -innotop: operations, logs, I/O operations, load graph, and more. -innotop: You can monitor many servers at once with innotop. -innotop: -innotop: Homepage: https://github.com/innotop/innotop -innotop: -innotop: diff --git a/system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch b/system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch new file mode 100644 index 0000000000..d565cff0f3 --- /dev/null +++ b/system/kyotocabinet/kyotocabinet-1.2.76-gcc6.patch @@ -0,0 +1,45 @@ +Patch from Andreas Stührk <andy@hammerhartes.de> to work around build +failures with GCC >= 6 like: + +In file included from kcdbext.cc:16:0: +kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)': +kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return + return false; + ^~~~~ +In file included from kclangc.cc:17:0: +kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)': +kcdbext.h:1281:14: error: cannot convert 'bool' to 'char*' in return + return false; + ^~~~~ + +Note that using '\0' rather nullptr (like the patch from openSUSE is +doing) just leads to new build failures with GCC >= 7 like: + +In file included from kcdbext.cc:16:0: +kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)': +kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*' [-fpermissive] + return '\0'; + ^~~~ +In file included from kclangc.cc:17:0: +kcdbext.h: In member function 'char* kyotocabinet::IndexDB::get(const char*, size_t, size_t*)': +kcdbext.h:1281:14: error: invalid conversion from 'char' to 'char*' [-fpermissive] + return '\0'; + ^~~~ + +See also: + + - https://bugzilla.redhat.com/show_bug.cgi?id=1307706 + - https://build.opensuse.org/package/view_file/devel:libraries:c_c++/kyotocabinet/gcc6-fix-errors.patch?expand=1 + - https://bugs.debian.org/811627 + +--- kyotocabinet-1.2.76/kcdbext.h 2016-05-25 11:32:53.591866016 +0200 ++++ kyotocabinet-1.2.76/kcdbext.h 2012-05-24 18:27:59.000000000 +0200 +@@ -1278,7 +1278,7 @@ + if (omode_ == 0) { + set_error(_KCCODELINE_, BasicDB::Error::INVALID, "not opened"); + *sp = 0; +- return false; ++ return nullptr; + } + if (!cache_) return db_.get(kbuf, ksiz, sp); + size_t dvsiz = 0; diff --git a/system/kyotocabinet/kyotocabinet.SlackBuild b/system/kyotocabinet/kyotocabinet.SlackBuild index 6cb8823a5a..5efbfdb944 100644 --- a/system/kyotocabinet/kyotocabinet.SlackBuild +++ b/system/kyotocabinet/kyotocabinet.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for kyotocabinet -# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Patch for gcc >= 6.x - thanks to opensuse +patch -p1 < $CWD/kyotocabinet-1.2.76-gcc6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/lbzip2/README b/system/lbzip2/README deleted file mode 100644 index 2092f0ebfb..0000000000 --- a/system/lbzip2/README +++ /dev/null @@ -1,2 +0,0 @@ -lbzip2 is a multi-threaded bzip2/bunzip2 filter that doesn't depend on the -lseek() system call and so isn't restricted to regular files. diff --git a/system/lbzip2/lbzip2.SlackBuild b/system/lbzip2/lbzip2.SlackBuild deleted file mode 100644 index 801213a810..0000000000 --- a/system/lbzip2/lbzip2.SlackBuild +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh -# -# Slackware build script for lbzip2 -# -# Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Modified by B. Watson <yalhcru@gmail.com>. - -# 20170302 bkw: use long-format github URL - -# 20150519 bkw: -# - took over maintenance -# - bump VERSION to 2.5 -# - add gnulib dependency -# - make VERSION respect environment -# - clean up slack-desc - -PRGNAM=lbzip2 -VERSION=${VERSION:-2.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -eu - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Upstream says automake-1.14 is required, but our -# 1.11.5 works fine if we change the version check. -sed -i '/^AM_INIT_AUTOMAKE/s,1\.14,1.11.5,' configure.ac - -sh build-aux/autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -gzip $PKG/usr/man/man1/$PRGNAM.1 - -# The other man pages just source lbzip2.1. Make them -# symlinks instead (easier to deal with). -for i in lbunzip2 lbzcat; do - rm -f $PKG/usr/man/man1/$i.1 - ln -s $PRGNAM.1.gz $PKG/usr/man/man1/$i.1.gz -done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ALGORITHM AUTHORS COPYING ChangeLog* NEWS README THANKS \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/lbzip2/lbzip2.info b/system/lbzip2/lbzip2.info deleted file mode 100644 index c1ccd5d21a..0000000000 --- a/system/lbzip2/lbzip2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lbzip2" -VERSION="2.5" -HOMEPAGE="https://github.com/kjn/lbzip2/" -DOWNLOAD="https://github.com/kjn/lbzip2/archive/v2.5/lbzip2-2.5.tar.gz" -MD5SUM="288e404f325d9073bdc80759cae30adc" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gnulib" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/system/lilyterm/lilyterm.SlackBuild b/system/lilyterm/lilyterm.SlackBuild index 6d4a4a5835..b5bc2dfe1e 100644 --- a/system/lilyterm/lilyterm.SlackBuild +++ b/system/lilyterm/lilyterm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lilyterm -VERSION=${VERSION:-0.9.9.2} +VERSION=${VERSION:-0.9.9.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lilyterm/lilyterm.info b/system/lilyterm/lilyterm.info index 18760fdefe..c7f00b5797 100644 --- a/system/lilyterm/lilyterm.info +++ b/system/lilyterm/lilyterm.info @@ -1,10 +1,10 @@ PRGNAM="lilyterm" -VERSION="0.9.9.2" +VERSION="0.9.9.4" HOMEPAGE="https://lilyterm.luna.com.tw/index.html" -DOWNLOAD="https://lilyterm.luna.com.tw/file/lilyterm-0.9.9.2.tar.gz" -MD5SUM="d68dd29ce4894f765adba1efd470f90e" +DOWNLOAD="https://lilyterm.luna.com.tw/file/lilyterm-0.9.9.4.tar.gz" +MD5SUM="3bbfd4037d45a16b1b45846ce51d100a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="vte2" MAINTAINER="Emil Torofiev" EMAIL="etorofiev@gmail.com" diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info index c55e2ad984..3e19d47f89 100644 --- a/system/lxterminal/lxterminal.info +++ b/system/lxterminal/lxterminal.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/lxde/lxterminal-0.3.1.tar.xz" MD5SUM="91febe1ec15297844333cb70f237b4b7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="vte2" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/system/mailutils/mailutils.SlackBuild b/system/mailutils/mailutils.SlackBuild index ed960ad4a8..e6d1fdd1f9 100644 --- a/system/mailutils/mailutils.SlackBuild +++ b/system/mailutils/mailutils.SlackBuild @@ -71,7 +71,7 @@ cd $PRGNAM-$VERSION --mandir=/usr/man \ --infodir=/usr/info \ --localstatedir=/var/lib \ - --with-guile-site-dir + --without-guile make make install DESTDIR=$PKG diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index d96fb10087..fd59a52657 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -260,6 +260,9 @@ cd - install -m 644 _out/Linux_$TARGET/nvidia-persistenced.1.gz $PKG/usr/man/man1/ cd - +# Remove $PKG/usr/lib{,$LIBDIRSUFFIX}/libGL.la files +rm -f $PKG/usr/lib{,$LIBDIRSUFFIX}/libGL.la + # Bash script to cleanly install (in doinst.sh) and uninstall the nvidia files # so we don't stomp on the overlapping xorg files. # Note: switching can be problematic ;-) @@ -278,24 +281,15 @@ else fi # These add or correct wrong paths -sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la -sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la sed -i "s|__UTILS_PATH__|/usr/bin|" $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__PIXMAP_PATH__|/usr/share/pixmaps|" $PKG/usr/share/applications/nvidia-settings.desktop sed -i "s|__NVIDIA_SETTINGS_DESKTOP_CATEGORIES__|Application;Settings;|" $PKG/usr/share/applications/nvidia-settings.desktop -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib/libGL.la - sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la - sed -i "s|'/usr/'|'/usr/lib'|" $PKG/usr/lib/libGL.la -fi - # rename wrong/conficting files as needed; remove conflicting symlinks created by installer cd $PKG/usr/lib$LIBDIRSUFFIX if [ "$GLVND" = "yes" ]; then mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia fi - mv libGL.la libGL.la-nvidia mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia rm -f libEGL.so @@ -312,7 +306,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then if [ "$GLVND" = "yes" ]; then mv libEGL.so.1.1.0 libEGL.so.1.1.0-nvidia fi - mv libGL.la libGL.la-nvidia mv libGLESv1_CM.so.1.2.0 libGLESv1_CM.so.1.2.0-nvidia mv libGLESv2.so.2.1.0 libGLESv2.so.2.1.0-nvidia rm -f libEGL.so diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch index 4499b2e5d9..026b6a169c 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -58,11 +58,9 @@ save_GL(){ "nvidia") mv libGL.so.$GL_VERSION $SAVELIBS/libGL.so.$GL_VERSION - mv libGL.la $SAVELIBS/libGL.la mv libEGL.so.1.0.0 $SAVELIBS/libEGL.so.1.0.0 mv libGLESv1_CM.so.1.1.0 $SAVELIBS/libGLESv1_CM.so.1.1.0 mv libGLESv2.so.2.0.0 $SAVELIBS/libGLESv2.so.2.0.0 - mv libGL.la-nvidia libGL.la if [ "$GLVND" = "yes" ]; then ln -sf libGL.so.1.7.0 libGL.so.1 @@ -86,9 +84,7 @@ save_GL(){ ;; "xorg") - mv libGL.la libGL.la-nvidia mv $SAVELIBS/libGL.so.$GL_VERSION libGL.so.$GL_VERSION - mv $SAVELIBS/libGL.la libGL.la mv $SAVELIBS/libEGL.so.1.0.0 libEGL.so.1.0.0 mv $SAVELIBS/libGLESv1_CM.so.1.1.0 libGLESv1_CM.so.1.1.0 mv $SAVELIBS/libGLESv2.so.2.0.0 libGLESv2.so.2.0.0 diff --git a/system/nvidia-legacy304-kernel/4.14_kernel.patch b/system/nvidia-legacy304-kernel/4.14_kernel.patch new file mode 100644 index 0000000000..6642189009 --- /dev/null +++ b/system/nvidia-legacy304-kernel/4.14_kernel.patch @@ -0,0 +1,26 @@ +diff -ur a/kernel/nv-drm.c b/kernel/nv-drm.c +--- a/kernel/nv-drm.c 2017-09-14 23:51:09.000000003 +0300 ++++ b/kernel/nv-drm.c 2017-12-06 18:47:48.279729889 +0200 +@@ -121,7 +121,11 @@ + { + int ret = 0; + #if defined(NV_DRM_AVAILABLE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + ret = drm_pci_init(&nv_drm_driver, pci_driver); ++#else ++ ret = drm_legacy_pci_init(&nv_drm_driver, pci_driver); ++#endif + #endif + return ret; + } +@@ -131,6 +135,10 @@ + ) + { + #if defined(NV_DRM_AVAILABLE) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) + drm_pci_exit(&nv_drm_driver, pci_driver); ++#else ++ drm_legacy_pci_exit(&nv_drm_driver, pci_driver); ++#endif + #endif + } diff --git a/system/nvidia-legacy304-kernel/4.15_kernel.patch b/system/nvidia-legacy304-kernel/4.15_kernel.patch new file mode 100644 index 0000000000..fdac62fb24 --- /dev/null +++ b/system/nvidia-legacy304-kernel/4.15_kernel.patch @@ -0,0 +1,48 @@ +diff -ur a/kernel/nv.c b/kernel/nv.c +--- a/kernel/nv.c 2017-09-14 23:51:09.000000000 +0300 ++++ b/kernel/nv.c 2018-02-13 14:56:42.289490885 +0200 +@@ -301,7 +301,11 @@ + #else + irqreturn_t nv_kern_isr(int, void *); + #endif ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + void nv_kern_rc_timer(unsigned long); ++#else ++void nv_kern_rc_timer(struct timer_list *t); ++#endif + #if defined(NV_PM_SUPPORT_OLD_STYLE_APM) + static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *); + #endif +@@ -2075,10 +2079,18 @@ + } + + void nv_kern_rc_timer( ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + unsigned long data ++#else ++ struct timer_list *t ++#endif + ) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + nv_linux_state_t *nvl = (nv_linux_state_t *) data; ++#else ++ nv_linux_state_t *nvl = from_timer(nvl, t, rc_timer); ++#endif + nv_state_t *nv = NV_STATE_PTR(nvl); + + NV_CHECK_PCI_CONFIG_SPACE(nvl->timer_sp, nv, TRUE, TRUE, FALSE); +@@ -3029,9 +3041,13 @@ + return -1; + + nv_printf(NV_DBG_INFO, "NVRM: initializing rc timer\n"); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + init_timer(&nvl->rc_timer); + nvl->rc_timer.function = nv_kern_rc_timer; + nvl->rc_timer.data = (unsigned long) nv; ++#else ++ timer_setup(&nvl->rc_timer, nv_kern_rc_timer, 0); ++#endif + nv->rc_timer_enabled = 1; + mod_timer(&nvl->rc_timer, jiffies + HZ); /* set our timeout for 1 second */ + nv_printf(NV_DBG_INFO, "NVRM: rc timer initialized\n"); diff --git a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild index c789ab3a6a..db6edc4a0d 100644 --- a/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild +++ b/system/nvidia-legacy304-kernel/nvidia-legacy304-kernel.SlackBuild @@ -75,6 +75,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# https://pkgs.rpmfusion.org/cgit/nonfree/nvidia-304xx-kmod.git/log/ +patch -p1 < $CWD/4.14_kernel.patch +patch -p1 < $CWD/4.15_kernel.patch + cd kernel || exit 1 make SYSSRC=$KERNELPATH module || exit 1 diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild index 383b7f696e..6fa2abf8e8 100644 --- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild +++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.SlackBuild @@ -26,7 +26,7 @@ # See changelog.txt PRGNAM=nvidia-legacy340-driver -VERSION=${VERSION:-340.104} +VERSION=${VERSION:-340.106} MVERS=340 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info index 5fd6b0141e..f6021f52fd 100644 --- a/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info +++ b/system/nvidia-legacy340-driver/nvidia-legacy340-driver.info @@ -1,26 +1,26 @@ PRGNAM="nvidia-legacy340-driver" -VERSION="340.104" +VERSION="340.106" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.104/NVIDIA-Linux-x86-340.104.run \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.104.tar.bz2" -MD5SUM="42e9c98e156f6ac2658ee526d796a428 \ - 68749455b4a2b5fb9e63876ea5c60787 \ - 0b5d473008734588dda2d1b8b7d79d71 \ - 0024eacf3e1b473b300123229a9012ff \ - 9f28850e70824a765918b13345f630f7" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.104/NVIDIA-Linux-x86_64-340.104.run \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.104.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.104.tar.bz2" -MD5SUM_x86_64="4750891b7e175c0dc9a04608e493d141 \ - 68749455b4a2b5fb9e63876ea5c60787 \ - 0b5d473008734588dda2d1b8b7d79d71 \ - 0024eacf3e1b473b300123229a9012ff \ - 9f28850e70824a765918b13345f630f7" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.106/NVIDIA-Linux-x86-340.106.run \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.106.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.106.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.106.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.106.tar.bz2" +MD5SUM="a2895c566341506677d8293b4aec0dc0 \ + 736a07966d0e412a7f640bd4917fb292 \ + 3d04e1de5fdb5bdd8da57d63bfd12a4c \ + 026fdb5bbda40d5002332a06c5873bd3 \ + a32d5995fdd4c588ae9187187adffbef" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.106/NVIDIA-Linux-x86_64-340.106.run \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-340.106.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-340.106.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-340.106.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-340.106.tar.bz2" +MD5SUM_x86_64="532776ec90b81daa9130b2d1a1040558 \ + 736a07966d0e412a7f640bd4917fb292 \ + 3d04e1de5fdb5bdd8da57d63bfd12a4c \ + 026fdb5bbda40d5002332a06c5873bd3 \ + a32d5995fdd4c588ae9187187adffbef" REQUIRES="nvidia-legacy340-kernel" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild index c89c49cce1..1e02926f07 100644 --- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild +++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild @@ -28,7 +28,7 @@ # See changelog.txt PRGNAM=nvidia-legacy340-kernel -VERSION=${VERSION:-340.104} +VERSION=${VERSION:-340.106} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info index 3053c85389..5d032a41ff 100644 --- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info +++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-legacy340-kernel" -VERSION="340.104" +VERSION="340.106" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.104/NVIDIA-Linux-x86-340.104.run" -MD5SUM="42e9c98e156f6ac2658ee526d796a428" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.104/NVIDIA-Linux-x86_64-340.104.run" -MD5SUM_x86_64="4750891b7e175c0dc9a04608e493d141" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/340.106/NVIDIA-Linux-x86-340.106.run" +MD5SUM="a2895c566341506677d8293b4aec0dc0" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/340.106/NVIDIA-Linux-x86_64-340.106.run" +MD5SUM_x86_64="532776ec90b81daa9130b2d1a1040558" REQUIRES="" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild index e7dc5c71e3..88eb086aec 100644 --- a/system/opensc/opensc.SlackBuild +++ b/system/opensc/opensc.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opensc -VERSION=${VERSION:-0.15.0} +VERSION=${VERSION:-0.16.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCFILES="README COPYING NEWS ChangeLog" -XSL_STYLESHEETS_VER=1.78.1 +DOCFILES="README COPYING NEWS" +XSL_STYLESHEETS_VER=1.79.2 # opensc now supports only one reader subsystem (pcsc-lite or openct) OPENCT=${OPENCT:-0} # pcsc-lite is the default, openct disabled @@ -51,8 +51,8 @@ case "$OPENCT" in *) RDRSUBSYS_flags="--disable-pcsc --enable-openct" ;; esac -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info index 91496b60e0..d536fa91ad 100644 --- a/system/opensc/opensc.info +++ b/system/opensc/opensc.info @@ -1,8 +1,8 @@ PRGNAM="opensc" -VERSION="0.15.0" +VERSION="0.16.0" HOMEPAGE="https://github.com/OpenSC/OpenSC/wiki/" -DOWNLOAD="http://downloads.sourceforge.net/opensc/OpenSC/opensc-0.15.0.tar.gz" -MD5SUM="34c55315b7f381bd047b6435933baab4" +DOWNLOAD="https://sourceforge.net/projects/opensc/files/OpenSC/opensc-0.16.0/opensc-0.16.0.tar.gz" +MD5SUM="724d128f23cd7a74b28d04300ce7bcbd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pcsc-lite" diff --git a/system/percona-xtrabackup/README b/system/percona-xtrabackup/README deleted file mode 100644 index 05cb5de107..0000000000 --- a/system/percona-xtrabackup/README +++ /dev/null @@ -1,2 +0,0 @@ -Percona XtraBackup is OpenSource online (non-blockable) backup -solution for InnoDB and XtraDB engines. diff --git a/system/percona-xtrabackup/percona-xtrabackup.SlackBuild b/system/percona-xtrabackup/percona-xtrabackup.SlackBuild deleted file mode 100644 index 3127baaa7c..0000000000 --- a/system/percona-xtrabackup/percona-xtrabackup.SlackBuild +++ /dev/null @@ -1,155 +0,0 @@ -#!/bin/sh - -# Slackware build script for percona-xtrabackup - -# Copyright 2012-2013 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=percona-xtrabackup -VERSION=${VERSION:-2.1.5} -PERCONA_VERSION=${PERCONA_VERSION:-5.5.31-rel30.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i586 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -rm -rf Percona-Server-$PERCONA_VERSION -tar xvf $PRGNAM-$VERSION/Percona-Server-$PERCONA_VERSION.tar.gz -cd Percona-Server-$PERCONA_VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Apply xtrabackup patch -patch -p1 -i ../$PRGNAM-$VERSION/patches/xtradb55.patch - -LIBS="-lrt" \ -cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION/src" \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS -I$TMP/$PRGNAM-$VERSION/src" \ - -DENABLED_LOCAL_INFILE=ON \ - -DWITH_INNOBASE_STORAGE_ENGINE=ON \ - -DWITH_PARTITION_STORAGE_ENGINE=ON \ - -DWITH_ZLIB=bundled \ - -DWITH_EXTRA_CHARSETS=all \ - -DENABLE_DTRACE=OFF \ - . - -for i in include zlib strings mysys dbug extra storage/innobase; do - make -C $i -done - -cd $TMP/$PRGNAM-$VERSION -chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# build internal libarchive -cd src/libarchive - cmake \ - -DCMAKE_C_FLAGS="$SLKCFLAGS" \ - -DENABLE_CPIO=OFF \ - -DENABLE_OPENSSL=OFF \ - -DENABLE_TAR=OFF \ - -DENABLE_TEST=OFF \ - . - - make -cd - - -# build xtrabackup -cd src - LIBS="-lrt" \ - CFLAGS="$SLKCFLAGS" \ - make \ - MYSQL_ROOT_DIR="$TMP/Percona-Server-$PERCONA_VERSION" \ - clean - - LIBS="-lrt" \ - CFLAGS="$SLKCFLAGS" \ - make \ - MYSQL_ROOT_DIR="$TMP/Percona-Server-$PERCONA_VERSION" \ - XTRABACKUP_VERSION=$VERSION \ - xtradb55 -cd - - -mkdir -p $PKG/usr/{bin,man/man1} -install -m 755 src/xtrabackup_55 $PKG/usr/bin/xtrabackup -install -m 755 src/xbstream $PKG/usr/bin/ -install -m 755 src/xbcrypt $PKG/usr/bin/ -install -m 755 innobackupex $PKG/usr/bin/ -install -m 644 doc/xtrabackup.1 $PKG/usr/man/man1/ - -# Fix xtrabackup usage in innobackupex -sed -i "s/xtrabackup_55/xtrabackup/g" $PKG/usr/bin/innobackupex - -find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a BUILD.txt COPYING REVNO VERSION \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/percona-xtrabackup/percona-xtrabackup.info b/system/percona-xtrabackup/percona-xtrabackup.info deleted file mode 100644 index e2b8be656b..0000000000 --- a/system/percona-xtrabackup/percona-xtrabackup.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="percona-xtrabackup" -VERSION="2.1.5" -HOMEPAGE="http://www.percona.com/software/percona-xtrabackup" -DOWNLOAD="http://www.percona.com/downloads/XtraBackup/XtraBackup-2.1.5/source/percona-xtrabackup-2.1.5.tar.gz" -MD5SUM="8782d736ecf7f0a702a8c053c4f9cdb8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/system/percona-xtrabackup/slack-desc b/system/percona-xtrabackup/slack-desc deleted file mode 100644 index 4ed2d118e3..0000000000 --- a/system/percona-xtrabackup/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -percona-xtrabackup: percona-xtrabackup (Online backup for MySQL / InnoDB) -percona-xtrabackup: -percona-xtrabackup: Percona XtraBackup is OpenSource online (non-blockable) backup -percona-xtrabackup: solution for InnoDB and XtraDB engines. -percona-xtrabackup: -percona-xtrabackup: Homepage: http://www.percona.com/software/percona-xtrabackup -percona-xtrabackup: -percona-xtrabackup: -percona-xtrabackup: -percona-xtrabackup: -percona-xtrabackup: diff --git a/system/qemu/patches/0000-qxl-fix-local-renderer-crash.patch b/system/qemu/patches/0000-qxl-fix-local-renderer-crash.patch new file mode 100644 index 0000000000..a839d38249 --- /dev/null +++ b/system/qemu/patches/0000-qxl-fix-local-renderer-crash.patch @@ -0,0 +1,43 @@ +From 5bd5c27c7d284d01477c5cc022ce22438c46bf9f Mon Sep 17 00:00:00 2001 +Message-Id: <5bd5c27c7d284d01477c5cc022ce22438c46bf9f.1528219523.git.crobinso@redhat.com> +From: Gerd Hoffmann <kraxel@redhat.com> +Date: Fri, 27 Apr 2018 13:55:28 +0200 +Subject: [PATCH] qxl: fix local renderer crash +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Make sure we only ask the spice local renderer for display updates in +case we have a valid primary surface. Without that spice is confused +and throws errors in case a display update request (triggered by +screendump for example) happens in parallel to a mode switch and hits +the race window where the old primary surface is gone and the new isn't +establisted yet. + +Cc: qemu-stable@nongnu.org +Fixes: https://bugzilla.redhat.com//show_bug.cgi?id=1567733 +Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> +Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> +Message-id: 20180427115528.345-1-kraxel@redhat.com +Signed-off-by: Cole Robinson <crobinso@redhat.com> +--- + hw/display/qxl-render.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c +index e7ac4f8789..c62b9a5e75 100644 +--- a/hw/display/qxl-render.c ++++ b/hw/display/qxl-render.c +@@ -169,7 +169,8 @@ void qxl_render_update(PCIQXLDevice *qxl) + + qemu_mutex_lock(&qxl->ssd.lock); + +- if (!runstate_is_running() || !qxl->guest_primary.commands) { ++ if (!runstate_is_running() || !qxl->guest_primary.commands || ++ qxl->mode == QXL_MODE_UNDEFINED) { + qxl_render_update_area_unlocked(qxl); + qemu_mutex_unlock(&qxl->ssd.lock); + return; +-- +2.17.1 + diff --git a/system/qemu/patches/0001-i386-define-the-ssbd-CPUID-feature-bit-CVE-2018-3639.patch b/system/qemu/patches/0001-i386-define-the-ssbd-CPUID-feature-bit-CVE-2018-3639.patch new file mode 100644 index 0000000000..00cad34a6f --- /dev/null +++ b/system/qemu/patches/0001-i386-define-the-ssbd-CPUID-feature-bit-CVE-2018-3639.patch @@ -0,0 +1,51 @@ +From 7920d78dc80e7206e07f2a35f942e9f33174d251 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com> +Date: Mon, 21 May 2018 22:54:22 +0100 +Subject: [PATCH 1/3] i386: define the 'ssbd' CPUID feature bit (CVE-2018-3639) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +New microcode introduces the "Speculative Store Bypass Disable" +CPUID feature bit. This needs to be exposed to guest OS to allow +them to protect against CVE-2018-3639. + +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +Message-Id: <20180521215424.13520-2-berrange@redhat.com> +Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> +(cherry picked from commit d19d1f965904a533998739698020ff4ee8a103da) +--- + target/i386/cpu.c | 2 +- + target/i386/cpu.h | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/target/i386/cpu.c b/target/i386/cpu.c +index a20fe26573..2f5263e22f 100644 +--- a/target/i386/cpu.c ++++ b/target/i386/cpu.c +@@ -510,7 +510,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, "spec-ctrl", NULL, +- NULL, NULL, NULL, NULL, ++ NULL, NULL, NULL, "ssbd", + }, + .cpuid_eax = 7, + .cpuid_needs_ecx = true, .cpuid_ecx = 0, +diff --git a/target/i386/cpu.h b/target/i386/cpu.h +index 1b219fafc4..970ab96e54 100644 +--- a/target/i386/cpu.h ++++ b/target/i386/cpu.h +@@ -684,6 +684,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS]; + #define CPUID_7_0_EDX_AVX512_4VNNIW (1U << 2) /* AVX512 Neural Network Instructions */ + #define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) /* AVX512 Multiply Accumulation Single Precision */ + #define CPUID_7_0_EDX_SPEC_CTRL (1U << 26) /* Speculation Control */ ++#define CPUID_7_0_EDX_SPEC_CTRL_SSBD (1U << 31) /* Speculative Store Bypass Disable */ + + #define KVM_HINTS_DEDICATED (1U << 0) + +-- +2.17.0 + diff --git a/system/qemu/patches/0002-i386-Define-the-Virt-SSBD-MSR-and-handling-of-it-CVE.patch b/system/qemu/patches/0002-i386-Define-the-Virt-SSBD-MSR-and-handling-of-it-CVE.patch new file mode 100644 index 0000000000..4fc3e74007 --- /dev/null +++ b/system/qemu/patches/0002-i386-Define-the-Virt-SSBD-MSR-and-handling-of-it-CVE.patch @@ -0,0 +1,148 @@ +From 70913a1bded444b1d264c3723fca2f6a7966d667 Mon Sep 17 00:00:00 2001 +From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +Date: Mon, 21 May 2018 22:54:24 +0100 +Subject: [PATCH 2/3] i386: Define the Virt SSBD MSR and handling of it + (CVE-2018-3639) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +"Some AMD processors only support a non-architectural means of enabling +speculative store bypass disable (SSBD). To allow a simplified view of +this to a guest, an architectural definition has been created through a new +CPUID bit, 0x80000008_EBX[25], and a new MSR, 0xc001011f. With this, a +hypervisor can virtualize the existence of this definition and provide an +architectural method for using SSBD to a guest. + +Add the new CPUID feature, the new MSR and update the existing SSBD +support to use this MSR when present." (from x86/speculation: Add virtualized +speculative store bypass disable support in Linux). + +Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +Message-Id: <20180521215424.13520-4-berrange@redhat.com> +Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> +(cherry picked from commit cfeea0c021db6234c154dbc723730e81553924ff) +--- + target/i386/cpu.h | 2 ++ + target/i386/kvm.c | 16 ++++++++++++++-- + target/i386/machine.c | 20 ++++++++++++++++++++ + 3 files changed, 36 insertions(+), 2 deletions(-) + +diff --git a/target/i386/cpu.h b/target/i386/cpu.h +index 970ab96e54..75e821cefe 100644 +--- a/target/i386/cpu.h ++++ b/target/i386/cpu.h +@@ -351,6 +351,7 @@ typedef enum X86Seg { + #define MSR_IA32_FEATURE_CONTROL 0x0000003a + #define MSR_TSC_ADJUST 0x0000003b + #define MSR_IA32_SPEC_CTRL 0x48 ++#define MSR_VIRT_SSBD 0xc001011f + #define MSR_IA32_TSCDEADLINE 0x6e0 + + #define FEATURE_CONTROL_LOCKED (1<<0) +@@ -1150,6 +1151,7 @@ typedef struct CPUX86State { + uint32_t pkru; + + uint64_t spec_ctrl; ++ uint64_t virt_ssbd; + + /* End of state preserved by INIT (dummy marker). */ + struct {} end_init_save; +diff --git a/target/i386/kvm.c b/target/i386/kvm.c +index 6c49954e68..19e6aa320d 100644 +--- a/target/i386/kvm.c ++++ b/target/i386/kvm.c +@@ -92,6 +92,7 @@ static bool has_msr_hv_stimer; + static bool has_msr_hv_frequencies; + static bool has_msr_xss; + static bool has_msr_spec_ctrl; ++static bool has_msr_virt_ssbd; + static bool has_msr_smi_count; + + static uint32_t has_architectural_pmu_version; +@@ -1218,6 +1219,9 @@ static int kvm_get_supported_msrs(KVMState *s) + case MSR_IA32_SPEC_CTRL: + has_msr_spec_ctrl = true; + break; ++ case MSR_VIRT_SSBD: ++ has_msr_virt_ssbd = true; ++ break; + } + } + } +@@ -1706,6 +1710,10 @@ static int kvm_put_msrs(X86CPU *cpu, int level) + if (has_msr_spec_ctrl) { + kvm_msr_entry_add(cpu, MSR_IA32_SPEC_CTRL, env->spec_ctrl); + } ++ if (has_msr_virt_ssbd) { ++ kvm_msr_entry_add(cpu, MSR_VIRT_SSBD, env->virt_ssbd); ++ } ++ + #ifdef TARGET_X86_64 + if (lm_capable_kernel) { + kvm_msr_entry_add(cpu, MSR_CSTAR, env->cstar); +@@ -2077,8 +2085,9 @@ static int kvm_get_msrs(X86CPU *cpu) + if (has_msr_spec_ctrl) { + kvm_msr_entry_add(cpu, MSR_IA32_SPEC_CTRL, 0); + } +- +- ++ if (has_msr_virt_ssbd) { ++ kvm_msr_entry_add(cpu, MSR_VIRT_SSBD, 0); ++ } + if (!env->tsc_valid) { + kvm_msr_entry_add(cpu, MSR_IA32_TSC, 0); + env->tsc_valid = !runstate_is_running(); +@@ -2444,6 +2453,9 @@ static int kvm_get_msrs(X86CPU *cpu) + case MSR_IA32_SPEC_CTRL: + env->spec_ctrl = msrs[i].data; + break; ++ case MSR_VIRT_SSBD: ++ env->virt_ssbd = msrs[i].data; ++ break; + case MSR_IA32_RTIT_CTL: + env->msr_rtit_ctrl = msrs[i].data; + break; +diff --git a/target/i386/machine.c b/target/i386/machine.c +index bd2d82e91b..f0a835c292 100644 +--- a/target/i386/machine.c ++++ b/target/i386/machine.c +@@ -893,6 +893,25 @@ static const VMStateDescription vmstate_msr_intel_pt = { + } + }; + ++static bool virt_ssbd_needed(void *opaque) ++{ ++ X86CPU *cpu = opaque; ++ CPUX86State *env = &cpu->env; ++ ++ return env->virt_ssbd != 0; ++} ++ ++static const VMStateDescription vmstate_msr_virt_ssbd = { ++ .name = "cpu/virt_ssbd", ++ .version_id = 1, ++ .minimum_version_id = 1, ++ .needed = virt_ssbd_needed, ++ .fields = (VMStateField[]){ ++ VMSTATE_UINT64(env.virt_ssbd, X86CPU), ++ VMSTATE_END_OF_LIST() ++ } ++}; ++ + VMStateDescription vmstate_x86_cpu = { + .name = "cpu", + .version_id = 12, +@@ -1015,6 +1034,7 @@ VMStateDescription vmstate_x86_cpu = { + &vmstate_spec_ctrl, + &vmstate_mcg_ext_ctl, + &vmstate_msr_intel_pt, ++ &vmstate_msr_virt_ssbd, + NULL + } + }; +-- +2.17.0 + diff --git a/system/qemu/patches/0003-i386-define-the-AMD-virt-ssbd-CPUID-feature-bit-CVE-.patch b/system/qemu/patches/0003-i386-define-the-AMD-virt-ssbd-CPUID-feature-bit-CVE-.patch new file mode 100644 index 0000000000..09f7116d6a --- /dev/null +++ b/system/qemu/patches/0003-i386-define-the-AMD-virt-ssbd-CPUID-feature-bit-CVE-.patch @@ -0,0 +1,41 @@ +From f956cd4aed74d55ecc03d3c33ea66b1d933cb28f Mon Sep 17 00:00:00 2001 +From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +Date: Mon, 21 May 2018 22:54:23 +0100 +Subject: [PATCH 3/3] i386: define the AMD 'virt-ssbd' CPUID feature bit + (CVE-2018-3639) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +AMD Zen expose the Intel equivalant to Speculative Store Bypass Disable +via the 0x80000008_EBX[25] CPUID feature bit. + +This needs to be exposed to guest OS to allow them to protect +against CVE-2018-3639. + +Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> +Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> +Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> +Message-Id: <20180521215424.13520-3-berrange@redhat.com> +Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> +(cherry picked from commit 403503b162ffc33fb64cfefdf7b880acf41772cd) +--- + target/i386/cpu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/target/i386/cpu.c b/target/i386/cpu.c +index 2f5263e22f..2e305ab689 100644 +--- a/target/i386/cpu.c ++++ b/target/i386/cpu.c +@@ -541,7 +541,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORDS] = { + "ibpb", NULL, NULL, NULL, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, +- NULL, NULL, NULL, NULL, ++ NULL, "virt-ssbd", NULL, NULL, + NULL, NULL, NULL, NULL, + }, + .cpuid_eax = 0x80000008, +-- +2.17.0 + diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index bd0068043f..8b21b3ab16 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -113,6 +113,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +for i in $CWD/patches/* ; do patch -p1 < $i ; done + # Remove double CFLAGS sed -i "s|^\ \ CFLAGS=\"-O2\ | CFLAGS=\"|" configure @@ -131,6 +133,9 @@ else with_vnc="--disable-vnc" fi +# Workaround for the newer perl, thanks @volkerdi! +sed -i "s|LC_ALL=C|LC_ALL=C.UTF-8|" Makefile + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -188,7 +193,7 @@ fi # Add docs to the proper location mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a Changelog COPYING* CODING_STYLE HACKING LICENSE MAINTAINERS README qemu-*.html docs/* \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PRGNAM-$VERSION || true cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/qtfm/gcc6.patch b/system/qtfm/gcc6.patch new file mode 100644 index 0000000000..18a5514dce --- /dev/null +++ b/system/qtfm/gcc6.patch @@ -0,0 +1,12 @@ +diff -Naur qtfm.orig/src/mymodel.cpp qtfm/src/mymodel.cpp +--- qtfm.orig/src/mymodel.cpp 2013-05-25 19:25:38.000000000 +0200 ++++ qtfm/src/mymodel.cpp 2017-05-31 17:12:54.877169485 +0200 +@@ -220,7 +220,7 @@ + + if(item) return item->absoluteFilePath(); + +- return false; ++ return ""; + } + + //--------------------------------------------------------------------------------------- diff --git a/system/qtfm/qtfm.SlackBuild b/system/qtfm/qtfm.SlackBuild index 59cb3c3203..d7a2e4eb1d 100644 --- a/system/qtfm/qtfm.SlackBuild +++ b/system/qtfm/qtfm.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=qtfm -VERSION=${VERSION:-5.5} +VERSION=${VERSION:-5.9} +SRCVER=${SRCVER:-158787} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM +unzip $CWD/$SRCVER-$PRGNAM.zip +cd $PRGNAM chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -69,6 +70,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/gcc6.patch + # Set doc path to /usr/doc/$PRGNAM-$VERSION in qtfm.pro sed -i "s,usr/share/doc/$PRGNAM,usr/doc/$PRGNAM-$VERSION," qtfm.pro diff --git a/system/qtfm/qtfm.info b/system/qtfm/qtfm.info index f47835683e..e209d2cb6c 100644 --- a/system/qtfm/qtfm.info +++ b/system/qtfm/qtfm.info @@ -1,8 +1,8 @@ PRGNAM="qtfm" -VERSION="5.5" -HOMEPAGE="http://www.qtfm.org/" -DOWNLOAD="http://www.qtfm.org/qtfm-5.5.tar.gz" -MD5SUM="cc1d930503bf0dedc824d6f2abdda719" +VERSION="5.9" +HOMEPAGE="http://www.qtfm.org" +DOWNLOAD="https://dl.opendesktop.org/api/files/download/id/1466643163/158787-qtfm.zip" +MD5SUM="1a94bd7fbe99e87f530dc9bc1d7a8c45" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/roxterm/roxterm.info b/system/roxterm/roxterm.info index 7a9c1bb1a2..84ba1a539e 100644 --- a/system/roxterm/roxterm.info +++ b/system/roxterm/roxterm.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/roxterm/roxterm-2.9.7.tar.bz2" MD5SUM="496b5ddc078cede502f168dadef46cb6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="vte2" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" diff --git a/system/sbsigntools/autogen.patch b/system/sbsigntools/autogen.patch deleted file mode 100644 index e681792c49..0000000000 --- a/system/sbsigntools/autogen.patch +++ /dev/null @@ -1,277 +0,0 @@ -From c8c7e1ba97d15433247bcf87e88485cf7c6b7cc3 Mon Sep 17 00:00:00 2001 -From: James Bottomley <JBottomley@Parallels.com> -Date: Tue, 26 Jun 2012 09:49:05 +0100 -Subject: sbsigntools: fix autogen.sh for build service - ---- - AUTHORS | 4 ++ - ChangeLog | 224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - autogen.sh | 10 --- - 3 files changed, 228 insertions(+), 10 deletions(-) - create mode 100644 AUTHORS - create mode 100644 ChangeLog - -diff --git a/AUTHORS b/AUTHORS -new file mode 100644 -index 0000000..3eaa355 ---- /dev/null -+++ b/AUTHORS -@@ -0,0 +1,4 @@ -+ Adam Conrad -+ Ivan Hu -+ James Bottomley -+ Jeremy Kerr -diff --git a/ChangeLog b/ChangeLog -new file mode 100644 -index 0000000..d5d5ea6 ---- /dev/null -+++ b/ChangeLog -@@ -0,0 +1,224 @@ -+2012-06-20 c07dfb9 Ivan Hu <ivan.hu@canonical.com> -+ -+ * configure: Add check for bfh.h -+ -+2012-06-19 5e07c4e Ivan Hu <ivan.hu@canonical.com> -+ -+ * tests: Add a test to check invalid PKCS7 signature attaching -+ -+2012-06-19 bfb778e Ivan Hu <ivan.hu@canonical.com> -+ -+ * sbattach: Check that attached signatures are valid PKCS7 data -+ -+2012-06-14 bf6df84 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: Use a variable for image filename -+ -+2012-06-13 9b7f7fb Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * image: Unconditionally parse PE/COFF data -+ -+2012-06-13 128f1c1 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: Check for failed image load -+ -+2012-06-13 b48e256 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * tests: Add tests for missing image, cert & key files -+ -+2012-06-13 0af5e01 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * tests: Execute tests in a clean (temporary) directory -+ -+2012-06-13 8716e88 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * tests: Use COMPILE.S for assembing test object -+ -+2012-06-13 807f0e6 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Version 0.2 -+ -+2012-06-13 7c2d8bb Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * docs: Add simple manpage for sbattach -+ -+2012-06-13 deb9211 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * automake: Clean generated man files -+ -+2012-06-13 3cde1e4 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * tests: Add a few simple tests -+ -+2012-06-13 cc881c2 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Remove unused test.c file -+ -+2012-06-12 4c79e3a Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbattach: Add too to manage detached signatures -+ -+2012-06-12 564f5bc Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * image: Add facility to write unsigned images -+ -+2012-06-11 a07b8d2 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbsign,sbverify: Update getopt_long optstrings -+ -+2012-06-11 5836038 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: Add support for detached signatures -+ -+2012-06-11 b8a7d51 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: Split image signature table reading to separate function -+ -+2012-06-11 e9f438c Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Fix warnings from added -W flags -+ -+2012-06-11 f19e8bb Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * automake: Add -Wall -Wextra CFLAGS -+ -+2012-06-11 af4f088 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbsign: Add --detached option to create detached PKCS7 signatures -+ -+2012-06-11 0c9fbd2 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbsign: fix flag for verbose operation -+ -+2012-06-11 3673db1 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * docs: Fix manpage creation -+ -+2012-05-29 9b2f3a7 Adam Conrad <adconrad@0c3.net> -+ -+ * autogen.sh: Fix ccan_module assignment -+ -+2012-05-28 3fb0f00 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * image: use read_write_all from ccan -+ -+2012-05-28 f1112b4 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * image: Fix format specifier for 32-bit builds -+ -+2012-05-24 d5e634c Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * autoconfiscate -+ -+2012-05-23 82f8c30 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * docs: Add initial manpages -+ -+2012-05-23 c14efcb Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbsign,sbverify: help2man-ize usage output -+ -+2012-05-23 98a4f10 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Makefile: Add dist targets -+ -+2012-05-22 1b2b5c6 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * ccan: Add ccan import logic -+ -+2012-05-15 6ff68e5 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Move ccan submodule -+ -+2012-05-15 9a08e25 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Remove unused header -+ -+2012-05-14 bc618c5 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Remove pkcs7-simple test file -+ -+2012-05-14 9ac930e Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Makefile: add install target -+ -+2012-05-14 a1b270f Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Makefile: Comment components -+ -+2012-05-14 c67b82a Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: clean up openssl init -+ -+2012-05-14 c499763 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: add check for invalid PKCS7 data -+ -+2012-05-14 74eb766 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: Add certificate chain verification -+ -+2012-05-12 e111127 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * verify: move idc-related parsing to idc.c -+ -+2012-05-12 46cf6a6 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbsign: fix incorrect check for certificate load -+ -+2012-05-12 57d9f0c Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * image: reformat gap warnings -+ -+2012-05-12 ab05bec Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * image: add cert table to image size -+ -+2012-05-12 e1fec08 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: Add check for image hash -+ -+2012-05-12 fefe97c Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbverify: check for presence of signature table -+ -+2012-05-12 b73f723 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Makefile: add $(tools) var -+ -+2012-05-12 55b1940 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbsigntool -> sbsign -+ -+2012-05-12 a183de9 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * image: open output file with O_TRUNC -+ -+2012-04-24 04b70fc Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * sbsigntooL: expand usage info -+ -+2012-04-24 9826a43 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Add GPLv3 text in COPYING -+ -+2012-04-24 906654e Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * coff: remove unneeded coff includes -+ -+2012-04-23 9d3c8b5 Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Add copyright comments -+ -+2012-04-23 e019eec Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * image: warn about potential checksum differences -+ -+2012-04-23 01e33cd Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * idc: allocate using the image context -+ -+2012-04-23 acd8c0a Jeremy Kerr <jeremy.kerr@canonical.com> -+ -+ * Initial commit -+ -diff --git a/autogen.sh b/autogen.sh -index 32ea6f6..117835b 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -16,16 +16,6 @@ then - --build-type=automake lib/ccan $ccan_modules - fi - --# Create generatable docs from git --( -- echo "Authors of sbsigntool:" -- echo -- git log --format='%an' | sort -u | sed 's,^,\t,' --) > AUTHORS -- --# Generate simple ChangeLog --git log --date=short --format='%ad %t %an <%ae>%n%n * %s%n' > ChangeLog -- - # automagic - aclocal - autoheader --- -2.1.2 - diff --git a/system/sbsigntools/ccan_makefile.patch b/system/sbsigntools/ccan_makefile.patch deleted file mode 100644 index e77b958ab8..0000000000 --- a/system/sbsigntools/ccan_makefile.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- sbsigntools-0.7/lib/ccan.git/Makefile 2015-02-07 12:56:54.457781357 +0000 -+++ sbsigntools-0.7/lib/ccan.git/Makefile 2015-02-07 13:00:25.482175092 +0000 -@@ -15,7 +15,7 @@ - EXCLUDE=wwviaudio ogg_to_pcm jmap jset nfs - - # Where make scores puts the results --SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty) -+#SCOREDIR=scores/$(shell whoami)/$(shell uname -s)-$(shell uname -m)-$(CC)-$(shell git describe --always --dirty) - - ALL=$(filter-out $(EXCLUDE), $(REALLY_ALL)) - -@@ -77,7 +77,7 @@ distclean: clean - scores: $(SCOREDIR)/SUMMARY - - $(SCOREDIR)/SUMMARY: $(patsubst ccan/%/_info, $(SCOREDIR)/score-%, $(wildcard ccan/*/_info)) -- git describe --always > $@ -+# git describe --always > $@ - uname -a >> $@ - $(CC) -v >> $@ - cat $^ | grep 'Total score:' >> $@ diff --git a/system/sbsigntools/fix_efi_arch.patch b/system/sbsigntools/fix_efi_arch.patch deleted file mode 100644 index fceb96f4bf..0000000000 --- a/system/sbsigntools/fix_efi_arch.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 706bec1a957f2fcce3781e326e6e0b2be41a9b86 Mon Sep 17 00:00:00 2001 -From: James Bottomley <JBottomley@Parallels.com> -Date: Tue, 6 Jan 2015 08:00:28 -0800 -Subject: [PATCH] OBS add correcting definition of EFI_ARCH - -Signed-off-by: James Bottomley <JBottomley@Parallels.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4891151..2e80e09 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(uuid, uuid, - AC_MSG_ERROR([libuuid (from the uuid package) is required])) - - dnl gnu-efi headers require extra include dirs --EFI_ARCH=$(uname -m) -+EFI_ARCH=$(uname -m | sed s/i.86/ia32/) - EFI_CPPFLAGS="-I/usr/include/efi -I/usr/include/efi/$EFI_ARCH \ - -DEFI_FUNCTION_WRAPPER" - CPPFLAGS_save="$CPPFLAGS" --- -2.1.2 - diff --git a/system/sbsigntools/sbsigntools.SlackBuild b/system/sbsigntools/sbsigntools.SlackBuild index f9701591ff..5f64805828 100644 --- a/system/sbsigntools/sbsigntools.SlackBuild +++ b/system/sbsigntools/sbsigntools.SlackBuild @@ -23,15 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sbsigntools -VERSION=${VERSION:-0.7} +VERSION=${VERSION:-0.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -CCAN_VERSION=${CCAN_VERSION:-0.0.2} - if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -42,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -62,23 +60,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +# The tarball is generated from a clone --recursive of the git repository +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION -tar -xvf $CWD/ccan-$CCAN_VERSION.tar.gz -C lib/ccan.git - -# Next 2 patches taken from -# https://build.opensuse.org/package/show/home:jejb1:UEFI/sbsigntools?rev=16 -# Fixes build on 32-bit. -patch -p1 -i $CWD/fix_efi_arch.patch - -# Creates changelog and stops git from being called. -patch -p1 -i $CWD/autogen.patch - -# Suppress "not git repo messages"- they're evaluated by the makefile but don't -# actually get run so it's just noise. -patch -p1 -i $CWD/ccan_makefile.patch -rm lib/ccan.git/Makefile-web - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -86,7 +70,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -./autogen.sh +sed -i "s|/usr/lib$LIBDIRSUFFIX/efi|/usr/lib$LIBDIRSUFFIX/gnuefi|" configure.ac + +NOCONFIGURE=1 ./autogen.sh + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/sbsigntools/sbsigntools.info b/system/sbsigntools/sbsigntools.info index 7a80834512..52bbf91726 100644 --- a/system/sbsigntools/sbsigntools.info +++ b/system/sbsigntools/sbsigntools.info @@ -1,10 +1,8 @@ PRGNAM="sbsigntools" -VERSION="0.7" +VERSION="0.9.1" HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jejb/sbsigntools.git/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/sbsigntools-0.7.tar.gz \ - http://ponce.cc/slackware/sources/repo/ccan-0.0.2.tar.gz" -MD5SUM="5adb5f7caaf435268f833eb816566c8e \ - 6de60482bf935a159ecb647d2e4a57ab" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/sbsigntools-0.9.1.tar.xz" +MD5SUM="3dbdb509be9310523377dc523d4b5bd7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/t1utils/README b/system/t1utils/README deleted file mode 100644 index 5ff4feb67b..0000000000 --- a/system/t1utils/README +++ /dev/null @@ -1,17 +0,0 @@ -t1utils is a collection of simple Type 1 font manipulation programs. Together, -they allow you to convert between PFA (ASCII) and PFB (binary) formats, -disassemble PFA or PFB files into human-readable form, and reassemble them -into PFA or PFB format. Additionally you can extract font resources from -a Macintosh font file (ATM/Laserwriter), or create a Macintosh Type 1 font -file from a PFA or PFB font. - -* t1ascii: changes PFB (binary) fonts into PFA (ASCII) format -* t1binary: goes the opposite direction -* t1disasm: translates PFBs or PFAs into a human-readable and -editable format -* t1asm: goes the opposite direction -* t1unmac: translates a Macintosh Type 1 font into either PFB or PFA format -* t1mac: goes the opposite direction - -NOTE: You do not need t1utils if you already have texlive installed as it is -already included there. However, installing it anyway doesn't do any harm -either. diff --git a/system/t1utils/slack-desc b/system/t1utils/slack-desc deleted file mode 100644 index ecbc9472a2..0000000000 --- a/system/t1utils/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -t1utils: t1utils (Type 1 Font Utilities) -t1utils: -t1utils: t1utils is a collection of simple Type 1 font manipulation programs. -t1utils: Together, they allow you to convert between PFA (ASCII) and PFB -t1utils: (binary) formats, disassemble PFA or PFB files into human-readable -t1utils: form, and reassemble them into PFA or PFB format. Additionally you -t1utils: can extract font resources from a Macintosh font file -t1utils: (ATM/Laserwriter), or create a Macintosh Type 1 font file from a -t1utils: PFA or PFB font. -t1utils: -t1utils: diff --git a/system/t1utils/t1utils.info b/system/t1utils/t1utils.info deleted file mode 100644 index 99d640b848..0000000000 --- a/system/t1utils/t1utils.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="t1utils" -VERSION="1.41" -HOMEPAGE="https://www.lcdf.org/type/#t1utils" -DOWNLOAD="https://www.lcdf.org/type/t1utils-1.41.tar.gz" -MD5SUM="5430f82fcc27ccfc44526a59fa64849a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Kyle Guinn" -EMAIL="elyk03@gmail.com" diff --git a/system/terminator/terminator.info b/system/terminator/terminator.info index 217966f2ae..d205f33bf4 100644 --- a/system/terminator/terminator.info +++ b/system/terminator/terminator.info @@ -5,6 +5,6 @@ DOWNLOAD="https://launchpad.net/terminator/trunk/1.0/+download/terminator-1.0.ta MD5SUM="26b2c80a30bead957b83cef3a2b9101f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="psutil" +REQUIRES="psutil vte2" MAINTAINER="Alan Alberghini" EMAIL="414N@slacky.it" diff --git a/system/tinyterm/tinyterm.info b/system/tinyterm/tinyterm.info index 64685cb803..3f3a60cc83 100644 --- a/system/tinyterm/tinyterm.info +++ b/system/tinyterm/tinyterm.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/ryanpcmcquen/tinyterm/archive/0.5.8/tinyterm-0.5.8. MD5SUM="d79ebef1fd122a5b06e348bd24437e41" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="vte2" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" diff --git a/system/ttyrec/ttyrec.SlackBuild b/system/ttyrec/ttyrec.SlackBuild index caecc00574..4b4f00653b 100644 --- a/system/ttyrec/ttyrec.SlackBuild +++ b/system/ttyrec/ttyrec.SlackBuild @@ -72,7 +72,7 @@ find -L . \ # Fixed: "Out of pty's Terminated" patch -p1 < $CWD/ttyrec-1.0.8.RHEL5.patch -make +make CFLAGS+="$SLKCFLAGS -DSVR4 -DHAVE_inotify -D_XOPEN_SOURCE=500" find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/system/uhd/uhd.SlackBuild b/system/uhd/uhd.SlackBuild index 1171a01c0a..d7100d6204 100644 --- a/system/uhd/uhd.SlackBuild +++ b/system/uhd/uhd.SlackBuild @@ -23,13 +23,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=uhd -VERSION=${VERSION:-003_005_002} +VERSION=${VERSION:-003_009_007} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -59,9 +59,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf UHD-Mirror-release_$VERSION -tar xvf $CWD/release_$VERSION.tar.gz || tar xvf $CWD/UHD-Mirror-release_$VERSION.tar.gz -cd UHD-Mirror-release_$VERSION/host +rm -rf $PRGNAM-release_$VERSION +tar xvf $CWD/release_$VERSION.tar.gz +cd $PRGNAM-release_$VERSION/host chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ diff --git a/system/uhd/uhd.info b/system/uhd/uhd.info index 15d3fc0305..87365de4d6 100644 --- a/system/uhd/uhd.info +++ b/system/uhd/uhd.info @@ -1,10 +1,10 @@ PRGNAM="uhd" -VERSION="003_005_002" +VERSION="003_009_007" HOMEPAGE="https://www.ettus.com/" -DOWNLOAD="https://github.com/EttusResearch/UHD-Mirror/archive/release_003_005_002.tar.gz" -MD5SUM="14f914b68bb9f58b1d08ae97000c03f4" +DOWNLOAD="https://github.com/EttusResearch/uhd/archive/release_003_009_007.tar.gz" +MD5SUM="3f024ac4d536a8aaf1ad66617deda941" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="python-cheetah" +REQUIRES="Mako python-cheetah python-requests" MAINTAINER="Georgi Kolev" EMAIL="shadowx@escom.bg" diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 5ad4476b66..1b06e4d4bf 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -24,7 +24,7 @@ # Initialize variables PRGNAM=vice -VERSION=${VERSION:-3.0} +VERSION=${VERSION:-3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,8 +79,7 @@ find -L . \ -exec chmod 644 {} \; # Set proper paths in documentation. -sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" \ - man/vice.1 src/geninfocontrib_h.sh src/arch/win32/utils/geninfocontrib.c +sed -i "s/\/usr\/local\/lib\//\/usr\/lib${LIBDIRSUFFIX}\//g" man/vice.1 sed -i 's/"\/vice_toc\.html"/"\/html\/vice_toc\.html"/g' \ src/arch/unix/gui/uicommands.c sed -i "s/\/usr\/local/\/usr/g" doc/vice.* doc/html/*html @@ -113,7 +112,6 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-quicktime \ --enable-ethernet \ --enable-parsid \ - --enable-memmap \ --enable-gnomeui \ --build=$ARCH-slackware-linux diff --git a/system/vice/vice.info b/system/vice/vice.info index 094b1ebd7e..b42b7a439d 100644 --- a/system/vice/vice.info +++ b/system/vice/vice.info @@ -1,8 +1,8 @@ PRGNAM="vice" -VERSION="3.0" +VERSION="3.1" HOMEPAGE="http://vice-emu.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-3.0.tar.gz" -MD5SUM="c732d76a70ac1232a43456dae540b43a" +DOWNLOAD="http://downloads.sourceforge.net/vice-emu/vice-3.1.tar.gz" +MD5SUM="f9018ca464b863da0bb1a82c56374432" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/virtualbox-addons/rc.vboxadd.diff b/system/virtualbox-addons/rc.vboxadd.diff index f0b3acddd0..bb5fdde0fe 100644 --- a/system/virtualbox-addons/rc.vboxadd.diff +++ b/system/virtualbox-addons/rc.vboxadd.diff @@ -1,6 +1,7 @@ ---- vboxadd.sh.orig 2016-11-23 16:24:46.000000000 +0100 -+++ vboxadd.sh 2016-12-27 16:06:46.413895799 +0100 -@@ -154,42 +154,9 @@ +diff -ur VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd.sh +--- VirtualBox-5.2.4.orig/src/VBox/Additions/linux/installer/vboxadd.sh 2017-12-19 10:22:03.000000000 +0100 ++++ VirtualBox-5.2.4/src/VBox/Additions/linux/installer/vboxadd.sh 2018-01-07 17:23:23.225998245 +0100 +@@ -130,18 +130,9 @@ dev=/dev/vboxguest userdev=/dev/vboxuser @@ -8,165 +9,127 @@ owner=vboxadd group=1 --test_for_gcc_and_make() --{ -- which make > /dev/null 2>&1 || printf "\nThe make utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n" -- which gcc > /dev/null 2>&1 || printf "\nThe gcc utility was not found. If the following module compilation fails then\nthis could be the reason and you should try installing it.\n" --} -- --test_sane_kernel_dir() --{ -- KERN_VER=`uname -r` -- KERN_DIR="/lib/modules/$KERN_VER/build" -- if [ -d "$KERN_DIR" ]; then -- KERN_REL=`make -sC $KERN_DIR --no-print-directory kernelrelease 2>/dev/null || true` -- if [ -z "$KERN_REL" -o "x$KERN_REL" = "x$KERN_VER" ]; then -- return 0 -- fi -- fi -- printf "\nThe headers for the current running kernel were not found. If the following\nmodule compilation fails then this could be the reason.\n" -- if [ "$system" = "redhat" ]; then -- if echo "$KERN_VER" | grep -q "uek"; then -- printf "The missing package can be probably installed with\nyum install kernel-uek-devel-$KERN_VER\n" -- else -- printf "The missing package can be probably installed with\nyum install kernel-devel-$KERN_VER\n" -- fi -- elif [ "$system" = "suse" ]; then -- KERN_VER_SUSE=`echo "$KERN_VER" | sed 's/.*-\([^-]*\)/\1/g'` -- KERN_VER_BASE=`echo "$KERN_VER" | sed 's/\(.*\)-[^-]*/\1/g'` -- printf "The missing package can be probably installed with\nzypper install kernel-$KERN_VER_SUSE-devel-$KERN_VER_BASE\n" -- elif [ "$system" = "debian" ]; then -- printf "The missing package can be probably installed with\napt-get install linux-headers-$KERN_VER\n" -- fi --} +-if test -r $config; then +- . $config +-else +- fail "Configuration file $config not found" +-fi +-test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" || +- fail "Configuration file $config not complete" - running_vboxguest() { lsmod | grep -q "vboxguest[^_-]" -@@ -261,13 +228,6 @@ - start() - { - begin "Starting the VirtualBox Guest Additions "; -- if test -r $config; then -- . $config -- else -- fail "Configuration file $config not found" +@@ -252,28 +243,6 @@ + } + fi # INSTALL_NO_MODULE_BUILDS + +- # Put the X.Org driver in place. This is harmless if it is not needed. +- "${INSTALL_DIR}/init/vboxadd-x11" setup 2>> "${LOG}" +- # Install the guest OpenGL drivers. For now we don't support +- # multi-architecture installations +- rm -f /etc/ld.so.conf.d/00vboxvideo.conf +- rm -Rf /var/lib/VBoxGuestAdditions/lib +- if /usr/bin/VBoxClient --check3d 2>/dev/null; then +- mkdir -p /var/lib/VBoxGuestAdditions/lib +- ln -sf "${INSTALL_DIR}/lib/VBoxOGL.so" /var/lib/VBoxGuestAdditions/lib/libGL.so.1 +- # SELinux for the OpenGL libraries, so that gdm can load them during the +- # acceleration support check. This prevents an "Oh no, something has gone +- # wrong!" error when starting EL7 guests. +- if test -e /etc/selinux/config; then +- if command -v semanage > /dev/null; then +- semanage fcontext -a -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1" +- fi +- chcon -h -t lib_t "/var/lib/VBoxGuestAdditions/lib/libGL.so.1" +- fi +- echo "/var/lib/VBoxGuestAdditions/lib" > /etc/ld.so.conf.d/00vboxvideo.conf - fi -- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" || -- fail "Configuration file $config not complete" - uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null && - ps -A -o comm | grep -q '/*udevd$' 2>/dev/null || - no_udev=1 -@@ -378,218 +338,16 @@ +- ldconfig +- + # Mount all shared folders from /etc/fstab. Normally this is done by some + # other startup script but this requires the vboxdrv kernel module loaded. + # This isn't necessary anymore as the vboxsf module is autoloaded. +@@ -303,195 +272,16 @@ return 0 } --## Update the initramfs. Debian and Ubuntu put the graphics driver in, and --# need the touch(1) command below. Everyone else that I checked just need --# the right module alias file from depmod(1) and only use the initramfs to --# load the root filesystem, not the boot splash. update-initramfs works --# for the first two and dracut for every one else I checked. We are only --# interested in distributions recent enough to use the KMS vboxvideo driver. --## @param $1 kernel version to update for. --update_module_dependencies() --{ -- depmod "${1}" -- rm -f "/lib/modules/${1}/initrd/vboxvideo" -- test -d "/lib/modules/${1}/initrd" && -- test -f "/lib/modules/${1}/misc/vboxvideo.ko" && -- touch "/lib/modules/${1}/initrd/vboxvideo" -- test -n "${QUICKSETUP}" && return -- if type dracut >/dev/null 2>&1; then -- dracut -f "/boot/initramfs-${1}.img" "${1}" -- elif type update-initramfs >/dev/null 2>&1; then -- update-initramfs -u -k "${1}" -- fi --} -- -# Remove any existing VirtualBox guest kernel modules from the disk, but not -# from the kernel as they may still be in use -cleanup_modules() -{ -- if [ -n "$(which dkms 2>/dev/null)" ]; then -- begin "Removing existing VirtualBox DKMS kernel modules" -- $DODKMS uninstall $OLDMODULES > $LOG -- succ_msg -- fi -- begin "Removing existing VirtualBox non-DKMS kernel modules" -- for i in $OLDMODULES; do -- find /lib/modules -name $i\* | xargs rm 2>/dev/null +- log "Removing existing VirtualBox kernel modules." +- for i in ${OLDMODULES}; do +- # We no longer support DKMS, remove any leftovers. +- rm -rf "/var/lib/dkms/${i}"* +- # And remove old modules. +- rm -f /lib/modules/*/misc/"${i}"* - done -- succ_msg +- # Remove leftover module folders. +- for i in /lib/modules/*/misc; do +- test -d "${i}" && rmdir -p "${i}" 2>/dev/null +- done +- rm -f /etc/depmod.d/vboxvideo-upstream.conf -} - -# Build and install the VirtualBox guest kernel modules -setup_modules() -{ - # don't stop the old modules here -- they might be in use -- cleanup_modules -- begin "Building the VirtualBox Guest Additions kernel modules" -- -- # Short cut out if a dkms build succeeds -- if [ -n "$(which dkms 2>/dev/null)" ] && -- $DODKMS install vboxguest $INSTALL_VER >> $LOG 2>&1; then -- succ_msg -- return 0 -- fi -- -- test_for_gcc_and_make -- test_sane_kernel_dir +- test -z "${QUICKSETUP}" && cleanup_modules +- # This does not work for 2.4 series kernels. How sad. +- test -n "${QUICKSETUP}" && test -f "${MODULE_DIR}/vboxguest.ko" && return 0 +- info "Building the VirtualBox Guest Additions kernel modules." - -- echo -- begin "Building the main Guest Additions module" +- # We are allowed to do ">> $LOG" after we have called "log()" once. +- log "Building the main Guest Additions module." - if ! $BUILDINTMP \ - --save-module-symvers /tmp/vboxguest-Module.symvers \ - --module-source $MODULE_SRC/vboxguest \ - --no-print-directory install >> $LOG 2>&1; then -- show_error "Look at $LOG to find out what went wrong" -- return 1 +- # If check_module_dependencies.sh fails it prints a message itself. +- "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 && +- info "Look at $LOG to find out what went wrong" +- return 0 - fi -- succ_msg -- begin "Building the shared folder support module" +- log "Building the shared folder support module" - if ! $BUILDINTMP \ - --use-module-symvers /tmp/vboxguest-Module.symvers \ - --module-source $MODULE_SRC/vboxsf \ - --no-print-directory install >> $LOG 2>&1; then -- show_error "Look at $LOG to find out what went wrong" -- return 1 +- info "Look at $LOG to find out what went wrong" +- return 0 - fi -- succ_msg -- begin "Building the graphics driver module" +- log "Building the graphics driver module" - if ! $BUILDINTMP \ - --use-module-symvers /tmp/vboxguest-Module.symvers \ - --module-source $MODULE_SRC/vboxvideo \ - --no-print-directory install >> $LOG 2>&1; then -- show_error "Look at $LOG to find out what went wrong" +- info "Look at $LOG to find out what went wrong" - fi -- succ_msg -- update_module_dependencies "${KERN_VER}" +- [ -d /etc/depmod.d ] || mkdir /etc/depmod.d +- echo "override vboxguest * misc" > /etc/depmod.d/vboxvideo-upstream.conf +- echo "override vboxsf * misc" >> /etc/depmod.d/vboxvideo-upstream.conf +- echo "override vboxvideo * misc" >> /etc/depmod.d/vboxvideo-upstream.conf +- depmod - return 0 -} - --# Do non-kernel bits needed for the kernel modules to work properly (user --# creation, udev, mount helper...) --extra_setup() +-create_vbox_user() -{ -- begin "Doing non-kernel setup of the Guest Additions" -- echo "Creating user for the Guest Additions." >> $LOG +- log "Creating user for the Guest Additions." - # This is the LSB version of useradd and should work on recent - # distributions - useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1 - # And for the others, we choose a UID ourselves - useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1 - -- # Add a group "vboxsf" for Shared Folders access -- # All users which want to access the auto-mounted Shared Folders have to -- # be added to this group. -- groupadd -r -f vboxsf >/dev/null 2>&1 +-} - +-create_udev_rule() +-{ - # Create udev description file - if [ -d /etc/udev/rules.d ]; then -- echo "Creating udev rule for the Guest Additions kernel module." >> $LOG +- log "Creating udev rule for the Guest Additions kernel module." - udev_call="" - udev_app=`which udevadm 2> /dev/null` - if [ $? -eq 0 ]; then @@ -189,91 +152,97 @@ - echo "KERNEL=${udev_fix}\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\"" > /etc/udev/rules.d/60-vboxadd.rules - echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules - fi +-} +- +-create_module_rebuild_script() +-{ +- # And a post-installation script for rebuilding modules when a new kernel +- # is installed. +- mkdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d +- cat << EOF > /etc/kernel/postinst.d/vboxadd +-#!/bin/sh +-test -d "/lib/modules/\${1}/build" || exit 0 +-KERN_VER="\${1}" /sbin/rcvboxadd quicksetup +-exit 0 +-EOF +- cat << EOF > /etc/kernel/prerm.d/vboxadd +-#!/bin/sh +-for i in ${OLDMODULES}; do rm -f /lib/modules/"\${1}"/misc/"\${i}".ko; done +-rmdir -p /lib/modules/"\$1"/misc 2>/dev/null +-exit 0 +-EOF +- chmod 0755 /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd +-} +- +-shared_folder_setup() +-{ +- # Add a group "vboxsf" for Shared Folders access +- # All users which want to access the auto-mounted Shared Folders have to +- # be added to this group. +- groupadd -r -f vboxsf >/dev/null 2>&1 - -- # Put mount.vboxsf in the right place -- ln -sf "$lib_path/$PACKAGE/mount.vboxsf" /sbin -- # And an rc file to re-build the kernel modules and re-set-up the X server. -- ln -sf "$lib_path/$PACKAGE/vboxadd" /sbin/rcvboxadd -- ln -sf "$lib_path/$PACKAGE/vboxadd-x11" /sbin/rcvboxadd-x11 +- # Put the mount.vboxsf mount helper in the right place. +- ## @todo It would be nicer if the kernel module just parsed parameters +- # itself instead of needing a separate binary to do that. +- ln -sf "${INSTALL_DIR}/other/mount.vboxsf" /sbin - # SELinux security context for the mount helper. - if test -e /etc/selinux/config; then - # This is correct. semanage maps this to the real path, and it aborts - # with an error, telling you what you should have typed, if you specify -- # the real path. The "chcon" is there as a back-up in case this is -- # different on old guests. -- semanage fcontext -a -t mount_exec_t "/usr/lib/$PACKAGE/mount.vboxsf" -- chcon -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" +- # the real path. The "chcon" is there as a back-up for old guests. +- command -v semanage > /dev/null && +- semanage fcontext -a -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf" +- chcon -t mount_exec_t "${INSTALL_DIR}/other/mount.vboxsf" - fi -- succ_msg -} - # setup_script setup() { -- if test -r $config; then -- . $config -- else -- fail "Configuration file $config not found" -- fi -- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" || -- fail "Configuration file $config not complete" - export BUILD_TYPE - export USERNAME - -- rm -f $LOG - MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER" - BUILDINTMP="$MODULE_SRC/build_in_tmp" -- DODKMS="$MODULE_SRC/do_dkms" - chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1 -- chcon -t bin_t "$DODKMS" > /dev/null 2>&1 - -- setup_modules -- mod_succ="$?" -- extra_setup -- if [ "$mod_succ" -eq "0" ]; then -- if running_vboxguest || running_vboxadd; then -- printf "You should restart your guest to make sure the new modules are actually used\n\n" -- else -- start -- fi +- test -z "${INSTALL_NO_MODULE_BUILDS}" && setup_modules +- create_vbox_user +- create_udev_rule +- test -z "${INSTALL_NO_MODULE_BUILDS}" && create_module_rebuild_script +- test -n "${QUICKSETUP}" && return 0 +- shared_folder_setup +- if running_vboxguest || running_vboxadd; then +- info "Running kernel modules will not be replaced until the system is restarted" - fi +- return 0 + echo "Not implemented! Please use the virtualbox-kernel-addons.SlackBuild available at SlackBuilds.org instead." } # cleanup_script cleanup() { -- if test -r $config; then -- . $config -- test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" || -- fail "Configuration file $config not complete" -- DODKMS="$INSTALL_DIR/src/vboxguest-$INSTALL_VER/do_dkms" -- elif test -x ./do_dkms; then # Executing as part of the installer... -- DODKMS=./do_dkms -- else -- fail "Configuration file $config not found" +- if test -z "${INSTALL_NO_MODULE_BUILDS}"; then +- # Delete old versions of VBox modules. +- cleanup_modules +- depmod +- +- # Remove old module sources +- for i in $OLDMODULES; do +- rm -rf /usr/src/$i-* +- done - fi - -- # Delete old versions of VBox modules. -- cleanup_modules -- for i in /lib/modules/*; do -- update_module_dependencies "${i#/lib/modules/}" -- done -- -- # Remove old module sources -- for i in $OLDMODULES; do -- rm -rf /usr/src/$i-* -- done -- - # Clean-up X11-related bits -- /sbin/rcvboxadd-x11 cleanup +- "${INSTALL_DIR}/init/vboxadd-x11" cleanup 2>> "${LOG}" - - # Remove other files - rm /sbin/mount.vboxsf 2>/dev/null -- rm /sbin/rcvboxadd 2>/dev/null -- rm /sbin/rcvboxadd-x11 2>/dev/null +- if test -z "${INSTALL_NO_MODULE_BUILDS}"; then +- rm -f /etc/kernel/postinst.d/vboxadd /etc/kernel/prerm.d/vboxadd +- rmdir -p /etc/kernel/postinst.d /etc/kernel/prerm.d 2>/dev/null +- fi - rm /etc/udev/rules.d/60-vboxadd.rules 2>/dev/null -- rm -f /lib/modules/*/initrd/vboxvideo + echo "Not implemented! Please use removepkg or pkgtool to remove virtualbox-addons and/or virtualbox-kernel-addons instead." } diff --git a/system/virtualbox-addons/virtualbox-addons.SlackBuild b/system/virtualbox-addons/virtualbox-addons.SlackBuild index 063fa71844..55e0f2c396 100644 --- a/system/virtualbox-addons/virtualbox-addons.SlackBuild +++ b/system/virtualbox-addons/virtualbox-addons.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-addons -# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PRGNAM=virtualbox-addons SRCNAM=VirtualBox -VERSION=${VERSION:-5.0.40} +VERSION=${VERSION:-5.2.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -86,22 +86,17 @@ find -L . \ # Use virtualbox-kernel-addons.SlackBuild for this. patch -d src/VBox/Additions/linux/installer/ -i $CWD/rc.vboxadd.diff -# We set the environment variables manually to avoid dependency on acpica -export BUILD_PLATFORM="linux" -export BUILD_PLATFORM_ARCH="$TARGET" -export BUILD_TARGET="linux" -export BUILD_TARGET_ARCH="$TARGET" -export BUILD_TARGET_CPU="$ARCH" -export BUILD_TYPE="release" -export PATH_KBUILD="$TMP/$SRCNAM-${VERSION}/kBuild" -export PATH_DEVTOOLS="$TMP/$SRCNAM-${VERSION}/tools" -path_kbuild_bin="$PATH_KBUILD/bin/$BUILD_TARGET.$BUILD_PLATFORM_ARCH" -export PATH_KBUILD_BIN="$path_kbuild_bin" -path_dev_bin="$PATH_DEVTOOLS/$BUILD_TARGET.$BUILD_PLATFORM_ARCH"/bin -echo "$PATH" | grep -q "$path_kbuild_bin" || PATH="$path_kbuild_bin:$PATH" -echo "$PATH" | grep -q "$path_dev_bin" || PATH="$path_dev_bin:$PATH" -export PATH -unset path_kbuild_bin path_dev_bin +./configure \ + --only-additions \ + --disable-kmods \ + --with-makeself=/usr/bin/echo + +. ./env.sh + +OPENSSL=$(grep openssl src/libs/Makefile.kmk | cut -d "/" -f 2) + +mkdir -p src/libs/$OPENSSL +touch src/libs/$OPENSSL/Makefile.kmk kmk -j ${JOBS} LOCALCFG=$CWD/LocalConfig.kmk @@ -135,8 +130,9 @@ cd out/linux.$TARGET/release/bin/additions install -m 755 VBoxClient $PKG/usr/bin/ install -m 755 VBoxService $PKG/usr/sbin/ install -m 4755 mount.vboxsf $PKG/sbin/mount.vboxsf - install -m 644 vboxvideo_drv_$XSERVER.so \ - $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so +## slackware > 14.2 already ships this +# install -m 644 vboxvideo_drv_$XSERVER.so \ +# $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/drivers/vboxvideo_drv.so install -m 644 VBoxOGLcrutil.so $PKG/usr/lib$LIBDIRSUFFIX install -m 644 VBoxOGLerrorspu.so $PKG/usr/lib$LIBDIRSUFFIX @@ -145,12 +141,9 @@ cd out/linux.$TARGET/release/bin/additions install -m 644 VBoxOGLpackspu.so $PKG/usr/lib$LIBDIRSUFFIX install -m 644 VBoxOGLpassthroughspu.so $PKG/usr/lib$LIBDIRSUFFIX install -m 644 VBoxOGL.so $PKG/usr/lib$LIBDIRSUFFIX + install -m 644 VBoxEGL.so $PKG/usr/lib$LIBDIRSUFFIX install -m 755 $CWD/vbox-uninstall-guest-additions $PKG/usr/sbin/ - - mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri - ln -s /usr/lib$LIBDIRSUFFIX/VBoxOGL.so \ - $PKG/usr/lib$LIBDIRSUFFIX/xorg/modules/dri/vboxvideo_dri.so cd - # kconf_update script to disable OpenGL within KDE diff --git a/system/virtualbox-addons/virtualbox-addons.info b/system/virtualbox-addons/virtualbox-addons.info index bf313e7e8d..df1ddc3012 100644 --- a/system/virtualbox-addons/virtualbox-addons.info +++ b/system/virtualbox-addons/virtualbox-addons.info @@ -1,8 +1,8 @@ PRGNAM="virtualbox-addons" -VERSION="5.0.40" +VERSION="5.2.8" HOMEPAGE="https://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2" -MD5SUM="53b259e48a137b0185c169590e2dcb77" +DOWNLOAD="http://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8.tar.bz2" +MD5SUM="e731ea9c5c31096ec4c2a3bfba26665c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild index 9115605537..d6b1e9e9da 100644 --- a/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild +++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.SlackBuild @@ -4,7 +4,7 @@ # Originally written by Vliegendehuiskat, vliegendehuiskat [at] gmail [dot] com -# Copyright 2014-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2014-2018 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=virtualbox-extension-pack -VERSION=${VERSION:-5.0.40} +VERSION=${VERSION:-5.2.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/virtualbox-extension-pack/virtualbox-extension-pack.info b/system/virtualbox-extension-pack/virtualbox-extension-pack.info index 701af5aaef..43175f4439 100644 --- a/system/virtualbox-extension-pack/virtualbox-extension-pack.info +++ b/system/virtualbox-extension-pack/virtualbox-extension-pack.info @@ -1,8 +1,8 @@ PRGNAM="virtualbox-extension-pack" -VERSION="5.0.40" +VERSION="5.2.8" HOMEPAGE="https://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/Oracle_VM_VirtualBox_Extension_Pack-5.0.40.vbox-extpack" -MD5SUM="6991b332555f07a14189478486d4aae6" +DOWNLOAD="http://download.virtualbox.org/virtualbox/5.2.8/Oracle_VM_VirtualBox_Extension_Pack-5.2.8.vbox-extpack" +MD5SUM="dfbe3c4b35b8759e7c9b0fc572c742dc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild index 3fa214a975..2142fce8b0 100644 --- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild +++ b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-kernel-addons -# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=virtualbox-kernel-addons -VERSION=${VERSION:-5.0.40} +VERSION=${VERSION:-5.2.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,7 +65,21 @@ find -L . \ mkdir -p $PKG/lib/modules/$KERNEL/misc -for i in vboxguest vboxsf vboxvideo; do +MODULES="" + +if ! [ -e /lib/modules/$KERNEL/kernel/drivers/staging/vboxvideo ]; then + MODULES="$MODULES vboxvideo" +fi + +if ! [ -e /lib/modules/$KERNEL/kernel/virt/vboxguest ]; then + MODULES="$MODULES vboxguest" +fi + +if ! [ -e /lib/modules/$KERNEL/kernel/fs/vboxsf ]; then + MODULES="$MODULES vboxsf" +fi + +for i in $MODULES; do cd $i make KERN_DIR=$KERNELPATH install -m 0644 $i.ko $PKG/lib/modules/$KERNEL/misc/ diff --git a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info index 33c005b4fe..6b86b209b4 100644 --- a/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info +++ b/system/virtualbox-kernel-addons/virtualbox-kernel-addons.info @@ -1,8 +1,8 @@ PRGNAM="virtualbox-kernel-addons" -VERSION="5.0.40" +VERSION="5.2.8" HOMEPAGE="https://www.virtualbox.org" -DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel-addons/virtualbox-kernel-addons-5.0.40.tar.xz" -MD5SUM="6146afd44b37c65bd7acc01e067b6e86" +DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel-addons/virtualbox-kernel-addons-5.2.8.tar.xz" +MD5SUM="e4202f46e4adeb1da588a86fe51d58d5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild index 2ded2d2429..4408b138e8 100644 --- a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild +++ b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-kernel -# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ # Modified by SlackBuilds.org PRGNAM=virtualbox-kernel -VERSION=${VERSION:-5.0.40} +VERSION=${VERSION:-5.2.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/virtualbox-kernel/virtualbox-kernel.info b/system/virtualbox-kernel/virtualbox-kernel.info index deded0026e..0a313bdf48 100644 --- a/system/virtualbox-kernel/virtualbox-kernel.info +++ b/system/virtualbox-kernel/virtualbox-kernel.info @@ -1,8 +1,8 @@ PRGNAM="virtualbox-kernel" -VERSION="5.0.40" +VERSION="5.2.8" HOMEPAGE="https://www.virtualbox.org" -DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel/virtualbox-kernel-5.0.40.tar.xz" -MD5SUM="475de2d0a915ce7c0c623ac50696bb79" +DOWNLOAD="http://www.liwjatan.at/files/src/virtualbox-kernel/virtualbox-kernel-5.2.8.tar.xz" +MD5SUM="280bf7fe55842b3a6e088f2b4c6e83e0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/virtualbox/LocalConfig.kmk b/system/virtualbox/LocalConfig.kmk index 379c93fb45..e531c08e83 100644 --- a/system/virtualbox/LocalConfig.kmk +++ b/system/virtualbox/LocalConfig.kmk @@ -32,3 +32,6 @@ VBOX_JAVA_HOME := /usr/LIBDIR/java # Do not build docs from source. Depends on texlive... VBOX_WITHOUT_DOCS := 1 + +# Use our CFLAGS +VBOX_GCC_OPT := CXXFLAGS diff --git a/system/virtualbox/vboxdrv.sh-setup.diff b/system/virtualbox/vboxdrv.sh-setup.diff index 0adf8ec237..a6fecbd6d7 100644 --- a/system/virtualbox/vboxdrv.sh-setup.diff +++ b/system/virtualbox/vboxdrv.sh-setup.diff @@ -1,93 +1,238 @@ ---- VirtualBox-4.3.4.orig/src/VBox/Installer/linux/vboxdrv.sh.in 2013-11-29 20:24:07.000000000 +0100 -+++ VirtualBox-4.3.4/src/VBox/Installer/linux/vboxdrv.sh.in 2013-12-08 18:08:09.667571974 +0100 -@@ -44,17 +44,13 @@ +diff -ur VirtualBox-5.2.2.orig/src/VBox/Installer/linux/vboxdrv.sh VirtualBox-5.2.2/src/VBox/Installer/linux/vboxdrv.sh +--- VirtualBox-5.2.2.orig/src/VBox/Installer/linux/vboxdrv.sh 2017-11-23 10:21:59.000000000 +0100 ++++ VirtualBox-5.2.2/src/VBox/Installer/linux/vboxdrv.sh 2017-12-03 13:58:52.107070523 +0100 +@@ -51,23 +51,9 @@ + export USERNAME + export USER=$USERNAME - if [ -n "$INSTALL_DIR" ]; then - VBOXMANAGE="$INSTALL_DIR/VBoxManage" -- MODULE_SRC="$INSTALL_DIR/src/vboxhost" - else - VBOXMANAGE="/usr/lib/virtualbox/VBoxManage" +-if test -n "${INSTALL_DIR}" && test -x "${INSTALL_DIR}/VirtualBox"; then +- MODULE_SRC="${INSTALL_DIR}/src/vboxhost" +-elif test -x /usr/lib/virtualbox/VirtualBox; then +- INSTALL_DIR=/usr/lib/virtualbox - MODULE_SRC="/usr/share/virtualbox/src/vboxhost" - fi --BUILDINTMP="$MODULE_SRC/build_in_tmp" --DODKMS="$MODULE_SRC/do_dkms" +-elif test -x "${SCRIPT_DIR}/VirtualBox"; then +- # Executing from the build directory +- INSTALL_DIR="${SCRIPT_DIR}" +- MODULE_SRC="${INSTALL_DIR}/src" +-else +- # Silently exit if the package was uninstalled but not purged. +- # Applies to Debian packages only (but shouldn't hurt elsewhere) +- exit 0 +-fi + VIRTUALBOX="${INSTALL_DIR}/VirtualBox" + VBOXMANAGE="${INSTALL_DIR}/VBoxManage" +-BUILDINTMP="${MODULE_SRC}/build_in_tmp" ++ + if test -u "${VIRTUALBOX}"; then + GROUP=root + DEVICE_MODE=0600 +@@ -111,117 +97,6 @@ + lsmod | grep -q "$1[^_-]" + } + +-## Output the vboxdrv part of our udev rule. This is redirected to the right file. +-udev_write_vboxdrv() { +- VBOXDRV_GRP="$1" +- VBOXDRV_MODE="$2" +- +- echo "KERNEL==\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\"" +- echo "KERNEL==\"vboxdrvu\", NAME=\"vboxdrvu\", OWNER=\"root\", GROUP=\"root\", MODE=\"0666\"" +- echo "KERNEL==\"vboxnetctl\", NAME=\"vboxnetctl\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\"" +-} +- +-## Output the USB part of our udev rule. This is redirected to the right file. +-udev_write_usb() { +- INSTALLATION_DIR="$1" +- USB_GROUP="$2" +- +- echo "SUBSYSTEM==\"usb_device\", ACTION==\"add\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\"" +- echo "SUBSYSTEM==\"usb\", ACTION==\"add\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\"" +- echo "SUBSYSTEM==\"usb_device\", ACTION==\"remove\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\"" +- echo "SUBSYSTEM==\"usb\", ACTION==\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\"" +-} +- +-## Generate our udev rule file. This takes a change in udev rule syntax in +-## version 55 into account. It only creates rules for USB for udev versions +-## recent enough to support USB device nodes. +-generate_udev_rule() { +- VBOXDRV_GRP="$1" # The group owning the vboxdrv device +- VBOXDRV_MODE="$2" # The access mode for the vboxdrv device +- INSTALLATION_DIR="$3" # The directory VirtualBox is installed in +- USB_GROUP="$4" # The group that has permission to access USB devices +- NO_INSTALL="$5" # Set this to "1" to remove but not re-install rules +- +- # Extra space! +- case "$USB_GROUP" in ?*) USB_GROUP=" $USB_GROUP" ;; esac +- case "$NO_INSTALL" in "1") return ;; esac +- udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE" +- udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP" +-} +- +-## Install udev rule (disable with INSTALL_NO_UDEV=1 in +-## /etc/default/virtualbox). +-install_udev() { +- VBOXDRV_GRP="$1" # The group owning the vboxdrv device +- VBOXDRV_MODE="$2" # The access mode for the vboxdrv device +- INSTALLATION_DIR="$3" # The directory VirtualBox is installed in +- USB_GROUP="$4" # The group that has permission to access USB devices +- NO_INSTALL="$5" # Set this to "1" to remove but not re-install rules +- +- if test -d /etc/udev/rules.d; then +- generate_udev_rule "$VBOXDRV_GRP" "$VBOXDRV_MODE" "$INSTALLATION_DIR" \ +- "$USB_GROUP" "$NO_INSTALL" +- fi +- # Remove old udev description file +- rm -f /etc/udev/rules.d/10-vboxdrv.rules 2> /dev/null +-} +- +-## Create a usb device node for a given sysfs path to a USB device. +-install_create_usb_node_for_sysfs() { +- path="$1" # sysfs path for the device +- usb_createnode="$2" # Path to the USB device node creation script +- usb_group="$3" # The group to give ownership of the node to +- if test -r "${path}/dev"; then +- dev="`cat "${path}/dev" 2> /dev/null`" +- major="`expr "$dev" : '\(.*\):' 2> /dev/null`" +- minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null`" +- class="`cat ${path}/bDeviceClass 2> /dev/null`" +- sh "${usb_createnode}" "$major" "$minor" "$class" \ +- "${usb_group}" 2>/dev/null +- fi +-} +- +-udev_rule_file=/etc/udev/rules.d/60-vboxdrv.rules +-sysfs_usb_devices="/sys/bus/usb/devices/*" +- +-## Install udev rules and create device nodes for usb access +-setup_usb() { +- VBOXDRV_GRP="$1" # The group that should own /dev/vboxdrv +- VBOXDRV_MODE="$2" # The mode to be used for /dev/vboxdrv +- INSTALLATION_DIR="$3" # The directory VirtualBox is installed in +- USB_GROUP="$4" # The group that should own the /dev/vboxusb device +- # nodes unless INSTALL_NO_GROUP=1 in +- # /etc/default/virtualbox. Optional. +- usb_createnode="$INSTALLATION_DIR/VBoxCreateUSBNode.sh" +- # install udev rule (disable with INSTALL_NO_UDEV=1 in +- # /etc/default/virtualbox) +- if [ "$INSTALL_NO_GROUP" != "1" ]; then +- usb_group=$USB_GROUP +- vboxdrv_group=$VBOXDRV_GRP +- else +- usb_group=root +- vboxdrv_group=root +- fi +- install_udev "${vboxdrv_group}" "$VBOXDRV_MODE" \ +- "$INSTALLATION_DIR" "${usb_group}" \ +- "$INSTALL_NO_UDEV" > ${udev_rule_file} +- # Build our device tree +- for i in ${sysfs_usb_devices}; do # This line intentionally without quotes. +- install_create_usb_node_for_sysfs "$i" "${usb_createnode}" \ +- "${usb_group}" +- done +-} +- +-cleanup_usb() +-{ +- # Remove udev description file +- rm -f /etc/udev/rules.d/60-vboxdrv.rules +- rm -f /etc/udev/rules.d/10-vboxdrv.rules +- +- # Remove our USB device tree +- rm -rf /dev/vboxusb +-} +- + start() + { + begin_msg "Starting VirtualBox services" console +@@ -283,8 +158,6 @@ + mkdir -p -m 0750 /dev/vboxusb 2>/dev/null + chown root:vboxusers /dev/vboxusb 2>/dev/null + fi +- # Remove any kernel modules left over from previously installed kernels. +- cleanup only_old + succ_msg "VirtualBox services started" + } - # silently exit if the package was uninstalled but not purged, - # applies to Debian packages only (but shouldn't hurt elsewhere) --[ ! -f /etc/debian_release -o -x $VBOXMANAGE -a -x $BUILDINTMP ] || exit 0 -+[ ! -f /etc/debian_release -o -x $VBOXMANAGE ] || exit 0 +@@ -365,66 +238,10 @@ + fi + } - if [ -n "$NOLSB" ]; then - if [ -f /etc/redhat-release ]; then -@@ -295,70 +291,7 @@ +-cleanup() +-{ +- # If this is set, only remove kernel modules for no longer installed +- # kernels. Note that only generated kernel modules should be placed +- # in /lib/modules/*/misc. Anything that we should not remove automatically +- # should go elsewhere. +- only_old="${1}" +- for i in /lib/modules/*; do +- # Check whether we are only cleaning up for uninstalled kernels. +- test -n "${only_old}" && test -e "${i}/kernel/drivers" && continue +- # We could just do "rm -f", but we only want to try deleting folders if +- # we are sure they were ours, i.e. they had our modules in beforehand. +- if test -e "${i}/misc/vboxdrv.ko" \ +- || test -e "${i}/misc/vboxnetadp.ko" \ +- || test -e "${i}/misc/vboxnetflt.ko" \ +- || test -e "${i}/misc/vboxpci.ko"; then +- rm -f "${i}/misc/vboxdrv.ko" "${i}/misc/vboxnetadp.ko" \ +- "${i}/misc/vboxnetflt.ko" "${i}/misc/vboxpci.ko" +- version=`expr "${i}" : "/lib/modules/\(.*\)"` +- depmod -a "${version}" +- fi +- # Remove the kernel version folder if it was empty except for us. +- test "`echo ${i}/misc/* ${i}/misc/.?* ${i}/* ${i}/.?*`" \ +- = "${i}/misc/* ${i}/misc/.. ${i}/misc ${i}/.." && +- rmdir "${i}/misc" "${i}" # We used to leave empty folders. +- done +-} +- # setup_script setup() { -- stop -- DKMS=`which dkms 2>/dev/null` -- if [ -n "$DKMS" ]; then -- begin_msg "Uninstalling old VirtualBox DKMS kernel modules" -- $DODKMS uninstall vboxhost vboxdrv vboxnetflt vboxnetadp > $LOG -- succ_msg +- begin_msg "Building VirtualBox kernel modules" console +- if ! $BUILDINTMP \ +- --save-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxdrv" \ +- --no-print-directory install >> $LOG 2>&1; then +- "${INSTALL_DIR}/check_module_dependencies.sh" || exit 1 +- failure "Look at $LOG to find out what went wrong" - fi -- if find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|grep -q vboxpci; then -- begin_msg "Removing old VirtualBox pci kernel module" -- find /lib/modules/`uname -r` -name "vboxpci\.*" 2>/dev/null|xargs rm -f 2>/dev/null -- succ_msg -- fi -- if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then -- begin_msg "Removing old VirtualBox netadp kernel module" -- find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null -- succ_msg -- fi -- if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then -- begin_msg "Removing old VirtualBox netflt kernel module" -- find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null -- succ_msg -- fi -- if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then -- begin_msg "Removing old VirtualBox kernel module" -- find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null -- succ_msg +- if ! $BUILDINTMP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxnetflt" \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" - fi -- if [ -n "$DKMS" ]; then -- begin_msg "Trying to register the VirtualBox kernel modules using DKMS" -- if ! $DODKMS install vboxhost $VERSION >> $LOG; then -- fail_msg "Failed, trying without DKMS" -- DKMS="" -- fi +- if ! $BUILDINTMP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxnetadp" \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" - fi -- if [ -z "$DKMS" ]; then -- begin_msg "Recompiling VirtualBox kernel modules" -- if ! $BUILDINTMP \ -- --save-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxdrv" \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi -- if ! $BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxnetflt" \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi -- if ! $BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxnetadp" \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi -- if ! $BUILDINTMP \ -- --use-module-symvers /tmp/vboxdrv-Module.symvers \ -- --module-source "$MODULE_SRC/vboxpci" \ -- --no-print-directory install >> $LOG 2>&1; then -- failure "Look at $LOG to find out what went wrong" -- fi +- if ! $BUILDINTMP \ +- --use-module-symvers /tmp/vboxdrv-Module.symvers \ +- --module-source "$MODULE_SRC/vboxpci" \ +- --no-print-directory install >> $LOG 2>&1; then +- failure "Look at $LOG to find out what went wrong" - fi - rm -f /etc/vbox/module_not_compiled -- succ_msg -- start +- depmod -a +- succ_msg "VirtualBox kernel modules built" + echo "Not implemented! Please use the virtualbox-kernel.SlackBuild available at SlackBuilds.org instead." } dmnstatus() +@@ -480,13 +297,7 @@ + ## todo Do we need a udev rule to create /dev/vboxdrv[u] at all? We have + ## working fall-back code here anyway, and the "right" code is more complex + ## than the fall-back. Unnecessary duplication? +- stop && cleanup +- setup_usb "$GROUP" "$DEVICE_MODE" "$INSTALL_DIR" +- setup && start +- ;; +-cleanup) +- stop && cleanup +- cleanup_usb ++ setup + ;; + force-reload) + stop diff --git a/system/virtualbox/virtualbox-gsoap.patch b/system/virtualbox/virtualbox-gsoap.patch deleted file mode 100644 index a8ba6f549c..0000000000 --- a/system/virtualbox/virtualbox-gsoap.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -u -r VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk ---- VirtualBox-5.0.10.orig/src/VBox/Main/webservice/Makefile.kmk 2015-11-10 18:06:29.000000000 +0100 -+++ VirtualBox-5.0.10/src/VBox/Main/webservice/Makefile.kmk 2015-11-22 09:58:21.669118291 +0100 -@@ -159,7 +159,6 @@ - RECOMPILE_ON_MAKEFILE_CURRENT := $(MAKEFILE_CURRENT) - - PATH_TARGET_SOAPDEMOXML := $(VBOXWEB_OUT_DIR)/demo_soapxml --PATH_TARGET_SOAPDEMOHEADERS := $(VBOXWEB_OUT_DIR)/demo_headers - PATH_TARGET_SOAPDEMONSMAPS := $(VBOXWEB_OUT_DIR)/demo_namespacemaps - PATH_TARGET_WEBTEST := $(VBOXWEB_OUT_DIR)/webtest - -@@ -515,8 +514,6 @@ - $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts \ - $(wildcard $(PATH_TARGET_SOAPDEMOXML)/*) \ - $(PATH_TARGET_SOAPDEMOXML)/dummy_file \ -- $(wildcard $(PATH_TARGET_SOAPDEMOHEADERS)/*) \ -- $(PATH_TARGET_SOAPDEMOHEADERS)/dummy_file \ - $(wildcard $(PATH_TARGET_SOAPDEMONSMAPS)/*) \ - $(PATH_TARGET_SOAPDEMONSMAPS)/dummy_file - -@@ -695,17 +692,14 @@ - # any more. Ignoring the exit code is the simple solution, accepting the error. - $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts: $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts | $$(dir $$@) - $(RM) -f $@ -- $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMOHEADERS) $(PATH_TARGET_SOAPDEMONSMAPS) -+ $(MKDIR) -p $(PATH_TARGET_SOAPDEMOXML) $(PATH_TARGET_SOAPDEMONSMAPS) - ifdef VBOX_GSOAP_VERBOSE - $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/*.req.xml $(VBOXWEB_OUT_DIR)/*.res.xml $(PATH_TARGET_SOAPDEMOXML)/ - endif -- -$(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/soapvbox*.h $(PATH_TARGET_SOAPDEMOHEADERS)/ - $(MV_EXT) -f -- $(VBOXWEB_OUT_DIR)/vboxBinding.nsmap $(PATH_TARGET_SOAPDEMONSMAPS)/ - $(APPEND) $@ done - --$(PATH_TARGET_SOAPDEMONSMAPS) \ --$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingProxy.h \ --$(PATH_TARGET_SOAPDEMOHEADERS)/soapvboxBindingObject.h: $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts -+$(PATH_TARGET_SOAPDEMONSMAPS): $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts - - # soapcpp2 -2: generate SOAP 1.2 calls - # soapcpp2 -S: server-side code only diff --git a/system/virtualbox/virtualbox.SlackBuild b/system/virtualbox/virtualbox.SlackBuild index 1048ea0771..69f6b6a361 100644 --- a/system/virtualbox/virtualbox.SlackBuild +++ b/system/virtualbox/virtualbox.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for virtualbox-ose -# Copyright 2008-2017 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2008-2018 Heinz Wiesinger, Amsterdam, The Netherlands # Copyright 2008 Mauro Giachero <mauro.giachero@gmail.com> # All rights reserved. # @@ -25,7 +25,7 @@ PRGNAM=virtualbox SRCNAM=VirtualBox -VERSION=${VERSION:-5.0.40} +VERSION=${VERSION:-5.2.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +62,7 @@ else harden="--disable-hardening" fi -# Support for the qt4-frontend +# Support for the Qt & SDL frontends if [ "${HEADLESS:-no}" = "no" ]; then guiapp="VirtualBox VBoxSDL" else @@ -132,17 +132,15 @@ MODE="755" # Use virtualbox-kernel.SlackBuild for this. patch -d src/VBox/Installer/linux -i $CWD/vboxdrv.sh-setup.diff -# Fix building against newer versions of gsoap -patch -p1 -i $CWD/virtualbox-gsoap.patch - # Fix wrong path to rdesktop-vrdp-keymaps patch -p1 -i $CWD/006-rdesktop-vrdp-keymap-path.patch # Remove gcc version check sed -i 's/^check_gcc$/#check_gcc/' ./configure -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# Use our CFLAGS +sed -i "s|CXX_FLAGS=\"\"|CXX_FLAGS=\"$SLKCFLAGS -std=c++11\"|" ./configure + ./configure \ --disable-kmods \ --enable-vde \ @@ -158,20 +156,16 @@ CXXFLAGS="$SLKCFLAGS" \ cp $CWD/LocalConfig.kmk . sed -i "s|LIBDIR|lib$LIBDIRSUFFIX|" ./LocalConfig.kmk +sed -i "s|CXXFLAGS|$SLKCFLAGS -std=c++11|" ./LocalConfig.kmk kmk -j ${JOBS} LOCALCFG=./LocalConfig.kmk -# build VBoxFUSE -cd src/VBox/ImageMounter/VBoxFUSE - kmk -j ${JOBS} -cd - - mkdir -p $PKG/usr/{lib$LIBDIRSUFFIX,share,include}/virtualbox \ $PKG/usr/{bin,src} \ $PKG/usr/share/{pixmaps,mime/packages} \ $PKG/etc/{default,rc.d,vbox} -for i in vboxdrv.sh.in vboxballoonctrl-service.sh vboxautostart-service.sh; do +for i in vboxdrv.sh vboxballoonctrl-service.sh vboxautostart-service.sh; do SCRIPT=$(echo $i | cut -d "." -f 1) cp -f src/VBox/Installer/linux/$i $PKG/etc/rc.d/rc.$SCRIPT.new sed -i "s/%PACKAGE%/virtualbox/g" $PKG/etc/rc.d/rc.$SCRIPT.new @@ -218,8 +212,7 @@ cd out/linux.$BUILDDIR/release/bin/ install -m $MODE -g $GROUP VBoxSysInfo.sh $PKG/usr/share/virtualbox/ install -m $MODE -g $GROUP VBoxCreateUSBNode.sh $PKG/usr/share/virtualbox/ install -m $MODE -g $GROUP VBoxTunctl $PKG/usr/bin/ - install -m $MODE -g $GROUP VBoxFUSE $PKG/usr/bin/ - rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl VBoxFUSE + rm -f VBoxSysInfo.sh VBoxCreateUSBNode.sh VBoxTunctl mv * $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/ chown -R root:$GROUP $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/ chmod -R $MODE $PKG/usr/lib$LIBDIRSUFFIX/virtualbox/ @@ -257,6 +250,7 @@ fi # install headers. Needed by some third party tools cp -rf include/* $PKG/usr/include/virtualbox/ rm -f $PKG/usr/include/virtualbox/Makefile.kmk +find $PKG/usr/include/virtualbox -name "Makefile.kup" -print0 | xargs -0 rm -f cp -f $CWD/VBoxGuestAdditions_$VERSION.iso \ $PKG/usr/share/virtualbox/VBoxGuestAdditions.iso diff --git a/system/virtualbox/virtualbox.info b/system/virtualbox/virtualbox.info index 11fef8a32a..30ab8c98cc 100644 --- a/system/virtualbox/virtualbox.info +++ b/system/virtualbox/virtualbox.info @@ -1,16 +1,16 @@ PRGNAM="virtualbox" -VERSION="5.0.40" +VERSION="5.2.8" HOMEPAGE="https://www.virtualbox.org" -DOWNLOAD="http://download.virtualbox.org/virtualbox/5.0.40/VirtualBox-5.0.40.tar.bz2 \ - http://download.virtualbox.org/virtualbox/5.0.40/VBoxGuestAdditions_5.0.40.iso \ - http://download.virtualbox.org/virtualbox/5.0.40/UserManual.pdf \ - http://download.virtualbox.org/virtualbox/5.0.40/SDKRef.pdf" -MD5SUM="53b259e48a137b0185c169590e2dcb77 \ - 71afc65e09d1d4d02020f0403ac47622 \ - bdc4bf38dd3ed786385044841a4af147 \ - 684ac3f7d17532cd8396ea83ba1d57ea" +DOWNLOAD="http://download.virtualbox.org/virtualbox/5.2.8/VirtualBox-5.2.8.tar.bz2 \ + http://download.virtualbox.org/virtualbox/5.2.8/VBoxGuestAdditions_5.2.8.iso \ + http://download.virtualbox.org/virtualbox/5.2.8/UserManual.pdf \ + http://download.virtualbox.org/virtualbox/5.2.8/SDKRef.pdf" +MD5SUM="e731ea9c5c31096ec4c2a3bfba26665c \ + 3fb71656e8720342ab6ea4022d3dec9c \ + a6ec396375cfb6604291d4da788b49bc \ + a2407872ea00b1ad3e1d34f502518cac" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="acpica virtualbox-kernel" +REQUIRES="acpica qt5 virtualbox-kernel" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" diff --git a/system/xnp2/gcc6.patch b/system/xnp2/gcc6.patch new file mode 100644 index 0000000000..6265959666 --- /dev/null +++ b/system/xnp2/gcc6.patch @@ -0,0 +1,17 @@ +--- xnp2-0.86/x11/compiler.h.old 2016-03-08 18:25:50.000000000 +0100 ++++ xnp2-0.86/x11/compiler.h 2016-07-05 23:48:04.507937827 +0200 +@@ -117,12 +117,14 @@ + #define MAX_PATH MAXPATHLEN + #endif + ++#ifndef __cplusplus + #ifndef max + #define max(a,b) (((a) > (b)) ? (a) : (b)) + #endif + #ifndef min + #define min(a,b) (((a) < (b)) ? (a) : (b)) + #endif ++#endif /* __cplusplus */ + + #ifndef ZeroMemory + #define ZeroMemory(d,n) memset((d), 0, (n)) diff --git a/system/xnp2/xnp2.SlackBuild b/system/xnp2/xnp2.SlackBuild index bbd8e9d826..b8a467720c 100644 --- a/system/xnp2/xnp2.SlackBuild +++ b/system/xnp2/xnp2.SlackBuild @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Thanks to the archlinux folks! +patch -p2 < $CWD/gcc6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |