diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-01-10 21:32:00 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-01-11 13:30:25 +0100 |
| commit | 4c8bd06faae5a8863bacd911b9cae04af4fa9869 (patch) | |
| tree | b1b643f9ff6d90aea70982485a4f5ec9e3ab8b98 /patches | |
| parent | 585883b9b5ec51fd1a9d4729c3e2a20c5c928eae (diff) | |
| download | current-4c8bd06faae5a8863bacd911b9cae04af4fa9869.tar.gz current-4c8bd06faae5a8863bacd911b9cae04af4fa9869.tar.xz | |
Tue Jan 10 21:32:00 UTC 202320230110213200_15.0
patches/packages/ca-certificates-20221205-noarch-2_slack15.0.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.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/packages/ca-certificates-20221205-noarch-2_slack15.0.txt (renamed from patches/packages/ca-certificates-20221205-noarch-1_slack15.0.txt) | 0 | ||||
| -rwxr-xr-x | patches/source/ca-certificates/ca-certificates.SlackBuild | 2 | ||||
| -rw-r--r-- | patches/source/ca-certificates/doinst.sh | 8 |
3 files changed, 7 insertions, 3 deletions
diff --git a/patches/packages/ca-certificates-20221205-noarch-1_slack15.0.txt b/patches/packages/ca-certificates-20221205-noarch-2_slack15.0.txt index b760348eb..b760348eb 100644 --- a/patches/packages/ca-certificates-20221205-noarch-1_slack15.0.txt +++ b/patches/packages/ca-certificates-20221205-noarch-2_slack15.0.txt diff --git a/patches/source/ca-certificates/ca-certificates.SlackBuild b/patches/source/ca-certificates/ca-certificates.SlackBuild index bdfb6a7be..acf3b3eb9 100755 --- a/patches/source/ca-certificates/ca-certificates.SlackBuild +++ b/patches/source/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_slack15.0} +BUILD=${BUILD:-2_slack15.0} # 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/patches/source/ca-certificates/doinst.sh b/patches/source/ca-certificates/doinst.sh index 9e50c5598..cf1f984b5 100644 --- a/patches/source/ca-certificates/doinst.sh +++ b/patches/source/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 |