diff options
Diffstat (limited to 'source')
15 files changed, 13 insertions, 43 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 7c8dc9c09..773e3d6c0 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.0 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-24} +BUILD=${BUILD:-25} # If the variable PRINT_PACKAGE_NAME is set, then this script will report what # the name of the created package would be, and then exit. This information diff --git a/source/a/pkgtools/scripts/makepkg b/source/a/pkgtools/scripts/makepkg index 63ab83cb8..d6b2e1863 100644 --- a/source/a/pkgtools/scripts/makepkg +++ b/source/a/pkgtools/scripts/makepkg @@ -420,9 +420,7 @@ if [ ! $ERRCODE = 0 ]; then fi # Warn of zero-length files: -find . -type f -size 0c | while read file ; do - echo "WARNING: zero length file $(echo $file | cut -b3-)" -done +find . -type f -size 0c | cut -b3- | sed "s/^/WARNING: zero length file /g" # Warn of corrupt or empty gzip files: find . -type f -name '*.gz' | while read file ; do diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild index 781f7d40a..6e4df6f07 100755 --- a/source/ap/sqlite/sqlite.SlackBuild +++ b/source/ap/sqlite/sqlite.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sqlite -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # First, convert the .zip file if needed: if ls *.zip 1> /dev/null 2> /dev/null ; then diff --git a/source/k/kernel-configs/config-generic-4.19.78 b/source/k/kernel-configs/config-generic-4.19.79 index f210842af..3dd59c480 100644 --- a/source/k/kernel-configs/config-generic-4.19.78 +++ b/source/k/kernel-configs/config-generic-4.19.79 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.78 Kernel Configuration +# Linux/x86 4.19.79 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-4.19.78.x64 b/source/k/kernel-configs/config-generic-4.19.79.x64 index 1c429e7cc..c3cac42a5 100644 --- a/source/k/kernel-configs/config-generic-4.19.78.x64 +++ b/source/k/kernel-configs/config-generic-4.19.79.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.78 Kernel Configuration +# Linux/x86 4.19.79 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-generic-smp-4.19.78-smp b/source/k/kernel-configs/config-generic-smp-4.19.79-smp index 872ccdb9a..58ffca5d0 100644 --- a/source/k/kernel-configs/config-generic-smp-4.19.78-smp +++ b/source/k/kernel-configs/config-generic-smp-4.19.79-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.78 Kernel Configuration +# Linux/x86 4.19.79 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.78 b/source/k/kernel-configs/config-huge-4.19.79 index 0a7240d5f..9ca089280 100644 --- a/source/k/kernel-configs/config-huge-4.19.78 +++ b/source/k/kernel-configs/config-huge-4.19.79 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.78 Kernel Configuration +# Linux/x86 4.19.79 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-4.19.78.x64 b/source/k/kernel-configs/config-huge-4.19.79.x64 index 457ff134c..2601bc88f 100644 --- a/source/k/kernel-configs/config-huge-4.19.78.x64 +++ b/source/k/kernel-configs/config-huge-4.19.79.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.78 Kernel Configuration +# Linux/x86 4.19.79 Kernel Configuration # # diff --git a/source/k/kernel-configs/config-huge-smp-4.19.78-smp b/source/k/kernel-configs/config-huge-smp-4.19.79-smp index fa01af0d7..339026bef 100644 --- a/source/k/kernel-configs/config-huge-smp-4.19.78-smp +++ b/source/k/kernel-configs/config-huge-smp-4.19.79-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.19.78 Kernel Configuration +# Linux/x86 4.19.79 Kernel Configuration # # diff --git a/source/l/parted/parted.SlackBuild b/source/l/parted/parted.SlackBuild index 91e9a42d6..a10f29380 100755 --- a/source/l/parted/parted.SlackBuild +++ b/source/l/parted/parted.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=parted VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-5} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -73,9 +73,6 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -zcat $CWD/parted.configure.diff.gz | patch -p1 || exit 1 -zcat $CWD/parted.glibc228.diff.gz | patch -p1 || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/l/parted/parted.SlackBuild.static b/source/l/parted/parted.SlackBuild.static index 48b5925d3..96415ec81 100755 --- a/source/l/parted/parted.SlackBuild.static +++ b/source/l/parted/parted.SlackBuild.static @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=parted VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -73,9 +73,6 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 -zcat $CWD/parted.configure.diff.gz | patch -p1 || exit 1 -zcat $CWD/parted.glibc228.diff.gz | patch -p1 || exit 1 - # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/l/parted/parted.configure.diff b/source/l/parted/parted.configure.diff deleted file mode 100644 index 4368f82dd..000000000 --- a/source/l/parted/parted.configure.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur parted-2.3.orig//configure parted-2.3/configure ---- parted-2.3.orig//configure 2010-05-28 13:29:12.000000000 -0500 -+++ parted-2.3/configure 2010-07-12 03:23:18.314505370 -0500 -@@ -14199,7 +14199,7 @@ - # Don't try bare '--as-needed'; nothing likes it and the HP-UX 11.11 - # native cc issues annoying warnings and then ignores it, - # which would cause us to incorrectly conclude that it worked. -- for gl_flags in '-Wl,--as-needed' \ -+ for gl_flags in '-Wl,--no-as-needed' \ - '-Wl,-z,ignore' \ - '-z ignore' - diff --git a/source/l/parted/parted.glibc228.diff b/source/l/parted/parted.glibc228.diff deleted file mode 100644 index db33798b0..000000000 --- a/source/l/parted/parted.glibc228.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./libparted/architecture.h.orig 2014-06-15 13:17:43.000000000 -0500 -+++ ./libparted/architecture.h 2018-09-18 18:55:41.959066415 -0500 -@@ -24,6 +24,7 @@ - #define _LIBPARTED_ARCH_H_INCLUDED - - #include <parted/disk.h> -+#include <sys/sysmacros.h> - - struct _PedArchitecture { - PedDiskArchOps* disk_ops; diff --git a/source/xap/rdesktop/rdesktop.SlackBuild b/source/xap/rdesktop/rdesktop.SlackBuild index a354f8eb7..d78045fa1 100755 --- a/source/xap/rdesktop/rdesktop.SlackBuild +++ b/source/xap/rdesktop/rdesktop.SlackBuild @@ -116,7 +116,7 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - COPYING README \ + COPYING* README* \ doc \ $PKG/usr/doc/${PKGNAM}-$VERSION diff --git a/source/xap/rdesktop/slack-desc b/source/xap/rdesktop/slack-desc index aa2660c4b..4d345930c 100644 --- a/source/xap/rdesktop/slack-desc +++ b/source/xap/rdesktop/slack-desc @@ -12,7 +12,7 @@ rdesktop: rdesktop is a client for Remote Desktop Protocol (RDP), used in a rdesktop: number of Microsoft products including Windows NT Terminal Server, rdesktop: Windows 2000 Server, Windows XP, and Windows 2003 Server. rdesktop: -rdesktop: For more information, see: http://www.rdesktop.org +rdesktop: Homepage: https://www.rdesktop.org rdesktop: rdesktop: rdesktop: |