summaryrefslogtreecommitdiffstats
path: root/source/n
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-01-10 21:32:00 +0000
committer Eric Hameleers <alien@slackware.com>2023-01-10 23:35:14 +0100
commit3fb38a9206728a3fa09f4c6bdb26f16fdeebfd58 (patch)
treeff64c8849ec3b8dd3b505e757f0deaab58ba9a8e /source/n
parente33171c1dcd46c51e778c9de2cc78586b3a00b9d (diff)
downloadcurrent-3fb38a9206728a3fa09f4c6bdb26f16fdeebfd58.tar.gz
current-3fb38a9206728a3fa09f4c6bdb26f16fdeebfd58.tar.xz
Tue Jan 10 21:32:00 UTC 202320230110213200
a/kernel-firmware-20230110_a1ad1d5-noarch-1.txz: Upgraded. n/ca-certificates-20221205-noarch-2.txz: Rebuilt. Make sure that if we're installing this package on another partition (such as when using installpkg with a --root parameter) that the updates are done on that partition. Thanks to fulalas. x/libva-utils-2.17.1-x86_64-1.txz: Upgraded. xfce/libxfce4util-4.18.1-x86_64-1.txz: Upgraded. xfce/thunar-4.18.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n')
-rwxr-xr-xsource/n/ca-certificates/ca-certificates.SlackBuild2
-rw-r--r--source/n/ca-certificates/doinst.sh8
2 files changed, 7 insertions, 3 deletions
diff --git a/source/n/ca-certificates/ca-certificates.SlackBuild b/source/n/ca-certificates/ca-certificates.SlackBuild
index 6e06613ac..baaf0ca18 100755
--- a/source/n/ca-certificates/ca-certificates.SlackBuild
+++ b/source/n/ca-certificates/ca-certificates.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=ca-certificates
VERSION=${VERSION:-$(echo certdata-*.txt.xz | cut -f 2 -d - | cut -f 1 -d .)}
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
diff --git a/source/n/ca-certificates/doinst.sh b/source/n/ca-certificates/doinst.sh
index 9e50c5598..cf1f984b5 100644
--- a/source/n/ca-certificates/doinst.sh
+++ b/source/n/ca-certificates/doinst.sh
@@ -17,7 +17,11 @@ config() {
# /usr/local/share/ca-certificates directory.
#config etc/ca-certificates.conf.new
-if [ -x /usr/sbin/update-ca-certificates ]; then
- /usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null
+# We don't want to run this from the installer because we've got a script
+# that runs it after all the packages are installed. But if we do run it,
+# we should chroot into the target partition to make sure the updates are
+# done in the correct location (and not on the calling partition):
+if [ ! -r /usr/lib/setup/setup ]; then
+ chroot . /usr/sbin/update-ca-certificates --fresh 1> /dev/null 2> /dev/null
fi