summaryrefslogtreecommitdiffstats
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-11 13:30:25 +0100
commit4c8bd06faae5a8863bacd911b9cae04af4fa9869 (patch)
treeb1b643f9ff6d90aea70982485a4f5ec9e3ab8b98
parent585883b9b5ec51fd1a9d4729c3e2a20c5c928eae (diff)
downloadcurrent-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.
-rw-r--r--ChangeLog.rss18
-rw-r--r--ChangeLog.txt6
-rw-r--r--FILELIST.TXT38
-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-xpatches/source/ca-certificates/ca-certificates.SlackBuild2
-rw-r--r--patches/source/ca-certificates/doinst.sh8
6 files changed, 48 insertions, 24 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index 08ea901e7..913940ed6 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,24 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
- <pubDate>Sat, 7 Jan 2023 01:50:00 GMT</pubDate>
- <lastBuildDate>Sat, 7 Jan 2023 12:30:16 GMT</lastBuildDate>
+ <pubDate>Tue, 10 Jan 2023 21:32:00 GMT</pubDate>
+ <lastBuildDate>Wed, 11 Jan 2023 12:30:12 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.17</generator>
<item>
+ <title>Tue, 10 Jan 2023 21:32:00 GMT</title>
+ <pubDate>Tue, 10 Jan 2023 21:32:00 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20230110213200</link>
+ <guid isPermaLink="false">20230110213200</guid>
+ <description>
+ <![CDATA[<pre>
+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.
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Sat, 7 Jan 2023 01:50:00 GMT</title>
<pubDate>Sat, 7 Jan 2023 01:50:00 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20230107015000</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 83d0fe881..247328def 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
+Tue Jan 10 21:32:00 UTC 2023
+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.
++--------------------------+
Sat Jan 7 01:50:00 UTC 2023
extra/php80/php80-8.0.27-x86_64-1_slack15.0.txz: Upgraded.
This update fixes a security issue:
diff --git a/FILELIST.TXT b/FILELIST.TXT
index c86d87beb..e03987196 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Sat Jan 7 01:51:05 UTC 2023
+Tue Jan 10 21:37:20 UTC 2023
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
-drwxr-xr-x 12 root root 4096 2023-01-07 01:50 .
+drwxr-xr-x 12 root root 4096 2023-01-10 21:32 .
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
-rw-r--r-- 1 root root 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 1167521 2023-01-07 01:41 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2023-01-07 01:41 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 1167435 2023-01-07 01:51 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2023-01-07 01:51 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
--rw-r--r-- 1 root root 1973700 2023-01-07 01:50 ./ChangeLog.txt
+-rw-r--r-- 1 root root 1974029 2023-01-10 21:32 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT
-rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi
@@ -25,7 +25,7 @@ drwxr-xr-x 2 root root 4096 2022-02-02 08:21 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r-- 1 root root 1524958 2023-01-07 01:41 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1524855 2023-01-07 01:51 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
-rw-r--r-- 1 root root 864745 2022-02-02 08:25 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
@@ -738,13 +738,13 @@ drwxr-xr-x 2 root root 4096 2008-05-07 05:21 ./pasture/source/php/pear
-rwxr-xr-x 1 root root 9448 2018-05-16 22:38 ./pasture/source/php/php.SlackBuild
-rw-r--r-- 1 root root 775 2017-07-07 19:25 ./pasture/source/php/php.ini-development.diff.gz
-rw-r--r-- 1 root root 830 2005-12-09 05:18 ./pasture/source/php/slack-desc
-drwxr-xr-x 4 root root 4096 2023-01-07 01:51 ./patches
--rw-r--r-- 1 root root 61886 2023-01-07 01:51 ./patches/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2023-01-07 01:51 ./patches/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 83371 2023-01-07 01:51 ./patches/FILE_LIST
--rw-r--r-- 1 root root 11944724 2023-01-07 01:51 ./patches/MANIFEST.bz2
--rw-r--r-- 1 root root 44325 2023-01-07 01:51 ./patches/PACKAGES.TXT
-drwxr-xr-x 3 root root 20480 2023-01-07 01:50 ./patches/packages
+drwxr-xr-x 4 root root 4096 2023-01-10 21:37 ./patches
+-rw-r--r-- 1 root root 61886 2023-01-10 21:37 ./patches/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2023-01-10 21:37 ./patches/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 83371 2023-01-10 21:37 ./patches/FILE_LIST
+-rw-r--r-- 1 root root 11944167 2023-01-10 21:37 ./patches/MANIFEST.bz2
+-rw-r--r-- 1 root root 44325 2023-01-10 21:37 ./patches/PACKAGES.TXT
+drwxr-xr-x 3 root root 20480 2023-01-10 21:37 ./patches/packages
-rw-r--r-- 1 root root 327 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txt
-rw-r--r-- 1 root root 10716 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-02-15 05:07 ./patches/packages/aaa_base-15.0-x86_64-4_slack15.0.txz.asc
@@ -760,9 +760,9 @@ drwxr-xr-x 3 root root 20480 2023-01-07 01:50 ./patches/packages
-rw-r--r-- 1 root root 432 2022-03-08 02:17 ./patches/packages/boost-1.78.0-x86_64-2_slack15.0.txt
-rw-r--r-- 1 root root 11235356 2022-03-08 02:17 ./patches/packages/boost-1.78.0-x86_64-2_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-03-08 02:17 ./patches/packages/boost-1.78.0-x86_64-2_slack15.0.txz.asc
--rw-r--r-- 1 root root 367 2022-12-05 20:54 ./patches/packages/ca-certificates-20221205-noarch-1_slack15.0.txt
--rw-r--r-- 1 root root 133964 2022-12-05 20:54 ./patches/packages/ca-certificates-20221205-noarch-1_slack15.0.txz
--rw-r--r-- 1 root root 163 2022-12-05 20:54 ./patches/packages/ca-certificates-20221205-noarch-1_slack15.0.txz.asc
+-rw-r--r-- 1 root root 367 2023-01-10 21:25 ./patches/packages/ca-certificates-20221205-noarch-2_slack15.0.txt
+-rw-r--r-- 1 root root 134128 2023-01-10 21:25 ./patches/packages/ca-certificates-20221205-noarch-2_slack15.0.txz
+-rw-r--r-- 1 root root 163 2023-01-10 21:25 ./patches/packages/ca-certificates-20221205-noarch-2_slack15.0.txz.asc
-rw-r--r-- 1 root root 642 2022-09-21 19:13 ./patches/packages/cups-2.4.2-x86_64-3_slack15.0.txt
-rw-r--r-- 1 root root 1589324 2022-09-21 19:13 ./patches/packages/cups-2.4.2-x86_64-3_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-09-21 19:13 ./patches/packages/cups-2.4.2-x86_64-3_slack15.0.txz.asc
@@ -956,7 +956,7 @@ drwxr-xr-x 2 root root 4096 2022-11-29 21:00 ./patches/packages/linux-5.15
-rw-r--r-- 1 root root 388 2022-10-15 04:05 ./patches/packages/zlib-1.2.13-x86_64-1_slack15.0.txt
-rw-r--r-- 1 root root 105356 2022-10-15 04:05 ./patches/packages/zlib-1.2.13-x86_64-1_slack15.0.txz
-rw-r--r-- 1 root root 163 2022-10-15 04:05 ./patches/packages/zlib-1.2.13-x86_64-1_slack15.0.txz.asc
-drwxr-xr-x 62 root root 4096 2023-01-07 01:47 ./patches/source
+drwxr-xr-x 62 root root 4096 2023-01-10 21:28 ./patches/source
drwxr-xr-x 2 root root 4096 2022-01-16 05:07 ./patches/source/aaa_base
-rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./patches/source/aaa_base/_aaa_base.tar.gz
-rwxr-xr-x 1 root root 3894 2022-02-15 05:07 ./patches/source/aaa_base/aaa_base.SlackBuild
@@ -1008,10 +1008,10 @@ drwxr-xr-x 2 root root 4096 2022-03-08 01:58 ./patches/source/boost
-rw-r--r-- 1 root root 91192426 2021-12-02 07:20 ./patches/source/boost/boost_1_78_0.tar.lz
-rw-r--r-- 1 root root 885 2021-04-17 17:57 ./patches/source/boost/slack-desc
drwxr-xr-x 2 root root 4096 2022-12-05 20:54 ./patches/source/ca-certificates
--rwxr-xr-x 1 root root 3671 2022-03-09 21:42 ./patches/source/ca-certificates/ca-certificates.SlackBuild
+-rwxr-xr-x 1 root root 3671 2023-01-10 21:25 ./patches/source/ca-certificates/ca-certificates.SlackBuild
-rw-r--r-- 1 root root 14672 2018-12-11 03:14 ./patches/source/ca-certificates/ca-certificates.tar.lz
-rw-r--r-- 1 root root 214596 2022-12-05 20:52 ./patches/source/ca-certificates/certdata-20221205.txt.xz
--rw-r--r-- 1 root root 448 2021-10-05 19:56 ./patches/source/ca-certificates/doinst.sh.gz
+-rw-r--r-- 1 root root 596 2023-01-10 21:19 ./patches/source/ca-certificates/doinst.sh.gz
-rw-r--r-- 1 root root 374 2015-09-14 21:52 ./patches/source/ca-certificates/fixup_update-ca-certificates.diff.gz
-rwxr-xr-x 1 root root 1626 2018-12-11 03:25 ./patches/source/ca-certificates/get-certdata.txt.sh
-rw-r--r-- 1 root root 128 2012-09-11 21:12 ./patches/source/ca-certificates/setup.11.cacerts
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