diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-04-24 18:55:05 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2021-04-25 08:59:56 +0200 |
commit | 7b610e99b43e1de0f1614d113ada49ba2ff8f607 (patch) | |
tree | 2f204b4234fdecfbf31386baf0a4ec12ef1a7ad4 /source | |
parent | 6e50489feda778db0ff21b6f06adb801e8a5d003 (diff) | |
download | current-7b610e99b43e1de0f1614d113ada49ba2ff8f607.tar.gz |
Sat Apr 24 18:55:05 UTC 202120210424185505
a/file-5.40-x86_64-3.txz: Rebuilt.
Fix detection of XZ compressed data. Thanks to TommyC7.
a/kernel-firmware-20210423_1334578-noarch-1.txz: Upgraded.
a/pkgtools-15.0-noarch-40.txz: Rebuilt.
Change several script shebangs to #!/bin/bash. Thanks to mumahendras3.
a/sysvinit-scripts-15.0-noarch-3.txz: Rebuilt.
inittab: fix label for runlevel 4. Thanks to Fellype.
rc.4: fix error message for no supported login manager found.
l/libjpeg-turbo-2.1.0-x86_64-1.txz: Upgraded.
n/fetchmail-6.4.19-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rw-r--r-- | source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch | 33 | ||||
-rwxr-xr-x | source/a/file/file.SlackBuild | 10 | ||||
-rwxr-xr-x | source/a/pkgtools/pkgtools.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/explodepkg | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/installpkg | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/makebootdisk | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/makepkg | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/pkgdiff | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/pkgtool | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/removepkg | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/inittab | 2 | ||||
-rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.4 | 2 | ||||
-rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild | 2 |
14 files changed, 52 insertions, 15 deletions
diff --git a/source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch b/source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch new file mode 100644 index 00000000..c71d2f81 --- /dev/null +++ b/source/a/file/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch @@ -0,0 +1,33 @@ +From 94ab14414606b794b7ccf60595493cd8715e195b Mon Sep 17 00:00:00 2001 +From: ProgAndy <code@progandy.de> +Date: Fri, 2 Apr 2021 14:33:18 +0200 +Subject: [PATCH] Fix mime type XZ after "Add checksum for XZ" + +--- + magic/Magdir/compress | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/magic/Magdir/compress b/magic/Magdir/compress +index 64d11a73..aef4bb49 100644 +--- a/magic/Magdir/compress ++++ b/magic/Magdir/compress +@@ -265,14 +265,13 @@ + + # http://tukaani.org/xz/xz-file-format.txt + 0 ustring \xFD7zXZ\x00 XZ compressed data, checksum ++!:strength * 2 ++!:mime application/x-xz + >7 byte&0xf 0x0 NONE + >7 byte&0xf 0x1 CRC32 + >7 byte&0xf 0x4 CRC64 + >7 byte&0xf 0xa SHA-256 + +-!:strength * 2 +-!:mime application/x-xz +- + # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt + 0 string LRZI LRZIP compressed data + >4 byte x - version %d +-- +2.31.1 + diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild index e70f55a1..1a5e6501 100755 --- a/source/a/file/file.SlackBuild +++ b/source/a/file/file.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=file VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -78,8 +78,6 @@ find . \ # Make the default data directory /etc/file like it has always been: zcat $CWD/file.etc.file.diff.gz | patch -p1 --verbose || exit 1 -# This is needed after the patch above: -autoreconf -vif || exit 1 # Since we're going to include the compiled magic database now (otherwise # there seem to be libmagic related crashes), this patch probably doesn't @@ -109,6 +107,12 @@ zcat $CWD/git-patches/6b34436ac766dae64749b8d14f18c6910be40131.patch.gz | patch zcat $CWD/git-patches/9e2becec20d023409a1671bf10a682f699350e85.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/git-patches/f06015040e7ffb3be21bb7622f9f8291b749aaf9.patch.gz | patch -p1 --verbose || exit 1 +# Fix detection of XZ compressed data: +zcat $CWD/0001-Fix-mime-type-XZ-after-Add-checksum-for-XZ.patch.gz | patch -p1 --verbose || exit 1 + +# This is needed after the default data directory patch above: +autoreconf -vif || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 0c7d43f0..f0eca658 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:-39} +BUILD=${BUILD:-40} # 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/explodepkg b/source/a/pkgtools/scripts/explodepkg index 72c013d4..e3849297 100644 --- a/source/a/pkgtools/scripts/explodepkg +++ b/source/a/pkgtools/scripts/explodepkg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 1994, 1998, 2000 Patrick Volkerding, Concord, CA, USA # Copyright 2001, 2003 Slackware Linux, Inc., Concord, CA, USA # Copyright 2007, 2009, 2017, 2018 Patrick Volkerding, Sebeka, MN, USA diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index 3bebe7ce..e7fa21c0 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 1994, 1998, 2000 Patrick Volkerding, Concord, CA, USA # Copyright 2001, 2003 Slackware Linux, Inc., Concord, CA, USA # Copyright 2007, 2009, 2011, 2017, 2018, 2019, 2020 Patrick Volkerding, Sebeka, MN, USA diff --git a/source/a/pkgtools/scripts/makebootdisk b/source/a/pkgtools/scripts/makebootdisk index 79379618..5fbe27e2 100644 --- a/source/a/pkgtools/scripts/makebootdisk +++ b/source/a/pkgtools/scripts/makebootdisk @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 1995, 1998, 2002, 2005 Patrick Volkerding, Moorhead, Minnesota USA # All rights reserved. # diff --git a/source/a/pkgtools/scripts/makepkg b/source/a/pkgtools/scripts/makepkg index e8e1f068..ddced779 100644 --- a/source/a/pkgtools/scripts/makepkg +++ b/source/a/pkgtools/scripts/makepkg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 1994, 1998, 2008 Patrick Volkerding, Moorhead, Minnesota USA # Copyright 2003 Slackware Linux, Inc. Concord, CA USA # Copyright 2009, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA diff --git a/source/a/pkgtools/scripts/pkgdiff b/source/a/pkgtools/scripts/pkgdiff index ca21ad8f..7210e2a9 100644 --- a/source/a/pkgtools/scripts/pkgdiff +++ b/source/a/pkgtools/scripts/pkgdiff @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright 2002 Patrick J. Volkerding, Concord, CA, USA # Copyright 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool index 076402b8..7c4fc766 100644 --- a/source/a/pkgtools/scripts/pkgtool +++ b/source/a/pkgtools/scripts/pkgtool @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999 Patrick Volkerding, Moorhead, MN USA # Copyright 2001, 2004 Slackware Linux, Inc., Concord, CA USA diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg index ec9b4299..cb7e9119 100644 --- a/source/a/pkgtools/scripts/removepkg +++ b/source/a/pkgtools/scripts/removepkg @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware remove package script # # Copyright 1994, 1995, 1998 Patrick Volkerding, Moorhead, Minnesota USA diff --git a/source/a/sysvinit-scripts/scripts/inittab b/source/a/sysvinit-scripts/scripts/inittab index ba6fe79e..e91b01c4 100644 --- a/source/a/sysvinit-scripts/scripts/inittab +++ b/source/a/sysvinit-scripts/scripts/inittab @@ -17,7 +17,7 @@ # 1 = single user mode # 2 = unused (but configured the same as runlevel 3) # 3 = multiuser mode (default Slackware runlevel) -# 4 = X11 with KDM/GDM/XDM (session managers) +# 4 = X11/Wayland with SDDM/KDM/GDM/XDM (session managers) # 5 = unused (but configured the same as runlevel 3) # 6 = reboot diff --git a/source/a/sysvinit-scripts/scripts/rc.4 b/source/a/sysvinit-scripts/scripts/rc.4 index ee32e48f..971445ad 100644 --- a/source/a/sysvinit-scripts/scripts/rc.4 +++ b/source/a/sysvinit-scripts/scripts/rc.4 @@ -53,7 +53,7 @@ fi # error echo -echo "Hey, you don't have KDM, GDM, or XDM. Can't use runlevel 4 without" +echo "Hey, you don't have SDDM, KDM, GDM, or XDM. Can't use runlevel 4 without" echo "one of those installed." sleep 30 diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index d09bc302..818e6243 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-15.0} ARCH=noarch -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # 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/l/libjpeg-turbo/libjpeg-turbo.SlackBuild b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild index 8c8aa11a..fa7e0ed8 100755 --- a/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild +++ b/source/l/libjpeg-turbo/libjpeg-turbo.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libjpeg-turbo VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |