diff options
| author |   Matteo Bernardini | 2019-11-17 09:41:16 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2019-11-17 09:41:16 +0100 |
| commit | b1037bdb13cfab1a866971d09462ace5cad56259 (patch) | |
| tree | 2ede4cb69452c1eff3dbf47b08cf60be0cabeaed /system | |
| parent | ed263eba8d75390f0e7789cc9e924e1be2584f69 (diff) | |
| download | slackbuilds-b1037bdb13cfab1a866971d09462ace5cad56259.tar.gz | |
20191117.1 global branch merge.current-20191117.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'system')
175 files changed, 1363 insertions, 3269 deletions
diff --git a/system/acpi_call/acpi_call.SlackBuild b/system/acpi_call/acpi_call.SlackBuild index 9be2bed29b..0271eae2d7 100644 --- a/system/acpi_call/acpi_call.SlackBuild +++ b/system/acpi_call/acpi_call.SlackBuild @@ -66,6 +66,9 @@ find -L . \ patch -p0 < $CWD/fix-acpi-include.patch +# Fix build with Linux >= 4.12 +sed -i 's|asm/uaccess.h|linux/uaccess.h|' acpi_call.c + make KDIR=$KERNELPATH mkdir -p $PKG/lib/modules/$KERNEL/misc diff --git a/system/audit/audit.SlackBuild b/system/audit/audit.SlackBuild index c18f98a8b8..b215fc7bd1 100644 --- a/system/audit/audit.SlackBuild +++ b/system/audit/audit.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=audit -VERSION=${VERSION:-2.3.6} +VERSION=${VERSION:-2.8.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -103,7 +103,7 @@ for i in $(find $PKG/etc -type f -name "*.rules" -o -name "*.conf") ; do mv $i $ mkdir -p $PKG/var/log/audit $PKG/var/lock/subsys mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO contrib \ +cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README contrib \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild cat $CWD/README.SLACKWARE > $PKG/usr/doc/$PRGNAM-$VERSION/README.SLACKWARE diff --git a/system/audit/audit.info b/system/audit/audit.info index 809f0561eb..3d9cee63cc 100644 --- a/system/audit/audit.info +++ b/system/audit/audit.info @@ -1,8 +1,8 @@ PRGNAM="audit" -VERSION="2.3.6" +VERSION="2.8.5" HOMEPAGE="http://people.redhat.com/sgrubb/audit/" -DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-2.3.6.tar.gz" -MD5SUM="ffe178196717f8d3fc5337559543f58a" +DOWNLOAD="http://people.redhat.com/sgrubb/audit/audit-2.8.5.tar.gz" +MD5SUM="9455e5773670afdbccaeb92681b2e97d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/cups-bjnp/cups-bjnp.SlackBuild b/system/cups-bjnp/cups-bjnp.SlackBuild index 1829168b60..0cb88341f5 100644 --- a/system/cups-bjnp/cups-bjnp.SlackBuild +++ b/system/cups-bjnp/cups-bjnp.SlackBuild @@ -69,7 +69,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/dahdi-complete/dahdi-complete.SlackBuild b/system/dahdi-complete/dahdi-complete.SlackBuild index c6984aae30..bbfbde084c 100644 --- a/system/dahdi-complete/dahdi-complete.SlackBuild +++ b/system/dahdi-complete/dahdi-complete.SlackBuild @@ -10,7 +10,7 @@ # All rights reserved. PRGNAM=dahdi-complete -VERSION=${VERSION:-2.10.2} +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,16 +61,19 @@ 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 -e 's/ -Werror//' tools/acinclude.m4 tools/xpp/Makefile -sed -i -e 's/-Werror //' tools/Makefile +sed -i -e 's/ -Werror//' tools/acinclude.m4 tools/xpp/Makefile.am +sed -i -e 's/-Werror //' tools/Makefile.am # Fix Perl install location (otherwise it installs to /usr/local/share/perl5) -sed -i -e 's/sitelib/vendorlib/' linux/build_tools/live_dahdi tools/xpp/Makefile +sed -i -e 's/sitelib/vendorlib/' linux/build_tools/live_dahdi tools/xpp/Makefile.am cd linux make all cd ../tools +./bootstrap.sh +autoreconf -fi +CPPFLAGS="-I$(pwd)/../linux/include" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -88,6 +91,10 @@ make install DESTDIR=$PKG cd .. make config DESTDIR=$PKG +mkdir -p $PKG/usr/share/perl5/vendor_perl +mv $PKG/usr/local/share/perl5/* $PKG/usr/share/perl5/vendor_perl/ +rm -fR $PKG/usr/local + # move config files to .new cd $PKG/etc for file in $(find . -type f); do @@ -103,7 +110,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Clean up zero-length firmware files -find $PKG/lib/firmware -size 0 -delete +find $PKG/lib/firmware -size 0 -delete || true # Remove unused directory rm -rf $PKG/usr/lib diff --git a/system/dahdi-complete/dahdi-complete.info b/system/dahdi-complete/dahdi-complete.info index 545f353e9a..1c53349c2a 100644 --- a/system/dahdi-complete/dahdi-complete.info +++ b/system/dahdi-complete/dahdi-complete.info @@ -1,8 +1,8 @@ PRGNAM="dahdi-complete" -VERSION="2.10.2" +VERSION="3.0.0" HOMEPAGE="http://www.asterisk.org/downloads/dahdi" -DOWNLOAD="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/releases/dahdi-linux-complete-2.10.2+2.10.2.tar.gz" -MD5SUM="9b5ae61dc6202b45284d71481ec758c0" +DOWNLOAD="http://downloads.asterisk.org/pub/telephony/dahdi-linux-complete/releases/dahdi-linux-complete-3.0.0+3.0.0.tar.gz" +MD5SUM="0e0a7f18bda5f97dcd22369645234231" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/dash/README b/system/dash/README deleted file mode 100644 index 4f1ca583a5..0000000000 --- a/system/dash/README +++ /dev/null @@ -1,4 +0,0 @@ -DASH is a POSIX-compliant implementation of /bin/sh that aims to be as -small as possible. It does this without sacrificing speed where -possible. In fact, it is significantly faster than bash (the GNU -Bourne-Again SHell) for most tasks. diff --git a/system/dash/dash.SlackBuild b/system/dash/dash.SlackBuild deleted file mode 100644 index dfb7bdf565..0000000000 --- a/system/dash/dash.SlackBuild +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -# Slackware build script for dash - -# Written by Vincent Batts, http://hashbangbash.com/ -# Copyright 2017-2018 Donald Cooley South Haven, Indiana USA - -PRGNAM=dash -VERSION=${VERSION:-0.5.10.2} -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 -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/ \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux \ - --with-libedit - -make -make install DESTDIR=$PKG - -mkdir -p $PKG/usr/bin -( cd $PKG/usr/bin ; ln -s /bin/dash dash ) - -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 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING ChangeLog \ - $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/dash/dash.info b/system/dash/dash.info deleted file mode 100644 index 93724d2bb5..0000000000 --- a/system/dash/dash.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="dash" -VERSION="0.5.10.2" -HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" -DOWNLOAD="http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.10.2.tar.gz" -MD5SUM="8f485f126c05d0ab800e85abfe1987aa" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libedit" -MAINTAINER="Donald Cooley" -EMAIL="chytraeu@sdf.org" diff --git a/system/dash/slack-desc b/system/dash/slack-desc deleted file mode 100644 index 83489625d6..0000000000 --- a/system/dash/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------------------------------------------------------| -dash: dash (POSIX compliant shell) -dash: -dash: DASH is a POSIX-compliant implementation of /bin/sh that aims -dash: to be as small as possible. It does this without sacrificing -dash: speed where possible. In fact, it is significantly faster than -dash: bash (the GNU Bourne-Again SHell) for most tasks. -dash: -dash: -dash: -dash: -dash: diff --git a/system/ddcutil/ddcutil.SlackBuild b/system/ddcutil/ddcutil.SlackBuild index 9a88356804..f19dc83435 100644 --- a/system/ddcutil/ddcutil.SlackBuild +++ b/system/ddcutil/ddcutil.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ddcutil -VERSION=${VERSION:-0.8.6} +VERSION=${VERSION:-0.9.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,10 +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 {} \; -./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ +./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ diff --git a/system/ddcutil/ddcutil.info b/system/ddcutil/ddcutil.info index acd1af4c28..21906ddac4 100644 --- a/system/ddcutil/ddcutil.info +++ b/system/ddcutil/ddcutil.info @@ -1,8 +1,8 @@ PRGNAM="ddcutil" -VERSION="0.8.6" +VERSION="0.9.7" HOMEPAGE="http://ddcutil.com/" -DOWNLOAD="https://github.com/rockowitz/ddcutil/archive/v0.8.6/ddcutil-0.8.6.tar.gz" -MD5SUM="4cb18bb13505e1713736c35f5e8f6237" +DOWNLOAD="https://github.com/rockowitz/ddcutil/archive/v0.9.7/ddcutil-0.9.7.tar.gz" +MD5SUM="427c956956ac8c9afdc8e18c76a8e3b0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" 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/ecryptfs-utils/ecryptfs-utils.SlackBuild b/system/ecryptfs-utils/ecryptfs-utils.SlackBuild index 27ba7c2bbb..8a32014071 100644 --- a/system/ecryptfs-utils/ecryptfs-utils.SlackBuild +++ b/system/ecryptfs-utils/ecryptfs-utils.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 -p0 < $CWD/openssl.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -84,7 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-pam \ --enable-gpg \ - --enable-tests \ + --disable-tests \ --build=$ARCH-slackware-linux make -j1 all check diff --git a/system/ecryptfs-utils/openssl.patch b/system/ecryptfs-utils/openssl.patch new file mode 100644 index 0000000000..5c3e419a91 --- /dev/null +++ b/system/ecryptfs-utils/openssl.patch @@ -0,0 +1,76 @@ +=== modified file 'src/key_mod/ecryptfs_key_mod_openssl.c' +--- src/key_mod/ecryptfs_key_mod_openssl.c 2013-10-25 19:45:09 +0000 ++++ src/key_mod/ecryptfs_key_mod_openssl.c 2017-03-13 20:34:27 +0000 +@@ -50,6 +50,20 @@ + #include "../include/ecryptfs.h" + #include "../include/decision_graph.h" + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++void RSA_get0_key(const RSA *r, ++ const BIGNUM **n, const BIGNUM **e, const BIGNUM **d) ++{ ++ if (n != NULL) ++ *n = r->n; ++ if (e != NULL) ++ *e = r->e; ++ if (d != NULL) ++ *d = r->d; ++} ++#endif ++ ++ + struct openssl_data { + char *path; + char *passphrase; +@@ -142,6 +156,7 @@ + { + int len, nbits, ebits, i; + int nbytes, ebytes; ++ const BIGNUM *key_n, *key_e; + unsigned char *hash; + unsigned char *data = NULL; + int rc = 0; +@@ -152,11 +167,13 @@ + rc = -ENOMEM; + goto out; + } +- nbits = BN_num_bits(key->n); ++ RSA_get0_key(key, &key_n, NULL, NULL); ++ nbits = BN_num_bits(key_n); + nbytes = nbits / 8; + if (nbits % 8) + nbytes++; +- ebits = BN_num_bits(key->e); ++ RSA_get0_key(key, NULL, &key_e, NULL); ++ ebits = BN_num_bits(key_e); + ebytes = ebits / 8; + if (ebits % 8) + ebytes++; +@@ -179,11 +196,13 @@ + data[i++] = '\02'; + data[i++] = (nbits >> 8); + data[i++] = nbits; +- BN_bn2bin(key->n, &(data[i])); ++ RSA_get0_key(key, &key_n, NULL, NULL); ++ BN_bn2bin(key_n, &(data[i])); + i += nbytes; + data[i++] = (ebits >> 8); + data[i++] = ebits; +- BN_bn2bin(key->e, &(data[i])); ++ RSA_get0_key(key, NULL, &key_e, NULL); ++ BN_bn2bin(key_e, &(data[i])); + i += ebytes; + SHA1(data, len + 3, hash); + to_hex(sig, (char *)hash, ECRYPTFS_SIG_SIZE); +@@ -278,7 +297,9 @@ + BIO *in = NULL; + int rc; + ++ #if OPENSSL_VERSION_NUMBER < 0x10100000L + CRYPTO_malloc_init(); ++ #endif + ERR_load_crypto_strings(); + OpenSSL_add_all_algorithms(); + ENGINE_load_builtin_engines(); + + diff --git a/system/efitools/efitools.SlackBuild b/system/efitools/efitools.SlackBuild index b2f041bed3..825ec0279e 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.9.2} 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 @@ -93,6 +93,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 {} \; +# https://github.com/vathpela/gnu-efi/commit/d34132e62f666904158c7ec2f1eef5a9d5281c36 +sed -i "s|EFI_WARN_UNKOWN_GLYPH|EFI_WARN_UNKNOWN_GLYPH|" lib/console.c + make \ CRTPATH=/usr/lib${LIBDIRSUFFIX}/gnuefi \ MYGUID=${MYGUID} \ diff --git a/system/efitools/efitools.info b/system/efitools/efitools.info index 8946a7cacf..ff0b1df6bc 100644 --- a/system/efitools/efitools.info +++ b/system/efitools/efitools.info @@ -1,8 +1,8 @@ PRGNAM="efitools" -VERSION="1.5.3" +VERSION="1.9.2" 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.9.2.tar.gz" +MD5SUM="a3a3f04ed6aa5486c97dd206edeebe0a" 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/f2fs_tools/README b/system/f2fs_tools/README deleted file mode 100644 index 9b03454053..0000000000 --- a/system/f2fs_tools/README +++ /dev/null @@ -1 +0,0 @@ -Userland tools for the f2fs filesystem. diff --git a/system/f2fs_tools/f2fs_tools.SlackBuild b/system/f2fs_tools/f2fs_tools.SlackBuild deleted file mode 100644 index 198eb74854..0000000000 --- a/system/f2fs_tools/f2fs_tools.SlackBuild +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -# Slackware build script for <f2fs_tools> -# -# Michales (clavisound) Michaloudes korgie@gmail.com <2014> - -PRGNAM=f2fs_tools -SRCNAM=f2fs-tools -VERSION=${VERSION:-1.6.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -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 $SRCNAM-v$VERSION -tar xvf $CWD/$SRCNAM-v$VERSION.tar.gz -cd $SRCNAM-v$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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" - -autoreconf --install - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -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 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog README 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/f2fs_tools/f2fs_tools.info b/system/f2fs_tools/f2fs_tools.info deleted file mode 100644 index cda93b1788..0000000000 --- a/system/f2fs_tools/f2fs_tools.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="f2fs_tools" -VERSION="1.6.1" -HOMEPAGE="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git" -DOWNLOAD="http://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/f2fs-tools-v1.6.1.tar.gz" -MD5SUM="3fc6caa14569e059fc41807e42641a11" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Michales Michaloudes" -EMAIL="korgie@gmail.com" 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/fuse3/README b/system/fuse3/README deleted file mode 100644 index 533ab44440..0000000000 --- a/system/fuse3/README +++ /dev/null @@ -1,10 +0,0 @@ -fuse3 - Filesystem in Userspace, version 3 - -FUSE (Filesystem in Userspace) is an interface for userspace programs to -export a filesystem to the Linux kernel. The FUSE project consists of two -components: the fuse kernel module (maintained in the regular kernel -repositories) and the libfuse userspace library (maintained in this -repository). libfuse provides the reference implementation for communicating -with the FUSE kernel module. - -This ought not collide with the "fuse" package in stock slackware install. diff --git a/system/fuse3/fuse3.info b/system/fuse3/fuse3.info deleted file mode 100644 index b2ef5b541d..0000000000 --- a/system/fuse3/fuse3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="fuse3" -VERSION="3.3.0" -HOMEPAGE="https://github.com/libfuse/libfuse" -DOWNLOAD="https://github.com/libfuse/libfuse/releases/download/fuse-3.3.0/fuse-3.3.0.tar.xz" -MD5SUM="2568a6bd41f5a4dead66e119a83cebaf" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="meson" -MAINTAINER="Vincent Batts" -EMAIL="vbatts@hashbanghbash.com" diff --git a/system/fwupdate/fwupdate.SlackBuild b/system/fwupdate/fwupdate.SlackBuild index 682bce6a05..5487906bf4 100644 --- a/system/fwupdate/fwupdate.SlackBuild +++ b/system/fwupdate/fwupdate.SlackBuild @@ -70,6 +70,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 {} \; +sed -i "s|-Og|-Og -Wno-error=address-of-packed-member -Wno-error=pointer-sign|" \ + {efi,linux}/Makefile + # randomly fails with more than one thread make -j1 \ EFIDIR=Slackware \ diff --git a/system/geoclue/geoclue.SlackBuild b/system/geoclue/geoclue.SlackBuild index ce119daa39..5276a0cd02 100644 --- a/system/geoclue/geoclue.SlackBuild +++ b/system/geoclue/geoclue.SlackBuild @@ -82,7 +82,6 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-static=no \ --enable-gtk=yes \ - --enable-networkmanager=yes \ --enable-skyhook=yes \ --enable-gpsd=no \ --build=$ARCH-slackware-linux 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 4318250bec..1aa4c2f63a 100644 --- a/system/guake/guake.info +++ b/system/guake/guake.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/Guake/guake/archive/0.8.14/guake-0.8.14.tar.gz" MD5SUM="a0155a28c4417d3c6200afbdebe2c306" 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/jmtpfs/jmtpfs.SlackBuild b/system/guefi/guefi.SlackBuild index 545efff32e..a515d4ceb6 100644 --- a/system/jmtpfs/jmtpfs.SlackBuild +++ b/system/guefi/guefi.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for jmtpfs +# Slackware build script for guefi -# Copyright 2015 Andre Barboza, Belo Horizonte, Minas Gerais, Brazil +# Copyright 2017 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=jmtpfs -VERSION=${VERSION:-0.5} +PRGNAM=guefi +VERSION=${VERSION:-0.1.3} 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" @@ -54,13 +54,15 @@ 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/v$VERSION.tar.gz || 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 . find -L . \ @@ -69,19 +71,17 @@ 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 {} \; -CXXFLAGS="$SLKCFLAGS -lpthread" \ -./configure \ - --prefix=/usr \ - --build=$ARCH-slackware-linux +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +make prefix=/usr -make make install DESTDIR=$PKG 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 AUTHORS COPYING INSTALL NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install 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/fuse3/slack-desc b/system/guefi/slack-desc index 6cd1dacca4..e0df51a295 100644 --- a/system/fuse3/slack-desc +++ b/system/guefi/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -fuse3: fuse3 (Filesystem in Userspace) -fuse3: -fuse3: FUSE is a simple interface for userspace programs to export a virtual -fuse3: filesystem to the Linux kernel. FUSE also aims to provide a secure -fuse3: method for non privileged users to create and mount their own -fuse3: filesystem implementations. -fuse3: -fuse3: Homepage: https://github.com/libfuse/libfuse -fuse3: -fuse3: -fuse3: +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/haveged/README b/system/haveged/README deleted file mode 100644 index 187b3bdda9..0000000000 --- a/system/haveged/README +++ /dev/null @@ -1,27 +0,0 @@ -haveged (a simple entropy-gathering daemon) - -The haveged project is an attempt to provide an easy-to-use, unpredictable -random number generator based upon an adaptation of the HAVEGE algorithm. -Haveged was created to remedy low-entropy conditions in the Linux random -device that can occur under some workloads, especially on headless servers. - -The HAVEGE algorithm is based upon the indirect effects of unrelated hardware -events on the instruction timing of a calculation that is sensitive to -processor features such as branch predictors and instruction/data access -mechanisms. -Samples from a high-resolution timer are input into the algorithm to -produce a stream of random data in a collection buffer. The contents of this -buffer can be fed into the random device or accessed directly through the -file system. File system access is a useful alternative to those situations -where use of the random device is either inappropriate or not available. - -Add the following snippet to your /etc/rc.d/rc.M to start up haveged at boot: - -# Starting HAVEGED entropy daemon -if [ -x /etc/rc.d/rc.haveged ]; then - /etc/rc.d/rc.haveged start -fi - -You can see how many bits of entropy are available to the system by reading -the /proc/sys/kernel/random/entropy_avail file, and check the size of your -entropy pool at /proc/sys/kernel/random/poolsize. diff --git a/system/haveged/doinst.sh b/system/haveged/doinst.sh deleted file mode 100644 index b9e90c8608..0000000000 --- a/system/haveged/doinst.sh +++ /dev/null @@ -1,28 +0,0 @@ -config() { - for infile in $1; do - NEW="$infile" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... - done -} - -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} - -preserve_perms etc/rc.d/rc.haveged.new - diff --git a/system/haveged/haveged.info b/system/haveged/haveged.info deleted file mode 100644 index ea62f1b72e..0000000000 --- a/system/haveged/haveged.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="haveged" -VERSION="1.9.2" -HOMEPAGE="http://www.issihosts.com/haveged/index.html" -DOWNLOAD="http://www.issihosts.com/haveged/haveged-1.9.2.tar.gz" -MD5SUM="fb1d8b3dcbb9d06b30eccd8aa500fd31" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Erik Falor" -EMAIL="ewfalor@gmail.com" diff --git a/system/haveged/rc.haveged b/system/haveged/rc.haveged deleted file mode 100644 index 404d9ca800..0000000000 --- a/system/haveged/rc.haveged +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# Start/stop/restart haveged. - -PIDFILE=/var/run/haveged.pid -HAVEGED_OPTS="-w 1024 -v 1 -p $PIDFILE" - -# Start haveged: -haveged_start() { - if [ -f $PIDFILE ]; then - echo "HAVEGE daemon is already running as PID $(cat $PIDFILE) " >&2 - exit 3 - elif [ -x /sbin/haveged ]; then - echo "Starting HAVEGE daemon: /sbin/haveged" - /sbin/haveged $HAVEGED_OPTS - fi -} - -# Stop haveged: -haveged_stop() { - if [ -r /var/run/haveged.pid ]; then - kill $(cat /var/run/haveged.pid) - else - killall haveged - fi -} - -# Restart haveged: -haveged_restart() { - haveged_stop - sleep 1 - haveged_start -} - -case "$1" in -'start') - haveged_start - ;; -'stop') - haveged_stop - ;; -'restart') - haveged_restart - ;; -*) - echo "usage $0 start|stop|restart" - exit 2 -esac diff --git a/system/haveged/slack-desc b/system/haveged/slack-desc deleted file mode 100644 index 55d8f9ed50..0000000000 --- a/system/haveged/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------------------------------------------------------| -haveged: haveged (A simple entropy daemon) -haveged: -haveged: The haveged project is an attempt to provide an easy-to-use, -haveged: unpredictable random number generator based upon an adaptation of the -haveged: HAVEGE algorithm. Haveged was created to remedy low-entropy -haveged: conditions in the Linux random device that can occur under some -haveged: workloads, especially on headless servers. -haveged: -haveged: -haveged: -haveged: 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/ipmitool/ipmitool.SlackBuild b/system/ipmitool/ipmitool.SlackBuild index b632d54ce8..595e05539b 100644 --- a/system/ipmitool/ipmitool.SlackBuild +++ b/system/ipmitool/ipmitool.SlackBuild @@ -9,15 +9,16 @@ # Based on http://slackbuilds.org/template.SlackBuild # Modified by Mario Preksavec <mario@slackware.hr> +# Modified by the SlackBuilds.org project PRGNAM=ipmitool -VERSION=${VERSION:-1.8.13} +VERSION=${VERSION:-1.8.18} 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 @@ -28,8 +29,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" @@ -52,10 +53,13 @@ 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 {} \; + \( -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 {} \; + +# patch from fedora to support openssl-1.1.x +patch -p1 < $CWD/openssl-1.1.x.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -70,13 +74,11 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/system/ipmitool/ipmitool.info b/system/ipmitool/ipmitool.info index db17f3f7d4..3304a70819 100644 --- a/system/ipmitool/ipmitool.info +++ b/system/ipmitool/ipmitool.info @@ -1,8 +1,8 @@ PRGNAM="ipmitool" -VERSION="1.8.13" +VERSION="1.8.18" HOMEPAGE="http://ipmitool.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/project/ipmitool/ipmitool/1.8.13/ipmitool-1.8.13.tar.gz" -MD5SUM="c1107597848bd0a8be05c179e6f66b62" +DOWNLOAD="http://downloads.sourceforge.net/ipmitool/ipmitool-1.8.18.tar.gz" +MD5SUM="55304c6c5b994784222d3944d086fa30" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/ipmitool/openssl-1.1.x.patch b/system/ipmitool/openssl-1.1.x.patch new file mode 100644 index 0000000000..ff5e7051bf --- /dev/null +++ b/system/ipmitool/openssl-1.1.x.patch @@ -0,0 +1,89 @@ +diff -urNp old/src/plugins/lanplus/lanplus_crypt_impl.c new/src/plugins/lanplus/lanplus_crypt_impl.c +--- old/src/plugins/lanplus/lanplus_crypt_impl.c 2016-05-28 10:20:20.000000000 +0200 ++++ new/src/plugins/lanplus/lanplus_crypt_impl.c 2017-02-21 10:50:21.634873466 +0100 +@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_ + uint8_t * output, + uint32_t * bytes_written) + { +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); + + + *bytes_written = 0; +@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ + assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); + + +- if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) ++ if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) + { + /* Error */ + *bytes_written = 0; +@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_ + { + uint32_t tmplen; + +- if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) ++ if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) + { + *bytes_written = 0; + return; /* Error */ +@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_ + { + /* Success */ + *bytes_written += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); + } + } + } +@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_ + uint8_t * output, + uint32_t * bytes_written) + { +- EVP_CIPHER_CTX ctx; +- EVP_CIPHER_CTX_init(&ctx); +- EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv); +- EVP_CIPHER_CTX_set_padding(&ctx, 0); ++ EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(ctx); ++ EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv); ++ EVP_CIPHER_CTX_set_padding(ctx, 0); + + + if (verbose >= 5) +@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ + assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0); + + +- if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length)) ++ if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length)) + { + /* Error */ + lprintf(LOG_DEBUG, "ERROR: decrypt update failed"); +@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_ + { + uint32_t tmplen; + +- if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen)) ++ if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen)) + { + char buffer[1000]; + ERR_error_string(ERR_get_error(), buffer); +@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_ + { + /* Success */ + *bytes_written += tmplen; +- EVP_CIPHER_CTX_cleanup(&ctx); ++ EVP_CIPHER_CTX_cleanup(ctx); ++ EVP_CIPHER_CTX_free(ctx); + } + } + diff --git a/system/iscan-data/README b/system/iscan-data/README new file mode 100644 index 0000000000..e26cac2c62 --- /dev/null +++ b/system/iscan-data/README @@ -0,0 +1,2 @@ +This package contains EPSON Image Scan! data files which are +required for using certain EPSON all-in-one devices. diff --git a/system/fuse3/fuse3.SlackBuild b/system/iscan-data/iscan-data.SlackBuild index 5b52fdfe2f..0219b2faad 100644 --- a/system/fuse3/fuse3.SlackBuild +++ b/system/iscan-data/iscan-data.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for fuse3 +# Slackware build script for iscan-data -# Copyright 2019 Vincent Batts, Raleigh, NC, USA +# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -SUFFIX=3 -BASENAME=fuse -PRGNAM=${BASENAME}${SUFFIX} -VERSION=${VERSION:-3.3.0} +PRGNAM=iscan-data +VERSION=${VERSION:-1.39.1} +ADDVER=${ADDVER:-2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,14 +55,16 @@ else LIBDIRSUFFIX="" fi +DOCS="COPYING KNOWN-PROBLEMS SUPPORTED-DEVICES" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $BASENAME-$VERSION -tar xvf $CWD/$BASENAME-$VERSION.tar.xz -cd $BASENAME-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/${PRGNAM}_${VERSION}-${ADDVER}.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 \ @@ -71,24 +72,25 @@ 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 {} \; -meson build \ - -Dexamples=false \ - -Dudevrulesdir="/etc/udev/rules.d" \ - --prefix="/usr" \ - --mandir="/usr/man" -ninja -C build -DESTDIR=$PKG ninja -C build install +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 DESTDIR=$PKG 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 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README.md LICENSE LGPL2.txt GPL2.txt doc/ example/ \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/iscan-data/iscan-data.info b/system/iscan-data/iscan-data.info new file mode 100644 index 0000000000..a59ad78c7e --- /dev/null +++ b/system/iscan-data/iscan-data.info @@ -0,0 +1,10 @@ +PRGNAM="iscan-data" +VERSION="1.39.1" +HOMEPAGE="http://epson.net" +DOWNLOAD="http://support.epson.net/linux/src/scanner/iscan/iscan-data_1.39.1-2.tar.gz" +MD5SUM="3a20ada6e5306048ce02e436bcb6afe3" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/f2fs_tools/slack-desc b/system/iscan-data/slack-desc index cb5332d95f..d3f025101e 100644 --- a/system/f2fs_tools/slack-desc +++ b/system/iscan-data/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -f2fs_tools: f2fs_tools (Userland tools for the f2fs filesystem) -f2fs_tools: -f2fs_tools: Project URL: -f2fs_tools: https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git -f2fs_tools: -f2fs_tools: -f2fs_tools: -f2fs_tools: -f2fs_tools: -f2fs_tools: -f2fs_tools: +iscan-data: iscan-data (EPSON Image Scan! data files) +iscan-data: +iscan-data: This package contains EPSON Image Scan! data files which are +iscan-data: required for using certain EPSON all-in-one devices. +iscan-data: +iscan-data: homepage: http://epson.net +iscan-data: +iscan-data: +iscan-data: +iscan-data: +iscan-data: diff --git a/system/iscan/README b/system/iscan/README new file mode 100644 index 0000000000..3ae47041b7 --- /dev/null +++ b/system/iscan/README @@ -0,0 +1,4 @@ +EPSON Image Scan! for Linux enables you to print to a networked +all-in-one EPSON printer. A SANE 'epkowa' backend is provided +as well; scanning over the network requires the additional +iscan-network-nt package which contains a protocol driver. diff --git a/system/iscan/doinst.sh b/system/iscan/doinst.sh new file mode 100644 index 0000000000..25f34e1d3a --- /dev/null +++ b/system/iscan/doinst.sh @@ -0,0 +1,29 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/sane.d/epkowa.conf.new + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/system/haveged/haveged.SlackBuild b/system/iscan/iscan.SlackBuild index 0d5e97f692..33276ad0c0 100644 --- a/system/haveged/haveged.SlackBuild +++ b/system/iscan/iscan.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for haveged +# Slackware build script for iscan -# Copyright 2018 Erik Falor, Logan, Utah, USA +# Copyright 2019 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by Nikos Giotis 20170903, Athens, GR -# Use static building -# Changed install target to /sbin, /lib[64] -# Added check for existing installation due to problems when rebuilding -# produces binary that segfaults if any previous installation is there +# Shamelessly ripped from Alien Bob's script: thank him for all the hard work! -PRGNAM=haveged -VERSION=${VERSION:-1.9.2} +PRGNAM=iscan +VERSION=${VERSION:-2.30.4} +ADDVER=${ADDVER:-2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,23 +57,23 @@ else LIBDIRSUFFIX="" fi -set -e - -# Try to detect any previous installations and bail out if true -if [ -f "/usr/lib$LIBDIRSUFFIX/libhavege.so" -o \ - -f "/usr/lib$LIBDIRSUFFIX/libhavege.a" -o \ - -f "/lib$LIBDIRSUFFIX/libhavege.so" -o \ - -f "/lib$LIBDIRSUFFIX/libhavege.a" ]; then - echo 'Detected libhaveged!' >&2 - echo 'Please remove libhaveged before building a new one.' >&2 - exit 1 +# Minor library version of libpng on our system: +PNGMINOR=$(pkg-config --modversion libpng |cut -d'.' -f2) +if [ $PNGMINOR -gt 5 ]; then + PNG_LDFLAGS="-lpng16" +elif [ $PNGMINOR -eq 4 ]; then + PNG_LDFLAGS="-lpng14" fi +DOCS="COPYING INSTALL NEWS README non-free/COPYING*.txt" + +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}-${ADDVER}.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -85,32 +82,58 @@ 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 {} \; -# Static build for easier inclusion in initrd +# Apply ArchLinux patches: +# Allow linking against libpng15 and newer: +patch -p0 < $CWD/patches/iscan_png15.patch +# Patch for ambiguous div in jpegstream.cc: +patch -p0 < $CWD/patches/jpegstream.cc.patch +# Fix compilation error 'unknown type name u_char' on 32bit: +patch -p1 < $CWD/patches/iscan-2.30.3_x86-unknown-types.patch +# Add fix for CXX ABI different than 1002: +ln -s libesmod-x86_64.c2.so non-free/libesmod-x86_64.so + +LDFLAGS="-ldl $PNG_LDFLAGS" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -LDFLAGS="-static" \ ./configure \ --prefix=/usr \ - --sbindir=/sbin \ - --libdir=/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-dependency-reduction \ + --enable-frontend \ + --enable-jpeg \ + --enable-tiff \ + --enable-png \ + --enable-gimp \ --build=$ARCH-slackware-linux make -make install-strip DESTDIR=$PKG +make install DESTDIR=$PKG + +# Install the SANE backend configuration: +mkdir -p $PKG/etc/sane.d/dll.d +install -m0644 backend/epkowa.conf $PKG/etc/sane.d/epkowa.conf.new +echo "epkowa" > $PKG/etc/sane.d/dll.d/epkowa.conf + +# Create the forgotten desktop menu: +mkdir -p $PKG/usr/share/applications +install -m0644 $PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop + +# Make the GIMP aware of the iscan plugin: +mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/gimp/2.0/plug-ins +ln -s /usr/bin/$PRGNAM $PKG/usr/lib$LIBDIRSUFFIX/gimp/2.0/plug-ins/ -rm -rf $PKG/etc/init.d -install -D -m0755 -oroot -groot $CWD/rc.haveged $PKG/etc/rc.d/rc.haveged.new +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 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/iscan/iscan.info b/system/iscan/iscan.info new file mode 100644 index 0000000000..a299693821 --- /dev/null +++ b/system/iscan/iscan.info @@ -0,0 +1,10 @@ +PRGNAM="iscan" +VERSION="2.30.4" +HOMEPAGE="http://epson.net" +DOWNLOAD="http://support.epson.net/linux/src/scanner/iscan/iscan_2.30.4-2.tar.gz" +MD5SUM="b79c73341fcd7dd930381d50952b88c8" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="iscan-data" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch new file mode 100644 index 0000000000..9bb856ff83 --- /dev/null +++ b/system/iscan/patches/iscan-2.30.3_x86-unknown-types.patch @@ -0,0 +1,12 @@ +diff -ru a/sanei/sanei_pio.c b/sanei/sanei_pio.c +--- a/sanei/sanei_pio.c 2019-03-01 10:44:36.723260142 -0600 ++++ b/sanei/sanei_pio.c 2019-03-01 10:48:47.660693036 -0600 +@@ -73,6 +73,7 @@ + #elif HAVE_SYS_HW_H + # include <sys/hw.h> + #elif defined(__i386__) && defined (__GNUC__) ++#include <sys/types.h> + + static __inline__ void + outb (u_char value, u_long port) + diff --git a/system/iscan/patches/iscan_png15.patch b/system/iscan/patches/iscan_png15.patch new file mode 100644 index 0000000000..8220ac4af3 --- /dev/null +++ b/system/iscan/patches/iscan_png15.patch @@ -0,0 +1,52 @@ +# +# Thanks to Fabio Castelli, ArchLinux: +# https://projects.archlinux.org/svntogit/community.git/tree/trunk/libpng15.patch?h=packages/iscan +# +--- lib/pngstream.cc 2011-12-01 02:30:53.000000000 +0100 ++++ lib/pngstream.cc 2012-02-06 03:06:22.000000000 +0100 +@@ -83,7 +83,12 @@ + #if HAVE_PNG_H + set_error_handler (_png, _info); + ++/* when not interlacing (ie, only one pass), number of rows is image height: _v_sz */ ++#if PNG_LIBPNG_VER > 10499 ++ if (!_footer && _v_sz == lib->get_current_row_number(_png)) ++#else + if (_header && !_footer && _png->num_rows == _png->flush_rows) ++#endif + { + lib->write_end (_png, _info); + _footer = true; +@@ -167,6 +172,9 @@ + funcsym (write_row); + funcsym (write_flush); + funcsym (write_end); ++#if PNG_LIBPNG_VER > 10499 ++ funcsym (get_current_row_number); ++#endif + + if (lib->access_version_number + && lib->create_write_struct +@@ -176,6 +184,9 @@ + && lib->set_IHDR + && lib->set_pHYs + && lib->set_invert_mono ++#if PNG_LIBPNG_VER > 10499 ++ && lib->get_current_row_number ++#endif + && lib->write_info + && lib->write_row + && lib->write_flush +--- lib/pngstream.hh 2011-12-01 02:30:53.000000000 +0100 ++++ lib/pngstream.hh 2012-02-06 03:09:09.000000000 +0100 +@@ -108,6 +108,10 @@ + png_structp); + fundecl (void, write_end, + png_structp, png_infop); ++#if PNG_LIBPNG_VER > 10499 ++ fundecl (png_uint_32, get_current_row_number, ++ png_structp); ++#endif + #endif /* HAVE_PNG_H */ + }; + static png_lib_handle *lib; diff --git a/system/iscan/patches/jpegstream.cc.patch b/system/iscan/patches/jpegstream.cc.patch new file mode 100644 index 0000000000..988a25daea --- /dev/null +++ b/system/iscan/patches/jpegstream.cc.patch @@ -0,0 +1,21 @@ +--- lib/jpegstream.cc.orig 2016-06-20 06:10:38.000000000 +0200 ++++ lib/jpegstream.cc 2016-07-10 18:45:40.511301054 +0200 +@@ -33,7 +33,7 @@ + + #include "jpegstream.hh" + +-#include <cstdlib> ++// #include <cstdlib> + #include <ios> + + namespace iscan +@@ -82,7 +82,8 @@ + // only that _bits != 8. + for (unsigned int i = 0; i < _h_sz; ++i) + { +- div_t index = div (i, 8 * sizeof (JSAMPLE)); ++ div_t index = div (static_cast<int>(i), ++ static_cast<int>(8 * sizeof (JSAMPLE))); + int offset = 8 * sizeof (JSAMPLE) - 1 - index.rem; + _scanline[i] = ((line[index.quot] & (1 << offset)) + ? 0 : ~0); diff --git a/system/iscan/slack-desc b/system/iscan/slack-desc new file mode 100644 index 0000000000..56fcd9b5c0 --- /dev/null +++ b/system/iscan/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +iscan: iscan (front-end for EPSON all-in-one devices) +iscan: +iscan: EPSON Image Scan! for Linux enables you to print to a networked +iscan: all-in-one EPSON printer. A SANE 'epkowa' backend is provided +iscan: as well; scanning over the network requires the additional +iscan: iscan-network-nt package which contains a protocol driver. +iscan: +iscan: homepage: http://epson.net +iscan: +iscan: +iscan: diff --git a/system/jmtpfs/README b/system/jmtpfs/README deleted file mode 100644 index d43b1a7ac3..0000000000 --- a/system/jmtpfs/README +++ /dev/null @@ -1,10 +0,0 @@ -jmtpfs is a FUSE and libmtp based filesystem for accessing MTP -(Media Transfer Protocol) devices. It was specifically designed -for exchaning files between Linux (and Mac OS X) systems and -newer Android devices that support MTP but not USB Mass Storage. - -The goal is to create a well behaved filesystem, allowing tools -like find and rsync to work as expected. MTP file types are set -automatically based on file type detection using libmagic. -Setting the file appears to be necessary for some Android apps, -like Gallery, to be able to find and use the files. diff --git a/system/jmtpfs/jmtpfs.info b/system/jmtpfs/jmtpfs.info deleted file mode 100644 index 897c93dc9f..0000000000 --- a/system/jmtpfs/jmtpfs.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="jmtpfs" -VERSION="0.5" -HOMEPAGE="https://github.com/JasonFerrara/jmtpfs" -DOWNLOAD="https://github.com/JasonFerrara/jmtpfs/archive/v0.5.tar.gz" -MD5SUM="501e51530d3c04d63e9ac96d794bf5c5" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Andre Barboza" -EMAIL="bmg.andre@gmail.com" diff --git a/system/jmtpfs/slack-desc b/system/jmtpfs/slack-desc deleted file mode 100644 index 7fab708cd9..0000000000 --- a/system/jmtpfs/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------------------------------------------------------| -jmtpfs: jmtpfs (FUSE and libmtp based filesystem for accessing MTP) -jmtpfs: -jmtpfs: jmtpfs is a FUSE and libmtp based filesystem for accessing MTP -jmtpfs: (Media Transfer Protocol) devices. It was specifically designed -jmtpfs: for exchaning files between Linux (and Mac OS X) systems and -jmtpfs: newer Android devices that support MTP but not USB Mass -jmtpfs: Storage. -jmtpfs: -jmtpfs: -jmtpfs: -jmtpfs: https://github.com/JasonFerrara/jmtpfs 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/lbzip2/slack-desc b/system/lbzip2/slack-desc deleted file mode 100644 index fb3286dd7e..0000000000 --- a/system/lbzip2/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------------------------------------------------------| -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: 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 8f5130af46..bd782fb65f 100644 --- a/system/lxterminal/lxterminal.info +++ b/system/lxterminal/lxterminal.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/lxde/lxterminal-0.3.2.tar.xz" MD5SUM="62e57c3aafb831505cc1638b2b737cc9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="vte2" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/system/lz4/lz4.SlackBuild b/system/lz4/lz4.SlackBuild index d965cfcd0d..7a3f3de06e 100644 --- a/system/lz4/lz4.SlackBuild +++ b/system/lz4/lz4.SlackBuild @@ -17,7 +17,7 @@ # 20170122 bkw: update for 1.7.5 PRGNAM=lz4 -VERSION=${VERSION:-1.8.3} +VERSION=${VERSION:-1.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/lz4/lz4.info b/system/lz4/lz4.info index 2ce94b8560..242a743a70 100644 --- a/system/lz4/lz4.info +++ b/system/lz4/lz4.info @@ -1,8 +1,8 @@ PRGNAM="lz4" -VERSION="1.8.3" +VERSION="1.9.1" HOMEPAGE="https://lz4.github.io/lz4/" -DOWNLOAD="https://github.com/lz4/lz4/archive/v1.8.3/lz4-1.8.3.tar.gz" -MD5SUM="d5ce78f7b1b76002bbfffa6f78a5fc4e" +DOWNLOAD="https://github.com/lz4/lz4/archive/v1.9.1/lz4-1.9.1.tar.gz" +MD5SUM="a80f28f2a2e5fe59ebfe8407f793da22" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/man-db/README b/system/man-db/README deleted file mode 100644 index 1e48863b3a..0000000000 --- a/system/man-db/README +++ /dev/null @@ -1,13 +0,0 @@ -man-db (database-driven manual pager suite) - -This package provides the man command and related utilities for examining -on-line help files (manual pages). It can act as a replacement for -Slackware's man package. It has several enhancements over man, including -an indexed database for searches with -k or apropos, the ability to -easily view man pages in a browser, better i18n support, and a much more -efficient implementation of the -K (full text search) option. - -This build includes a complete install of libpipeline. - -By default, man-db doesn't conflict with Slackware's man package. See -README.Slackware for details. diff --git a/system/man-db/README.Slackware b/system/man-db/README.Slackware deleted file mode 100644 index 165e9dfa4c..0000000000 --- a/system/man-db/README.Slackware +++ /dev/null @@ -1,49 +0,0 @@ -By default, man-db can be installed alongside Slackware's man package -without conflict, as it installs its binaries and man pages into -/opt/man-db. After installation, either log out and back in, or source -/etc/profile.d/man-db.sh in your shell (this adjusts $PATH so the man -command from /opt/man-db will be found first). - -Alternately, man-db can be built as a replacement for Slackware's -man package. To do this, set USR=yes in the script's environment, -and "removepkg man" before installing man-db. No profile scripts are -installed in this case. - -When installing man-db, the doinst.sh script may take several minutes to -run. This is because it's indexing all the man pages on the system. Also, -a cron job is installed in /etc/cron.daily, which adds newly-installed -man pages to the database. The index speeds up searching via "man -k" -or "apropos". The disadvantage is that newly-installed man pages won't -be found in these searches until the database has been updated, so any -time you install new man pages, you'll want to run "mandb" as root, or -wait for cron to do it for you (if you don't do this, the new pages can -still be displayed, they just won't be searchable). The indexing runs -quickly once the initial database has been created, so the cron job or -manual update shouldn't bring your system to its knees. - -The database is located in /var/cache/man, and on a full Slackware install -will be approximately 5MB in size. During index creation, approximately -10MB in /var is used. If you decide to removepkg man-db, you'll probably -also want to get rid of its database with "rm -rf /var/cache/man". If -the database gets corrupted somehow, it can be regenerated from scratch -by running "mandb -c" or just reinstalling the man-db package. - -Although man-db supports caching formatted pages ("cat" pages), it's -disabled in this build, to make man-db behave more like Slackware's man -(which supports caching, but it's disabled). On modern (and even 10+ -year old) systems, the small amount of extra time it takes to format -a man page every time it's viewed is probably not worth the headaches -caused by stale cat pages. - -Unlike some distro packages of man-db, this build doesn't install man or -mandb setuid. This prevents caching cat pages from working (see above), -and prevents man from automatically adding new man pages to the database -the first time a user views them (they will be indexed by the cron job, -or by root manually running "mandb", if you're impatient). - -A word about i18n support: the whole reason I packaged man-db is because -Slackware's man can't handle Japanese man pages, and I couldn't come -up with a way to make them work after several hours of research and -man.conf editing. With man-db, they Just Work, with LANG=ja_JP.UTF-8 -(now all I have to do is learn to read Japanese). In general, UTF-8 -locales are preferred for man-db, although non-UTF-8 is also supported. diff --git a/system/man-db/doinst.sh b/system/man-db/doinst.sh deleted file mode 100644 index cb474322c8..0000000000 --- a/system/man-db/doinst.sh +++ /dev/null @@ -1,48 +0,0 @@ - -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/man_db.conf.new - -# In English, the if/find below means "only run the database creation if -# it was last done over an hour ago". This is needed because upgradepkg -# runs doinst.sh twice, but I don't want the 10+ minute long database -# creation to happen twice on upgrade (or at all, when I'm repeatedly -# reinstalling man-db for testing purposes). - -if \ - [ ! -e /var/cache/man/man-db ] || \ - [ -n "$( find var/cache/man/ -type d -a -name man-db -a -mmin +60 )" ] -then -# Generate the initial man database (or rebuild it if it exists). -# We want to skip this step if installing somewhere besides / (e.g. with -# the -root option or ROOT env variable set for installpkg), hence the -# readlink silliness. - -# The -c option means it blows away any existing db. I thought about -# leaving it off (it will still create the db if it doesn't exist), -# but decided it's better to build it fresh if the package gets -# reinstalled (in case the db format has changed, or in case the -# db is corrupted and the user is trying to fix it by reinstalling -# this package). - -# the 2>/dev/null was added for 2.7.6 because it complains about -# missing CACHEDIR.TAG files... which don't matter, because we've -# got NOCACHE in the config file. - ( \ - [ -x /bin/readlink ] && \ - [ "$( /bin/readlink -f $( pwd ) )" = "/" ] && \ - ( [ -x /opt/man-db/bin/mandb ] && /opt/man-db/bin/mandb -c -q ) || \ - ( [ -x /usr/bin/mandb ] && /usr/bin/mandb -c -q ) \ - ) 2>/dev/null -fi diff --git a/system/man-db/dont_write_in_usr.diff b/system/man-db/dont_write_in_usr.diff deleted file mode 100644 index 8f71585981..0000000000 --- a/system/man-db/dont_write_in_usr.diff +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur man-db-2.7.6.1/configure man-db-2.7.6.1.patched/configure ---- man-db-2.7.6.1/configure 2016-12-12 07:43:48.000000000 -0500 -+++ man-db-2.7.6.1.patched/configure 2017-03-04 16:49:57.389893574 -0500 -@@ -25809,46 +25809,8 @@ - - - --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5 --$as_echo_n "checking for long file names... " >&6; } --if ${ac_cv_sys_long_file_names+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- ac_cv_sys_long_file_names=yes --# Test for long file names in all the places we know might matter: --# . the current directory, where building will happen --# $prefix/lib where we will be installing things --# $exec_prefix/lib likewise --# $TMPDIR if set, where it might want to write temporary files --# /tmp where it might want to write temporary files --# /var/tmp likewise --# /usr/tmp likewise --for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do -- # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib -- # in the usual case where exec_prefix is '${prefix}'. -- case $ac_dir in #( -- . | /* | ?:[\\/]*) ;; #( -- *) continue;; -- esac -- test -w "$ac_dir/." || continue # It is less confusing to not echo anything here. -- ac_xdir=$ac_dir/cf$$ -- (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue -- ac_tf1=$ac_xdir/conftest9012345 -- ac_tf2=$ac_xdir/conftest9012346 -- touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" || -- ac_cv_sys_long_file_names=no -- rm -f -r "$ac_xdir" 2>/dev/null -- test $ac_cv_sys_long_file_names = no && break --done --fi --{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_long_file_names" >&5 --$as_echo "$ac_cv_sys_long_file_names" >&6; } --if test $ac_cv_sys_long_file_names = yes; then -- - $as_echo "#define HAVE_LONG_FILE_NAMES 1" >>confdefs.h - --fi -- - - - diff --git a/system/man-db/man-db.SlackBuild b/system/man-db/man-db.SlackBuild deleted file mode 100644 index 4d5e2e10c6..0000000000 --- a/system/man-db/man-db.SlackBuild +++ /dev/null @@ -1,230 +0,0 @@ -#!/bin/sh - -# Slackware build script for man-db - -# Written by B. Watson (yalhcru@gmail.com) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -# 20180801 bkw: -# - update for v2.8.4. - -# 20180611 bkw: -# - update for v2.8.3, to match what Pat has in -current. - -# 20180208 bkw: update for man-db 2.8.0, libpipeline 1.5.0. -# This may be the last SBo update, since Pat has imported man-db -# into Slackware-current. Depends on how long it is from now until -# the next release: I'll maintain this until SBo stops accepting -# submissions for 14.2. - -# 20170305 bkw: -# - BUILD=2 -# - get rid of systemd-specific /usr/lib/tmpfiles.d from package. -# - patch configure so it doesn't write to /usr/lib. - -# 20170215 bkw: -# - update for 2.7.6.1 (whoops, last update wasn't for the latest version -# - only update the cache in doinst.sh if it's over an hour old. this -# takes several minutes, and happens twice (uselessly) if the package -# is upgraded (since upgradepkg runs doinst.sh twice). waiting an hour -# also makes my life easier when I'm testing this script. -# - fix man-db.cron so it works even if USR=yes (whoops), and stop trying -# to chown the cache to the nonexistent 'man' user. - -# 20170125 bkw: -# - update for 2.7.6. -# - add --disable-cache-owner. TODO: revisit this at some -# point. Maybe create a dedicated 'man' user, or use one of the existing -# users like 'bin' or 'operator'. - -# 20160726 bkw: -# - update for 2.7.5. - -# 20150507 bkw: -# - update for 2.7.1. -# - fix homepage in .info file. -# - had to update libpipeline to 1.4.0. - -# 20140924 bkw: -# - update for 2.7.0.1, which fixes the clash between man-db's zsoelim -# and groff's zsoelim. -# - update README and README.Slackware slightly. - -PRGNAM=man-db -VERSION=${VERSION:-2.8.4} -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 - -# By default, install binaries to /opt, so as not to stomp on Slackware's -# man pkg. We will have to include a /etc/profile.d script to set PATH, -# MANPATH, etc. Note that only binaries and the man pages for man-db itself -# go to /opt. Everything else (libpipeline, man-db's shared libs, localized -# messages, etc) goes to /usr as usual. - -# If you want a proper replacement for Slack's man pkg, build with -# USR="yes", which puts the binaries in the usual places. If your name is -# Patrick V. and you're finally replacing man with man-db in Slackware, -# feel free to uncomment the next line: -#USR="yes" - -BINDIR=/opt/$PRGNAM/bin -[ "${USR:-no}" = "yes" ] && BINDIR=/usr/bin -MANDIR="${BINDIR/bin/man}" - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT - -# libpipeline is a pretty niche-market library. It used to be bundled -# in the man-db source, and as far as I can tell, nothing else uses it. -# Instead of making it a separate build and external dep, we'll just -# bundle it here. -LIBNAM=libpipeline -LIBVER=1.5.0 - -cd $TMP -rm -rf $LIBNAM-$LIBVER -tar xvf $CWD/$LIBNAM-$LIBVER.tar.gz -cd $LIBNAM-$LIBVER -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER -cp -a COPYING ChangeLog* NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION/$LIBNAM-$LIBVER - -# now build man-db itself, using the libpipeline installed in $PKG -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -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 {} \; - -# The 'checking for long filenames' test in the configure script writes to -# /usr/lib, which is bad behaviour for a configure script. Not to mention -# wrong (it assumes configure is always being run as root). We already -# know we have long filename support, because we live in the 21st century -# now, so this patch gets rid of the test and force-enables it. -patch -p1 < $CWD/dont_write_in_usr.diff - -# The circumlocutions below are needed because doing it the sane way: -# libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lpipeline" -# gets broken by libtool (it *insists* on replacing -lpipeline with -# /usr/lib64/libpipeline.so, which will fail if it's an older version). -LD_LIBRARY_PATH="$PKG/usr/lib$LIBDIRSUFFIX" \ -LDFLAGS="$PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \ -libpipeline_CFLAGS="-I$PKG/usr/include" \ -libpipeline_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/lib$LIBDIRSUFFIX/libpipeline.so" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --disable-setuid \ - --disable-cache-owner \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=$MANDIR \ - --bindir=$BINDIR \ - --sbindir=${BINDIR/bin/sbin} \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -# This stuff is for systemd, we don't need it (and it might confuse -# people coming from systemd distros): -rm -rf $PKG/usr/lib/tmpfiles.d/ - -# There will always be man pages here, regardless of USR=yes or no. -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -if [ "${USR:-no}" != "yes" ]; then - # separate dir full of man pages and symlinks in /opt - find $PKG/$MANDIR -type f -exec gzip -9 {} \; - for i in $( find $PKG/$MANDIR -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - - # only need the profile.d stuff if installing to /opt - mkdir -p $PKG/etc/profile.d - install -m0755 -oroot -groot $CWD/$PRGNAM.sh $CWD/$PRGNAM.csh $PKG/etc/profile.d -fi - -# no special ownership or perms needed here since we --disable-setuid -mkdir -p $PKG/var/cache/man - -# only ship a daily cronjob, don't need a weekly one like Debian has. -mkdir -p $PKG/etc/cron.daily -install -m0755 -oroot -groot $CWD/$PRGNAM.cron $PKG/etc/cron.daily/$PRGNAM - -# modified default config, customized for Slackware. See the conf file for -# list of changes. -zcat $CWD/man_db.conf.new.gz \ - | sed "s,@LIBDIRSUFFIX@,$LIBDIRSUFFIX,g" \ - > $PKG/etc/man_db.conf.new -rm -rf $PKG/etc/man_db.conf - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS Change* FAQ NEWS README docs/* $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -sed "s,@BINDIR@,$BINDIR," < $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -# N.B. the -p option is actually needed here (for libpipeline.so). -cd $PKG -/sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/man-db/man-db.cron b/system/man-db/man-db.cron deleted file mode 100644 index 93c3a00ff2..0000000000 --- a/system/man-db/man-db.cron +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# man-db daily cronjob, part of the slackbuilds.org man-db package. -# Author: B. Watson. -# Adapted from Debian's man-db package, so I guess the license is GPL. - -set -e - -if ! [ -d /var/cache/man ]; then - # Recover from deletion, per FHS. - mkdir -p /var/cache/man - chown root:root /var/cache/man || true - chmod 2755 /var/cache/man -fi - -# expunge old catman pages which have not been read in a week -# commented out, as we've got cat pages disabled in this build. Left -# here for reference in case someone really wants to enable cat pages -# some day. -#find /var/cache/man -type f -name '*.gz' -atime +6 -print0 | xargs -r0 rm -f &> /dev/null - -# regenerate man database. /opt/man-db/bin probably isn't in cron's $PATH, -# so check for it specially, otherwise use $PATH. -if [ -x /opt/man-db/bin/mandb ]; then - MANDB=/opt/man-db/bin/mandb -else - MANDB=mandb -fi - -$MANDB --no-purge --quiet diff --git a/system/man-db/man-db.csh b/system/man-db/man-db.csh deleted file mode 100644 index 6cf39ce0ba..0000000000 --- a/system/man-db/man-db.csh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/csh - -# Set up environment for man-db. This file is part of the slackbuilds.org -# man-db build. - -# Author: B. Watson. License: WTFPL - -setenv MANPATH /opt/man-db/man:$MANPATH -set path = ( /opt/man-db/bin $path ) -if ("`id -u`" == "0") then - set path = ( /opt/man-db/sbin $path ) -endif diff --git a/system/man-db/man-db.info b/system/man-db/man-db.info deleted file mode 100644 index 70a6f6a7c1..0000000000 --- a/system/man-db/man-db.info +++ /dev/null @@ -1,12 +0,0 @@ -PRGNAM="man-db" -VERSION="2.8.4" -HOMEPAGE="http://www.nongnu.org/man-db/" -DOWNLOAD="http://download.savannah.gnu.org/releases/man-db/man-db-2.8.4.tar.xz \ - http://download.savannah.gnu.org/releases/libpipeline/libpipeline-1.5.0.tar.gz" -MD5SUM="ab41db551f500e4a595b11203b86c67a \ - b7437a5020190cfa84f09c412db38902" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/system/man-db/man-db.sh b/system/man-db/man-db.sh deleted file mode 100644 index 54c9b34ae0..0000000000 --- a/system/man-db/man-db.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -# Set up environment for man-db. This file is part of the slackbuilds.org -# man-db build. - -# Author: B. Watson. License: WTFPL - -MANPATH="/opt/man-db/man:$MANPATH" -PATH="/opt/man-db/bin:$PATH" - -if [ "$( id -u )" = "0" ]; then - PATH="/opt/man-db/sbin:$PATH" -fi - -export MANPATH -export PATH diff --git a/system/man-db/man_db.conf.new.gz b/system/man-db/man_db.conf.new.gz Binary files differdeleted file mode 100644 index 1d128438c4..0000000000 --- a/system/man-db/man_db.conf.new.gz +++ /dev/null diff --git a/system/man-db/slack-desc b/system/man-db/slack-desc deleted file mode 100644 index 5abdea8fb6..0000000000 --- a/system/man-db/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------------------------------------------------------| -man-db: man-db (database-driven manual pager suite) -man-db: -man-db: This package provides the man command and related utilities -man-db: for examining on-line help files (manual pages). It can act as a -man-db: replacement for Slackware's man package. It has several enhancements -man-db: over man, including an indexed database for searches with -k or -man-db: apropos, the ability to easily view man pages in a browser, better -man-db: i18n support, and a much more efficient implementation of the -K -man-db: (full text search) option. -man-db: -man-db: diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild index 2b3f328aa7..0053b7124b 100644 --- a/system/nvidia-driver/nvidia-driver.SlackBuild +++ b/system/nvidia-driver/nvidia-driver.SlackBuild @@ -25,7 +25,7 @@ # see changelog.txt PRGNAM=nvidia-driver -VERSION=${VERSION:-430.50} +VERSION=${VERSION:-440.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -171,17 +171,6 @@ if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then cd - fi -# Only one conflicting lib -cd $PKG/usr/lib$LIBDIRSUFFIX -mv libGL.la libGL.la-nvidia -cd - - -if [ "$ARCH" = "x86_64" -a "${COMPAT32}" = "yes" ]; then - cd $PKG/usr/lib - mv libGL.la libGL.la-nvidia - cd - -fi - # Compile utilites from source, replacing the precompiled versions # # Compiling nvidia-settings @@ -261,6 +250,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 ;-) @@ -275,17 +267,10 @@ else fi # These update or correct wrong paths -sed -i "s|$TMP/package-$PRGNAM/usr|/usr|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia -sed -i "s|/usr/X11R6/lib|/usr/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/libGL.la-nvidia 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-nvidia - sed -i "s|/usr/X11R6/lib|/usr/lib|" $PKG/usr/lib/libGL.la-nvidia -fi - # Move ICDs to $PKG and cleanup (no switch option in installer?) mv /etc/OpenCL/vendors/nvidia.icd $PKG/etc/OpenCL/vendors/nvidia.icd mv /etc/vulkan/icd.d/nvidia_icd.json $PKG/etc/vulkan/icd.d/nvidia_icd.json diff --git a/system/nvidia-driver/nvidia-driver.info b/system/nvidia-driver/nvidia-driver.info index f75518e937..ec26514af2 100644 --- a/system/nvidia-driver/nvidia-driver.info +++ b/system/nvidia-driver/nvidia-driver.info @@ -1,20 +1,20 @@ PRGNAM="nvidia-driver" -VERSION="430.50" +VERSION="440.31" HOMEPAGE="http://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/430.50/NVIDIA-Linux-x86_64-430.50.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-430.50.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-430.50.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-430.50.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-430.50.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-430.50.tar.bz2" -MD5SUM_x86_64="f10833a9522b4c35ea3439dd17b11b28 \ - 48d65a19bc47b7898313d29d90e939f2 \ - c633915dfe6af04014b02037d9c2ec81 \ - 0fd45f263f553e23f77b21a9edaf7b9e \ - 1d44fa4b7e7758af24e6bc629dad6706 \ - f8c254fbac76bb192bf9cd8e99ba07ba" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.31/NVIDIA-Linux-x86_64-440.31.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-440.31.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-440.31.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-440.31.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-440.31.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-440.31.tar.bz2" +MD5SUM_x86_64="dc33e07e1b3ba11a14daf226f5d8cf7b \ + 6f75ec98192a5017845ef05d8a307cab \ + c5e7454db0bf79032353dcfff14de09a \ + b23d162585865418430e38227d1b5998 \ + 6b50fcc16909a9f97c4a4f175eae55b7 \ + 50d630a37d172df630aafa733144ce61" REQUIRES="nvidia-kernel" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch index 105156c3c4..6564b10eab 100644 --- a/system/nvidia-driver/nvidia-switch +++ b/system/nvidia-driver/nvidia-switch @@ -47,13 +47,9 @@ save_GL(){ cd $2 case "$1" in "nvidia") - mv libGL.la libGL.la-xorg - mv libGL.la-nvidia libGL.la - ;; + ;; "xorg") - mv libGL.la libGL.la-nvidia - mv libGL.la-xorg libGL.la ;; *) diff --git a/system/nvidia-kernel/nvidia-kernel.SlackBuild b/system/nvidia-kernel/nvidia-kernel.SlackBuild index bf0b7460b5..377ee5ea78 100644 --- a/system/nvidia-kernel/nvidia-kernel.SlackBuild +++ b/system/nvidia-kernel/nvidia-kernel.SlackBuild @@ -28,7 +28,7 @@ # see nvidia-driver/changelog.txt PRGNAM=nvidia-kernel -VERSION=${VERSION:-430.50} +VERSION=${VERSION:-440.31} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/nvidia-kernel/nvidia-kernel.info b/system/nvidia-kernel/nvidia-kernel.info index 4e1c42ff2b..7f14b2cbbb 100644 --- a/system/nvidia-kernel/nvidia-kernel.info +++ b/system/nvidia-kernel/nvidia-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-kernel" -VERSION="430.50" +VERSION="440.31" HOMEPAGE="http://www.nvidia.com" DOWNLOAD="UNSUPPORTED" MD5SUM="" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/430.50/NVIDIA-Linux-x86_64-430.50.run" -MD5SUM_x86_64="f10833a9522b4c35ea3439dd17b11b28" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/440.31/NVIDIA-Linux-x86_64-440.31.run" +MD5SUM_x86_64="dc33e07e1b3ba11a14daf226f5d8cf7b" REQUIRES="" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" 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-kernel/nvidia-legacy340-kernel.SlackBuild b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild index 1679d12988..21f287918f 100644 --- a/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild +++ b/system/nvidia-legacy340-kernel/nvidia-legacy340-kernel.SlackBuild @@ -83,6 +83,7 @@ patch -p1 < $CWD/kernel-4.4.168.patch (cd kernel || exit 1 make SYSSRC=$KERNELPATH module || exit 1 cd uvm + sed -i "s|-O2$|-O2 -Wno-error=incompatible-pointer-types|" Makefile make SYSSRC=$KERNELPATH module || exit 1 ) diff --git a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild index 643487be48..071c30a7cf 100644 --- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild +++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.SlackBuild @@ -25,7 +25,7 @@ # see changelog.txt PRGNAM=nvidia-legacy390-driver -VERSION=${VERSION:-390.129} +VERSION=${VERSION:-390.132} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -278,24 +278,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 +303,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-legacy390-driver/nvidia-legacy390-driver.info b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info index 6be40157ed..97a028b6a8 100644 --- a/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info +++ b/system/nvidia-legacy390-driver/nvidia-legacy390-driver.info @@ -1,30 +1,30 @@ PRGNAM="nvidia-legacy390-driver" -VERSION="390.129" +VERSION="390.132" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.129/NVIDIA-Linux-x86-390.129.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.129.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.129.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.129.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.129.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.129.tar.bz2" -MD5SUM="763f9789e0fe1a76031211d0fb58fc4f \ - c01ddf84ab16e558776a7650cddfde55 \ - ad52a93c66543efdc4fa24879f5b3180 \ - 802db97e66da89ff03bba124240e5ab4 \ - 8f8dc1a8a1c3cf4315e4ae1f209f3293 \ - 2b800aaa6a6e2546f18ab9344e30c70e" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.129/NVIDIA-Linux-x86_64-390.129.run \ - https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.129.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.129.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.129.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.129.tar.bz2 \ - https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.129.tar.bz2" -MD5SUM_x86_64="23b3cf4bddfcb73c0f7db694829cadf8 \ - c01ddf84ab16e558776a7650cddfde55 - ad52a93c66543efdc4fa24879f5b3180 \ - 802db97e66da89ff03bba124240e5ab4 \ - 8f8dc1a8a1c3cf4315e4ae1f209f3293 \ - 2b800aaa6a6e2546f18ab9344e30c70e" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.132.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.132.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.132.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.132.tar.bz2" +MD5SUM="2677480ee20cd4918b1de9289b2d0af8 \ + 1f9b5ef3fb9329cf8f1b3b1880f11aa0 \ + 37a8bf0de34b9769e9c97ee1cc70f5dd \ + 9d506bcdf40fe794673dfc7c48064759 \ + 45e7cc0e1717fb23c675f11607a2d756 \ + 4d6bb6e058282d7da8673953c9755e38" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run \ + https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.132.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.132.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.132.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.132.tar.bz2 \ + https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.132.tar.bz2" +MD5SUM_x86_64="c6a37fc418ede54ad63fdf5c96f54958 \ + 1f9b5ef3fb9329cf8f1b3b1880f11aa0 + 37a8bf0de34b9769e9c97ee1cc70f5dd \ + 9d506bcdf40fe794673dfc7c48064759 \ + 45e7cc0e1717fb23c675f11607a2d756 \ + 4d6bb6e058282d7da8673953c9755e38" REQUIRES="nvidia-legacy390-kernel" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/system/nvidia-legacy390-driver/nvidia-switch b/system/nvidia-legacy390-driver/nvidia-switch index 7d97f3304b..f9874cea37 100644 --- a/system/nvidia-legacy390-driver/nvidia-switch +++ b/system/nvidia-legacy390-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-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild index 0ca0f5b0a3..bba2956a1b 100644 --- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild +++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.SlackBuild @@ -28,7 +28,7 @@ # see nvidia-driver/changelog.txt PRGNAM=nvidia-legacy390-kernel -VERSION=${VERSION:-390.129} +VERSION=${VERSION:-390.132} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -80,6 +80,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; (cd kernel || exit 1 + sed -i "s|error=undef|no-error=undef|" Kbuild make SYSSRC=$KERNELPATH module || exit 1 ) diff --git a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info index db761b730e..ccf6a592c8 100644 --- a/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info +++ b/system/nvidia-legacy390-kernel/nvidia-legacy390-kernel.info @@ -1,10 +1,10 @@ PRGNAM="nvidia-legacy390-kernel" -VERSION="390.129" +VERSION="390.132" HOMEPAGE="http://www.nvidia.com" -DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.129/NVIDIA-Linux-x86-390.129.run" -MD5SUM="763f9789e0fe1a76031211d0fb58fc4f" -DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.129/NVIDIA-Linux-x86_64-390.129.run" -MD5SUM_x86_64="23b3cf4bddfcb73c0f7db694829cadf8" +DOWNLOAD="https://download.nvidia.com/XFree86/Linux-x86/390.132/NVIDIA-Linux-x86-390.132.run" +MD5SUM="2677480ee20cd4918b1de9289b2d0af8" +DOWNLOAD_x86_64="https://download.nvidia.com/XFree86/Linux-x86_64/390.132/NVIDIA-Linux-x86_64-390.132.run" +MD5SUM_x86_64="c6a37fc418ede54ad63fdf5c96f54958" REQUIRES="" MAINTAINER="Edward W. Koenig" EMAIL="kingbeowulf@gmail.com" diff --git a/system/opam/README b/system/opam/README index 9257895cd0..36b3e185fc 100644 --- a/system/opam/README +++ b/system/opam/README @@ -6,15 +6,16 @@ constraints, and a Git-friendly development workflow. Managing your OCaml installation can be as simple as: - opam list -a # List the available packages - opam install lwt # Install LWT - opam update # Update the package list - ... - opam upgrade # Upgrade the installed packages to their latest version + opam list -a # List the available packages + opam install lwt # Install LWT + opam update # Update the package list + ... + opam upgrade # Upgrade the installed packages to their latest version It has to be initialised. To do it, you can use the following command: -opam init + + opam init It is not recommended to run opam as root. Apparently it rather installs per-user packages. diff --git a/system/opam/opam.SlackBuild b/system/opam/opam.SlackBuild index e7d8270b0d..04464c1032 100644 --- a/system/opam/opam.SlackBuild +++ b/system/opam/opam.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=opam -VERSION=${VERSION:-2.0.1} +VERSION=${VERSION:-2.0.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -73,16 +73,16 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=/usr/lib$LIBDIRSUFFIX \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make lib-ext -make -make install DESTDIR=$PKG +make -j1 lib-ext +make -j1 +make -j1 DESTDIR=$PKG install 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/opam/opam.info b/system/opam/opam.info index fd986517c7..718cadb372 100644 --- a/system/opam/opam.info +++ b/system/opam/opam.info @@ -1,8 +1,8 @@ PRGNAM="opam" -VERSION="2.0.1" +VERSION="2.0.5" HOMEPAGE="https://opam.ocaml.org/" -DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.1/opam-full-2.0.1.tar.gz" -MD5SUM="24faa0ad049d146dfc3fcbe9cbab5eda" +DOWNLOAD="https://github.com/ocaml/opam/releases/download/2.0.5/opam-full-2.0.5.tar.gz" +MD5SUM="3a273029a55529831fdd408d9add2db0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="ocaml bubblewrap" diff --git a/system/open-vm-tools/open-vm-tools.SlackBuild b/system/open-vm-tools/open-vm-tools.SlackBuild index a294741688..7c8753ef11 100644 --- a/system/open-vm-tools/open-vm-tools.SlackBuild +++ b/system/open-vm-tools/open-vm-tools.SlackBuild @@ -89,6 +89,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|\ -Werror||" configure.ac + autoreconf -i CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/opensc/opensc.SlackBuild b/system/opensc/opensc.SlackBuild index e7dc5c71e3..02473da5f7 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.18.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" @@ -81,7 +81,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # --enable-nsplugin and --with-pinentry= are no longer supported. -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=stringop-truncation" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/system/opensc/opensc.info b/system/opensc/opensc.info index 91496b60e0..b7102a1bc6 100644 --- a/system/opensc/opensc.info +++ b/system/opensc/opensc.info @@ -1,8 +1,8 @@ PRGNAM="opensc" -VERSION="0.15.0" +VERSION="0.18.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://github.com/OpenSC/OpenSC/releases/download/0.18.0/opensc-0.18.0.tar.gz" +MD5SUM="9da66126a45203c49285fb4277e946e5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pcsc-lite" diff --git a/system/packagekit/doinst.sh b/system/packagekit/doinst.sh index fa9fe022ef..4e39e9d043 100644 --- a/system/packagekit/doinst.sh +++ b/system/packagekit/doinst.sh @@ -14,7 +14,6 @@ config() { config etc/PackageKit/PackageKit.conf.new config etc/PackageKit/Vendor.conf.new config etc/PackageKit/CommandNotFound.conf.new -config etc/PackageKit/Katja.conf.new if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 diff --git a/system/packagekit/packagekit.SlackBuild b/system/packagekit/packagekit.SlackBuild index 7527471105..33c2dd3f99 100644 --- a/system/packagekit/packagekit.SlackBuild +++ b/system/packagekit/packagekit.SlackBuild @@ -26,7 +26,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM="packagekit" -VERSION=${VERSION:-1.1.4} +VERSION=${VERSION:-1.1.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -98,7 +98,6 @@ for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i mv $PKG/etc/PackageKit/CommandNotFound.conf $PKG/etc/PackageKit/CommandNotFound.conf.new mv $PKG/etc/PackageKit/PackageKit.conf $PKG/etc/PackageKit/PackageKit.conf.new mv $PKG/etc/PackageKit/Vendor.conf $PKG/etc/PackageKit/Vendor.conf.new -mv $PKG/etc/PackageKit/Katja.conf $PKG/etc/PackageKit/Katja.conf.new find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done diff --git a/system/packagekit/packagekit.info b/system/packagekit/packagekit.info index c7f1732d6a..223c61a515 100644 --- a/system/packagekit/packagekit.info +++ b/system/packagekit/packagekit.info @@ -1,10 +1,10 @@ PRGNAM="packagekit" -VERSION="1.1.4" +VERSION="1.1.12" HOMEPAGE="https://www.freedesktop.org/software/PackageKit/" -DOWNLOAD="https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.4.tar.xz" -MD5SUM="d1a000a33c7c935522af7a01dea012bf" +DOWNLOAD="https://www.freedesktop.org/software/PackageKit/releases/PackageKit-1.1.12.tar.xz" +MD5SUM="da8c9d81c886fae43047b3c006e9b4a8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="autoconf-archive" MAINTAINER="Nishant Limbachia" EMAIL="nishant@mnspace.net" diff --git a/system/parallel/README b/system/parallel/README deleted file mode 100644 index bbee7b2123..0000000000 --- a/system/parallel/README +++ /dev/null @@ -1,9 +0,0 @@ -GNU parallel is a shell tool for executing jobs in parallel using one -or more computers. A job can be a single command or a small script -that has to be run for each of the lines in the input. The typical -input is a list of files, a list of hosts, a list of users, a list of -URLs, or a list of tables. A job can also be a command that reads -from a pipe. GNU parallel can then split the input and pipe it into -commands in parallel. - -This package conflicts with misc/moreutils. diff --git a/system/parallel/parallel.SlackBuild b/system/parallel/parallel.SlackBuild deleted file mode 100644 index 7ffc2f6552..0000000000 --- a/system/parallel/parallel.SlackBuild +++ /dev/null @@ -1,99 +0,0 @@ -#!/bin/sh - -# Slackware build script for "parallel". - -# Copyright 2015-2017 Marcel Saegebarth <marc@mos6581.de> -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "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 COPYRIGHT -# OWNER OR CONTRIBUTORS 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=parallel -VERSION=${VERSION:-20170622} -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.bz2 -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 {} \; - -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 - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CITATION COPYING NEWS README $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/parallel/parallel.info b/system/parallel/parallel.info deleted file mode 100644 index f8ab2f619c..0000000000 --- a/system/parallel/parallel.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="parallel" -VERSION="20170622" -HOMEPAGE="http://www.gnu.org/software/parallel/" -DOWNLOAD="http://gnu.uberglobalmirror.com/parallel/parallel-20170622.tar.bz2" -MD5SUM="8494ff022451aac0162f18cf3dd3ae7f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Marcel Saegebarth" -EMAIL="marc@mos6581.de" diff --git a/system/parallel/slack-desc b/system/parallel/slack-desc deleted file mode 100644 index 32663235a5..0000000000 --- a/system/parallel/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------------------------------------------------------| -parallel: parallel (Executes jobs in parallel) -parallel: -parallel: GNU parallel is a shell tool for executing jobs in parallel using one -parallel: or more computers. A job can be a single command or a small script -parallel: that has to be run for each of the lines in the input. The typical -parallel: input is a list of files, a list of hosts, a list of users, a list of -parallel: URLs, or a list of tables. A job can also be a command that reads -parallel: from a pipe. GNU parallel can then split the input and pipe it into -parallel: commands in parallel. -parallel: -parallel: Homepage: http://www.gnu.org/software/parallel/ diff --git a/system/patchelf/README b/system/patchelf/README deleted file mode 100644 index 4286fd37ae..0000000000 --- a/system/patchelf/README +++ /dev/null @@ -1,3 +0,0 @@ -PatchELF is a simple utility for modifing existing ELF executables -and libraries. It can change the dynamic loader ("ELF interpreter") -of executables and change the RPATH of executables and libraries. diff --git a/system/patchelf/patchelf.SlackBuild b/system/patchelf/patchelf.SlackBuild deleted file mode 100644 index 7ca4ad1081..0000000000 --- a/system/patchelf/patchelf.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# Slackware build script for patchelf - -# Copyright 2014 Zhu Qun-Ying -# 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=patchelf -VERSION=${VERSION:-0.10} -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 - -set -e - -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" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 {} \; - -autoreconf -isf - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make - -make install DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp README COPYING $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -gzip $PKG/usr/man/man1/* - -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/patchelf/patchelf.info b/system/patchelf/patchelf.info deleted file mode 100644 index 2697431fba..0000000000 --- a/system/patchelf/patchelf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="patchelf" -VERSION="0.10" -HOMEPAGE="https://nixos.org/patchelf.html" -DOWNLOAD="https://nixos.org/releases/patchelf/patchelf-0.10/patchelf-0.10.tar.bz2" -MD5SUM="6c3f3a06a95705870d129494a6880106" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Zhu Qun-Ying" -EMAIL="zhu.qunying@gmail.com" diff --git a/system/patchelf/slack-desc b/system/patchelf/slack-desc deleted file mode 100644 index 30e2694647..0000000000 --- a/system/patchelf/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------------------------------------------------------| -patchelf: patchelf (A utility for patching ELF binaries) -patchelf: -patchelf: PatchELF is a simple utility for modifing existing ELF executables -patchelf: and libraries. It can change the dynamic loader ("ELF interpreter") -patchelf: of executables and change the RPATH of executables and libraries. -patchelf: -patchelf: -patchelf: -patchelf: -patchelf: Home page: https://nixos.org/patchelf.html -patchelf: 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/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/rxvt-unicode/README b/system/rxvt-unicode/README deleted file mode 100644 index 8b1c84db04..0000000000 --- a/system/rxvt-unicode/README +++ /dev/null @@ -1,8 +0,0 @@ -rxvt-unicode is an enhanced version of the rxvt terminal emulator. It has -full unicode and Xft support, does font antialiasing and italics, and has -the same transparency capabilities as ATerm. It can be extended using Perl. - -The slackbuild uses environment variable called CONFIG_PERL to control -whether the embedded perl interpreter will be built. Setting to anything -other than YES during the build will disable it, which will result in a -much leaner package. diff --git a/system/rxvt-unicode/rxvt-unicode.SlackBuild b/system/rxvt-unicode/rxvt-unicode.SlackBuild deleted file mode 100644 index ab2f3f1387..0000000000 --- a/system/rxvt-unicode/rxvt-unicode.SlackBuild +++ /dev/null @@ -1,162 +0,0 @@ -#!/bin/sh - -# Slackware build script for rxvt-unicode - -# 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. - -# Currently maintained by Glenn Becker (glenn.becker@gmail.com) -# Updates by Kevin Paulus, aka "goarilla" (goarilla@gmail.com) -# Previously maintained by LEVAI Daniel, 2010-2014 -# Initial SlackBuild written by Dugan Chen (dugan_c@fastmail.fm) - -PRGNAM=rxvt-unicode -VERSION=${VERSION:-9.22} -BUILD=${BUILD:-2} -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.bz2 -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 {} \; - -# Option to enable/disable the embedded perl interpreter -CONFIG_PERL=${CONFIG_PERL:-YES} - -if [ "${CONFIG_PERL}" == 'YES' ];then - _PERL_OPT='--enable-perl' -else - _PERL_OPT='--disable-perl' -fi - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --enable-everything \ - --enable-unicode3 \ - --enable-combining \ - --enable-xft \ - --enable-font-styles \ - --enable-transparency \ - --enable-fading \ - --enable-frills \ - --enable-pixbuf \ - --enable-rxvt-scroll \ - --enable-next-scroll \ - --enable-xterm-scroll \ - ${_PERL_OPT} \ - --enable-xim \ - --enable-iso14755 \ - --enable-keepscrolling \ - --enable-selectionscrolling \ - --enable-mousewheel \ - --enable-slipwheeling \ - --enable-smart-resize \ - --enable-text-blink \ - --enable-pointer-blank \ - --enable-utmp \ - --enable-wtmp \ - --enable-lastlog \ - --enable-256-color \ - --build=$ARCH-slackware-linux - -make - -mkdir -p $PKG/usr/share/terminfo -TERMINFO=$PKG/usr/share/terminfo make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | \ - cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/share/pixmaps/ -cp $CWD/urxvt.xpm $PKG/usr/share/pixmaps/urxvt.xpm - -mkdir -p $PKG/usr/share/applications -cp $CWD/rxvt-unicode.desktop $PKG/usr/share/applications/rxvt-unicode.desktop - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING Changes INSTALL README.FAQ $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 - -# Fix usr/bin/urxvt permissions to enable writing to utmp and wtmp files -# -version="$(echo "$VERSION" |sed -e 's/[^0-9]//g')" -if [ "$version" -le 922 ]; then - # standalone - chgrp utmp usr/bin/urxvt - chmod 2755 usr/bin/urxvt - # client - chgrp utmp usr/bin/urxvtc - chmod 2755 usr/bin/urxvtc - # server - chgrp utmp usr/bin/urxvtd - chmod 2755 usr/bin/urxvtd -fi - -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/rxvt-unicode/rxvt-unicode.desktop b/system/rxvt-unicode/rxvt-unicode.desktop deleted file mode 100644 index 7622918703..0000000000 --- a/system/rxvt-unicode/rxvt-unicode.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=urxvt -Comment=An unicode capable rxvt clone -Exec=urxvt -Icon=utilities-terminal -Terminal=false -Type=Application -Categories=System;TerminalEmulator; diff --git a/system/rxvt-unicode/rxvt-unicode.info b/system/rxvt-unicode/rxvt-unicode.info deleted file mode 100644 index d02aee8160..0000000000 --- a/system/rxvt-unicode/rxvt-unicode.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="rxvt-unicode" -VERSION="9.22" -HOMEPAGE="http://software.schmorp.de/pkg/rxvt-unicode.html" -DOWNLOAD="http://dist.schmorp.de/rxvt-unicode/rxvt-unicode-9.22.tar.bz2" -MD5SUM="93782dec27494eb079467dacf6e48185" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Jason Graham" -EMAIL="jgraha8@gmail.com" diff --git a/system/rxvt-unicode/slack-desc b/system/rxvt-unicode/slack-desc deleted file mode 100644 index 2f428ddfd9..0000000000 --- a/system/rxvt-unicode/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------------------------------------------------------| -rxvt-unicode: rxvt-unicode (enhanced version of rxvt) -rxvt-unicode: -rxvt-unicode: This project is an enhanced version of the rxvt terminal -rxvt-unicode: emulator. It has full unicode and Xft support, does font -rxvt-unicode: antialiasing and italics, and has the same transparency -rxvt-unicode: capabilities as ATerm. It can be extended using Perl. -rxvt-unicode: -rxvt-unicode: Visit the rxvt-unicode project online: -rxvt-unicode: http://software.schmorp.de/pkg/rxvt-unicode/ -rxvt-unicode: -rxvt-unicode: diff --git a/system/rxvt-unicode/urxvt.xpm b/system/rxvt-unicode/urxvt.xpm deleted file mode 100644 index c7b6a2db7e..0000000000 --- a/system/rxvt-unicode/urxvt.xpm +++ /dev/null @@ -1,141 +0,0 @@ -/* XPM */ -static char * urxvt_32x32_xpm[] = { -"32 32 106 2", -" c None", -". c #E7E7E7", -"+ c #E7E3DE", -"@ c #E7DFDE", -"# c #29417B", -"$ c #5A719C", -"% c #294173", -"& c #08246B", -"* c #18387B", -"= c #294D8C", -"- c #395D9C", -"; c #526DAD", -"> c #6382BD", -", c #7392C6", -"' c #84A6DE", -") c #9CBAE7", -"! c #B5CFF7", -"~ c #CEDBEF", -"{ c #ADBECE", -"] c #94B2D6", -"^ c #CEDFEF", -"/ c #ADBED6", -"( c #C6D3DE", -"_ c #52658C", -": c #7371F7", -"< c #394573", -"[ c #B5D3F7", -"} c #D6D3CE", -"| c #A5A6A5", -"1 c #A59E9C", -"2 c #6B6963", -"3 c #B5B2AD", -"4 c #8496AD", -"5 c #CEC7C6", -"6 c #9CA6AD", -"7 c #C6C7C6", -"8 c #525D6B", -"9 c #294584", -"0 c #8C96BD", -"a c #8C9EC6", -"b c #425D9C", -"c c #7392CE", -"d c #8CA6DE", -"e c #ADAAA5", -"f c #A5A29C", -"g c #211C18", -"h c #C6BEBD", -"i c #52618C", -"j c #B5B6B5", -"k c #52596B", -"l c #847D7B", -"m c #002063", -"n c #001C52", -"o c #001C5A", -"p c #ADC7EF", -"q c #94A2B5", -"r c #8C9EAD", -"s c #8CAAC6", -"t c #9CAABD", -"u c #8C9EB5", -"v c #F7F7F7", -"w c #DEDBDE", -"x c #848284", -"y c #8C8A8C", -"z c #8C8E8C", -"A c #D6D7D6", -"B c #FFFFFF", -"C c #E7E3E7", -"D c #DEDFDE", -"E c #949294", -"F c #ADAAAD", -"G c #EFEFEF", -"H c #CECFCE", -"I c #BDBEBD", -"J c #4A4D4A", -"K c #B5B2B5", -"L c #9C9E9C", -"M c #7B7D7B", -"N c #393C39", -"O c #9C9A9C", -"P c #848684", -"Q c #313031", -"R c #636563", -"S c #292C29", -"T c #F7F3F7", -"U c #949694", -"V c #5A595A", -"W c #EFEBEF", -"X c #737173", -"Y c #000000", -"Z c #ADAEAD", -"` c #BDBABD", -" . c #D6D7FF", -".. c #5A59FF", -"+. c #CECFFF", -"@. c #B5B2FF", -"#. c #DEDBFF", -"$. c #A5A2A5", -"%. c #C6C3C6", -"&. c #ADA6AD", -"*. c #7371FF", -"=. c #6B6DFF", -"-. c #5A5D5A", -";. c #BDB6BD", -">. c #CECBC6", -",. c #BDBAB5", -" ", -" ", -" ", -". + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ", -"@ # $ $ $ % & * = - ; > , ' ) ! ~ ~ ~ ~ { ~ ~ ~ ~ ] ^ ~ ~ ~ / ( ", -"@ _ : : : < & * = - ; > , ' ) [ } } } } | 1 2 2 3 4 @ 1 5 1 6 ( ", -"@ _ 7 7 7 8 9 0 a b ; > c d ) [ } } } } | e } } e 4 @ f g h 6 ( ", -"@ i j j j k & * = - ; > , ' ) [ } 2 l } | e 1 1 3 4 @ 1 5 1 6 ( ", -"@ m n n n o & * = - ; > , ' ) p q q q q r q q q q s t q q q u ( ", -"@ v v v v v v v v v v v v v v v v v v v v v v v v v v w x y z A ", -"@ B B B B B B B B B B B B B B B B B C B B B B B B B B D E F | + ", -"@ B D G H H B H B B H G D B B w G I J I I B B B B B B D F K L + ", -"@ B M J z N B z O H P B Q v B R B O N O O B B B B B B D M y L + ", -"@ B M I B B B B J S T B L K I z B B R B B B B B B B B D P U F + ", -"@ B M I B B B C J V H B T V J W B B R B B B B B B B B D P U F + ", -"@ B M I B B B V G G J G B X M B B B X S N B B B B B B D P U F + ", -"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D P U F + ", -"@ B B B B B B B B B B B B B B B . H H H H C B B B B B D P U F + ", -"@ B B B B B B B B B B B B B B B M Y Y Y Y R B B B B B D P U F + ", -"@ B B B B B B v B B B B B B B B M Y Y Y Y R B B B B B D P U F + ", -"@ B B B B B B J L B B B B B B B M Y Y Y Y R B B B B B D O Z ` + ", -"@ .....+.@.#.B K R $.B B B B B M Y Y Y Y R B B B B B D %.%.&.+ ", -"@ +.B B *.=.B B L -.H B B B B B M Y Y Y Y R B B B B B D %.K L + ", -"@ B B B B B B R K B B B B B B B M Y Y Y Y R B B B B B D %.K L + ", -"@ B B B B B B B B B B B B B B B M Y Y Y Y R B B B B B D ;.O O + ", -"@ B B B B B B B B B B B B B B B O Q Q Q Q P B B B B B D $.F F + ", -"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D | K L + ", -"@ B B B B B B B B B B B B B B B B B B B B B B B B B B D O Z j + ", -"H >.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.>.7 >.>.>.,.", -" ", -" ", -" "}; 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/spacefm/glibc-2.28.patch b/system/spacefm/glibc-2.28.patch new file mode 100644 index 0000000000..324bc43b93 --- /dev/null +++ b/system/spacefm/glibc-2.28.patch @@ -0,0 +1,12 @@ +diff --git a/src/main.c b/src/main.c +index 645e2ec..9453a3b 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -23,6 +23,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/un.h> ++#include <sys/sysmacros.h> + + #include <signal.h> + diff --git a/system/spacefm/spacefm.SlackBuild b/system/spacefm/spacefm.SlackBuild index c8a93b7eaa..46cf4735bd 100644 --- a/system/spacefm/spacefm.SlackBuild +++ b/system/spacefm/spacefm.SlackBuild @@ -81,6 +81,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 {} \; +# https://github.com/IgnorantGuru/spacefm/issues/727 +patch -p1 < $CWD/glibc-2.28.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ 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.SlackBuild b/system/t1utils/t1utils.SlackBuild deleted file mode 100644 index ab9ef7ba50..0000000000 --- a/system/t1utils/t1utils.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for t1utils - -# Copyright 2013-2017 Kyle Guinn <elyk03@gmail.com>, 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. - -PRGNAM=t1utils -VERSION=${VERSION:-1.41} -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-$VERSION -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 - 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 -cd $PRGNAM-$VERSION -chown -R root:root . -chmod -R u+w,go-w,a+rX-st . - -# -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" \ - -make -make install-strip DESTDIR=$PKG - -find $PKG/usr/man -type f -exec gzip -9 {} + - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $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/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/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/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild index 405df90f90..a1f0ea5822 100644 --- a/system/vhba-module/vhba-module.SlackBuild +++ b/system/vhba-module/vhba-module.SlackBuild @@ -60,6 +60,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|\ -Werror||" Makefile + make KERNELRELEASE=$KERNEL mkdir -p $PKG/lib/modules/$KERNEL/extra diff --git a/system/virt-manager/Add-Slackware-to-OS-choices.patch b/system/virt-manager/Add-Slackware-to-OS-choices.patch index 18aadb62cf..0a5260206f 100644 --- a/system/virt-manager/Add-Slackware-to-OS-choices.patch +++ b/system/virt-manager/Add-Slackware-to-OS-choices.patch @@ -1,37 +1,21 @@ -diff -Nur virt-manager-1.5.0.orig/virtinst/osdict.py virt-manager-1.5.0/virtinst/osdict.py ---- virt-manager-1.5.0.orig/virtinst/osdict.py 2018-01-27 14:57:20.000000000 -0600 -+++ virt-manager-1.5.0/virtinst/osdict.py 2018-02-19 00:52:00.750416744 -0600 -@@ -159,6 +159,7 @@ - "rhel5": "rhel5.0", - "rhel6": "rhel6.0", - "rhel7": "rhel7.0", -+ "slackware": "slackware14.2", - "ubuntuhardy": "ubuntu8.04", - "ubuntuintrepid": "ubuntu8.10", - "ubuntujaunty": "ubuntu9.04", -@@ -373,7 +374,7 @@ - # EOL date. So assume None == EOL, add some manual work arounds. - # We should fix this in a new libosinfo version, and then drop - # this hack -- if self._is_related_to(["fedora24", "rhel7.0", "debian6", -+ if self._is_related_to(["slackware14.2", "fedora24", "rhel7.0", "debian6", - "ubuntu13.04", "win8", "win2k12", "mageia5", "centos7.0"], - check_clones=False, check_derives=False): - return True -diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virtinst/urlfetcher.py ---- virt-manager-1.5.0.orig/virtinst/urlfetcher.py 2018-01-27 14:57:20.000000000 -0600 -+++ virt-manager-1.5.0/virtinst/urlfetcher.py 2018-02-19 00:52:00.751416752 -0600 -@@ -1379,6 +1379,43 @@ - return False +diff -Nur virt-manager-2.2.0.orig/virtinst/install/urldetect.py virt-manager-2.2.0/virtinst/install/urldetect.py +--- virt-manager-2.2.0.orig/virtinst/install/urldetect.py 2019-06-17 00:20:11.000000000 -0500 ++++ virt-manager-2.2.0/virtinst/install/urldetect.py 2019-07-03 02:14:35.978571412 -0500 +@@ -466,6 +466,47 @@ + return cache.treeinfo_family_regex(famregex) -+class SlackwareDistro(Distro): ++class SlackwareDistro(_DistroTree): + # slackware doesn't have installable URLs, so this is just for a + # mounted ISO + name = "Slackware" + urldistro = "slackware" + os_variant = "linux" + ++ PRETTY_NAME = "Slackware" ++ matching_distros = ["slackware"] ++ _variant_prefix = "slackware" ++ + _boot_iso_paths = [] + _xen_kernel_paths = [] + @@ -62,6 +46,17 @@ diff -Nur virt-manager-1.5.0.orig/virtinst/urlfetcher.py virt-manager-1.5.0/virt + return False + + - # Build list of all *Distro classes - def _build_distro_list(): - allstores = [] + class _SuseDistro(_RHELDistro): + PRETTY_NAME = None + _suse_regex = [] +diff -Nur virt-manager-2.2.0.orig/virtinst/osdict.py virt-manager-2.2.0/virtinst/osdict.py +--- virt-manager-2.2.0.orig/virtinst/osdict.py 2019-06-17 00:20:11.000000000 -0500 ++++ virt-manager-2.2.0/virtinst/osdict.py 2019-07-03 02:11:59.208399622 -0500 +@@ -146,6 +146,7 @@ + "rhel5": "rhel5.0", + "rhel6": "rhel6.0", + "rhel7": "rhel7.0", ++ "slackware": "slackware14.2", + "ubuntuhardy": "ubuntu8.04", + "ubuntuintrepid": "ubuntu8.10", + "ubuntujaunty": "ubuntu9.04", diff --git a/system/virt-manager/virt-manager.SlackBuild b/system/virt-manager/virt-manager.SlackBuild index 3a8402bd75..1b2326ed09 100644 --- a/system/virt-manager/virt-manager.SlackBuild +++ b/system/virt-manager/virt-manager.SlackBuild @@ -4,10 +4,10 @@ # Written by Ash Wiren ash@spooksoftware.com # Released to public domain. # Modified by Zoran Stojakovic -# Lots of mods by rworkman for 1.x +# Lots of mods by rworkman for 1.x and (later) 2.x PRGNAM=virt-manager -VERSION=${VERSION:-1.5.1} +VERSION=${VERSION:-2.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,8 +56,8 @@ find -L . \ # Add Slackware support patch -p1 < $CWD/Add-Slackware-to-OS-choices.patch -python setup.py configure -python setup.py install --root=$PKG +python3 setup.py configure +python3 setup.py install --root=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -68,7 +68,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING HACKING.md INSTALL.md NEWS.md README.md \ + CONTRIBUTING.md COPYING INSTALL.md NEWS.md README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/virt-manager/virt-manager.info b/system/virt-manager/virt-manager.info index 6bdff3b232..c21bad0447 100644 --- a/system/virt-manager/virt-manager.info +++ b/system/virt-manager/virt-manager.info @@ -1,10 +1,10 @@ PRGNAM="virt-manager" -VERSION="1.5.1" +VERSION="2.2.1" HOMEPAGE="http://virt-manager.org/" -DOWNLOAD="http://virt-manager.org/download/sources/virt-manager/virt-manager-1.5.1.tar.gz" -MD5SUM="32a929fd91fca9767730abaefb94661d" +DOWNLOAD="https://virt-manager.org/download/sources/virt-manager/virt-manager-2.2.1.tar.gz" +MD5SUM="adb4fa436d60b62a8e18a7b3a1667d97" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libosinfo libvirt-glib libvirt-python gnome-python2-gconf tunctl ipaddr-py python-requests gtk-vnc spice-gtk vte3" +REQUIRES="gtksourceview3 libosinfo libvirt-glib libvirt-python gtk-vnc spice-gtk" MAINTAINER="Robby Workman" EMAIL="rworkman@slackbuilds.org" 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..fd72c91ad3 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,20 @@ 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 +# Cheat! +sed -i "s|cc_maj -gt 7|cc_maj -gt 9|" configure + +./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 +133,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 +144,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 722e60c9b8..e9a70ab605 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-2019 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,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=virtualbox-kernel-addons -VERSION=${VERSION:-5.0.40} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.2.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} @@ -79,7 +79,21 @@ if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxguest/r0drv/linux/memobj-r0drv-linux.c fi -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/kernel_4.17.patch b/system/virtualbox-kernel/kernel_4.17.patch new file mode 100644 index 0000000000..007bf737f2 --- /dev/null +++ b/system/virtualbox-kernel/kernel_4.17.patch @@ -0,0 +1,32 @@ +In kernel 4.17, pci_get_bus_and_slot() has been removed in favor of +pci_get_domain_bus_and_slot(). It appears that VirtualBox only uses +domain number 0, thus pci_get_domain_bus_and_slot(0, bus, devfn) +is a suitable replacement for pci_get_bus_and_slot(bus, devfn). + +The resulting code compiles; however, I do not use PCI passthru, which +I think means that I have not actually tested the code. + +This patch released under a combined MIT/GPLv2 license. + +Shamelessly copied by the patch from Larry Finger. + +Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org> + +diff -Naur virtualbox-kernel-5.2.8.orig/vboxpci/linux/VBoxPci-linux.c virtualbox-kernel-5.2.8/vboxpci/linux/VBoxPci-linux.c +--- virtualbox-kernel-5.2.8.orig/vboxpci/linux/VBoxPci-linux.c 2018-03-14 20:33:31.000000000 +0100 ++++ virtualbox-kernel-5.2.8/vboxpci/linux/VBoxPci-linux.c 2019-04-16 23:18:10.607698000 +0200 +@@ -89,7 +89,14 @@ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) + # define PCI_DEV_GET(v,d,p) pci_get_device(v,d,p) + # define PCI_DEV_PUT(x) pci_dev_put(x) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 17, 0) ++/* assume the domain number to be zero - exactly the same assumption of ++* pci_get_bus_and_slot() ++*/ ++# define PCI_DEV_GET_SLOT(bus, devfn) pci_get_domain_bus_and_slot(0, bus, devfn) ++#else + # define PCI_DEV_GET_SLOT(bus, devfn) pci_get_bus_and_slot(bus, devfn) ++#endif + #else + # define PCI_DEV_GET(v,d,p) pci_find_device(v,d,p) + # define PCI_DEV_PUT(x) do { } while (0) diff --git a/system/virtualbox-kernel/virtualbox-kernel.SlackBuild b/system/virtualbox-kernel/virtualbox-kernel.SlackBuild index d879686802..338da42bfc 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-2019 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,8 +25,8 @@ # Modified by SlackBuilds.org PRGNAM=virtualbox-kernel -VERSION=${VERSION:-5.0.40} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.2.8} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} KERNEL=${KERNEL:-$(uname -r)} @@ -84,6 +84,8 @@ if [ "$KERNEL_MINOR" = 4 -a "$KERNEL_PATCH" -ge 168 ]; then sed -i "s|KERNEL_VERSION(4, 9, 0)|KERNEL_VERSION(4, 4, 168)|" vboxdrv/r0drv/linux/memobj-r0drv-linux.c fi +patch -p1 < $CWD/kernel_4.17.patch + make KERN_DIR=${KERNELPATH} mkdir -p $PKG/lib/modules/$KERNEL/misc 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/python_3.7.patch b/system/virtualbox/python_3.7.patch new file mode 100644 index 0000000000..2bc9d0ee44 --- /dev/null +++ b/system/virtualbox/python_3.7.patch @@ -0,0 +1,13 @@ +diff -Naur VirtualBox-5.2.8.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp VirtualBox-5.2.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp +--- VirtualBox-5.2.8.orig/src/libs/xpcom18a4/python/src/ErrorUtils.cpp 2018-02-26 17:05:25.000000000 +0100 ++++ VirtualBox-5.2.8/src/libs/xpcom18a4/python/src/ErrorUtils.cpp 2019-04-17 11:45:42.706698000 +0200 +@@ -440,7 +440,8 @@ + #if PY_MAJOR_VERSION <= 2 + char *tempResult = PyString_AsString(obResult); + #else +- char *tempResult = PyUnicode_AsUTF8(obResult); ++ /* PyUnicode_AsUTF8() is const char * as of Python 3.7, char * earlier. */ ++ const char *tempResult = (const char *)PyUnicode_AsUTF8(obResult); + #endif + result = (char *)PyMem_Malloc(strlen(tempResult)+1); + if (result==NULL) 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..f53fde16c6 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,18 @@ 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 +# Patch for python-3.7 +patch -p1 < $CWD/python_3.7.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 +159,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 +215,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 +253,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 \ diff --git a/system/zstd/README b/system/zstd/README deleted file mode 100644 index 70e275669d..0000000000 --- a/system/zstd/README +++ /dev/null @@ -1,5 +0,0 @@ -Zstd, short for Zstandard, is a fast lossless compression algorithm, -targeting real-time compression scenarios at zlib-level and better -compression ratios. - -Since 1.3.1, it is dual licensed as BSD and GPLv2. diff --git a/system/zstd/slack-desc b/system/zstd/slack-desc deleted file mode 100644 index 215674d549..0000000000 --- a/system/zstd/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------------------------------------------------------| -zstd: zstd (real-time compression algorithm) -zstd: -zstd: Zstandard, or zstd for short, is a real-time compression algorithm -zstd: providing high compression ratios. It offers a very wide range of -zstd: compression/speed trade-off, while being backed by a very fast -zstd: decoder. It also offers a special mode for small data, called -zstd: dictionary compression, and can create dictionaries from any sample -zstd: set. -zstd: -zstd: Homepage: http://zstd.net/ -zstd: diff --git a/system/zstd/zstd.SlackBuild b/system/zstd/zstd.SlackBuild deleted file mode 100644 index 297b0b92f5..0000000000 --- a/system/zstd/zstd.SlackBuild +++ /dev/null @@ -1,107 +0,0 @@ -#!/bin/sh - -# Slackware build script for zstd - -# Copyright 2016-2019, Zhu Qun-Ying -# 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=zstd -VERSION=${VERSION:-1.4.4} -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 -cd $PRGNAM-$VERSION -zcat $CWD/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz | patch -p1 --verbose || exit 1 -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 {} \; - -# Compile it: -make CFLAGS="$SLKCFLAGS" -make CFLAGS="$SLKCFLAGS" -C contrib/pzstd - -# Install it: -make \ - prefix=/usr \ - libdir=/usr/lib${LIBDIRSUFFIX} \ - mandir=/usr/man \ - DESTDIR=$PKG \ - install -install -Dm755 contrib/pzstd/pzstd $PKG/usr/bin/pzstd - -# Don't ship static library: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a - -# zstdmt as the same as zstd, so just make a symlink: -( cd $PKG/usr/bin - ln -sf zstd zstdmt -) - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/pzstd -cp -a CONTRIBUTING* COPYING* LICENSE README* doc $PKG/usr/doc/$PRGNAM-$VERSION -cp contrib/pzstd/README.md $PKG/usr/doc/$PRGNAM-$VERSION/pzstd-README.md - -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/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz b/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz Binary files differdeleted file mode 100644 index 3e5d5d7c32..0000000000 --- a/system/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz +++ /dev/null diff --git a/system/zstd/zstd.info b/system/zstd/zstd.info deleted file mode 100644 index 5f404b9774..0000000000 --- a/system/zstd/zstd.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="zstd" -VERSION="1.4.4" -HOMEPAGE="http://facebook.github.io/zstd/" -DOWNLOAD="https://github.com/facebook/zstd/releases/download/v1.4.4/zstd-1.4.4.tar.gz" -MD5SUM="487f7ee1562dee7c1c8adf85e2a63df9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Zhu Qun-Ying" -EMAIL="zhu.qunying@gmail.com" |