diff --git a/ChangeLog.rss b/ChangeLog.rss
index 76099c5a1..b5fb1ff58 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,9 +11,33 @@
Tracking Slackware development in git.
en-us
urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f
- Sat, 9 Dec 2023 19:55:12 GMT
- Sat, 9 Dec 2023 20:35:11 GMT
+ Sun, 10 Dec 2023 01:12:17 GMT
+ Sun, 10 Dec 2023 01:58:50 GMT
maintain_current_git.sh v 1.17
+ -
+ Sun, 10 Dec 2023 01:12:17 GMT
+ Sun, 10 Dec 2023 01:12:17 GMT
+ https://git.slackware.nl/current/tag/?h=20231210011217
+ 20231210011217
+
+
+l/libxml2-2.12.2-x86_64-2.txz: Rebuilt.
+ Add --sysconfdir=/etc option so that this can find the xml catalog.
+ Thanks to SpiderTux.
+ Fix the following security issues:
+ Fix integer overflows with XML_PARSE_HUGE.
+ Fix dict corruption caused by entity reference cycles.
+ Hashing of empty dict strings isn't deterministic.
+ Fix null deref in xmlSchemaFixupComplexType.
+ For more information, see:
+ https://www.cve.org/CVERecord?id=CVE-2022-40303
+ https://www.cve.org/CVERecord?id=CVE-2022-40304
+ https://www.cve.org/CVERecord?id=CVE-2023-29469
+ https://www.cve.org/CVERecord?id=CVE-2023-28484
+ (* Security fix *)
+ ]]>
+
+
-
Sat, 9 Dec 2023 19:55:12 GMT
Sat, 9 Dec 2023 19:55:12 GMT
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6a3cb8355..5e64cb007 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,19 @@
+Sun Dec 10 01:12:17 UTC 2023
+l/libxml2-2.12.2-x86_64-2.txz: Rebuilt.
+ Add --sysconfdir=/etc option so that this can find the xml catalog.
+ Thanks to SpiderTux.
+ Fix the following security issues:
+ Fix integer overflows with XML_PARSE_HUGE.
+ Fix dict corruption caused by entity reference cycles.
+ Hashing of empty dict strings isn't deterministic.
+ Fix null deref in xmlSchemaFixupComplexType.
+ For more information, see:
+ https://www.cve.org/CVERecord?id=CVE-2022-40303
+ https://www.cve.org/CVERecord?id=CVE-2022-40304
+ https://www.cve.org/CVERecord?id=CVE-2023-29469
+ https://www.cve.org/CVERecord?id=CVE-2023-28484
+ (* Security fix *)
++--------------------------+
Sat Dec 9 19:55:12 UTC 2023
kde/plasma-wayland-protocols-1.12.0-x86_64-1.txz: Upgraded.
l/libxslt-1.1.39-x86_64-1.txz: Upgraded.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 6fc08d49b..2c213c917 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Sat Dec 9 20:04:38 UTC 2023
+Sun Dec 10 01:19:31 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-12-09 20:00 .
+drwxr-xr-x 12 root root 4096 2023-12-10 01:12 .
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
-rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 1129799 2023-12-09 20:00 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2023-12-09 20:00 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 1129738 2023-12-09 20:04 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2023-12-09 20:04 ./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 894781 2023-12-09 19:55 ./ChangeLog.txt
+-rw-r--r-- 1 root root 895470 2023-12-10 01:12 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2023-12-08 21:58 ./EFI/BOOT
-rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2023-12-08 21:58 ./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 1474462 2023-12-09 20:00 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1474384 2023-12-09 20:04 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 888224 2023-12-09 19:59 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 888223 2023-12-10 01:18 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
-rw-r--r-- 1 root root 3629 2023-12-08 21:44 ./README.initrd
-rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT
@@ -666,11 +666,11 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches
-rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT
-drwxr-xr-x 17 root root 4096 2023-12-09 20:00 ./slackware64
--rw-r--r-- 1 root root 345880 2023-12-09 20:00 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2023-12-09 20:00 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 428630 2023-12-09 19:59 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 4353573 2023-12-09 19:59 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 17 root root 4096 2023-12-10 01:19 ./slackware64
+-rw-r--r-- 1 root root 345880 2023-12-10 01:19 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2023-12-10 01:19 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 428630 2023-12-10 01:18 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 4359365 2023-12-10 01:18 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
drwxr-xr-x 2 root root 32768 2023-12-08 22:04 ./slackware64/a
-rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt
@@ -2754,7 +2754,7 @@ drwxr-xr-x 2 root root 86016 2023-12-09 19:59 ./slackware64/kde
-rw-r--r-- 1 root root 517 2023-12-07 21:02 ./slackware64/kde/zanshin-23.08.4-x86_64-1.txt
-rw-r--r-- 1 root root 683696 2023-12-07 21:02 ./slackware64/kde/zanshin-23.08.4-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-12-07 21:02 ./slackware64/kde/zanshin-23.08.4-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 86016 2023-12-09 19:59 ./slackware64/l
+drwxr-xr-x 2 root root 86016 2023-12-10 01:18 ./slackware64/l
-rw-r--r-- 1 root root 329 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txt
-rw-r--r-- 1 root root 928144 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz
-rw-r--r-- 1 root root 163 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz.asc
@@ -3528,9 +3528,9 @@ drwxr-xr-x 2 root root 86016 2023-12-09 19:59 ./slackware64/l
-rw-r--r-- 1 root root 291 2021-02-13 07:19 ./slackware64/l/libxklavier-5.4-x86_64-4.txt
-rw-r--r-- 1 root root 79564 2021-02-13 07:19 ./slackware64/l/libxklavier-5.4-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 07:19 ./slackware64/l/libxklavier-5.4-x86_64-4.txz.asc
--rw-r--r-- 1 root root 518 2022-05-02 17:54 ./slackware64/l/libxml2-2.9.14-x86_64-1.txt
--rw-r--r-- 1 root root 1373992 2022-05-02 17:54 ./slackware64/l/libxml2-2.9.14-x86_64-1.txz
--rw-r--r-- 1 root root 163 2022-05-02 17:54 ./slackware64/l/libxml2-2.9.14-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 518 2023-12-10 00:47 ./slackware64/l/libxml2-2.12.2-x86_64-2.txt
+-rw-r--r-- 1 root root 1158824 2023-12-10 00:47 ./slackware64/l/libxml2-2.12.2-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2023-12-10 00:47 ./slackware64/l/libxml2-2.12.2-x86_64-2.txz.asc
-rw-r--r-- 1 root root 219 2023-12-09 19:23 ./slackware64/l/libxslt-1.1.39-x86_64-1.txt
-rw-r--r-- 1 root root 240384 2023-12-09 19:23 ./slackware64/l/libxslt-1.1.39-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-12-09 19:23 ./slackware64/l/libxslt-1.1.39-x86_64-1.txz.asc
@@ -5649,11 +5649,11 @@ drwxr-xr-x 2 root root 4096 2023-03-08 20:34 ./slackware64/y
-rw-r--r-- 1 root root 1491108 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz.asc
-rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile
-drwxr-xr-x 18 root root 4096 2023-12-09 20:04 ./source
--rw-r--r-- 1 root root 606391 2023-12-09 20:04 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2023-12-09 20:04 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 843942 2023-12-09 20:04 ./source/FILE_LIST
--rw-r--r-- 1 root root 25151093 2023-12-09 20:04 ./source/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2023-12-10 01:19 ./source
+-rw-r--r-- 1 root root 606316 2023-12-10 01:19 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2023-12-10 01:19 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 843850 2023-12-10 01:19 ./source/FILE_LIST
+-rw-r--r-- 1 root root 25138518 2023-12-10 01:19 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT
drwxr-xr-x 124 root root 4096 2023-11-20 18:52 ./source/a
-rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog
@@ -9869,7 +9869,7 @@ drwxr-xr-x 2 root root 4096 2023-11-30 17:19 ./source/kde/wcslib
-rw-r--r-- 1 root root 2607622 2023-11-29 08:11 ./source/kde/wcslib/wcslib-8.2.2.tar.lz
-rwxr-xr-x 1 root root 4611 2023-10-22 00:57 ./source/kde/wcslib/wcslib.SlackBuild
-rw-r--r-- 1 root root 44 2023-11-17 18:29 ./source/kde/wcslib/wcslib.url
-drwxr-xr-x 408 root root 12288 2023-12-09 19:22 ./source/l
+drwxr-xr-x 408 root root 12288 2023-12-10 00:46 ./source/l
-rw-r--r-- 1 root root 1485 2023-10-27 17:56 ./source/l/FTBFSlog
drwxr-xr-x 3 root root 4096 2022-03-06 19:58 ./source/l/GConf
-rw-r--r-- 1 root root 1559904 2013-01-22 02:48 ./source/l/GConf/GConf-3.2.6.tar.xz
@@ -11253,16 +11253,15 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/libxklavier
-rw-r--r-- 1 root root 318336 2013-04-23 23:05 ./source/l/libxklavier/libxklavier-5.4.tar.xz
-rwxr-xr-x 1 root root 3932 2021-02-13 05:32 ./source/l/libxklavier/libxklavier.SlackBuild
-rw-r--r-- 1 root root 744 2018-02-27 06:12 ./source/l/libxklavier/slack-desc
-drwxr-xr-x 2 root root 4096 2022-05-02 17:59 ./source/l/libxml2
--rw-r--r-- 1 root root 3022896 2022-05-02 17:59 ./source/l/libxml2/libxml2-2.9.14.tar.xz
--rwxr-xr-x 1 root root 4916 2022-02-28 19:21 ./source/l/libxml2/libxml2.SlackBuild
--rw-r--r-- 1 root root 495 2013-04-19 07:57 ./source/l/libxml2/libxml2.do-not-check-crc.diff.gz
--rw-r--r-- 1 root root 620 2021-07-22 15:29 ./source/l/libxml2/libxml2.python3-unicode-errors.patch.gz
--rw-r--r-- 1 root root 70 2022-02-28 18:56 ./source/l/libxml2/libxml2.url
+drwxr-xr-x 2 root root 4096 2023-12-09 19:10 ./source/l/libxml2
+-rw-r--r-- 1 root root 1254 2023-12-06 00:00 ./source/l/libxml2/libxml2-2.12.0-python3-unicode-errors.patch
+-rw-r--r-- 1 root root 2642336 2023-12-05 19:59 ./source/l/libxml2/libxml2-2.12.2.tar.xz
+-rwxr-xr-x 1 root root 5063 2023-12-10 00:35 ./source/l/libxml2/libxml2.SlackBuild
+-rw-r--r-- 1 root root 114 2022-08-27 18:08 ./source/l/libxml2/libxml2.url
-rw-r--r-- 1 root root 973 2018-02-27 06:49 ./source/l/libxml2/slack-desc
drwxr-xr-x 2 root root 4096 2023-12-09 20:03 ./source/l/libxslt
-rw-r--r-- 1 root root 1578216 2023-11-16 13:06 ./source/l/libxslt/libxslt-1.1.39.tar.xz
--rwxr-xr-x 1 root root 4724 2022-08-19 19:24 ./source/l/libxslt/libxslt.SlackBuild
+-rwxr-xr-x 1 root root 4746 2023-12-10 00:37 ./source/l/libxslt/libxslt.SlackBuild
-rw-r--r-- 1 root root 114 2023-11-17 02:15 ./source/l/libxslt/libxslt.url
-rw-r--r-- 1 root root 198 2023-11-17 02:16 ./source/l/libxslt/libxslt.xsltMaxDepth.diff.gz
-rw-r--r-- 1 root root 674 2018-02-27 06:12 ./source/l/libxslt/slack-desc
@@ -15256,8 +15255,8 @@ drwxr-xr-x 2 root root 4096 2023-03-07 21:39 ./source/xap/xine-lib
-rw-r--r-- 1 root root 967 2018-02-27 06:13 ./source/xap/xine-lib/slack-desc
-rw-r--r-- 1 root root 5004148 2023-01-26 11:37 ./source/xap/xine-lib/xine-lib-1.2.13.tar.xz
-rwxr-xr-x 1 root root 4259 2023-03-07 21:39 ./source/xap/xine-lib/xine-lib.SlackBuild
-drwxr-xr-x 2 root root 4096 2023-03-05 20:50 ./source/xap/xine-ui
--rw-r--r-- 1 root root 828 2018-02-27 06:13 ./source/xap/xine-ui/slack-desc
+drwxr-xr-x 2 root root 4096 2023-03-05 20:50 ./source/xap/xine-ui
+-rw-r--r-- 1 root root 828 2018-02-27 06:13 ./source/xap/xine-ui/slack-desc
-rw-r--r-- 1 root root 2210025 2023-01-07 19:35 ./source/xap/xine-ui/xine-ui-0.99.14.tar.lz
-rwxr-xr-x 1 root root 3385 2023-03-05 20:50 ./source/xap/xine-ui/xine-ui.SlackBuild
-rw-r--r-- 1 root root 53 2023-01-12 20:40 ./source/xap/xine-ui/xine-ui.url
@@ -15563,13 +15562,13 @@ drwxr-xr-x 2 root root 4096 2023-02-19 18:29 ./source/y/nethack
-rwxr-xr-x 1 root root 4972 2023-02-19 18:30 ./source/y/nethack/nethack.SlackBuild
-rw-r--r-- 1 root root 59 2023-02-19 18:28 ./source/y/nethack/nethack.url
-rw-r--r-- 1 root root 1031 2020-12-30 21:50 ./source/y/nethack/slack-desc
-drwxr-xr-x 4 root root 4096 2023-12-09 20:00 ./testing
--rw-r--r-- 1 root root 4857 2023-12-09 20:00 ./testing/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2023-12-09 20:00 ./testing/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 6339 2023-12-09 20:00 ./testing/FILE_LIST
--rw-r--r-- 1 root root 3149095 2023-12-09 20:00 ./testing/MANIFEST.bz2
--rw-r--r-- 1 root root 4313 2023-12-09 20:00 ./testing/PACKAGES.TXT
-drwxr-xr-x 2 root root 4096 2023-12-09 20:00 ./testing/packages
+drwxr-xr-x 4 root root 4096 2023-12-10 01:19 ./testing
+-rw-r--r-- 1 root root 4271 2023-12-10 01:19 ./testing/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2023-12-10 01:19 ./testing/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 5558 2023-12-10 01:19 ./testing/FILE_LIST
+-rw-r--r-- 1 root root 3120390 2023-12-10 01:19 ./testing/MANIFEST.bz2
+-rw-r--r-- 1 root root 3638 2023-12-10 01:19 ./testing/PACKAGES.TXT
+drwxr-xr-x 2 root root 4096 2023-12-10 00:41 ./testing/packages
-rw-r--r-- 1 root root 489 2023-12-08 21:28 ./testing/packages/kernel-generic-6.6.5-x86_64-1.txt
-rw-r--r-- 1 root root 13288100 2023-12-08 21:28 ./testing/packages/kernel-generic-6.6.5-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-12-08 21:28 ./testing/packages/kernel-generic-6.6.5-x86_64-1.txz.asc
@@ -15585,19 +15584,10 @@ drwxr-xr-x 2 root root 4096 2023-12-09 20:00 ./testing/packages
-rw-r--r-- 1 root root 317 2023-12-08 21:22 ./testing/packages/kernel-source-6.6.5-noarch-1.txt
-rw-r--r-- 1 root root 136058972 2023-12-08 21:22 ./testing/packages/kernel-source-6.6.5-noarch-1.txz
-rw-r--r-- 1 root root 163 2023-12-08 21:22 ./testing/packages/kernel-source-6.6.5-noarch-1.txz.asc
--rw-r--r-- 1 root root 518 2023-12-09 19:44 ./testing/packages/libxml2-2.12.2-x86_64-1.txt
--rw-r--r-- 1 root root 1158636 2023-12-09 19:44 ./testing/packages/libxml2-2.12.2-x86_64-1.txz
--rw-r--r-- 1 root root 163 2023-12-09 19:44 ./testing/packages/libxml2-2.12.2-x86_64-1.txz.asc
-rw-r--r-- 1 root root 426 2023-12-07 20:29 ./testing/packages/rust-1.74.1-x86_64-1.txt
-rw-r--r-- 1 root root 104210984 2023-12-07 20:29 ./testing/packages/rust-1.74.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-12-07 20:29 ./testing/packages/rust-1.74.1-x86_64-1.txz.asc
-drwxr-xr-x 5 root root 4096 2023-12-09 19:22 ./testing/source
-drwxr-xr-x 2 root root 4096 2023-12-09 19:10 ./testing/source/libxml2
--rw-r--r-- 1 root root 1254 2023-12-06 00:00 ./testing/source/libxml2/libxml2-2.12.0-python3-unicode-errors.patch
--rw-r--r-- 1 root root 2642336 2023-12-05 19:59 ./testing/source/libxml2/libxml2-2.12.2.tar.xz
--rwxr-xr-x 1 root root 5019 2023-12-09 19:12 ./testing/source/libxml2/libxml2.SlackBuild
--rw-r--r-- 1 root root 114 2022-08-27 18:08 ./testing/source/libxml2/libxml2.url
--rw-r--r-- 1 root root 973 2018-02-27 06:49 ./testing/source/libxml2/slack-desc
+drwxr-xr-x 4 root root 4096 2023-12-10 00:41 ./testing/source
drwxr-xr-x 5 root root 4096 2023-12-08 18:05 ./testing/source/linux-6.6.x
-rwxr-xr-x 1 root root 8119 2023-11-15 21:04 ./testing/source/linux-6.6.x/build-all-kernels.sh
drwxr-xr-x 2 root root 4096 2023-12-08 18:16 ./testing/source/linux-6.6.x/kernel-configs
diff --git a/recompress.sh b/recompress.sh
index 205a4dc5e..dd39ef3cc 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -738,8 +738,6 @@ gzip ./source/l/mozjs102/double_t.x86.diff
gzip ./source/l/clucene/clucene.ctime.diff
gzip ./source/l/clucene/clucene.install_contribs_lib.diff
gzip ./source/l/clucene/clucene.pkgconfig.diff
-gzip ./source/l/libxml2/libxml2.python3-unicode-errors.patch
-gzip ./source/l/libxml2/libxml2.do-not-check-crc.diff
gzip ./source/l/libgpod/doinst.sh
gzip ./source/l/alsa-lib/doinst.sh
gzip ./source/l/djvulibre/doinst.sh
diff --git a/testing/source/libxml2/libxml2-2.12.0-python3-unicode-errors.patch b/source/l/libxml2/libxml2-2.12.0-python3-unicode-errors.patch
similarity index 100%
rename from testing/source/libxml2/libxml2-2.12.0-python3-unicode-errors.patch
rename to source/l/libxml2/libxml2-2.12.0-python3-unicode-errors.patch
diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild
index b7a49084e..79b5bab02 100755
--- a/source/l/libxml2/libxml2.SlackBuild
+++ b/source/l/libxml2/libxml2.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2018, 2022 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2018, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libxml2
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -60,7 +60,7 @@ else
LIBDIRSUFFIX=""
fi
-PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
+PYTHONLIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
TMP=${TMP:-/tmp}
@@ -79,14 +79,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-zcat $CWD/libxml2.do-not-check-crc.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/libxml2.python3-unicode-errors.patch.gz | patch -p1 --verbose || exit 1
-
-# Fixes for python-3.9.x:
-sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c}
-sed -i '/_PyVerify_fd/,+1d' python/types.c
-sed -i 's/test.test/#&/' python/tests/tstLastError.py
-
if [ ! -r configure ]; then
if [ -x ./autogen.sh ]; then
NOCONFIGURE=1 ./autogen.sh
@@ -94,14 +86,50 @@ if [ ! -r configure ]; then
autoreconf -vif
fi
fi
+
+# Build for python2, for now...
+
+PYTHON=/usr/bin/python2 \
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --sysconfdir=/etc \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--docdir=/usr/doc/$PKGNAM-$VERSION \
--disable-static \
- --with-python=/usr/bin/python3 \
+ --with-python \
+ --build=$ARCH-slackware-linux || exit 1
+
+make $NUMJOBS || make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+python2 -m compileall "${PKG}$PYTHONLIB"
+python2 -O -m compileall "${PKG}$PYTHONLIB"
+
+make clean
+
+# Next build for python3...
+
+## Fixes for python-3.9.x:
+#sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c}
+#sed -i '/_PyVerify_fd/,+1d' python/types.c
+#sed -i 's/test.test/#&/' python/tests/tstLastError.py
+
+# Patch from openSUSE.
+# See: https://bugzilla.gnome.org/show_bug.cgi?id=789714
+cat $CWD/libxml2-2.12.0-python3-unicode-errors.patch | patch -p1 --verbose || exit 1
+
+PYTHON=/usr/bin/python3 \
+CFLAGS="$SLKCFLAGS" \
+./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --mandir=/usr/man \
+ --docdir=/usr/doc/$PKGNAM-$VERSION \
+ --disable-static \
+ --with-python \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
@@ -110,24 +138,6 @@ make install DESTDIR=$PKG || exit 1
python3 -m compileall "${PKG}$PYTHON3LIB"
python3 -O -m compileall "${PKG}$PYTHON3LIB"
-make clean
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --disable-static \
- --with-python=/usr/bin/python \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-python -m compileall "${PKG}$PYTHONLIB"
-python -O -m compileall "${PKG}$PYTHONLIB"
-
# Don't ship .la files:
rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
@@ -153,4 +163,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
/sbin/makepkg -l y -c n $TMP/libxml2-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/libxml2/libxml2.do-not-check-crc.diff b/source/l/libxml2/libxml2.do-not-check-crc.diff
deleted file mode 100644
index 3e6507764..000000000
--- a/source/l/libxml2/libxml2.do-not-check-crc.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -up libxml2-2.9.0/xzlib.c.do-not-check-crc libxml2-2.9.0/xzlib.c
---- libxml2-2.9.0/xzlib.c.do-not-check-crc 2012-09-11 05:52:46.000000000 +0200
-+++ libxml2-2.9.0/xzlib.c 2012-11-19 19:28:42.431700534 +0100
-@@ -552,17 +552,20 @@ xz_decomp(xz_statep state)
- #ifdef HAVE_ZLIB_H
- if (state->how == GZIP) {
- if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) {
-- xz_error(state, LZMA_DATA_ERROR, "unexpected end of file");
-- return -1;
-- }
-- if (crc != state->zstrm.adler) {
-- xz_error(state, LZMA_DATA_ERROR, "incorrect data check");
-- return -1;
-- }
-- if (len != (state->zstrm.total_out & 0xffffffffL)) {
-- xz_error(state, LZMA_DATA_ERROR, "incorrect length check");
-- return -1;
-- }
-+ /*
-+ xz_error(state, LZMA_DATA_ERROR, "unexpected end of file");
-+ return -1;
-+ */
-+ } else {
-+ if (crc != state->zstrm.adler) {
-+ xz_error(state, LZMA_DATA_ERROR, "incorrect data check");
-+ return -1;
-+ }
-+ if (len != (state->zstrm.total_out & 0xffffffffL)) {
-+ xz_error(state, LZMA_DATA_ERROR, "incorrect length check");
-+ return -1;
-+ }
-+ }
- state->strm.avail_in = 0;
- state->strm.next_in = NULL;
- state->strm.avail_out = 0;
diff --git a/source/l/libxml2/libxml2.python3-unicode-errors.patch b/source/l/libxml2/libxml2.python3-unicode-errors.patch
deleted file mode 100644
index e87dcdedf..000000000
--- a/source/l/libxml2/libxml2.python3-unicode-errors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: libxml2-2.9.5/python/libxml.c
-===================================================================
---- libxml2-2.9.5.orig/python/libxml.c
-+++ libxml2-2.9.5/python/libxml.c
-@@ -1620,6 +1620,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
- PyObject *message;
- PyObject *result;
- char str[1000];
-+ unsigned char *ptr = (unsigned char *)str;
-
- #ifdef DEBUG_ERROR
- printf("libxml_xmlErrorFuncHandler(%p, %s, ...) called\n", ctx, msg);
-@@ -1636,12 +1637,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNU
- str[999] = 0;
- va_end(ap);
-
-+#if PY_MAJOR_VERSION >= 3
-+ /* Ensure the error string doesn't start at UTF8 continuation. */
-+ while (*ptr && (*ptr & 0xc0) == 0x80)
-+ ptr++;
-+#endif
-+
- list = PyTuple_New(2);
- PyTuple_SetItem(list, 0, libxml_xmlPythonErrorFuncCtxt);
- Py_XINCREF(libxml_xmlPythonErrorFuncCtxt);
-- message = libxml_charPtrConstWrap(str);
-+ message = libxml_charPtrConstWrap(ptr);
- PyTuple_SetItem(list, 1, message);
- result = PyEval_CallObject(libxml_xmlPythonErrorFuncHandler, list);
-+ /* Forget any errors caused in the error handler. */
-+ PyErr_Clear();
- Py_XDECREF(list);
- Py_XDECREF(result);
- }
diff --git a/source/l/libxml2/libxml2.url b/source/l/libxml2/libxml2.url
index 937f078cf..47808cb85 100644
--- a/source/l/libxml2/libxml2.url
+++ b/source/l/libxml2/libxml2.url
@@ -1,2 +1,3 @@
#ftp://ftp.xmlsoft.org/libxml2
-https://gitlab.gnome.org/GNOME/libxml2
+#https://gitlab.gnome.org/GNOME/libxml2
+https://download.gnome.org/sources/libxml2
diff --git a/source/l/libxslt/libxslt.SlackBuild b/source/l/libxslt/libxslt.SlackBuild
index 0216ab702..2e735ac94 100755
--- a/source/l/libxslt/libxslt.SlackBuild
+++ b/source/l/libxslt/libxslt.SlackBuild
@@ -93,6 +93,7 @@ PYTHON=/usr/bin/python3 \
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --sysconfdir=/etc \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--mandir=/usr/man \
--disable-static \
diff --git a/testing/source/libxml2/libxml2.SlackBuild b/testing/source/libxml2/libxml2.SlackBuild
deleted file mode 100755
index a102c23f6..000000000
--- a/testing/source/libxml2/libxml2.SlackBuild
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-
-# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2018, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-cd $(dirname $0) ; CWD=$(pwd)
-
-PKGNAM=libxml2
-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
- case "$( uname -m )" in
- i?86) export ARCH=i586 ;;
- arm*) export ARCH=arm ;;
- # Unless $ARCH is already set, use uname -m for all other archs:
- *) export ARCH=$( uname -m ) ;;
- esac
-fi
-
-# 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
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
- echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
- exit 0
-fi
-
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
-if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "s390" ]; then
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O2 -fPIC"
- LIBDIRSUFFIX="64"
-else
- SLKCFLAGS="-O2"
- LIBDIRSUFFIX=""
-fi
-
-PYTHONLIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
-PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
-
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-libxml2
-rm -rf $PKG
-mkdir -p $TMP $PKG
-
-cd $TMP
-rm -rf libxml2-$VERSION
-tar xvf $CWD/libxml2-$VERSION.tar.?z || exit 1
-cd libxml2-$VERSION || exit 1
-chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \+ -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \+
-
-if [ ! -r configure ]; then
- if [ -x ./autogen.sh ]; then
- NOCONFIGURE=1 ./autogen.sh
- else
- autoreconf -vif
- fi
-fi
-
-# Build for python2, for now...
-
-PYTHON=/usr/bin/python2 \
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --disable-static \
- --with-python \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-python2 -m compileall "${PKG}$PYTHONLIB"
-python2 -O -m compileall "${PKG}$PYTHONLIB"
-
-make clean
-
-# Next build for python3...
-
-## Fixes for python-3.9.x:
-#sed -i '/if Py/{s/Py/(Py/;s/)/))/}' python/{types.c,libxml.c}
-#sed -i '/_PyVerify_fd/,+1d' python/types.c
-#sed -i 's/test.test/#&/' python/tests/tstLastError.py
-
-# Patch from openSUSE.
-# See: https://bugzilla.gnome.org/show_bug.cgi?id=789714
-cat $CWD/libxml2-2.12.0-python3-unicode-errors.patch | patch -p1 --verbose || exit 1
-
-PYTHON=/usr/bin/python3 \
-CFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PKGNAM-$VERSION \
- --disable-static \
- --with-python \
- --build=$ARCH-slackware-linux || exit 1
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-python3 -m compileall "${PKG}$PYTHON3LIB"
-python3 -O -m compileall "${PKG}$PYTHON3LIB"
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-
-mv $PKG/usr/share/doc/libxml2-python-$VERSION $PKG/usr/doc/libxml2-$VERSION
-rmdir $PKG/usr/share/doc
-cp -a \
- AUTHORS* COPYING* Copyright* INSTALL* NEWS* README* TODO* \
- $PKG/usr/doc/libxml2-$VERSION
-find $PKG/usr/doc/libxml2-$VERSION -type f | xargs chmod 644
-
-# Compress manual pages:
-find $PKG/usr/man -type f -exec gzip -9 {} \+
-for i in $( find $PKG/usr/man -type l ) ; do
- ln -s $( readlink $i ).gz $i.gz
- rm $i
-done
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-cd $PKG
-/sbin/makepkg -l y -c n $TMP/libxml2-$VERSION-$ARCH-$BUILD.txz
diff --git a/testing/source/libxml2/libxml2.url b/testing/source/libxml2/libxml2.url
deleted file mode 100644
index 47808cb85..000000000
--- a/testing/source/libxml2/libxml2.url
+++ /dev/null
@@ -1,3 +0,0 @@
-#ftp://ftp.xmlsoft.org/libxml2
-#https://gitlab.gnome.org/GNOME/libxml2
-https://download.gnome.org/sources/libxml2
diff --git a/testing/source/libxml2/slack-desc b/testing/source/libxml2/slack-desc
deleted file mode 100644
index 5b72d9970..000000000
--- a/testing/source/libxml2/slack-desc
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-libxml2: libxml2 (XML parser library)
-libxml2:
-libxml2: Libxml2 is the XML C parser library and toolkit. XML itself is a
-libxml2: metalanguage to design markup languages - i.e. a text language where
-libxml2: structures are added to the content using extra "markup" information
-libxml2: enclosed between angle brackets. HTML is the most well-known markup
-libxml2: language. Though the library is written in C, a variety of language
-libxml2: bindings make it available in other environments.
-libxml2:
-libxml2:
-libxml2: