From a22d1843900f65ede3f87d55207ca0b8f2a38b98 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 18 Sep 2018 19:22:30 +0000 Subject: Tue Sep 18 19:22:30 UTC 2018 ap/dmidecode-3.2-x86_64-1.txz: Upgraded. ap/nano-3.1-x86_64-1.txz: Upgraded. ap/slackpkg-2.83.0-noarch-4.txz: Rebuilt. Merged two patches from git: Clarify that a press of "Enter" is needed to confirm kernel change Mention possible stale mirror if CHECKSUMS.md5 gpg verify fails Thanks to Mario Preksavec and Robby Workman. ap/sqlite-3.25.0-x86_64-1.txz: Upgraded. ap/xorriso-1.5.0-x86_64-1.txz: Upgraded. l/lmdb-0.9.22-x86_64-2.txz: Rebuilt. Fixed the build script to clear out the build area properly - previously it was possible for binaries of the wrong $ARCH to end up in the package. Thanks to reddog83. n/gnutls-3.6.3-x86_64-2.txz: Rebuilt. Merged backported SSL/TLS fixes. Thanks to orbea. n/samba-4.9.0-x86_64-2.txz: Rebuilt. Recompiled in case the lmdb package was broken. --- source/ap/acct/acct.SlackBuild | 3 +++ source/ap/diffutils/diffutils.SlackBuild | 3 +++ source/ap/dmidecode/dmidecode.SlackBuild | 2 +- source/ap/dmidecode/dmidecode.url | 1 + source/ap/man-db/man-db.SlackBuild | 20 +-------------- source/ap/nano/nano.SlackBuild | 20 +-------------- ...t-a-press-of-Enter-is-needed-to-confirm-k.patch | 27 +++++++++++++++++++ ...sible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch | 30 ++++++++++++++++++++++ source/ap/slackpkg/slackpkg.SlackBuild | 10 +++++++- source/ap/texinfo/texinfo.SlackBuild | 3 +++ source/ap/xorriso/xorriso.SlackBuild | 6 ++--- 11 files changed, 82 insertions(+), 43 deletions(-) create mode 100644 source/ap/dmidecode/dmidecode.url create mode 100644 source/ap/slackpkg/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch create mode 100644 source/ap/slackpkg/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch (limited to 'source/ap') diff --git a/source/ap/acct/acct.SlackBuild b/source/ap/acct/acct.SlackBuild index ae09f5ad..7788a3ee 100755 --- a/source/ap/acct/acct.SlackBuild +++ b/source/ap/acct/acct.SlackBuild @@ -55,6 +55,9 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") + TMP=${TMP:-/tmp} PKG=$TMP/package-acct diff --git a/source/ap/diffutils/diffutils.SlackBuild b/source/ap/diffutils/diffutils.SlackBuild index fbfb0bb0..b257322b 100755 --- a/source/ap/diffutils/diffutils.SlackBuild +++ b/source/ap/diffutils/diffutils.SlackBuild @@ -59,6 +59,9 @@ else SLKCFLAGS="-O2" fi +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") + rm -rf $PKG mkdir -p $TMP $PKG diff --git a/source/ap/dmidecode/dmidecode.SlackBuild b/source/ap/dmidecode/dmidecode.SlackBuild index 0b338c75..329d6dc3 100755 --- a/source/ap/dmidecode/dmidecode.SlackBuild +++ b/source/ap/dmidecode/dmidecode.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=dmidecode VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/ap/dmidecode/dmidecode.url b/source/ap/dmidecode/dmidecode.url new file mode 100644 index 00000000..66dd9cd4 --- /dev/null +++ b/source/ap/dmidecode/dmidecode.url @@ -0,0 +1 @@ +http://download.savannah.gnu.org/releases/dmidecode/ diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild index dd3faec2..080d9759 100755 --- a/source/ap/man-db/man-db.SlackBuild +++ b/source/ap/man-db/man-db.SlackBuild @@ -103,25 +103,7 @@ else fi # Don't use icecream: -for path_element in $(echo $PATH | tr ':' '\n') ; do - if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then - continue - fi - if [ -z "$REVERSE_PATH" ]; then - REVERSE_PATH="$path_element" - else - REVERSE_PATH="${REVERSE_PATH}:$path_element" - fi -done -for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do - if [ -z "$FORWARD_PATH" ]; then - FORWARD_PATH="$path_element" - else - FORWARD_PATH="${FORWARD_PATH}:$path_element" - fi -done -PATH=$FORWARD_PATH -unset FORWARD_PATH REVERSE_PATH +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") # 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, diff --git a/source/ap/nano/nano.SlackBuild b/source/ap/nano/nano.SlackBuild index e0816b31..3635bb7d 100755 --- a/source/ap/nano/nano.SlackBuild +++ b/source/ap/nano/nano.SlackBuild @@ -74,25 +74,7 @@ rm -rf $PKG mkdir -p $TMP $PKG # Don't use icecream: -for path_element in $(echo $PATH | tr ':' '\n') ; do - if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then - continue - fi - if [ -z "$REVERSE_PATH" ]; then - REVERSE_PATH="$path_element" - else - REVERSE_PATH="${REVERSE_PATH}:$path_element" - fi -done -for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do - if [ -z "$FORWARD_PATH" ]; then - FORWARD_PATH="$path_element" - else - FORWARD_PATH="${FORWARD_PATH}:$path_element" - fi -done -PATH=$FORWARD_PATH -unset FORWARD_PATH REVERSE_PATH +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") cd $TMP rm -rf ${PKGNAM}-${VERSION} diff --git a/source/ap/slackpkg/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch b/source/ap/slackpkg/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch new file mode 100644 index 00000000..c228d5df --- /dev/null +++ b/source/ap/slackpkg/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch @@ -0,0 +1,27 @@ +From 24ec5a28f81504c339152840c4282c77b2506398 Mon Sep 17 00:00:00 2001 +From: Mario Preksavec +Date: Wed, 20 Jun 2018 01:27:04 -0500 +Subject: [PATCH 5/6] Clarify that a press of "Enter" is needed to confirm + kernel change + +Signed-off-by: Robby Workman +--- + files/post-functions.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/files/post-functions.sh b/files/post-functions.sh +index b5fecd3..b3beac8 100644 +--- a/files/post-functions.sh ++++ b/files/post-functions.sh +@@ -236,7 +236,7 @@ Your kernel image was updated, and lilo does not appear to be used on + your system. You may need to adjust your boot manager (like GRUB) to + boot the appropriate kernel (after generating an initrd if required)." + fi +- echo -e "Press any key to continue...\n " ++ echo -e "Press the \"Enter\" key to continue...\n " + read _junk + fi + } +-- +2.18.0 + diff --git a/source/ap/slackpkg/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch b/source/ap/slackpkg/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch new file mode 100644 index 00000000..2ca7bede --- /dev/null +++ b/source/ap/slackpkg/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch @@ -0,0 +1,30 @@ +From ff0b9ff70a6031e712035e98b1dd2845774cb137 Mon Sep 17 00:00:00 2001 +From: Robby Workman +Date: Wed, 5 Sep 2018 22:49:24 -0500 +Subject: [PATCH 6/6] Mention possible stale mirror if CHECKSUMS.md5 gpg verify + fails + +Signed-off-by: Robby Workman +--- + files/core-functions.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/files/core-functions.sh b/files/core-functions.sh +index 76cab6f..908edb0 100644 +--- a/files/core-functions.sh ++++ b/files/core-functions.sh +@@ -1067,7 +1067,10 @@ function updatefilelists() + echo -e "\ + \n\t\tERROR: Verification of the gpg signature on CHECKSUMS.md5\n\ + \t\t failed! This could mean that the file is out of date\n\ +-\t\t or has been tampered with.\n" ++\t\t or has been tampered with. If you use mirrors.slackware.com\n\ ++\t\t as your mirror, this could also mean that the mirror to\n\ ++\t\t which you got redirected is not yet updated with the most\n\ ++\t\t recent changes in the Slackware tree.\n" + cleanup + fi + elif [ "$SLACKKEY" != "" ]; then +-- +2.18.0 + diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild index 2d6fe94c..a9323d8a 100755 --- a/source/ap/slackpkg/slackpkg.SlackBuild +++ b/source/ap/slackpkg/slackpkg.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=slackpkg VERSION=${VERSION:-2.83.0} ARCH="noarch" -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} # 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 @@ -134,6 +134,14 @@ mkdir -pv $PKG/var/cache/packages zcat $CWD/0003-mirrors-x86-.sample-Remove-bjtu.edu.cn-mirror.patch.gz | patch -p2 --verbose || exit 1 ) || exit 1 +( cd $PKG/usr/libexec/slackpkg/functions.d + zcat $CWD/0005-Clarify-that-a-press-of-Enter-is-needed-to-confirm-k.patch.gz | patch -p2 --verbose || exit 1 +) || exit 1 + +( cd $PKG/usr/libexec/slackpkg + zcat $CWD/0006-Mention-possible-stale-mirror-if-CHECKSUMS.md5-gpg-v.patch.gz | patch -p2 --verbose || exit 1 +) || exit 1 + mkdir -p $PKG/install zcat $CWD/doinst.sh.gz | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/ap/texinfo/texinfo.SlackBuild b/source/ap/texinfo/texinfo.SlackBuild index 7675f86d..79b6a5fc 100755 --- a/source/ap/texinfo/texinfo.SlackBuild +++ b/source/ap/texinfo/texinfo.SlackBuild @@ -66,6 +66,9 @@ else LIBDIRSUFFIX="" fi +# Don't use icecream: +PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") + TMP=${TMP:-/tmp} PKG=$TMP/package-texinfo diff --git a/source/ap/xorriso/xorriso.SlackBuild b/source/ap/xorriso/xorriso.SlackBuild index 164f78ae..9282a0ec 100755 --- a/source/ap/xorriso/xorriso.SlackBuild +++ b/source/ap/xorriso/xorriso.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xorriso -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -75,7 +75,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . -- cgit v1.2.3