From a5dc0f82be04d16d330f1343600a16ee1f2a44cc Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 20 Dec 2022 20:40:18 +0000 Subject: Tue Dec 20 20:40:18 UTC 2022 patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txz: Upgraded. Fix another integer overflow in the CRL's signature parser. (* Security fix *) patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txz: Rebuilt. This update fixes a heap overflow problem in video/SDL_pixels.c in SDL. By crafting a malicious .BMP file, an attacker can cause the application using this library to crash, denial of service, or code execution. Thanks to marav for the heads-up. For more information, see: https://www.cve.org/CVERecord?id=CVE-2021-33657 (* Security fix *) --- ChangeLog.rss | 25 +- ChangeLog.txt | 13 + FILELIST.TXT | 166 ++++++----- .../packages/libksba-1.6.2-x86_64-1_slack15.0.txt | 11 - .../packages/libksba-1.6.3-x86_64-1_slack15.0.txt | 11 + .../packages/sdl-1.2.15-x86_64-13_slack15.0.txt | 11 + patches/source/sdl/CVE-2021-33657.patch | 35 +++ patches/source/sdl/SDL_mixer.usrlocal.diff | 11 + patches/source/sdl/SDL_ttf.shaded.text.diff | 11 + patches/source/sdl/libsdl-1.2.15-resizing.patch | 63 +++++ .../source/sdl/sdl-1.2.14-fix-mouse-clicking.patch | 23 ++ patches/source/sdl/sdl.SlackBuild | 304 +++++++++++++++++++++ patches/source/sdl/slack-desc | 19 ++ recompress.sh | 5 + 14 files changed, 621 insertions(+), 87 deletions(-) delete mode 100644 patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txt create mode 100644 patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txt create mode 100644 patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txt create mode 100644 patches/source/sdl/CVE-2021-33657.patch create mode 100644 patches/source/sdl/SDL_mixer.usrlocal.diff create mode 100644 patches/source/sdl/SDL_ttf.shaded.text.diff create mode 100644 patches/source/sdl/libsdl-1.2.15-resizing.patch create mode 100644 patches/source/sdl/sdl-1.2.14-fix-mouse-clicking.patch create mode 100755 patches/source/sdl/sdl.SlackBuild create mode 100644 patches/source/sdl/slack-desc diff --git a/ChangeLog.rss b/ChangeLog.rss index 04ea7b554..a1d7b712b 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,30 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Mon, 19 Dec 2022 21:18:22 GMT - Tue, 20 Dec 2022 12:30:16 GMT + Tue, 20 Dec 2022 20:40:18 GMT + Wed, 21 Dec 2022 12:30:19 GMT maintain_current_git.sh v 1.17 + + Tue, 20 Dec 2022 20:40:18 GMT + Tue, 20 Dec 2022 20:40:18 GMT + https://git.slackware.nl/current/tag/?h=20221220204018 + 20221220204018 + + +patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txz: Upgraded. + Fix another integer overflow in the CRL's signature parser. + (* Security fix *) +patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txz: Rebuilt. + This update fixes a heap overflow problem in video/SDL_pixels.c in SDL. + By crafting a malicious .BMP file, an attacker can cause the application + using this library to crash, denial of service, or code execution. + Thanks to marav for the heads-up. + For more information, see: + https://www.cve.org/CVERecord?id=CVE-2021-33657 + (* Security fix *) + ]]> + + Mon, 19 Dec 2022 21:18:22 GMT Mon, 19 Dec 2022 21:18:22 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 9782e5949..80f21b549 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,16 @@ +Tue Dec 20 20:40:18 UTC 2022 +patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txz: Upgraded. + Fix another integer overflow in the CRL's signature parser. + (* Security fix *) +patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txz: Rebuilt. + This update fixes a heap overflow problem in video/SDL_pixels.c in SDL. + By crafting a malicious .BMP file, an attacker can cause the application + using this library to crash, denial of service, or code execution. + Thanks to marav for the heads-up. + For more information, see: + https://www.cve.org/CVERecord?id=CVE-2021-33657 + (* Security fix *) ++--------------------------+ Mon Dec 19 21:18:22 UTC 2022 patches/packages/xorg-server-1.20.14-x86_64-6_slack15.0.txz: Rebuilt. This release fixes an invalid event type mask in XTestSwapFakeInput which diff --git a/FILELIST.TXT b/FILELIST.TXT index 31d82c81b..0aa50b433 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Dec 19 21:21:13 UTC 2022 +Tue Dec 20 20:43:36 UTC 2022 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 2022-12-19 21:18 . +drwxr-xr-x 12 root root 4096 2022-12-20 20:40 . -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 1163940 2022-12-18 20:32 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-12-18 20:32 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1164163 2022-12-19 21:21 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-12-19 21:21 ./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 1969166 2022-12-19 21:18 ./ChangeLog.txt +-rw-r--r-- 1 root root 1969792 2022-12-20 20:40 ./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 1520358 2022-12-18 20:32 ./FILELIST.TXT +-rw-r--r-- 1 root root 1520615 2022-12-19 21:21 ./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 2022-12-19 21:21 ./patches --rw-r--r-- 1 root root 58934 2022-12-19 21:21 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-12-19 21:21 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 79475 2022-12-19 21:21 ./patches/FILE_LIST --rw-r--r-- 1 root root 11884924 2022-12-19 21:21 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 42425 2022-12-19 21:21 ./patches/PACKAGES.TXT -drwxr-xr-x 3 root root 20480 2022-12-19 21:21 ./patches/packages +drwxr-xr-x 4 root root 4096 2022-12-20 20:43 ./patches +-rw-r--r-- 1 root root 60168 2022-12-20 20:43 ./patches/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-12-20 20:43 ./patches/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 81062 2022-12-20 20:43 ./patches/FILE_LIST +-rw-r--r-- 1 root root 11904330 2022-12-20 20:43 ./patches/MANIFEST.bz2 +-rw-r--r-- 1 root root 43081 2022-12-20 20:43 ./patches/PACKAGES.TXT +drwxr-xr-x 3 root root 20480 2022-12-20 20:43 ./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 @@ -823,9 +823,9 @@ drwxr-xr-x 3 root root 20480 2022-12-19 21:21 ./patches/packages -rw-r--r-- 1 root root 402 2022-12-18 19:33 ./patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txt -rw-r--r-- 1 root root 511044 2022-12-18 19:33 ./patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txz -rw-r--r-- 1 root root 163 2022-12-18 19:33 ./patches/packages/libarchive-3.6.2-x86_64-2_slack15.0.txz.asc --rw-r--r-- 1 root root 332 2022-10-08 18:41 ./patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txt --rw-r--r-- 1 root root 169288 2022-10-08 18:41 ./patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txz --rw-r--r-- 1 root root 163 2022-10-08 18:41 ./patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txz.asc +-rw-r--r-- 1 root root 332 2022-12-20 19:28 ./patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txt +-rw-r--r-- 1 root root 169200 2022-12-20 19:28 ./patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txz +-rw-r--r-- 1 root root 163 2022-12-20 19:28 ./patches/packages/libksba-1.6.3-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 @@ -899,6 +899,9 @@ drwxr-xr-x 2 root root 4096 2022-11-29 21:00 ./patches/packages/linux-5.15 -rw-r--r-- 1 root root 507 2022-12-17 19:58 ./patches/packages/samba-4.15.13-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 13030204 2022-12-17 19:58 ./patches/packages/samba-4.15.13-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-12-17 19:58 ./patches/packages/samba-4.15.13-x86_64-1_slack15.0.txz.asc +-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 2022-09-29 20:19 ./patches/packages/seamonkey-2.53.14-x86_64-1_slack15.0.txt -rw-r--r-- 1 root root 38098032 2022-09-29 20:19 ./patches/packages/seamonkey-2.53.14-x86_64-1_slack15.0.txz -rw-r--r-- 1 root root 163 2022-09-29 20:19 ./patches/packages/seamonkey-2.53.14-x86_64-1_slack15.0.txz.asc @@ -947,7 +950,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 59 root root 4096 2022-12-19 20:09 ./patches/source +drwxr-xr-x 60 root root 4096 2022-12-20 20:34 ./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 @@ -1184,8 +1187,8 @@ drwxr-xr-x 2 root root 4096 2022-12-09 18:14 ./patches/source/libarchive -rwxr-xr-x 1 root root 3786 2022-12-18 19:32 ./patches/source/libarchive/libarchive.SlackBuild -rw-r--r-- 1 root root 41 2019-06-17 02:47 ./patches/source/libarchive/libarchive.url -rw-r--r-- 1 root root 856 2018-02-27 06:12 ./patches/source/libarchive/slack-desc -drwxr-xr-x 2 root root 4096 2022-10-08 18:27 ./patches/source/libksba --rw-r--r-- 1 root root 568950 2022-10-07 08:13 ./patches/source/libksba/libksba-1.6.2.tar.lz +drwxr-xr-x 2 root root 4096 2022-12-20 19:28 ./patches/source/libksba +-rw-r--r-- 1 root root 569208 2022-12-20 06:43 ./patches/source/libksba/libksba-1.6.3.tar.lz -rwxr-xr-x 1 root root 3977 2022-10-08 18:40 ./patches/source/libksba/libksba.SlackBuild -rw-r--r-- 1 root root 36 2020-05-24 18:04 ./patches/source/libksba/libksba.url -rw-r--r-- 1 root root 787 2018-02-27 06:13 ./patches/source/libksba/slack-desc @@ -1429,6 +1432,21 @@ drwxr-xr-x 2 root root 4096 2022-12-17 19:52 ./patches/source/samba -rw-r--r-- 1 root root 7921 2018-04-29 17:31 ./patches/source/samba/smb.conf.default -rw-r--r-- 1 root root 7933 2018-01-14 20:41 ./patches/source/samba/smb.conf.default.orig -rw-r--r-- 1 root root 536 2017-03-23 19:18 ./patches/source/samba/smb.conf.diff.gz +drwxr-xr-x 2 root root 4096 2022-12-20 20:09 ./patches/source/sdl +-rw-r--r-- 1 root root 661 2022-12-20 20:09 ./patches/source/sdl/CVE-2021-33657.patch.gz +-rw-r--r-- 1 root root 2521972 2012-01-21 02:15 ./patches/source/sdl/SDL-1.2.15.tar.xz +-rw-r--r-- 1 root root 1250244 2012-01-21 01:58 ./patches/source/sdl/SDL_image-1.2.12.tar.xz +-rw-r--r-- 1 root root 2714656 2012-01-15 22:19 ./patches/source/sdl/SDL_mixer-1.2.12.tar.xz +-rw-r--r-- 1 root root 212 2010-02-14 23:16 ./patches/source/sdl/SDL_mixer.usrlocal.diff.gz +-rw-r--r-- 1 root root 237384 2012-01-15 22:37 ./patches/source/sdl/SDL_net-1.2.8.tar.xz +-rw-r--r-- 1 root root 914840 2008-04-20 20:38 ./patches/source/sdl/SDL_sound-1.0.3.tar.xz +-rw-r--r-- 1 root root 1946336 2012-01-15 22:52 ./patches/source/sdl/SDL_ttf-2.0.11.tar.xz +-rw-r--r-- 1 root root 280 2016-06-08 17:00 ./patches/source/sdl/SDL_ttf.shaded.text.diff.gz +-rw-r--r-- 1 root root 731528 2016-08-31 20:51 ./patches/source/sdl/libmikmod-3.1.20.tar.xz +-rw-r--r-- 1 root root 1018 2013-01-27 19:16 ./patches/source/sdl/libsdl-1.2.15-resizing.patch.gz +-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 2022-09-29 18:56 ./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 @@ -2720,22 +2738,22 @@ drwxr-xr-x 2 root root 69632 2022-02-01 08:29 ./slackware64/kde -rw-r--r-- 1 root root 856336 2022-01-06 22:07 ./slackware64/kde/kcachegrind-21.12.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-06 22:07 ./slackware64/kde/kcachegrind-21.12.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 251 2022-01-06 22:03 ./slackware64/kde/kcalc-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 557248 2022-01-06 22:03 ./slackware64/kde/kcalc-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:03 ./slackware64/kde/kcalc-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 369 2022-01-08 22:28 ./slackware64/kde/kcalendarcore-5.90.0-x86_64-1.txt --rw-r--r-- 1 root root 310612 2022-01-08 22:28 ./slackware64/kde/kcalendarcore-5.90.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-08 22:28 ./slackware64/kde/kcalendarcore-5.90.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 284 2022-01-06 21:37 ./slackware64/kde/kcalutils-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 282960 2022-01-06 21:37 ./slackware64/kde/kcalutils-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 21:37 ./slackware64/kde/kcalutils-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 336 2022-01-06 22:03 ./slackware64/kde/kcharselect-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 409316 2022-01-06 22:03 ./slackware64/kde/kcharselect-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:03 ./slackware64/kde/kcharselect-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 430 2021-02-13 19:19 ./slackware64/kde/kcm-fcitx-0.5.6-x86_64-4.txt --rw-r--r-- 1 root root 132444 2021-02-13 19:19 ./slackware64/kde/kcm-fcitx-0.5.6-x86_64-4.txz --rw-r--r-- 1 root root 163 2021-02-13 19:19 ./slackware64/kde/kcm-fcitx-0.5.6-x86_64-4.txz.asc --rw-r--r-- 1 root root 269 2022-01-08 22:41 ./slackware64/kde/kcmutils-5.90.0-x86_64-1.txt --rw-r--r-- 1 root root 217272 2022-01-08 22:41 ./slackware64/kde/kcmutils-5.90.0-x86_64-1.txz +-rw-r--r-- 1 root root 557248 2022-01-06 22:03 ./slackware64/kde/kcalc-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:03 ./slackware64/kde/kcalc-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 369 2022-01-08 22:28 ./slackware64/kde/kcalendarcore-5.90.0-x86_64-1.txt +-rw-r--r-- 1 root root 310612 2022-01-08 22:28 ./slackware64/kde/kcalendarcore-5.90.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-08 22:28 ./slackware64/kde/kcalendarcore-5.90.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 284 2022-01-06 21:37 ./slackware64/kde/kcalutils-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 282960 2022-01-06 21:37 ./slackware64/kde/kcalutils-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 21:37 ./slackware64/kde/kcalutils-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 336 2022-01-06 22:03 ./slackware64/kde/kcharselect-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 409316 2022-01-06 22:03 ./slackware64/kde/kcharselect-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:03 ./slackware64/kde/kcharselect-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 430 2021-02-13 19:19 ./slackware64/kde/kcm-fcitx-0.5.6-x86_64-4.txt +-rw-r--r-- 1 root root 132444 2021-02-13 19:19 ./slackware64/kde/kcm-fcitx-0.5.6-x86_64-4.txz +-rw-r--r-- 1 root root 163 2021-02-13 19:19 ./slackware64/kde/kcm-fcitx-0.5.6-x86_64-4.txz.asc +-rw-r--r-- 1 root root 269 2022-01-08 22:41 ./slackware64/kde/kcmutils-5.90.0-x86_64-1.txt +-rw-r--r-- 1 root root 217272 2022-01-08 22:41 ./slackware64/kde/kcmutils-5.90.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-08 22:41 ./slackware64/kde/kcmutils-5.90.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 441 2022-01-08 22:25 ./slackware64/kde/kcodecs-5.90.0-x86_64-1.txt -rw-r--r-- 1 root root 175464 2022-01-08 22:25 ./slackware64/kde/kcodecs-5.90.0-x86_64-1.txz @@ -5449,23 +5467,23 @@ drwxr-xr-x 2 root root 65536 2022-02-01 04:47 ./slackware64/x -rw-r--r-- 1 root root 163 2021-06-27 18:06 ./slackware64/x/glu-9.0.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 508 2021-02-13 12:47 ./slackware64/x/hack-fonts-ttf-3.003-noarch-3.txt -rw-r--r-- 1 root root 375048 2021-02-13 12:47 ./slackware64/x/hack-fonts-ttf-3.003-noarch-3.txz --rw-r--r-- 1 root root 163 2021-02-13 12:47 ./slackware64/x/hack-fonts-ttf-3.003-noarch-3.txz.asc --rw-r--r-- 1 root root 287 2021-11-18 18:00 ./slackware64/x/ibus-1.5.25-x86_64-5.txt --rw-r--r-- 1 root root 7728816 2021-11-18 18:00 ./slackware64/x/ibus-1.5.25-x86_64-5.txz --rw-r--r-- 1 root root 163 2021-11-18 18:00 ./slackware64/x/ibus-1.5.25-x86_64-5.txz.asc --rw-r--r-- 1 root root 253 2021-12-27 19:51 ./slackware64/x/ibus-anthy-1.5.14-x86_64-1.txt --rw-r--r-- 1 root root 807520 2021-12-27 19:51 ./slackware64/x/ibus-anthy-1.5.14-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-12-27 19:51 ./slackware64/x/ibus-anthy-1.5.14-x86_64-1.txz.asc --rw-r--r-- 1 root root 283 2021-11-03 01:10 ./slackware64/x/ibus-hangul-1.5.4-x86_64-5.txt --rw-r--r-- 1 root root 55976 2021-11-03 01:10 ./slackware64/x/ibus-hangul-1.5.4-x86_64-5.txz --rw-r--r-- 1 root root 163 2021-11-03 01:10 ./slackware64/x/ibus-hangul-1.5.4-x86_64-5.txz.asc --rw-r--r-- 1 root root 251 2021-02-13 12:48 ./slackware64/x/ibus-kkc-1.5.22-x86_64-3.txt --rw-r--r-- 1 root root 68676 2021-02-13 12:48 ./slackware64/x/ibus-kkc-1.5.22-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 12:48 ./slackware64/x/ibus-kkc-1.5.22-x86_64-3.txz.asc --rw-r--r-- 1 root root 393 2021-11-03 01:10 ./slackware64/x/ibus-libpinyin-1.12.1-x86_64-3.txt --rw-r--r-- 1 root root 734896 2021-11-03 01:10 ./slackware64/x/ibus-libpinyin-1.12.1-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-11-03 01:10 ./slackware64/x/ibus-libpinyin-1.12.1-x86_64-3.txz.asc --rw-r--r-- 1 root root 220 2022-01-21 02:42 ./slackware64/x/ibus-m17n-1.4.9-x86_64-1.txt +-rw-r--r-- 1 root root 163 2021-02-13 12:47 ./slackware64/x/hack-fonts-ttf-3.003-noarch-3.txz.asc +-rw-r--r-- 1 root root 287 2021-11-18 18:00 ./slackware64/x/ibus-1.5.25-x86_64-5.txt +-rw-r--r-- 1 root root 7728816 2021-11-18 18:00 ./slackware64/x/ibus-1.5.25-x86_64-5.txz +-rw-r--r-- 1 root root 163 2021-11-18 18:00 ./slackware64/x/ibus-1.5.25-x86_64-5.txz.asc +-rw-r--r-- 1 root root 253 2021-12-27 19:51 ./slackware64/x/ibus-anthy-1.5.14-x86_64-1.txt +-rw-r--r-- 1 root root 807520 2021-12-27 19:51 ./slackware64/x/ibus-anthy-1.5.14-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-27 19:51 ./slackware64/x/ibus-anthy-1.5.14-x86_64-1.txz.asc +-rw-r--r-- 1 root root 283 2021-11-03 01:10 ./slackware64/x/ibus-hangul-1.5.4-x86_64-5.txt +-rw-r--r-- 1 root root 55976 2021-11-03 01:10 ./slackware64/x/ibus-hangul-1.5.4-x86_64-5.txz +-rw-r--r-- 1 root root 163 2021-11-03 01:10 ./slackware64/x/ibus-hangul-1.5.4-x86_64-5.txz.asc +-rw-r--r-- 1 root root 251 2021-02-13 12:48 ./slackware64/x/ibus-kkc-1.5.22-x86_64-3.txt +-rw-r--r-- 1 root root 68676 2021-02-13 12:48 ./slackware64/x/ibus-kkc-1.5.22-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 12:48 ./slackware64/x/ibus-kkc-1.5.22-x86_64-3.txz.asc +-rw-r--r-- 1 root root 393 2021-11-03 01:10 ./slackware64/x/ibus-libpinyin-1.12.1-x86_64-3.txt +-rw-r--r-- 1 root root 734896 2021-11-03 01:10 ./slackware64/x/ibus-libpinyin-1.12.1-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-11-03 01:10 ./slackware64/x/ibus-libpinyin-1.12.1-x86_64-3.txz.asc +-rw-r--r-- 1 root root 220 2022-01-21 02:42 ./slackware64/x/ibus-m17n-1.4.9-x86_64-1.txt -rw-r--r-- 1 root root 41464 2022-01-21 02:42 ./slackware64/x/ibus-m17n-1.4.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-21 02:42 ./slackware64/x/ibus-m17n-1.4.9-x86_64-1.txz.asc -rw-r--r-- 1 root root 391 2021-11-03 01:11 ./slackware64/x/ibus-table-1.14.1-x86_64-3.txt @@ -15072,28 +15090,28 @@ drwxr-xr-x 2 root root 12288 2020-05-18 17:50 ./source/x/x11/slack-desc -rw-r--r-- 1 root root 664 2018-02-26 23:04 ./source/x/x11/slack-desc/xrandr -rw-r--r-- 1 root root 736 2012-04-08 04:46 ./source/x/x11/slack-desc/xrdb -rw-r--r-- 1 root root 792 2012-04-08 04:46 ./source/x/x11/slack-desc/xrefresh --rw-r--r-- 1 root root 773 2012-04-08 04:46 ./source/x/x11/slack-desc/xscope --rw-r--r-- 1 root root 681 2012-04-08 01:01 ./source/x/x11/slack-desc/xset --rw-r--r-- 1 root root 801 2012-04-08 04:47 ./source/x/x11/slack-desc/xsetroot --rw-r--r-- 1 root root 707 2012-04-08 04:47 ./source/x/x11/slack-desc/xsm --rw-r--r-- 1 root root 880 2018-02-26 23:04 ./source/x/x11/slack-desc/xstdcmap --rw-r--r-- 1 root root 848 2018-02-26 23:04 ./source/x/x11/slack-desc/xtrans --rw-r--r-- 1 root root 694 2012-04-08 04:48 ./source/x/x11/slack-desc/xvidtune --rw-r--r-- 1 root root 710 2012-04-08 03:25 ./source/x/x11/slack-desc/xvinfo --rw-r--r-- 1 root root 716 2012-04-08 02:21 ./source/x/x11/slack-desc/xwd --rw-r--r-- 1 root root 702 2012-04-08 02:21 ./source/x/x11/slack-desc/xwininfo --rw-r--r-- 1 root root 668 2012-04-07 23:42 ./source/x/x11/slack-desc/xwud -drwxr-xr-x 12 root root 4096 2022-01-25 05:57 ./source/x/x11/src -drwxr-xr-x 2 root root 4096 2021-12-08 20:10 ./source/x/x11/src/app --rw-r--r-- 1 root root 115464 2018-03-05 03:32 ./source/x/x11/src/app/appres-1.0.5.tar.xz --rw-r--r-- 1 root root 139452 2017-11-07 19:12 ./source/x/x11/src/app/bdftopcf-1.1.tar.xz --rw-r--r-- 1 root root 109956 2013-01-15 05:23 ./source/x/x11/src/app/beforelight-1.0.5.tar.xz --rw-r--r-- 1 root root 158384 2019-02-10 21:11 ./source/x/x11/src/app/bitmap-1.0.9.tar.xz --rw-r--r-- 1 root root 154268 2018-03-05 02:45 ./source/x/x11/src/app/editres-1.0.7.tar.xz --rw-r--r-- 1 root root 136776 2021-06-15 01:28 ./source/x/x11/src/app/fonttosfnt-1.2.2.tar.xz --rw-r--r-- 1 root root 116372 2014-12-31 04:49 ./source/x/x11/src/app/fslsfonts-1.0.5.tar.xz --rw-r--r-- 1 root root 117176 2014-12-31 04:58 ./source/x/x11/src/app/fstobdf-1.0.6.tar.xz --rw-r--r-- 1 root root 127368 2018-03-05 04:07 ./source/x/x11/src/app/iceauth-1.0.8.tar.xz +-rw-r--r-- 1 root root 773 2012-04-08 04:46 ./source/x/x11/slack-desc/xscope +-rw-r--r-- 1 root root 681 2012-04-08 01:01 ./source/x/x11/slack-desc/xset +-rw-r--r-- 1 root root 801 2012-04-08 04:47 ./source/x/x11/slack-desc/xsetroot +-rw-r--r-- 1 root root 707 2012-04-08 04:47 ./source/x/x11/slack-desc/xsm +-rw-r--r-- 1 root root 880 2018-02-26 23:04 ./source/x/x11/slack-desc/xstdcmap +-rw-r--r-- 1 root root 848 2018-02-26 23:04 ./source/x/x11/slack-desc/xtrans +-rw-r--r-- 1 root root 694 2012-04-08 04:48 ./source/x/x11/slack-desc/xvidtune +-rw-r--r-- 1 root root 710 2012-04-08 03:25 ./source/x/x11/slack-desc/xvinfo +-rw-r--r-- 1 root root 716 2012-04-08 02:21 ./source/x/x11/slack-desc/xwd +-rw-r--r-- 1 root root 702 2012-04-08 02:21 ./source/x/x11/slack-desc/xwininfo +-rw-r--r-- 1 root root 668 2012-04-07 23:42 ./source/x/x11/slack-desc/xwud +drwxr-xr-x 12 root root 4096 2022-01-25 05:57 ./source/x/x11/src +drwxr-xr-x 2 root root 4096 2021-12-08 20:10 ./source/x/x11/src/app +-rw-r--r-- 1 root root 115464 2018-03-05 03:32 ./source/x/x11/src/app/appres-1.0.5.tar.xz +-rw-r--r-- 1 root root 139452 2017-11-07 19:12 ./source/x/x11/src/app/bdftopcf-1.1.tar.xz +-rw-r--r-- 1 root root 109956 2013-01-15 05:23 ./source/x/x11/src/app/beforelight-1.0.5.tar.xz +-rw-r--r-- 1 root root 158384 2019-02-10 21:11 ./source/x/x11/src/app/bitmap-1.0.9.tar.xz +-rw-r--r-- 1 root root 154268 2018-03-05 02:45 ./source/x/x11/src/app/editres-1.0.7.tar.xz +-rw-r--r-- 1 root root 136776 2021-06-15 01:28 ./source/x/x11/src/app/fonttosfnt-1.2.2.tar.xz +-rw-r--r-- 1 root root 116372 2014-12-31 04:49 ./source/x/x11/src/app/fslsfonts-1.0.5.tar.xz +-rw-r--r-- 1 root root 117176 2014-12-31 04:58 ./source/x/x11/src/app/fstobdf-1.0.6.tar.xz +-rw-r--r-- 1 root root 127368 2018-03-05 04:07 ./source/x/x11/src/app/iceauth-1.0.8.tar.xz -rw-r--r-- 1 root root 126188 2018-03-10 06:29 ./source/x/x11/src/app/ico-1.0.5.tar.xz -rw-r--r-- 1 root root 1573468 2021-04-23 10:41 ./source/x/x11/src/app/igt-gpu-tools-1.26.tar.xz -rw-r--r-- 1 root root 116560 2018-03-05 03:37 ./source/x/x11/src/app/listres-1.0.4.tar.xz diff --git a/patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txt b/patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txt deleted file mode 100644 index d6bcdaec9..000000000 --- a/patches/packages/libksba-1.6.2-x86_64-1_slack15.0.txt +++ /dev/null @@ -1,11 +0,0 @@ -libksba: libksba (X.509 & CMS library for S/MIME and TLS) -libksba: -libksba: KSBA (pronounced Kasbah) is a library to make X.509 certificates as -libksba: well as the CMS easily accessible by other applications. -libksba: Both specifications are building blocks of S/MIME and TLS. -libksba: -libksba: -libksba: -libksba: -libksba: -libksba: diff --git a/patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txt b/patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txt new file mode 100644 index 000000000..d6bcdaec9 --- /dev/null +++ b/patches/packages/libksba-1.6.3-x86_64-1_slack15.0.txt @@ -0,0 +1,11 @@ +libksba: libksba (X.509 & CMS library for S/MIME and TLS) +libksba: +libksba: KSBA (pronounced Kasbah) is a library to make X.509 certificates as +libksba: well as the CMS easily accessible by other applications. +libksba: Both specifications are building blocks of S/MIME and TLS. +libksba: +libksba: +libksba: +libksba: +libksba: +libksba: diff --git a/patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txt b/patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txt new file mode 100644 index 000000000..5706c71ec --- /dev/null +++ b/patches/packages/sdl-1.2.15-x86_64-13_slack15.0.txt @@ -0,0 +1,11 @@ +sdl: sdl (Simple DirectMedia Layer library) +sdl: +sdl: This is the Simple DirectMedia Layer, a generic API that provides low +sdl: level access to audio, keyboard, mouse, joystick, 3D hardware via +sdl: OpenGL, and 2D framebuffer across multiple platforms. +sdl: +sdl: SDL links against alsa-lib, audiofile, esound, and the X11 libraries. +sdl: Make sure all of these are installed if you're planning to use SDL +sdl: (a full installation will cover all of the prerequisites). +sdl: +sdl: diff --git a/patches/source/sdl/CVE-2021-33657.patch b/patches/source/sdl/CVE-2021-33657.patch new file mode 100644 index 000000000..3ceb96a17 --- /dev/null +++ b/patches/source/sdl/CVE-2021-33657.patch @@ -0,0 +1,35 @@ +From d95c1a4bbd644baba748d341b03141e5f0481ae6 Mon Sep 17 00:00:00 2001 +From: Sam Lantinga +Date: Tue, 30 Nov 2021 12:36:46 -0800 +Subject: [PATCH] Always create a full 256-entry map in case color values are + out of range + +Fixes https://github.com/libsdl-org/SDL/issues/5042 + +Backport of CVE-2021-33657 fix from SDL2 +--- + src/video/SDL_pixels.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/video/SDL_pixels.c b/src/video/SDL_pixels.c +index 17f1a7199..d0973f217 100644 +--- a/src/video/SDL_pixels.c ++++ b/src/video/SDL_pixels.c +@@ -477,7 +477,7 @@ static Uint8 *Map1to1(SDL_Palette *src, SDL_Palette *dst, int *identical) + } + *identical = 0; + } +- map = (Uint8 *)SDL_malloc(src->ncolors); ++ map = (Uint8 *) SDL_calloc(256, sizeof(Uint8)); + if ( map == NULL ) { + SDL_OutOfMemory(); + return(NULL); +@@ -498,7 +498,7 @@ static Uint8 *Map1toN(SDL_PixelFormat *src, SDL_PixelFormat *dst) + SDL_Palette *pal = src->palette; + + bpp = ((dst->BytesPerPixel == 3) ? 4 : dst->BytesPerPixel); +- map = (Uint8 *)SDL_malloc(pal->ncolors*bpp); ++ map = (Uint8 *) SDL_calloc(256, bpp); + if ( map == NULL ) { + SDL_OutOfMemory(); + return(NULL); diff --git a/patches/source/sdl/SDL_mixer.usrlocal.diff b/patches/source/sdl/SDL_mixer.usrlocal.diff new file mode 100644 index 000000000..4630e9ea6 --- /dev/null +++ b/patches/source/sdl/SDL_mixer.usrlocal.diff @@ -0,0 +1,11 @@ +--- ./timidity/config.h.orig 2010-02-14 17:14:44.000000000 -0600 ++++ ./timidity/config.h 2010-02-14 17:15:45.000000000 -0600 +@@ -179,7 +179,7 @@ + #else + #define DEFAULT_PATH "/etc/timidity" + #define DEFAULT_PATH1 "/usr/share/timidity" +-#define DEFAULT_PATH2 "/usr/local/lib/timidity" ++#define DEFAULT_PATH2 "/usr/lib/timidity" + #endif + + /* These affect general volume */ diff --git a/patches/source/sdl/SDL_ttf.shaded.text.diff b/patches/source/sdl/SDL_ttf.shaded.text.diff new file mode 100644 index 000000000..549a60a48 --- /dev/null +++ b/patches/source/sdl/SDL_ttf.shaded.text.diff @@ -0,0 +1,11 @@ +--- ./SDL_ttf.c.orig 2012-01-14 22:44:08.000000000 -0600 ++++ ./SDL_ttf.c 2016-06-08 11:59:50.163770281 -0500 +@@ -1747,7 +1747,7 @@ + /* Copy the character from the pixmap */ + src = glyph->pixmap.buffer; + dst = (Uint8*) textbuf->pixels; +- for ( row = 0; row < glyph->bitmap.rows; ++row ) { ++ for ( row = 0; row < glyph->pixmap.rows; ++row ) { + memcpy( dst, src, glyph->pixmap.width ); + src += glyph->pixmap.pitch; + dst += textbuf->pitch; diff --git a/patches/source/sdl/libsdl-1.2.15-resizing.patch b/patches/source/sdl/libsdl-1.2.15-resizing.patch new file mode 100644 index 000000000..709881962 --- /dev/null +++ b/patches/source/sdl/libsdl-1.2.15-resizing.patch @@ -0,0 +1,63 @@ +Description: Revert change that breaks window corner resizing + http://bugzilla.libsdl.org/show_bug.cgi?id=1430 +Author: Andrew Caudwell +Last-Update: 2012-04-10 +Bug-Debian: http://bugs.debian.org/665779 + +diff -r c787fb1b5699 src/video/x11/SDL_x11events.c +--- a/src/video/x11/SDL_x11events.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events.c Mon Mar 26 12:26:52 2012 +1300 +@@ -57,12 +57,6 @@ + static SDLKey MISC_keymap[256]; + SDLKey X11_TranslateKeycode(Display *display, KeyCode kc); + +-/* +- Pending resize target for ConfigureNotify (so outdated events don't +- cause inappropriate resize events) +-*/ +-int X11_PendingConfigureNotifyWidth = -1; +-int X11_PendingConfigureNotifyHeight = -1; + + #ifdef X_HAVE_UTF8_STRING + Uint32 Utf8ToUcs4(const Uint8 *utf8) +@@ -825,16 +819,6 @@ + #ifdef DEBUG_XEVENTS + printf("ConfigureNotify! (resize: %dx%d)\n", xevent.xconfigure.width, xevent.xconfigure.height); + #endif +- if ((X11_PendingConfigureNotifyWidth != -1) && +- (X11_PendingConfigureNotifyHeight != -1)) { +- if ((xevent.xconfigure.width != X11_PendingConfigureNotifyWidth) && +- (xevent.xconfigure.height != X11_PendingConfigureNotifyHeight)) { +- /* Event is from before the resize, so ignore. */ +- break; +- } +- X11_PendingConfigureNotifyWidth = -1; +- X11_PendingConfigureNotifyHeight = -1; +- } + if ( SDL_VideoSurface ) { + if ((xevent.xconfigure.width != SDL_VideoSurface->w) || + (xevent.xconfigure.height != SDL_VideoSurface->h)) { +diff -r c787fb1b5699 src/video/x11/SDL_x11events_c.h +--- a/src/video/x11/SDL_x11events_c.h Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11events_c.h Mon Mar 26 12:26:52 2012 +1300 +@@ -27,8 +27,3 @@ + extern void X11_InitOSKeymap(_THIS); + extern void X11_PumpEvents(_THIS); + extern void X11_SetKeyboardState(Display *display, const char *key_vec); +- +-/* Variables to be exported */ +-extern int X11_PendingConfigureNotifyWidth; +-extern int X11_PendingConfigureNotifyHeight; +- +diff -r c787fb1b5699 src/video/x11/SDL_x11video.c +--- a/src/video/x11/SDL_x11video.c Mon Feb 20 23:51:08 2012 -0500 ++++ b/src/video/x11/SDL_x11video.c Mon Mar 26 12:26:52 2012 +1300 +@@ -1182,8 +1182,6 @@ + current = NULL; + goto done; + } +- X11_PendingConfigureNotifyWidth = width; +- X11_PendingConfigureNotifyHeight = height; + } else { + if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { + current = NULL; diff --git a/patches/source/sdl/sdl-1.2.14-fix-mouse-clicking.patch b/patches/source/sdl/sdl-1.2.14-fix-mouse-clicking.patch new file mode 100644 index 000000000..7d3e5acfc --- /dev/null +++ b/patches/source/sdl/sdl-1.2.14-fix-mouse-clicking.patch @@ -0,0 +1,23 @@ +--- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700 ++++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700 +@@ -423,12 +423,15 @@ + if ( xevent.xcrossing.mode == NotifyUngrab ) + printf("Mode: NotifyUngrab\n"); + #endif +- if ( this->input_grab == SDL_GRAB_OFF ) { +- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ if ( (xevent.xcrossing.mode != NotifyGrab) && ++ (xevent.xcrossing.mode != NotifyUngrab) ) { ++ if ( this->input_grab == SDL_GRAB_OFF ) { ++ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); ++ } ++ posted = SDL_PrivateMouseMotion(0, 0, ++ xevent.xcrossing.x, ++ xevent.xcrossing.y); + } +- posted = SDL_PrivateMouseMotion(0, 0, +- xevent.xcrossing.x, +- xevent.xcrossing.y); + } + break; + diff --git a/patches/source/sdl/sdl.SlackBuild b/patches/source/sdl/sdl.SlackBuild new file mode 100755 index 000000000..d8f943932 --- /dev/null +++ b/patches/source/sdl/sdl.SlackBuild @@ -0,0 +1,304 @@ +#!/bin/bash + +# Copyright 2008, 2009, 2010, 2011, 2013, 2016, 2018, 2020, 2022 Patrick J. Volkerding, Sebeka, Minnesota, 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=sdl +VERSION=${VERSION:-$(echo SDL-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +IMAGE=${IMAGE:-$(echo SDL_image-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +MIXER=${MIXER:-$(echo SDL_mixer-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +NET=${NET:-$(echo SDL_net-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +SOUND=${SOUND:-$(echo SDL_sound-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +TTF=${TTF:-$(echo SDL_ttf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} + +BUILD=${BUILD:-13_slack15.0} + +# 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 + +TMP=${TMP:-/tmp} +PKG=$TMP/package-sdl + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf sdl-$VERSION +tar xf $CWD/SDL-$VERSION.tar.?z* || exit 1 +cd SDL-$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 {} \+ + +zcat $CWD/libsdl-1.2.15-resizing.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/sdl-1.2.14-fix-mouse-clicking.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/CVE-2021-33657.patch.gz | patch -p1 --verbose || exit 1 + +# We must use --disable-x11-shared or programs linked with SDL will +# crash on machines that use the closed source nVidia drivers. + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --disable-arts \ + --disable-esd \ + --enable-shared=yes \ + --enable-static=no \ + --disable-x11-shared || exit 1 + +make $NUMJOBS || make || exit 1 + +# Spam /, for mixer/image later on: +make install || exit 1 +# Later we will need to remove .la files installed to the system by the above. + +# install to package: +make install DESTDIR=$PKG || exit 1 +mkdir -p $PKG/usr/doc/SDL-$VERSION/html +cp -a docs/index.html $PKG/usr/doc/SDL-$VERSION +cp -a docs/html/*.html $PKG/usr/doc/SDL-$VERSION/html +cp -a \ + BUGS COPYING CREDITS INSTALL README* TODO WhatsNew \ + $PKG/usr/doc/SDL-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Add SDL_image: +cd $TMP +rm -rf SDL_image-$IMAGE +tar xf $CWD/SDL_image-$IMAGE.tar.?z* || exit 1 +cd SDL_image-$IMAGE || 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 {} \+ + +# we don't want sdl to load the libs with dlopen(), gcc is smarter... +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-shared=yes \ + --enable-static=no \ + --enable-jpg-shared=no \ + --enable-png-shared=no \ + --enable-tif-shared=no || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 +mkdir -p $PKG/usr/doc/SDL_image-$IMAGE +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_image-$IMAGE + +# Add SDL_mixer: +cd $TMP +rm -rf SDL_mixer-$MIXER +tar xf $CWD/SDL_mixer-$MIXER.tar.?z* || exit 1 +cd SDL_mixer-$MIXER || exit 1 + +# Fix default library path. Don't use /usr/local, and use lib64 where needed: +sed -i "s,usr/local/lib,usr/lib${LIBDIRSUFFIX},g" timidity/config.h + +# Install patched static libmikmod: +tar xf $CWD/libmikmod-3.1.20.tar.xz +( cd libmikmod-3.1.20 + CFLAGS="$SLKCFLAGS" \ + ./configure \ + --prefix=/usr/local \ + --libdir=/usr/local/lib${LIBDIRSUFFIX} \ + --with-pic \ + --enable-shared=no \ + --enable-static=yes || exit 1 + make $NUMJOBS || make || exit 1 + make install || exit 1 +) || 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 {} \+ + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-music-mod \ + --enable-shared=yes \ + --enable-static=no || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/usr/doc/SDL_mixer-$MIXER +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_mixer-$MIXER + +# We do not want to try to pull in -lmikmod, since that was linked static: +sed -i -e "s/ -lmikmod//g" $PKG/usr/lib${LIBDIRSUFFIX}/libSDL_mixer.la + +# Add SDL_net: +cd $TMP +rm -rf SDL_net-$NET +tar xf $CWD/SDL_net-$NET.tar.?z* || exit 1 +cd SDL_net-$NET || 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 {} \+ + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-shared=yes \ + --enable-static=no || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/usr/doc/SDL_net-$NET +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_net-$NET + +# Add SDL_ttf: +cd $TMP +rm -rf SDL_ttf-$TTF +tar xf $CWD/SDL_ttf-$TTF.tar.?z* || exit 1 +cd SDL_ttf-$TTF || exit 1 + +zcat $CWD/SDL_ttf.shaded.text.diff.gz | patch -p1 --verbose || 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 {} \+ + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-shared=yes \ + --enable-static=no || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/usr/doc/SDL_ttf-$TTF +cp -a \ + CHANGES COPYING README \ + $PKG/usr/doc/SDL_ttf-$TTF + +# Add SDL_sound: +cd $TMP +rm -rf SDL_sound-$SOUND +tar xf $CWD/SDL_sound-$SOUND.tar.?z* || exit 1 +cd SDL_sound-$SOUND || 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 {} \+ + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --enable-shared=yes \ + --enable-static=no || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/usr/doc/SDL_sound-$SOUND +cp -a \ + CHANGES COPYING CREDITS README TODO \ + $PKG/usr/doc/SDL_sound-$SOUND + +# Remove .la files from the package and the system (due to make install): +pushd $PKG + for lafile in usr/lib${LIBDIRSUFFIX}/*.la ; do + rm -f ${lafile} /${lafile} + done +popd + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +gzip -9 $PKG/usr/man/man?/*.? + +cd $PKG +/sbin/makepkg -l y -c n $TMP/sdl-$VERSION-$ARCH-$BUILD.txz diff --git a/patches/source/sdl/slack-desc b/patches/source/sdl/slack-desc new file mode 100644 index 000000000..3ee1d4571 --- /dev/null +++ b/patches/source/sdl/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +sdl: sdl (Simple DirectMedia Layer library) +sdl: +sdl: This is the Simple DirectMedia Layer, a generic API that provides low +sdl: level access to audio, keyboard, mouse, joystick, 3D hardware via +sdl: OpenGL, and 2D framebuffer across multiple platforms. +sdl: +sdl: SDL links against alsa-lib, audiofile, esound, and the X11 libraries. +sdl: Make sure all of these are installed if you're planning to use SDL +sdl: (a full installation will cover all of the prerequisites). +sdl: +sdl: diff --git a/recompress.sh b/recompress.sh index c61b7f5aa..1587ed90b 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1219,6 +1219,11 @@ gzip ./patches/source/ca-certificates/fixup_update-ca-certificates.diff gzip ./patches/source/ca-certificates/doinst.sh gzip ./patches/source/ca-certificates/update-ca-certificates.c_rehash.diff gzip ./patches/source/krb5/doinst.sh +gzip ./patches/source/sdl/sdl-1.2.14-fix-mouse-clicking.patch +gzip ./patches/source/sdl/CVE-2021-33657.patch +gzip ./patches/source/sdl/SDL_ttf.shaded.text.diff +gzip ./patches/source/sdl/SDL_mixer.usrlocal.diff +gzip ./patches/source/sdl/libsdl-1.2.15-resizing.patch gzip ./patches/source/emacs/d48bb4874bc6cd3e69c7a15fc3c91cc141025c51.patch gzip ./patches/source/emacs/doinst.sh gzip ./patches/source/xorg-server/patch/xorg-server/CVE-2022-46342.patch -- cgit v1.2.3