From e20d844068126e89fe483df7687b094b92f7369d Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Sun, 10 Dec 2023 01:12:17 +0000 Subject: Sun Dec 10 01:12:17 UTC 2023 patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txz: Upgraded. 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 *) --- ChangeLog.rss | 44 ++++++++++++++-- ChangeLog.txt | 24 ++++++++- FILELIST.TXT | 58 +++++++++++----------- .../packages/libxml2-2.12.2-x86_64-1_slack15.0.txt | 11 ++++ .../packages/libxml2-2.9.14-x86_64-1_slack15.0.txt | 11 ---- .../seamonkey-2.53.17.1-x86_64-1_slack15.0.txt | 11 ---- .../seamonkey-2.53.18-x86_64-1_slack15.0.txt | 11 ++++ .../libxml2-2.12.0-python3-unicode-errors.patch | 34 +++++++++++++ patches/source/libxml2/libxml2.SlackBuild | 43 +++++++++------- .../source/libxml2/libxml2.do-not-check-crc.diff | 35 ------------- .../libxml2/libxml2.python3-unicode-errors.patch | 34 ------------- patches/source/libxml2/libxml2.url | 3 +- patches/source/seamonkey/seamonkey.SlackBuild | 15 +++--- patches/source/seamonkey/skip.check_glibc.diff | 11 ++++ recompress.sh | 3 +- 15 files changed, 196 insertions(+), 152 deletions(-) create mode 100644 patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txt delete mode 100644 patches/packages/libxml2-2.9.14-x86_64-1_slack15.0.txt delete mode 100644 patches/packages/seamonkey-2.53.17.1-x86_64-1_slack15.0.txt create mode 100644 patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txt create mode 100644 patches/source/libxml2/libxml2-2.12.0-python3-unicode-errors.patch delete mode 100644 patches/source/libxml2/libxml2.do-not-check-crc.diff delete mode 100644 patches/source/libxml2/libxml2.python3-unicode-errors.patch create mode 100644 patches/source/seamonkey/skip.check_glibc.diff diff --git a/ChangeLog.rss b/ChangeLog.rss index 3f168aca4..6bcf0d895 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,47 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Wed, 6 Dec 2023 20:29:23 GMT - Thu, 7 Dec 2023 12:30:31 GMT + Sun, 10 Dec 2023 01:12:17 GMT + Sun, 10 Dec 2023 12:30:27 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 + + +patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txz: Upgraded. + 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 + https://git.slackware.nl/current/tag/?h=20231209195512 + 20231209195512 + + +patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txz: Upgraded. + This is a bugfix release. + For more information, see: + https://www.seamonkey-project.org/releases/seamonkey2.53.18 + ]]> + + Wed, 6 Dec 2023 20:29:23 GMT Wed, 6 Dec 2023 20:29:23 GMT @@ -21,7 +59,7 @@ 20231206202923 -patches/packages/rdfind-1.6.0-x86_64-1_slack15.0.txz: Upgraded. +patches/packages/rdfind-1.6.0-x86_64-1_slack15.0.txz: Added. Redundant data finder utility, needed to build the kernel-firmware package. ]]> diff --git a/ChangeLog.txt b/ChangeLog.txt index d6f77021b..6a85856dc 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,27 @@ +Sun Dec 10 01:12:17 UTC 2023 +patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txz: Upgraded. + 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 +patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txz: Upgraded. + This is a bugfix release. + For more information, see: + https://www.seamonkey-project.org/releases/seamonkey2.53.18 ++--------------------------+ Wed Dec 6 20:29:23 UTC 2023 -patches/packages/rdfind-1.6.0-x86_64-1_slack15.0.txz: Upgraded. +patches/packages/rdfind-1.6.0-x86_64-1_slack15.0.txz: Added. Redundant data finder utility, needed to build the kernel-firmware package. +--------------------------+ Thu Nov 30 21:21:55 UTC 2023 diff --git a/FILELIST.TXT b/FILELIST.TXT index d23116684..9b042ba97 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Wed Dec 6 20:31:54 UTC 2023 +Sun Dec 10 01:17:37 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-06 20:29 . +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 16609 2022-03-30 19:03 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1202674 2023-11-30 21:25 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-11-30 21:25 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1203324 2023-12-09 19:58 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-12-09 19:58 ./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 2070341 2023-12-06 20:29 ./ChangeLog.txt +-rw-r--r-- 1 root root 2071302 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 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 1572255 2023-11-30 21:25 ./FILELIST.TXT +-rw-r--r-- 1 root root 1573114 2023-12-09 19:58 ./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 @@ -770,13 +770,13 @@ drwxr-xr-x 2 root root 4096 2022-12-17 19:52 ./pasture/source/samba -rw-r--r-- 1 root root 7921 2018-04-29 17:31 ./pasture/source/samba/smb.conf.default -rw-r--r-- 1 root root 7933 2018-01-14 20:41 ./pasture/source/samba/smb.conf.default.orig -rw-r--r-- 1 root root 536 2017-03-23 19:18 ./pasture/source/samba/smb.conf.diff.gz -drwxr-xr-x 4 root root 4096 2023-12-06 20:31 ./patches --rw-r--r-- 1 root root 91923 2023-12-06 20:31 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-12-06 20:31 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 125064 2023-12-06 20:31 ./patches/FILE_LIST --rw-r--r-- 1 root root 14521067 2023-12-06 20:31 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 67682 2023-12-06 20:31 ./patches/PACKAGES.TXT -drwxr-xr-x 4 root root 24576 2023-12-06 20:31 ./patches/packages +drwxr-xr-x 4 root root 4096 2023-12-10 01:17 ./patches +-rw-r--r-- 1 root root 91913 2023-12-10 01:17 ./patches/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-12-10 01:17 ./patches/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 125054 2023-12-10 01:17 ./patches/FILE_LIST +-rw-r--r-- 1 root root 14534414 2023-12-10 01:17 ./patches/MANIFEST.bz2 +-rw-r--r-- 1 root root 67679 2023-12-10 01:17 ./patches/PACKAGES.TXT +drwxr-xr-x 4 root root 28672 2023-12-10 01:17 ./patches/packages -rw-r--r-- 1 root root 360 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 2389564 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-09-26 19:28 ./patches/packages/Cython-0.29.36-x86_64-1_slack15.0.txz.asc @@ -921,9 +921,9 @@ drwxr-xr-x 4 root root 24576 2023-12-06 20:31 ./patches/packages -rw-r--r-- 1 root root 498 2023-09-14 17:26 ./patches/packages/libwebp-1.3.2-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 358924 2023-09-14 17:26 ./patches/packages/libwebp-1.3.2-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-09-14 17:26 ./patches/packages/libwebp-1.3.2-x86_64-1_slack15.0.txz.asc --rw-r--r-- 1 root root 518 2022-05-02 18:01 ./patches/packages/libxml2-2.9.14-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 1374356 2022-05-02 18:01 ./patches/packages/libxml2-2.9.14-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 163 2022-05-02 18:01 ./patches/packages/libxml2-2.9.14-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 518 2023-12-10 00:58 ./patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 1162520 2023-12-10 00:58 ./patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 163 2023-12-10 00:58 ./patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 219 2022-03-01 04:56 ./patches/packages/libxslt-1.1.35-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 375568 2022-03-01 04:56 ./patches/packages/libxslt-1.1.35-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-03-01 04:56 ./patches/packages/libxslt-1.1.35-x86_64-1_slack15.0.txz.asc @@ -1040,9 +1040,9 @@ drwxr-xr-x 2 root root 4096 2023-06-23 18:50 ./patches/packages/old-linux- -rw-r--r-- 1 root root 480 2022-12-20 20:19 ./patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txt -rw-r--r-- 1 root root 735084 2022-12-20 20:19 ./patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txz -rw-r--r-- 1 root root 163 2022-12-20 20:19 ./patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txz.asc --rw-r--r-- 1 root root 392 2023-09-20 19:57 ./patches/packages/seamonkey-2.53.17.1-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 38416604 2023-09-20 19:57 ./patches/packages/seamonkey-2.53.17.1-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 163 2023-09-20 19:57 ./patches/packages/seamonkey-2.53.17.1-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 392 2023-12-09 06:54 ./patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 39378992 2023-12-09 06:54 ./patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 163 2023-12-09 06:54 ./patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txz.asc -rw-r--r-- 1 root root 442 2023-11-08 19:07 ./patches/packages/sudo-1.9.15p1-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 1311928 2023-11-08 19:07 ./patches/packages/sudo-1.9.15p1-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-11-08 19:07 ./patches/packages/sudo-1.9.15p1-x86_64-1_slack15.0.txz.asc @@ -1103,7 +1103,7 @@ drwxr-xr-x 2 root root 4096 2023-06-23 18:50 ./patches/packages/old-linux- -rw-r--r-- 1 root root 463 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 459652 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2023-04-05 18:16 ./patches/packages/zstd-1.5.5-x86_64-1_slack15.0.txz.asc -drwxr-xr-x 97 root root 4096 2023-12-06 20:26 ./patches/source +drwxr-xr-x 97 root root 4096 2023-12-10 01:10 ./patches/source drwxr-xr-x 2 root root 4096 2023-09-26 19:22 ./patches/source/Cython -rw-r--r-- 1 root root 1623580 2023-07-04 19:24 ./patches/source/Cython/Cython-0.29.36.tar.lz -rwxr-xr-x 1 root root 3041 2023-09-26 19:23 ./patches/source/Cython/Cython.SlackBuild @@ -1501,12 +1501,11 @@ drwxr-xr-x 2 root root 4096 2023-09-14 17:24 ./patches/source/libwebp -rwxr-xr-x 1 root root 5226 2023-09-14 17:25 ./patches/source/libwebp/libwebp.SlackBuild -rw-r--r-- 1 root root 49 2022-01-21 19:13 ./patches/source/libwebp/libwebp.url -rw-r--r-- 1 root root 985 2018-02-27 06:12 ./patches/source/libwebp/slack-desc -drwxr-xr-x 2 root root 4096 2022-05-02 17:57 ./patches/source/libxml2 --rw-r--r-- 1 root root 3022896 2022-05-02 17:59 ./patches/source/libxml2/libxml2-2.9.14.tar.xz --rwxr-xr-x 1 root root 4926 2022-03-01 01:04 ./patches/source/libxml2/libxml2.SlackBuild --rw-r--r-- 1 root root 495 2013-04-19 07:57 ./patches/source/libxml2/libxml2.do-not-check-crc.diff.gz --rw-r--r-- 1 root root 620 2021-07-22 15:29 ./patches/source/libxml2/libxml2.python3-unicode-errors.patch.gz --rw-r--r-- 1 root root 70 2022-02-28 18:56 ./patches/source/libxml2/libxml2.url +drwxr-xr-x 2 root root 4096 2023-12-09 19:10 ./patches/source/libxml2 +-rw-r--r-- 1 root root 1254 2023-12-06 00:00 ./patches/source/libxml2/libxml2-2.12.0-python3-unicode-errors.patch +-rw-r--r-- 1 root root 2642336 2023-12-05 19:59 ./patches/source/libxml2/libxml2-2.12.2.tar.xz +-rwxr-xr-x 1 root root 5073 2023-12-10 00:55 ./patches/source/libxml2/libxml2.SlackBuild +-rw-r--r-- 1 root root 114 2022-08-27 18:08 ./patches/source/libxml2/libxml2.url -rw-r--r-- 1 root root 973 2018-02-27 06:49 ./patches/source/libxml2/slack-desc drwxr-xr-x 2 root root 4096 2022-03-01 02:05 ./patches/source/libxslt -rw-r--r-- 1 root root 1568264 2022-02-16 16:27 ./patches/source/libxslt/libxslt-1.1.35.tar.xz @@ -1901,19 +1900,20 @@ drwxr-xr-x 2 root root 4096 2022-12-20 20:09 ./patches/source/sdl -rw-r--r-- 1 root root 407 2013-01-27 19:16 ./patches/source/sdl/sdl-1.2.14-fix-mouse-clicking.patch.gz -rwxr-xr-x 1 root root 9039 2022-12-20 20:17 ./patches/source/sdl/sdl.SlackBuild -rw-r--r-- 1 root root 931 2018-02-27 06:12 ./patches/source/sdl/slack-desc -drwxr-xr-x 3 root root 4096 2023-09-20 19:26 ./patches/source/seamonkey +drwxr-xr-x 3 root root 4096 2023-12-09 06:10 ./patches/source/seamonkey drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./patches/source/seamonkey/autoconf -rw-r--r-- 1 root root 5869 2016-07-03 18:04 ./patches/source/seamonkey/autoconf/autoconf-2.13-consolidated_fixes-1.patch.gz -rw-r--r-- 1 root root 300116 1999-01-15 21:03 ./patches/source/seamonkey/autoconf/autoconf-2.13.tar.xz -rwxr-xr-x 1 root root 2632 2016-07-03 18:50 ./patches/source/seamonkey/autoconf/autoconf.build -rw-r--r-- 1 root root 248 2019-09-08 19:23 ./patches/source/seamonkey/doinst.sh.gz -rw-r--r-- 1 root root 238 2023-07-31 20:31 ./patches/source/seamonkey/double_t.x86.diff.gz --rw-r--r-- 1 root root 266075292 2023-09-20 07:06 ./patches/source/seamonkey/seamonkey-2.53.17.1.source.tar.xz +-rw-r--r-- 1 root root 252379244 2023-12-08 00:23 ./patches/source/seamonkey/seamonkey-2.53.18.source.tar.xz -rw-r--r-- 1 root root 12796 2006-02-09 03:17 ./patches/source/seamonkey/seamonkey-icon.png -rw-r--r-- 1 root root 185 2006-02-09 03:40 ./patches/source/seamonkey/seamonkey-mail-icon.png -rw-r--r-- 1 root root 211 2021-07-13 20:11 ./patches/source/seamonkey/seamonkey-mail.desktop --rwxr-xr-x 1 root root 9174 2023-09-20 19:25 ./patches/source/seamonkey/seamonkey.SlackBuild +-rwxr-xr-x 1 root root 9247 2023-12-09 06:11 ./patches/source/seamonkey/seamonkey.SlackBuild -rw-r--r-- 1 root root 319 2021-07-13 20:11 ./patches/source/seamonkey/seamonkey.desktop +-rw-r--r-- 1 root root 296 2023-09-21 18:05 ./patches/source/seamonkey/skip.check_glibc.diff.gz -rw-r--r-- 1 root root 849 2020-03-01 04:26 ./patches/source/seamonkey/slack-desc -rw-r--r-- 1 root root 341 2017-07-21 16:21 ./patches/source/seamonkey/sm.ui.scrollToClick.diff.gz drwxr-xr-x 2 root root 4096 2023-11-08 18:41 ./patches/source/sudo diff --git a/patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txt b/patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txt new file mode 100644 index 000000000..2bea28102 --- /dev/null +++ b/patches/packages/libxml2-2.12.2-x86_64-1_slack15.0.txt @@ -0,0 +1,11 @@ +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: diff --git a/patches/packages/libxml2-2.9.14-x86_64-1_slack15.0.txt b/patches/packages/libxml2-2.9.14-x86_64-1_slack15.0.txt deleted file mode 100644 index 2bea28102..000000000 --- a/patches/packages/libxml2-2.9.14-x86_64-1_slack15.0.txt +++ /dev/null @@ -1,11 +0,0 @@ -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: diff --git a/patches/packages/seamonkey-2.53.17.1-x86_64-1_slack15.0.txt b/patches/packages/seamonkey-2.53.17.1-x86_64-1_slack15.0.txt deleted file mode 100644 index dad8e1f1b..000000000 --- a/patches/packages/seamonkey-2.53.17.1-x86_64-1_slack15.0.txt +++ /dev/null @@ -1,11 +0,0 @@ -seamonkey: seamonkey (an open-source web browser suite) -seamonkey: -seamonkey: The SeaMonkey browser suite. SeaMonkey features a state-of-the-art -seamonkey: web browser and powerful email client, as well as a WYSIWYG web page -seamonkey: composer and a feature-rich IRC chat client. -seamonkey: -seamonkey: Homepage: https://www.seamonkey-project.org/ -seamonkey: -seamonkey: -seamonkey: -seamonkey: diff --git a/patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txt b/patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txt new file mode 100644 index 000000000..dad8e1f1b --- /dev/null +++ b/patches/packages/seamonkey-2.53.18-x86_64-1_slack15.0.txt @@ -0,0 +1,11 @@ +seamonkey: seamonkey (an open-source web browser suite) +seamonkey: +seamonkey: The SeaMonkey browser suite. SeaMonkey features a state-of-the-art +seamonkey: web browser and powerful email client, as well as a WYSIWYG web page +seamonkey: composer and a feature-rich IRC chat client. +seamonkey: +seamonkey: Homepage: https://www.seamonkey-project.org/ +seamonkey: +seamonkey: +seamonkey: +seamonkey: diff --git a/patches/source/libxml2/libxml2-2.12.0-python3-unicode-errors.patch b/patches/source/libxml2/libxml2-2.12.0-python3-unicode-errors.patch new file mode 100644 index 000000000..b07e4049f --- /dev/null +++ b/patches/source/libxml2/libxml2-2.12.0-python3-unicode-errors.patch @@ -0,0 +1,34 @@ +diff --git a/python/libxml.c b/python/libxml.c +index bf048006..5f42e5b7 100644 +--- a/python/libxml.c ++++ b/python/libxml.c +@@ -1505,6 +1505,7 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg, + PyObject *message; + PyObject *result; + char str[1000]; ++ unsigned char *ptr = (unsigned char *)str; + + if (libxml_xmlPythonErrorFuncHandler == NULL) { + va_start(ap, msg); +@@ -1516,12 +1517,20 @@ libxml_xmlErrorFuncHandler(ATTRIBUTE_UNUSED void *ctx, const char *msg, + 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 = PyObject_CallObject(libxml_xmlPythonErrorFuncHandler, list); ++ /* Forget any errors caused in the error handler. */ ++ PyErr_Clear(); + Py_XDECREF(list); + Py_XDECREF(result); + } diff --git a/patches/source/libxml2/libxml2.SlackBuild b/patches/source/libxml2/libxml2.SlackBuild index a9c441ac3..1dd393067 100755 --- a/patches/source/libxml2/libxml2.SlackBuild +++ b/patches/source/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 @@ -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,39 +86,57 @@ 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 -python3 -m compileall "${PKG}$PYTHON3LIB" -python3 -O -m compileall "${PKG}$PYTHON3LIB" +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=/usr/bin/python \ + --with-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" +python3 -m compileall "${PKG}$PYTHON3LIB" +python3 -O -m compileall "${PKG}$PYTHON3LIB" # 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/patches/source/libxml2/libxml2.do-not-check-crc.diff b/patches/source/libxml2/libxml2.do-not-check-crc.diff deleted file mode 100644 index 3e6507764..000000000 --- a/patches/source/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/patches/source/libxml2/libxml2.python3-unicode-errors.patch b/patches/source/libxml2/libxml2.python3-unicode-errors.patch deleted file mode 100644 index e87dcdedf..000000000 --- a/patches/source/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/patches/source/libxml2/libxml2.url b/patches/source/libxml2/libxml2.url index 937f078cf..47808cb85 100644 --- a/patches/source/libxml2/libxml2.url +++ b/patches/source/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/patches/source/seamonkey/seamonkey.SlackBuild b/patches/source/seamonkey/seamonkey.SlackBuild index b2729b7ef..e9aeb81a1 100755 --- a/patches/source/seamonkey/seamonkey.SlackBuild +++ b/patches/source/seamonkey/seamonkey.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2020, 2021, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -122,7 +122,8 @@ rm -rf seamonkey-${TARBALLVER} rm -rf seamonkey-unpack mkdir seamonkey-unpack cd seamonkey-unpack -tar xvf $CWD/seamonkey-${TARBALLVER}.source.tar.?z* || exit 1 +echo "Extracting $CWD/seamonkey-${TARBALLVER}.source.tar.?z..." +tar xf $CWD/seamonkey-${TARBALLVER}.source.tar.?z || exit 1 mv * .. cd .. rm -rf seamonkey-unpack @@ -136,6 +137,10 @@ if [ "$ARCH" = "i686" -a "$CC" = "gcc" ]; then zcat $CWD/double_t.x86.diff.gz | patch -p1 --verbose || exit 1 fi +# Getting a strange failure on only 32-bit Slackware 15.0. +# Workaround kludge: +zcat $CWD/skip.check_glibc.diff.gz | patch -p1 --verbose || exit 1 + # Make sure the perms/ownerships are sane: chown -R root:root . find . \ @@ -148,7 +153,6 @@ find . \ OPTIONS="\ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-cpp-rtti \ --enable-default-toolkit=cairo-gtk3 \ --enable-startup-notification \ --enable-alsa \ @@ -156,20 +160,15 @@ OPTIONS="\ --enable-linker=$LINKER \ --disable-strip \ --disable-install-strip \ - --disable-tests \ --disable-crashreporter \ - --disable-rust-simd \ --enable-accessibility \ $GOOGLE_API_KEY \ --disable-updater \ - --enable-chrome-format=omni \ --disable-necko-wifi \ --enable-js-shell \ $ELFHACK \ --enable-release \ --enable-calendar \ - --with-system-nss \ - --with-system-nspr \ --with-system-zlib \ --with-unsigned-addon-scopes=app,system \ --enable-application=comm/suite \ diff --git a/patches/source/seamonkey/skip.check_glibc.diff b/patches/source/seamonkey/skip.check_glibc.diff new file mode 100644 index 000000000..5e59b20ad --- /dev/null +++ b/patches/source/seamonkey/skip.check_glibc.diff @@ -0,0 +1,11 @@ +--- ./python/mozbuild/mozbuild/action/check_binary.py.orig 2023-06-10 05:41:20.000000000 -0500 ++++ ./python/mozbuild/mozbuild/action/check_binary.py 2023-09-21 13:05:35.011027671 -0500 +@@ -326,7 +326,7 @@ + checks = [] + checks.append(check_stdcxx) + checks.append(check_libgcc) +- checks.append(check_glibc) ++ # checks.append(check_glibc) + + # Disabled for local builds because of readelf performance: See bug 1472496 + if not buildconfig.substs.get('DEVELOPER_OPTIONS'): diff --git a/recompress.sh b/recompress.sh index 5458ddf24..8e4aef9bc 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1190,8 +1190,6 @@ gzip ./patches/source/mozilla-thunderbird/gkrust.a.no.networking.check.diff gzip ./patches/source/mariadb/rc.mysqld gzip ./patches/source/mariadb/doinst.sh gzip ./patches/source/boost/0001-b2-fix-install.patch -gzip ./patches/source/libxml2/libxml2.python3-unicode-errors.patch -gzip ./patches/source/libxml2/libxml2.do-not-check-crc.diff gzip ./patches/source/python3/python.sysconfig.py.x86_64.diff gzip ./patches/source/python3/python3.no-static-library.diff gzip ./patches/source/python3/python3.readline.set_pre_input_hook.diff @@ -1220,6 +1218,7 @@ gzip ./patches/source/xorg-server-xwayland/CVE-2023-5367.patch gzip ./patches/source/seamonkey/autoconf/autoconf-2.13-consolidated_fixes-1.patch gzip ./patches/source/seamonkey/doinst.sh gzip ./patches/source/seamonkey/double_t.x86.diff +gzip ./patches/source/seamonkey/skip.check_glibc.diff gzip ./patches/source/seamonkey/sm.ui.scrollToClick.diff gzip ./patches/source/vim/ctags.use-conventional-unused-marker.patch gzip ./patches/source/vim/vim.vimrc.diff -- cgit v1.2.3-80-g2a13