summaryrefslogtreecommitdiff
path: root/source/ap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-02-09 20:43:33 +0000
committerEric Hameleers <alien@slackware.com>2021-02-10 08:59:53 +0100
commit39e07c298747c13cc4ee3600f81d7c53118b166e (patch)
tree0f178d36dc6890c596c432803cfcb18926e95bc9 /source/ap
parent970784a8a8c9a4f10fcc9014c5d51643d021ff82 (diff)
downloadcurrent-39e07c298747c13cc4ee3600f81d7c53118b166e.tar.gz
Tue Feb 9 20:43:33 UTC 202120210209204333
a/exfatprogs-1.1.0-x86_64-1.txz: Upgraded. a/kernel-firmware-20210208_b79d239-noarch-1.txz: Upgraded. a/procps-ng-3.3.17-x86_64-1.txz: Upgraded. ap/man-db-2.9.4-x86_64-1.txz: Upgraded. ap/slackpkg-15.0-noarch-2.txz: Rebuilt. Allow new-config after slackpkg upgrade itself. Thanks to PiterPUNK. d/git-2.30.1-x86_64-1.txz: Upgraded. l/imagemagick-7.0.10_62-x86_64-1.txz: Upgraded. l/jasper-2.0.25-x86_64-1.txz: Upgraded. n/fetchmail-6.4.16-x86_64-1.txz: Upgraded. xfce/thunar-4.16.3-x86_64-1.txz: Upgraded. testing/packages/aaa_glibc-solibs-2.33-x86_64-1_testing.txz: Added. testing/packages/glibc-2.33-x86_64-1_testing.txz: Added. This is here for some actual testing - don't go just jumping into this one all willy-nilly, especially if you're on 32-bit. The internal implementation of some glibc functions has changed in ways that can break sandboxes that restrict the allowable functions. So far this is known to affect qt5-webengine and openssl, and in the case of openssl upgrading to this version of glibc will lock out ssh access to the machine. I've seen one mention of the openssh issue online as a comment posted to LWN's article about the release of glibc-2.33. It says that a patch was submitted upstream, but I haven't been able to locate a copy yet. On the qt5 issue, alienBOB has given me a link to this patch: https://src.fedoraproject.org/rpms/qt5-qtwebengine/blob/09e1adb883639325aa8115dc1fc3e8f5088a2438/f/qtwebengine-everywhere-src-5.15.2-%231904652.patch If anyone has a fix for openssl on 32-bit, kindly post it to LQ. testing/packages/glibc-i18n-2.33-x86_64-1_testing.txz: Added. testing/packages/glibc-profile-2.33-x86_64-1_testing.txz: Added.
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/man-db/man-db.SlackBuild2
-rw-r--r--source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch25
-rwxr-xr-xsource/ap/slackpkg/slackpkg.SlackBuild8
3 files changed, 32 insertions, 3 deletions
diff --git a/source/ap/man-db/man-db.SlackBuild b/source/ap/man-db/man-db.SlackBuild
index 60f749c5..74b6cb5d 100755
--- a/source/ap/man-db/man-db.SlackBuild
+++ b/source/ap/man-db/man-db.SlackBuild
@@ -8,7 +8,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=man-db
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
MAN2HTML=${MAN2HTML:-20180101}
diff --git a/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch b/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch
new file mode 100644
index 00000000..82e9f5a2
--- /dev/null
+++ b/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch
@@ -0,0 +1,25 @@
+From 5edf86dcebd2ab55a4a7221db77e10676723bbb1 Mon Sep 17 00:00:00 2001
+From: piterpunk <piterpunk@slackware.com>
+Date: Mon, 8 Feb 2021 18:22:33 -0300
+Subject: [PATCH] Allow new-config after slackpkg upgrade itself
+
+Signed-off-by: Robby Workman <rworkman@slackware.com>
+---
+ files/core-functions.sh | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/files/core-functions.sh b/files/core-functions.sh
+index dcbceae..9816458 100644
+--- a/files/core-functions.sh
++++ b/files/core-functions.sh
+@@ -345,6 +345,7 @@ use slackpkg.\n"
+ CHECKMD5=off
+ elif ! [ -f ${ROOT}/${WORKDIR}/CHECKSUMS.md5 ] && \
+ [ "$CMD" != "update" ] && \
++ [ "$CMD" != "new-config" ] && \
+ [ "$CHECKMD5" = "on" ]; then
+ echo -e "\n\
+ No CHECKSUMS.md5 found! Please disable md5sums checking\n\
+--
+2.30.0
+
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index db377434..788600a7 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:-15.0}
ARCH="noarch"
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# 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
@@ -113,10 +113,14 @@ chmod 644 $PKG/usr/doc/slackpkg-$VERSION/*
mkdir -pv $PKG/var/lib/slackpkg
mkdir -pv $PKG/var/cache/packages
+# Allow new-config after slackpkg upgrade itself:
+( cd $PKG/usr/libexec/slackpkg
+ cat $CWD/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch | patch -p2 --verbose || exit 1
+) || exit 1
+
mkdir -p $PKG/install
cat $CWD/doinst.sh | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-