diff options
| -rw-r--r-- | ChangeLog.rss | 24 | ||||
| -rw-r--r-- | ChangeLog.txt | 12 | ||||
| -rw-r--r-- | FILELIST.TXT | 137 | ||||
| -rw-r--r-- | patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txt | 11 | ||||
| -rw-r--r-- | patches/source/xorg-server-xwayland/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch | 75 | ||||
| -rw-r--r-- | patches/source/xorg-server-xwayland/0002-dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.patch | 178 | ||||
| -rw-r--r-- | patches/source/xorg-server-xwayland/0003-6907b6ea2b4ce949cb07271f5b678d5966d9df42.patch | 181 | ||||
| -rw-r--r-- | patches/source/xorg-server-xwayland/slack-desc | 19 | ||||
| -rwxr-xr-x | patches/source/xorg-server-xwayland/xorg-server-xwayland.SlackBuild | 162 | ||||
| -rwxr-xr-x | recompress.sh | 3 |
10 files changed, 737 insertions, 65 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index e7f1d586..d7827a3f 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,30 @@ <description>Tracking Slackware development in git.</description> <language>en-us</language> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> - <pubDate>Mon, 26 Sep 2022 19:43:54 GMT</pubDate> - <lastBuildDate>Tue, 27 Sep 2022 11:30:17 GMT</lastBuildDate> + <pubDate>Wed, 28 Sep 2022 18:59:51 GMT</pubDate> + <lastBuildDate>Thu, 29 Sep 2022 11:29:53 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.17</generator> <item> + <title>Wed, 28 Sep 2022 18:59:51 GMT</title> + <pubDate>Wed, 28 Sep 2022 18:59:51 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20220928185951</link> + <guid isPermaLink="false">20220928185951</guid> + <description> + <![CDATA[<pre> +patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txz: Rebuilt. + xkb: switch to array index loops to moving pointers. + xkb: add request length validation for XkbSetGeometry. + xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck. + I hadn't realized that the xorg-server patches were needed (or applied + cleanly) to Xwayland. Thanks to LuckyCyborg for the kind reminder. :-) + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2319 + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2320 + (* Security fix *) + </pre>]]> + </description> + </item> + <item> <title>Mon, 26 Sep 2022 19:43:54 GMT</title> <pubDate>Mon, 26 Sep 2022 19:43:54 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20220926194354</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index bfad9b15..9c095cca 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,15 @@ +Wed Sep 28 18:59:51 UTC 2022 +patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txz: Rebuilt. + xkb: switch to array index loops to moving pointers. + xkb: add request length validation for XkbSetGeometry. + xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck. + I hadn't realized that the xorg-server patches were needed (or applied + cleanly) to Xwayland. Thanks to LuckyCyborg for the kind reminder. :-) + For more information, see: + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2319 + https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-2320 + (* Security fix *) ++--------------------------+ Mon Sep 26 19:43:54 UTC 2022 patches/packages/dnsmasq-2.87-x86_64-1_slack15.0.txz: Upgraded. Fix write-after-free error in DHCPv6 server code. diff --git a/FILELIST.TXT b/FILELIST.TXT index de06761c..29145c0e 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Sep 26 19:48:49 UTC 2022 +Wed Sep 28 19:03:07 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-09-26 19:43 . +drwxr-xr-x 12 root root 4096 2022-09-28 18:59 . -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 1151535 2022-09-23 23:53 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-09-23 23:53 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1152496 2022-09-26 19:49 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-09-26 19:49 ./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 1934003 2022-09-26 19:43 ./ChangeLog.txt +-rw-r--r-- 1 root root 1934634 2022-09-28 18:59 ./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 1503236 2022-09-23 23:53 ./FILELIST.TXT +-rw-r--r-- 1 root root 1504478 2022-09-26 19:48 ./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-09-26 19:48 ./patches --rw-r--r-- 1 root root 48344 2022-09-26 19:48 ./patches/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2022-09-26 19:48 ./patches/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 64676 2022-09-26 19:48 ./patches/FILE_LIST --rw-r--r-- 1 root root 11627021 2022-09-26 19:48 ./patches/MANIFEST.bz2 --rw-r--r-- 1 root root 35483 2022-09-26 19:48 ./patches/PACKAGES.TXT -drwxr-xr-x 3 root root 16384 2022-09-26 19:48 ./patches/packages +drwxr-xr-x 4 root root 4096 2022-09-28 19:03 ./patches +-rw-r--r-- 1 root root 49342 2022-09-28 19:03 ./patches/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2022-09-28 19:03 ./patches/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 65925 2022-09-28 19:03 ./patches/FILE_LIST +-rw-r--r-- 1 root root 11638196 2022-09-28 19:03 ./patches/MANIFEST.bz2 +-rw-r--r-- 1 root root 36496 2022-09-28 19:03 ./patches/PACKAGES.TXT +drwxr-xr-x 3 root root 16384 2022-09-28 19:03 ./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 @@ -908,13 +908,16 @@ drwxr-xr-x 2 root root 4096 2022-08-26 04:06 ./patches/packages/linux-5.15 -rw-r--r-- 1 root root 689 2022-07-12 20:36 ./patches/packages/xorg-server-xvfb-1.20.14-x86_64-3_slack15.0.txt -rw-r--r-- 1 root root 731032 2022-07-12 20:36 ./patches/packages/xorg-server-xvfb-1.20.14-x86_64-3_slack15.0.txz -rw-r--r-- 1 root root 163 2022-07-12 20:36 ./patches/packages/xorg-server-xvfb-1.20.14-x86_64-3_slack15.0.txz.asc +-rw-r--r-- 1 root root 816 2022-09-27 02:34 ./patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txt +-rw-r--r-- 1 root root 816808 2022-09-27 02:34 ./patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txz +-rw-r--r-- 1 root root 163 2022-09-27 02:34 ./patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txz.asc -rw-r--r-- 1 root root 489 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txt -rw-r--r-- 1 root root 322660 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz -rw-r--r-- 1 root root 163 2022-04-14 21:04 ./patches/packages/xz-5.2.5-x86_64-4_slack15.0.txz.asc -rw-r--r-- 1 root root 388 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txt -rw-r--r-- 1 root root 105196 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz -rw-r--r-- 1 root root 163 2022-08-09 17:48 ./patches/packages/zlib-1.2.12-x86_64-2_slack15.0.txz.asc -drwxr-xr-x 49 root root 4096 2022-09-26 19:41 ./patches/source +drwxr-xr-x 50 root root 4096 2022-09-28 18:32 ./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 @@ -1381,6 +1384,14 @@ drwxr-xr-x 2 root root 4096 2022-04-12 19:47 ./patches/source/whois -rwxr-xr-x 1 root root 2917 2022-03-28 19:06 ./patches/source/whois/whois.SlackBuild -rw-r--r-- 1 root root 33 2019-07-24 18:55 ./patches/source/whois/whois.url drwxr-xr-x 10 root root 4096 2022-07-12 20:19 ./patches/source/xorg-server +drwxr-xr-x 2 root root 4096 2022-09-27 02:31 ./patches/source/xorg-server-xwayland +-rw-r--r-- 1 root root 1175 2022-07-12 17:02 ./patches/source/xorg-server-xwayland/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch.gz +-rw-r--r-- 1 root root 2243 2022-07-12 17:03 ./patches/source/xorg-server-xwayland/0002-dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.patch.gz +-rw-r--r-- 1 root root 1923 2022-07-12 17:03 ./patches/source/xorg-server-xwayland/0003-6907b6ea2b4ce949cb07271f5b678d5966d9df42.patch.gz +-rw-r--r-- 1 root root 1287 2021-04-18 18:21 ./patches/source/xorg-server-xwayland/slack-desc +-rwxr-xr-x 1 root root 5425 2022-09-27 02:30 ./patches/source/xorg-server-xwayland/xorg-server-xwayland.SlackBuild +-rw-r--r-- 1 root root 1261712 2021-12-14 14:01 ./patches/source/xorg-server-xwayland/xwayland-21.1.4.tar.xz +-rw-r--r-- 1 root root 95 2021-12-14 14:01 ./patches/source/xorg-server-xwayland/xwayland-21.1.4.tar.xz.sig -rw-r--r-- 1 root root 376 2021-01-16 18:58 ./patches/source/xorg-server/arch.use.flags drwxr-xr-x 2 root root 4096 2013-04-18 22:42 ./patches/source/xorg-server/build -rw-r--r-- 1 root root 12 2022-07-12 19:50 ./patches/source/xorg-server/build/xorg-server @@ -2713,22 +2724,22 @@ drwxr-xr-x 2 root root 69632 2022-02-01 08:29 ./slackware64/kde -rw-r--r-- 1 root root 312904 2022-01-06 22:00 ./slackware64/kde/keditbookmarks-21.12.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-06 22:00 ./slackware64/kde/keditbookmarks-21.12.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 366 2022-01-08 22:37 ./slackware64/kde/kemoticons-5.90.0-x86_64-1.txt --rw-r--r-- 1 root root 1636556 2022-01-08 22:37 ./slackware64/kde/kemoticons-5.90.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-08 22:37 ./slackware64/kde/kemoticons-5.90.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 470 2022-01-08 22:35 ./slackware64/kde/kfilemetadata-5.90.0-x86_64-1.txt --rw-r--r-- 1 root root 181836 2022-01-08 22:35 ./slackware64/kde/kfilemetadata-5.90.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-08 22:35 ./slackware64/kde/kfilemetadata-5.90.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 431 2022-01-06 22:00 ./slackware64/kde/kfind-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 415672 2022-01-06 22:00 ./slackware64/kde/kfind-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:00 ./slackware64/kde/kfind-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 287 2022-01-06 22:03 ./slackware64/kde/kfloppy-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 313268 2022-01-06 22:03 ./slackware64/kde/kfloppy-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:03 ./slackware64/kde/kfloppy-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 335 2022-01-06 22:33 ./slackware64/kde/kfourinline-21.12.1-x86_64-1.txt --rw-r--r-- 1 root root 823372 2022-01-06 22:33 ./slackware64/kde/kfourinline-21.12.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2022-01-06 22:33 ./slackware64/kde/kfourinline-21.12.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 194 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txt --rw-r--r-- 1 root root 149612 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txz +-rw-r--r-- 1 root root 1636556 2022-01-08 22:37 ./slackware64/kde/kemoticons-5.90.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-08 22:37 ./slackware64/kde/kemoticons-5.90.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 470 2022-01-08 22:35 ./slackware64/kde/kfilemetadata-5.90.0-x86_64-1.txt +-rw-r--r-- 1 root root 181836 2022-01-08 22:35 ./slackware64/kde/kfilemetadata-5.90.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-08 22:35 ./slackware64/kde/kfilemetadata-5.90.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 431 2022-01-06 22:00 ./slackware64/kde/kfind-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 415672 2022-01-06 22:00 ./slackware64/kde/kfind-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:00 ./slackware64/kde/kfind-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 287 2022-01-06 22:03 ./slackware64/kde/kfloppy-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 313268 2022-01-06 22:03 ./slackware64/kde/kfloppy-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:03 ./slackware64/kde/kfloppy-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 335 2022-01-06 22:33 ./slackware64/kde/kfourinline-21.12.1-x86_64-1.txt +-rw-r--r-- 1 root root 823372 2022-01-06 22:33 ./slackware64/kde/kfourinline-21.12.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2022-01-06 22:33 ./slackware64/kde/kfourinline-21.12.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 194 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txt +-rw-r--r-- 1 root root 149612 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-01-04 21:33 ./slackware64/kde/kgamma5-5.23.5-x86_64-1.txz.asc -rw-r--r-- 1 root root 475 2022-01-06 22:42 ./slackware64/kde/kgeography-21.12.1-x86_64-1.txt -rw-r--r-- 1 root root 9647764 2022-01-06 22:42 ./slackware64/kde/kgeography-21.12.1-x86_64-1.txz @@ -5461,24 +5472,24 @@ drwxr-xr-x 2 root root 65536 2022-02-01 04:47 ./slackware64/x -rw-r--r-- 1 root root 290308 2021-03-18 18:36 ./slackware64/x/libgee-0.20.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2021-03-18 18:36 ./slackware64/x/libgee-0.20.4-x86_64-1.txz.asc -rw-r--r-- 1 root root 462 2021-05-01 17:59 ./slackware64/x/libglvnd-1.3.3-x86_64-1.txt --rw-r--r-- 1 root root 342804 2021-05-01 17:59 ./slackware64/x/libglvnd-1.3.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-05-01 17:59 ./slackware64/x/libglvnd-1.3.3-x86_64-1.txz.asc --rw-r--r-- 1 root root 378 2021-02-13 12:51 ./slackware64/x/libhangul-0.1.0-x86_64-4.txt --rw-r--r-- 1 root root 1865140 2021-02-13 12:51 ./slackware64/x/libhangul-0.1.0-x86_64-4.txz --rw-r--r-- 1 root root 163 2021-02-13 12:51 ./slackware64/x/libhangul-0.1.0-x86_64-4.txz.asc --rw-r--r-- 1 root root 534 2021-12-14 20:59 ./slackware64/x/libinput-1.19.3-x86_64-1.txt --rw-r--r-- 1 root root 273836 2021-12-14 20:59 ./slackware64/x/libinput-1.19.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2021-12-14 20:59 ./slackware64/x/libinput-1.19.3-x86_64-1.txz.asc --rw-r--r-- 1 root root 420 2021-02-13 12:53 ./slackware64/x/libkkc-0.3.5-x86_64-3.txt --rw-r--r-- 1 root root 312164 2021-02-13 12:53 ./slackware64/x/libkkc-0.3.5-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 12:53 ./slackware64/x/libkkc-0.3.5-x86_64-3.txz.asc --rw-r--r-- 1 root root 316 2021-02-13 12:52 ./slackware64/x/libkkc-data-0.2.7-x86_64-3.txt --rw-r--r-- 1 root root 12845488 2021-02-13 12:52 ./slackware64/x/libkkc-data-0.2.7-x86_64-3.txz --rw-r--r-- 1 root root 163 2021-02-13 12:52 ./slackware64/x/libkkc-data-0.2.7-x86_64-3.txz.asc --rw-r--r-- 1 root root 322 2021-02-13 12:53 ./slackware64/x/libmypaint-1.6.1-x86_64-4.txt --rw-r--r-- 1 root root 201316 2021-02-13 12:53 ./slackware64/x/libmypaint-1.6.1-x86_64-4.txz --rw-r--r-- 1 root root 163 2021-02-13 12:53 ./slackware64/x/libmypaint-1.6.1-x86_64-4.txz.asc --rw-r--r-- 1 root root 377 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txt +-rw-r--r-- 1 root root 342804 2021-05-01 17:59 ./slackware64/x/libglvnd-1.3.3-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-05-01 17:59 ./slackware64/x/libglvnd-1.3.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 378 2021-02-13 12:51 ./slackware64/x/libhangul-0.1.0-x86_64-4.txt +-rw-r--r-- 1 root root 1865140 2021-02-13 12:51 ./slackware64/x/libhangul-0.1.0-x86_64-4.txz +-rw-r--r-- 1 root root 163 2021-02-13 12:51 ./slackware64/x/libhangul-0.1.0-x86_64-4.txz.asc +-rw-r--r-- 1 root root 534 2021-12-14 20:59 ./slackware64/x/libinput-1.19.3-x86_64-1.txt +-rw-r--r-- 1 root root 273836 2021-12-14 20:59 ./slackware64/x/libinput-1.19.3-x86_64-1.txz +-rw-r--r-- 1 root root 163 2021-12-14 20:59 ./slackware64/x/libinput-1.19.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 420 2021-02-13 12:53 ./slackware64/x/libkkc-0.3.5-x86_64-3.txt +-rw-r--r-- 1 root root 312164 2021-02-13 12:53 ./slackware64/x/libkkc-0.3.5-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 12:53 ./slackware64/x/libkkc-0.3.5-x86_64-3.txz.asc +-rw-r--r-- 1 root root 316 2021-02-13 12:52 ./slackware64/x/libkkc-data-0.2.7-x86_64-3.txt +-rw-r--r-- 1 root root 12845488 2021-02-13 12:52 ./slackware64/x/libkkc-data-0.2.7-x86_64-3.txz +-rw-r--r-- 1 root root 163 2021-02-13 12:52 ./slackware64/x/libkkc-data-0.2.7-x86_64-3.txz.asc +-rw-r--r-- 1 root root 322 2021-02-13 12:53 ./slackware64/x/libmypaint-1.6.1-x86_64-4.txt +-rw-r--r-- 1 root root 201316 2021-02-13 12:53 ./slackware64/x/libmypaint-1.6.1-x86_64-4.txz +-rw-r--r-- 1 root root 163 2021-02-13 12:53 ./slackware64/x/libmypaint-1.6.1-x86_64-4.txz.asc +-rw-r--r-- 1 root root 377 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txt -rw-r--r-- 1 root root 34816 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txz -rw-r--r-- 1 root root 163 2021-02-13 13:09 ./slackware64/x/libpciaccess-0.16-x86_64-3.txz.asc -rw-r--r-- 1 root root 330 2021-09-17 03:16 ./slackware64/x/libpinyin-2.6.1-x86_64-1.txt @@ -15079,21 +15090,21 @@ drwxr-xr-x 2 root root 4096 2020-08-09 17:46 ./source/x/x11/src/font -rw-r--r-- 1 root root 589148 2010-11-15 20:01 ./source/x/x11/src/font/font-bh-100dpi-1.0.3.tar.xz -rw-r--r-- 1 root root 489900 2010-11-15 20:06 ./source/x/x11/src/font/font-bh-75dpi-1.0.3.tar.xz -rw-r--r-- 1 root root 216368 2010-11-15 20:11 ./source/x/x11/src/font/font-bh-lucidatypewriter-100dpi-1.0.3.tar.xz --rw-r--r-- 1 root root 193720 2010-11-15 20:16 ./source/x/x11/src/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.xz --rw-r--r-- 1 root root 367740 2010-11-11 05:26 ./source/x/x11/src/font/font-bh-ttf-1.0.3.tar.xz --rw-r--r-- 1 root root 628208 2010-11-15 20:36 ./source/x/x11/src/font/font-bh-type1-1.0.3.tar.xz --rw-r--r-- 1 root root 172716 2010-11-15 20:39 ./source/x/x11/src/font/font-bitstream-100dpi-1.0.3.tar.xz --rw-r--r-- 1 root root 155516 2010-11-15 20:46 ./source/x/x11/src/font/font-bitstream-75dpi-1.0.3.tar.xz --rw-r--r-- 1 root root 329196 2010-11-15 20:53 ./source/x/x11/src/font/font-bitstream-speedo-1.0.2.tar.xz --rw-r--r-- 1 root root 390700 2010-11-15 20:56 ./source/x/x11/src/font/font-bitstream-type1-1.0.3.tar.xz --rw-r--r-- 1 root root 236644 2010-11-15 21:06 ./source/x/x11/src/font/font-cronyx-cyrillic-1.0.3.tar.xz --rw-r--r-- 1 root root 94716 2010-11-15 21:14 ./source/x/x11/src/font/font-cursor-misc-1.0.3.tar.xz --rw-r--r-- 1 root root 508312 2010-11-15 21:20 ./source/x/x11/src/font/font-daewoo-misc-1.0.3.tar.xz --rw-r--r-- 1 root root 92740 2010-11-15 21:25 ./source/x/x11/src/font/font-dec-misc-1.0.3.tar.xz --rw-r--r-- 1 root root 374360 2010-11-15 21:33 ./source/x/x11/src/font/font-ibm-type1-1.0.3.tar.xz --rw-r--r-- 1 root root 719756 2010-11-15 22:21 ./source/x/x11/src/font/font-isas-misc-1.0.3.tar.xz --rw-r--r-- 1 root root 517868 2010-11-15 22:34 ./source/x/x11/src/font/font-jis-misc-1.0.3.tar.xz --rw-r--r-- 1 root root 91408 2010-11-15 22:38 ./source/x/x11/src/font/font-micro-misc-1.0.3.tar.xz +-rw-r--r-- 1 root root 193720 2010-11-15 20:16 ./source/x/x11/src/font/font-bh-lucidatypewriter-75dpi-1.0.3.tar.xz +-rw-r--r-- 1 root root 367740 2010-11-11 05:26 ./source/x/x11/src/font/font-bh-ttf-1.0.3.tar.xz +-rw-r--r-- 1 root root 628208 2010-11-15 20:36 ./source/x/x11/src/font/font-bh-type1-1.0.3.tar.xz +-rw-r--r-- 1 root root 172716 2010-11-15 20:39 ./source/x/x11/src/font/font-bitstream-100dpi-1.0.3.tar.xz +-rw-r--r-- 1 root root 155516 2010-11-15 20:46 ./source/x/x11/src/font/font-bitstream-75dpi-1.0.3.tar.xz +-rw-r--r-- 1 root root 329196 2010-11-15 20:53 ./source/x/x11/src/font/font-bitstream-speedo-1.0.2.tar.xz +-rw-r--r-- 1 root root 390700 2010-11-15 20:56 ./source/x/x11/src/font/font-bitstream-type1-1.0.3.tar.xz +-rw-r--r-- 1 root root 236644 2010-11-15 21:06 ./source/x/x11/src/font/font-cronyx-cyrillic-1.0.3.tar.xz +-rw-r--r-- 1 root root 94716 2010-11-15 21:14 ./source/x/x11/src/font/font-cursor-misc-1.0.3.tar.xz +-rw-r--r-- 1 root root 508312 2010-11-15 21:20 ./source/x/x11/src/font/font-daewoo-misc-1.0.3.tar.xz +-rw-r--r-- 1 root root 92740 2010-11-15 21:25 ./source/x/x11/src/font/font-dec-misc-1.0.3.tar.xz +-rw-r--r-- 1 root root 374360 2010-11-15 21:33 ./source/x/x11/src/font/font-ibm-type1-1.0.3.tar.xz +-rw-r--r-- 1 root root 719756 2010-11-15 22:21 ./source/x/x11/src/font/font-isas-misc-1.0.3.tar.xz +-rw-r--r-- 1 root root 517868 2010-11-15 22:34 ./source/x/x11/src/font/font-jis-misc-1.0.3.tar.xz +-rw-r--r-- 1 root root 91408 2010-11-15 22:38 ./source/x/x11/src/font/font-micro-misc-1.0.3.tar.xz -rw-r--r-- 1 root root 121968 2010-11-15 22:42 ./source/x/x11/src/font/font-misc-cyrillic-1.0.3.tar.xz -rw-r--r-- 1 root root 233864 2020-08-06 21:25 ./source/x/x11/src/font/font-misc-ethiopic-1.0.4.tar.xz -rw-r--r-- 1 root root 828248 2010-11-15 22:52 ./source/x/x11/src/font/font-misc-meltho-1.0.3.tar.xz diff --git a/patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txt b/patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txt new file mode 100644 index 00000000..44e18f2c --- /dev/null +++ b/patches/packages/xorg-server-xwayland-21.1.4-x86_64-2_slack15.0.txt @@ -0,0 +1,11 @@ +xorg-server-xwayland: xorg-server-xwayland (X Clients under Wayland) +xorg-server-xwayland: +xorg-server-xwayland: Wayland is a complete window system in itself, but even so, if we're +xorg-server-xwayland: migrating away from X, it makes sense to have a good backwards +xorg-server-xwayland: compatibility story. With a few changes, the Xorg server can be +xorg-server-xwayland: modified to use Wayland input devices for input and forward either the +xorg-server-xwayland: root window or individual top-level windows as wayland surfaces. The +xorg-server-xwayland: server still runs the same 2D driver with the same acceleration code +xorg-server-xwayland: as it does when it runs natively. The main difference is that Wayland +xorg-server-xwayland: handles presentation of the windows instead of KMS. +xorg-server-xwayland: diff --git a/patches/source/xorg-server-xwayland/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch b/patches/source/xorg-server-xwayland/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch new file mode 100644 index 00000000..0efddcf5 --- /dev/null +++ b/patches/source/xorg-server-xwayland/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch @@ -0,0 +1,75 @@ +From f1070c01d616c5f21f939d5ebc533738779451ac Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue, 5 Jul 2022 12:40:47 +1000 +Subject: [PATCH] xkb: switch to array index loops to moving pointers + +Most similar loops here use a pointer that advances with each loop +iteration, let's do the same here for consistency. + +No functional changes. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Olivier Fourdan <ofourdan@redhat.com> +--- + xkb/xkb.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index a29262c24..64e52611e 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -5368,16 +5368,16 @@ _CheckSetSections(XkbGeometryPtr geom, + row->left = rWire->left; + row->vertical = rWire->vertical; + kWire = (xkbKeyWireDesc *) &rWire[1]; +- for (k = 0; k < rWire->nKeys; k++) { ++ for (k = 0; k < rWire->nKeys; k++, kWire++) { + XkbKeyPtr key; + + key = XkbAddGeomKey(row); + if (!key) + return BadAlloc; +- memcpy(key->name.name, kWire[k].name, XkbKeyNameLength); +- key->gap = kWire[k].gap; +- key->shape_ndx = kWire[k].shapeNdx; +- key->color_ndx = kWire[k].colorNdx; ++ memcpy(key->name.name, kWire->name, XkbKeyNameLength); ++ key->gap = kWire->gap; ++ key->shape_ndx = kWire->shapeNdx; ++ key->color_ndx = kWire->colorNdx; + if (key->shape_ndx >= geom->num_shapes) { + client->errorValue = _XkbErrCode3(0x10, key->shape_ndx, + geom->num_shapes); +@@ -5389,7 +5389,7 @@ _CheckSetSections(XkbGeometryPtr geom, + return BadMatch; + } + } +- rWire = (xkbRowWireDesc *) &kWire[rWire->nKeys]; ++ rWire = (xkbRowWireDesc *)kWire; + } + wire = (char *) rWire; + if (sWire->nDoodads > 0) { +@@ -5454,16 +5454,16 @@ _CheckSetShapes(XkbGeometryPtr geom, + return BadAlloc; + ol->corner_radius = olWire->cornerRadius; + ptWire = (xkbPointWireDesc *) &olWire[1]; +- for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++) { +- pt->x = ptWire[p].x; +- pt->y = ptWire[p].y; ++ for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++, ptWire++) { ++ pt->x = ptWire->x; ++ pt->y = ptWire->y; + if (client->swapped) { + swaps(&pt->x); + swaps(&pt->y); + } + } + ol->num_points = olWire->nPoints; +- olWire = (xkbOutlineWireDesc *) (&ptWire[olWire->nPoints]); ++ olWire = (xkbOutlineWireDesc *)ptWire; + } + if (shapeWire->primaryNdx != XkbNoShape) + shape->primary = &shape->outlines[shapeWire->primaryNdx]; +-- +GitLab + diff --git a/patches/source/xorg-server-xwayland/0002-dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.patch b/patches/source/xorg-server-xwayland/0002-dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.patch new file mode 100644 index 00000000..72d30f36 --- /dev/null +++ b/patches/source/xorg-server-xwayland/0002-dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.patch @@ -0,0 +1,178 @@ +From dd8caf39e9e15d8f302e54045dd08d8ebf1025dc Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue, 5 Jul 2022 09:50:41 +1000 +Subject: [PATCH] xkb: swap XkbSetDeviceInfo and XkbSetDeviceInfoCheck + +XKB often uses a FooCheck and Foo function pair, the former is supposed +to check all values in the request and error out on BadLength, +BadValue, etc. The latter is then called once we're confident the values +are good (they may still fail on an individual device, but that's a +different topic). + +In the case of XkbSetDeviceInfo, those functions were incorrectly +named, with XkbSetDeviceInfo ending up as the checker function and +XkbSetDeviceInfoCheck as the setter function. As a result, the setter +function was called before the checker function, accessing request +data and modifying device state before we ensured that the data is +valid. + +In particular, the setter function relied on values being already +byte-swapped. This in turn could lead to potential OOB memory access. + +Fix this by correctly naming the functions and moving the length checks +over to the checker function. These were added in 87c64fc5b0 to the +wrong function, probably due to the incorrect naming. + +Fixes ZDI-CAN 16070, CVE-2022-2320. + +This vulnerability was discovered by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Introduced in c06e27b2f6fd9f7b9f827623a48876a225264132 + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + xkb/xkb.c | 46 +++++++++++++++++++++++++--------------------- + 1 file changed, 25 insertions(+), 21 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index 64e52611e..34b2c290b 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -6550,7 +6550,8 @@ ProcXkbGetDeviceInfo(ClientPtr client) + static char * + CheckSetDeviceIndicators(char *wire, + DeviceIntPtr dev, +- int num, int *status_rtrn, ClientPtr client) ++ int num, int *status_rtrn, ClientPtr client, ++ xkbSetDeviceInfoReq * stuff) + { + xkbDeviceLedsWireDesc *ledWire; + int i; +@@ -6558,6 +6559,11 @@ CheckSetDeviceIndicators(char *wire, + + ledWire = (xkbDeviceLedsWireDesc *) wire; + for (i = 0; i < num; i++) { ++ if (!_XkbCheckRequestBounds(client, stuff, ledWire, ledWire + 1)) { ++ *status_rtrn = BadLength; ++ return (char *) ledWire; ++ } ++ + if (client->swapped) { + swaps(&ledWire->ledClass); + swaps(&ledWire->ledID); +@@ -6585,6 +6591,11 @@ CheckSetDeviceIndicators(char *wire, + atomWire = (CARD32 *) &ledWire[1]; + if (nNames > 0) { + for (n = 0; n < nNames; n++) { ++ if (!_XkbCheckRequestBounds(client, stuff, atomWire, atomWire + 1)) { ++ *status_rtrn = BadLength; ++ return (char *) atomWire; ++ } ++ + if (client->swapped) { + swapl(atomWire); + } +@@ -6596,6 +6607,10 @@ CheckSetDeviceIndicators(char *wire, + mapWire = (xkbIndicatorMapWireDesc *) atomWire; + if (nMaps > 0) { + for (n = 0; n < nMaps; n++) { ++ if (!_XkbCheckRequestBounds(client, stuff, mapWire, mapWire + 1)) { ++ *status_rtrn = BadLength; ++ return (char *) mapWire; ++ } + if (client->swapped) { + swaps(&mapWire->virtualMods); + swapl(&mapWire->ctrls); +@@ -6647,11 +6662,6 @@ SetDeviceIndicators(char *wire, + xkbIndicatorMapWireDesc *mapWire; + XkbSrvLedInfoPtr sli; + +- if (!_XkbCheckRequestBounds(client, stuff, ledWire, ledWire + 1)) { +- *status_rtrn = BadLength; +- return (char *) ledWire; +- } +- + namec = mapc = statec = 0; + sli = XkbFindSrvLedInfo(dev, ledWire->ledClass, ledWire->ledID, + XkbXI_IndicatorMapsMask); +@@ -6670,10 +6680,6 @@ SetDeviceIndicators(char *wire, + memset((char *) sli->names, 0, XkbNumIndicators * sizeof(Atom)); + for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { + if (ledWire->namesPresent & bit) { +- if (!_XkbCheckRequestBounds(client, stuff, atomWire, atomWire + 1)) { +- *status_rtrn = BadLength; +- return (char *) atomWire; +- } + sli->names[n] = (Atom) *atomWire; + if (sli->names[n] == None) + ledWire->namesPresent &= ~bit; +@@ -6691,10 +6697,6 @@ SetDeviceIndicators(char *wire, + if (ledWire->mapsPresent) { + for (n = 0, bit = 1; n < XkbNumIndicators; n++, bit <<= 1) { + if (ledWire->mapsPresent & bit) { +- if (!_XkbCheckRequestBounds(client, stuff, mapWire, mapWire + 1)) { +- *status_rtrn = BadLength; +- return (char *) mapWire; +- } + sli->maps[n].flags = mapWire->flags; + sli->maps[n].which_groups = mapWire->whichGroups; + sli->maps[n].groups = mapWire->groups; +@@ -6730,13 +6732,17 @@ SetDeviceIndicators(char *wire, + } + + static int +-_XkbSetDeviceInfo(ClientPtr client, DeviceIntPtr dev, ++_XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, + xkbSetDeviceInfoReq * stuff) + { + char *wire; + + wire = (char *) &stuff[1]; + if (stuff->change & XkbXI_ButtonActionsMask) { ++ int sz = stuff->nBtns * SIZEOF(xkbActionWireDesc); ++ if (!_XkbCheckRequestBounds(client, stuff, wire, (char *) wire + sz)) ++ return BadLength; ++ + if (!dev->button) { + client->errorValue = _XkbErrCode2(XkbErr_BadClass, ButtonClass); + return XkbKeyboardErrorCode; +@@ -6747,13 +6753,13 @@ _XkbSetDeviceInfo(ClientPtr client, DeviceIntPtr dev, + dev->button->numButtons); + return BadMatch; + } +- wire += (stuff->nBtns * SIZEOF(xkbActionWireDesc)); ++ wire += sz; + } + if (stuff->change & XkbXI_IndicatorsMask) { + int status = Success; + + wire = CheckSetDeviceIndicators(wire, dev, stuff->nDeviceLedFBs, +- &status, client); ++ &status, client, stuff); + if (status != Success) + return status; + } +@@ -6764,8 +6770,8 @@ _XkbSetDeviceInfo(ClientPtr client, DeviceIntPtr dev, + } + + static int +-_XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, +- xkbSetDeviceInfoReq * stuff) ++_XkbSetDeviceInfo(ClientPtr client, DeviceIntPtr dev, ++ xkbSetDeviceInfoReq * stuff) + { + char *wire; + xkbExtensionDeviceNotify ed; +@@ -6789,8 +6795,6 @@ _XkbSetDeviceInfoCheck(ClientPtr client, DeviceIntPtr dev, + if (stuff->firstBtn + stuff->nBtns > nBtns) + return BadValue; + sz = stuff->nBtns * SIZEOF(xkbActionWireDesc); +- if (!_XkbCheckRequestBounds(client, stuff, wire, (char *) wire + sz)) +- return BadLength; + memcpy((char *) &acts[stuff->firstBtn], (char *) wire, sz); + wire += sz; + ed.reason |= XkbXI_ButtonActionsMask; +-- +GitLab + diff --git a/patches/source/xorg-server-xwayland/0003-6907b6ea2b4ce949cb07271f5b678d5966d9df42.patch b/patches/source/xorg-server-xwayland/0003-6907b6ea2b4ce949cb07271f5b678d5966d9df42.patch new file mode 100644 index 00000000..11121070 --- /dev/null +++ b/patches/source/xorg-server-xwayland/0003-6907b6ea2b4ce949cb07271f5b678d5966d9df42.patch @@ -0,0 +1,181 @@ +From 6907b6ea2b4ce949cb07271f5b678d5966d9df42 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Tue, 5 Jul 2022 11:11:06 +1000 +Subject: [PATCH] xkb: add request length validation for XkbSetGeometry + +No validation of the various fields on that report were done, so a +malicious client could send a short request that claims it had N +sections, or rows, or keys, and the server would process the request for +N sections, running out of bounds of the actual request data. + +Fix this by adding size checks to ensure our data is valid. + +ZDI-CAN 16062, CVE-2022-2319. + +This vulnerability was discovered by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + xkb/xkb.c | 43 ++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 38 insertions(+), 5 deletions(-) + +diff --git a/xkb/xkb.c b/xkb/xkb.c +index 34b2c290b..4692895db 100644 +--- a/xkb/xkb.c ++++ b/xkb/xkb.c +@@ -5156,7 +5156,7 @@ _GetCountedString(char **wire_inout, ClientPtr client, char **str) + } + + static Status +-_CheckSetDoodad(char **wire_inout, ++_CheckSetDoodad(char **wire_inout, xkbSetGeometryReq *req, + XkbGeometryPtr geom, XkbSectionPtr section, ClientPtr client) + { + char *wire; +@@ -5167,6 +5167,9 @@ _CheckSetDoodad(char **wire_inout, + Status status; + + dWire = (xkbDoodadWireDesc *) (*wire_inout); ++ if (!_XkbCheckRequestBounds(client, req, dWire, dWire + 1)) ++ return BadLength; ++ + any = dWire->any; + wire = (char *) &dWire[1]; + if (client->swapped) { +@@ -5269,7 +5272,7 @@ _CheckSetDoodad(char **wire_inout, + } + + static Status +-_CheckSetOverlay(char **wire_inout, ++_CheckSetOverlay(char **wire_inout, xkbSetGeometryReq *req, + XkbGeometryPtr geom, XkbSectionPtr section, ClientPtr client) + { + register int r; +@@ -5280,6 +5283,9 @@ _CheckSetOverlay(char **wire_inout, + + wire = *wire_inout; + olWire = (xkbOverlayWireDesc *) wire; ++ if (!_XkbCheckRequestBounds(client, req, olWire, olWire + 1)) ++ return BadLength; ++ + if (client->swapped) { + swapl(&olWire->name); + } +@@ -5291,6 +5297,9 @@ _CheckSetOverlay(char **wire_inout, + xkbOverlayKeyWireDesc *kWire; + XkbOverlayRowPtr row; + ++ if (!_XkbCheckRequestBounds(client, req, rWire, rWire + 1)) ++ return BadLength; ++ + if (rWire->rowUnder > section->num_rows) { + client->errorValue = _XkbErrCode4(0x20, r, section->num_rows, + rWire->rowUnder); +@@ -5299,6 +5308,9 @@ _CheckSetOverlay(char **wire_inout, + row = XkbAddGeomOverlayRow(ol, rWire->rowUnder, rWire->nKeys); + kWire = (xkbOverlayKeyWireDesc *) &rWire[1]; + for (k = 0; k < rWire->nKeys; k++, kWire++) { ++ if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1)) ++ return BadLength; ++ + if (XkbAddGeomOverlayKey(ol, row, + (char *) kWire->over, + (char *) kWire->under) == NULL) { +@@ -5332,6 +5344,9 @@ _CheckSetSections(XkbGeometryPtr geom, + register int r; + xkbRowWireDesc *rWire; + ++ if (!_XkbCheckRequestBounds(client, req, sWire, sWire + 1)) ++ return BadLength; ++ + if (client->swapped) { + swapl(&sWire->name); + swaps(&sWire->top); +@@ -5357,6 +5372,9 @@ _CheckSetSections(XkbGeometryPtr geom, + XkbRowPtr row; + xkbKeyWireDesc *kWire; + ++ if (!_XkbCheckRequestBounds(client, req, rWire, rWire + 1)) ++ return BadLength; ++ + if (client->swapped) { + swaps(&rWire->top); + swaps(&rWire->left); +@@ -5371,6 +5389,9 @@ _CheckSetSections(XkbGeometryPtr geom, + for (k = 0; k < rWire->nKeys; k++, kWire++) { + XkbKeyPtr key; + ++ if (!_XkbCheckRequestBounds(client, req, kWire, kWire + 1)) ++ return BadLength; ++ + key = XkbAddGeomKey(row); + if (!key) + return BadAlloc; +@@ -5396,7 +5417,7 @@ _CheckSetSections(XkbGeometryPtr geom, + register int d; + + for (d = 0; d < sWire->nDoodads; d++) { +- status = _CheckSetDoodad(&wire, geom, section, client); ++ status = _CheckSetDoodad(&wire, req, geom, section, client); + if (status != Success) + return status; + } +@@ -5405,7 +5426,7 @@ _CheckSetSections(XkbGeometryPtr geom, + register int o; + + for (o = 0; o < sWire->nOverlays; o++) { +- status = _CheckSetOverlay(&wire, geom, section, client); ++ status = _CheckSetOverlay(&wire, req, geom, section, client); + if (status != Success) + return status; + } +@@ -5439,6 +5460,9 @@ _CheckSetShapes(XkbGeometryPtr geom, + xkbOutlineWireDesc *olWire; + XkbOutlinePtr ol; + ++ if (!_XkbCheckRequestBounds(client, req, shapeWire, shapeWire + 1)) ++ return BadLength; ++ + shape = + XkbAddGeomShape(geom, shapeWire->name, shapeWire->nOutlines); + if (!shape) +@@ -5449,12 +5473,18 @@ _CheckSetShapes(XkbGeometryPtr geom, + XkbPointPtr pt; + xkbPointWireDesc *ptWire; + ++ if (!_XkbCheckRequestBounds(client, req, olWire, olWire + 1)) ++ return BadLength; ++ + ol = XkbAddGeomOutline(shape, olWire->nPoints); + if (!ol) + return BadAlloc; + ol->corner_radius = olWire->cornerRadius; + ptWire = (xkbPointWireDesc *) &olWire[1]; + for (p = 0, pt = ol->points; p < olWire->nPoints; p++, pt++, ptWire++) { ++ if (!_XkbCheckRequestBounds(client, req, ptWire, ptWire + 1)) ++ return BadLength; ++ + pt->x = ptWire->x; + pt->y = ptWire->y; + if (client->swapped) { +@@ -5560,12 +5590,15 @@ _CheckSetGeom(XkbGeometryPtr geom, xkbSetGeometryReq * req, ClientPtr client) + return status; + + for (i = 0; i < req->nDoodads; i++) { +- status = _CheckSetDoodad(&wire, geom, NULL, client); ++ status = _CheckSetDoodad(&wire, req, geom, NULL, client); + if (status != Success) + return status; + } + + for (i = 0; i < req->nKeyAliases; i++) { ++ if (!_XkbCheckRequestBounds(client, req, wire, wire + XkbKeyNameLength)) ++ return BadLength; ++ + if (XkbAddGeomKeyAlias(geom, &wire[XkbKeyNameLength], wire) == NULL) + return BadAlloc; + wire += 2 * XkbKeyNameLength; +-- +GitLab + diff --git a/patches/source/xorg-server-xwayland/slack-desc b/patches/source/xorg-server-xwayland/slack-desc new file mode 100644 index 00000000..7a292b27 --- /dev/null +++ b/patches/source/xorg-server-xwayland/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------------------------------------------------------| +xorg-server-xwayland: xorg-server-xwayland (X Clients under Wayland) +xorg-server-xwayland: +xorg-server-xwayland: Wayland is a complete window system in itself, but even so, if we're +xorg-server-xwayland: migrating away from X, it makes sense to have a good backwards +xorg-server-xwayland: compatibility story. With a few changes, the Xorg server can be +xorg-server-xwayland: modified to use Wayland input devices for input and forward either the +xorg-server-xwayland: root window or individual top-level windows as wayland surfaces. The +xorg-server-xwayland: server still runs the same 2D driver with the same acceleration code +xorg-server-xwayland: as it does when it runs natively. The main difference is that Wayland +xorg-server-xwayland: handles presentation of the windows instead of KMS. +xorg-server-xwayland: diff --git a/patches/source/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/patches/source/xorg-server-xwayland/xorg-server-xwayland.SlackBuild new file mode 100755 index 00000000..fb119aa2 --- /dev/null +++ b/patches/source/xorg-server-xwayland/xorg-server-xwayland.SlackBuild @@ -0,0 +1,162 @@ +#!/bin/bash + +# Copyright 2016, 2018, 2019 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=xorg-server-xwayland +SRCNAM=xwayland +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2_slack15.0} + +# Default font paths to be used by the X server: +DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic" + +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 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 + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP || exit 1 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1 +cd $SRCNAM-$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 {} \+ + +# Patch CVE-2022-2319 and CVE-2022-2320: +zcat $CWD/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0002-dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0003-6907b6ea2b4ce949cb07271f5b678d5966d9df42.patch.gz | patch -p1 --verbose || exit 1 + +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ + --prefix=/usr \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Dxwayland_eglstream=true \ + -Ddefault_font_path="${DEF_FONTPATH}" \ + -Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \ + -Dxkb_output_dir=/var/lib/xkb \ + -Dvendor_name="Slackware Linux Project" \ + -Dxdmcp=false \ + -Dxcsecurity=true \ + -Dglamor=true \ + -Ddri3=true \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. + +# Remove unwanted files/dirs: +rm $PKG/usr/man/man1/Xserver.1* +rm -Rf $PKG/usr/lib${LIBDIRSUFFIX}/xorg +rm -Rf $PKG/usr/include/xorg +rm -Rf $PKG/usr/share/aclocal +rm -Rf $PKG/var/lib/xkb + +# Strip the binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* CREDITS INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/recompress.sh b/recompress.sh index 18228c6a..82f552c7 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1181,6 +1181,9 @@ gzip ./patches/source/python3/python3.no-static-library.diff gzip ./patches/source/python3/python3.readline.set_pre_input_hook.diff gzip ./patches/source/python3/python3.setup.py.x86_64.diff gzip ./patches/source/python3/python3.distutils.x86_64.diff +gzip ./patches/source/xorg-server-xwayland/0003-6907b6ea2b4ce949cb07271f5b678d5966d9df42.patch +gzip ./patches/source/xorg-server-xwayland/0002-dd8caf39e9e15d8f302e54045dd08d8ebf1025dc.patch +gzip ./patches/source/xorg-server-xwayland/0001-f1070c01d616c5f21f939d5ebc533738779451ac.patch gzip ./patches/source/seamonkey/autoconf/autoconf-2.13-consolidated_fixes-1.patch gzip ./patches/source/seamonkey/doinst.sh gzip ./patches/source/seamonkey/sm.ui.scrollToClick.diff |