diff --git a/ChangeLog.rss b/ChangeLog.rss index eda79fe7f..b7457cebd 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,22 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Fri, 24 Mar 2023 19:42:46 GMT - Fri, 24 Mar 2023 20:33:18 GMT + Sat, 25 Mar 2023 18:59:34 GMT + Sat, 25 Mar 2023 19:37:26 GMT maintain_current_git.sh v 1.17 + + Sat, 25 Mar 2023 18:59:34 GMT + Sat, 25 Mar 2023 18:59:34 GMT + https://git.slackware.nl/current/tag/?h=20230325185934 + 20230325185934 + + +l/netpbm-11.02.00-x86_64-1.txz: Upgraded. +x/mesa-23.0.1-x86_64-1.txz: Upgraded. + Properly apply/revert patches for the amber drivers. Thanks to lucabon. + ]]> + + Fri, 24 Mar 2023 19:42:46 GMT Fri, 24 Mar 2023 19:42:46 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index e3bcdfee4..521e6150c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +Sat Mar 25 18:59:34 UTC 2023 +l/netpbm-11.02.00-x86_64-1.txz: Upgraded. +x/mesa-23.0.1-x86_64-1.txz: Upgraded. + Properly apply/revert patches for the amber drivers. Thanks to lucabon. ++--------------------------+ Fri Mar 24 19:42:46 UTC 2023 a/glibc-zoneinfo-2023b-noarch-1.txz: Upgraded. This package provides the latest timezone updates. diff --git a/FILELIST.TXT b/FILELIST.TXT index b364a9802..60fa239ec 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Fri Mar 24 19:49:38 UTC 2023 +Sat Mar 25 19:02:47 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-03-24 19:42 . +drwxr-xr-x 12 root root 4096 2023-03-25 18:59 . -rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0 -rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 1105215 2023-03-23 20:40 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-03-23 20:40 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1105280 2023-03-24 19:49 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-03-24 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 567573 2023-03-24 19:42 ./ChangeLog.txt +-rw-r--r-- 1 root root 567787 2023-03-25 18:59 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2023-03-22 20:22 ./EFI/BOOT -rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2023-03-22 20:22 ./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 1438806 2023-03-23 20:40 ./FILELIST.TXT +-rw-r--r-- 1 root root 1438889 2023-03-24 19:49 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 864873 2023-03-24 19:49 ./PACKAGES.TXT +-rw-r--r-- 1 root root 864873 2023-03-25 19:02 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3629 2023-03-22 20:04 ./README.initrd -rw-r--r-- 1 root root 34162 2022-01-30 20:35 ./README_CRYPT.TXT @@ -687,11 +687,11 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches -rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT -drwxr-xr-x 17 root root 4096 2023-03-24 19:49 ./slackware64 --rw-r--r-- 1 root root 337335 2023-03-24 19:49 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-03-24 19:49 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 418335 2023-03-24 19:48 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4287648 2023-03-24 19:48 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2023-03-25 19:02 ./slackware64 +-rw-r--r-- 1 root root 337335 2023-03-25 19:02 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-03-25 19:02 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 418335 2023-03-25 19:01 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4294040 2023-03-25 19:01 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 32768 2023-03-24 19:48 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt @@ -2718,7 +2718,7 @@ drwxr-xr-x 2 root root 86016 2023-03-15 18:09 ./slackware64/kde -rw-r--r-- 1 root root 517 2023-03-02 18:50 ./slackware64/kde/zanshin-22.12.3-x86_64-1.txt -rw-r--r-- 1 root root 681536 2023-03-02 18:50 ./slackware64/kde/zanshin-22.12.3-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-03-02 18:50 ./slackware64/kde/zanshin-22.12.3-x86_64-1.txz.asc -drwxr-xr-x 2 root root 86016 2023-03-23 20:38 ./slackware64/l +drwxr-xr-x 2 root root 86016 2023-03-25 19:01 ./slackware64/l -rw-r--r-- 1 root root 329 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txt -rw-r--r-- 1 root root 928144 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz -rw-r--r-- 1 root root 163 2022-03-06 20:00 ./slackware64/l/GConf-3.2.6-x86_64-8.txz.asc @@ -3527,9 +3527,9 @@ drwxr-xr-x 2 root root 86016 2023-03-23 20:38 ./slackware64/l -rw-r--r-- 1 root root 345 2023-03-08 02:19 ./slackware64/l/neon-0.32.5-x86_64-2.txt -rw-r--r-- 1 root root 217372 2023-03-08 02:19 ./slackware64/l/neon-0.32.5-x86_64-2.txz -rw-r--r-- 1 root root 163 2023-03-08 02:19 ./slackware64/l/neon-0.32.5-x86_64-2.txz.asc --rw-r--r-- 1 root root 271 2023-03-23 20:01 ./slackware64/l/netpbm-11.01.03-x86_64-1.txt --rw-r--r-- 1 root root 2133052 2023-03-23 20:01 ./slackware64/l/netpbm-11.01.03-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-03-23 20:01 ./slackware64/l/netpbm-11.01.03-x86_64-1.txz.asc +-rw-r--r-- 1 root root 271 2023-03-25 17:06 ./slackware64/l/netpbm-11.02.00-x86_64-1.txt +-rw-r--r-- 1 root root 2134488 2023-03-25 17:06 ./slackware64/l/netpbm-11.02.00-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-03-25 17:06 ./slackware64/l/netpbm-11.02.00-x86_64-1.txz.asc -rw-r--r-- 1 root root 423 2022-11-30 20:09 ./slackware64/l/newt-0.52.23-x86_64-1.txt -rw-r--r-- 1 root root 115100 2022-11-30 20:09 ./slackware64/l/newt-0.52.23-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-11-30 20:09 ./slackware64/l/newt-0.52.23-x86_64-1.txz.asc @@ -4404,7 +4404,7 @@ drwxr-xr-x 2 root root 4096 2022-11-23 19:54 ./slackware64/tcl -rw-r--r-- 1 root root 227 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txt -rw-r--r-- 1 root root 1802760 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-11-23 19:07 ./slackware64/tcl/tk-8.6.13-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2023-03-24 19:48 ./slackware64/x +drwxr-xr-x 2 root root 65536 2023-03-25 19:01 ./slackware64/x -rw-r--r-- 1 root root 440 2022-12-09 18:23 ./slackware64/x/OpenCC-1.1.6-x86_64-1.txt -rw-r--r-- 1 root root 677084 2022-12-09 18:23 ./slackware64/x/OpenCC-1.1.6-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-12-09 18:23 ./slackware64/x/OpenCC-1.1.6-x86_64-1.txz.asc @@ -4862,9 +4862,9 @@ drwxr-xr-x 2 root root 65536 2023-03-24 19:48 ./slackware64/x -rw-r--r-- 1 root root 485 2022-12-25 19:47 ./slackware64/x/marisa-0.2.6-x86_64-6.txt -rw-r--r-- 1 root root 157376 2022-12-25 19:47 ./slackware64/x/marisa-0.2.6-x86_64-6.txz -rw-r--r-- 1 root root 163 2022-12-25 19:47 ./slackware64/x/marisa-0.2.6-x86_64-6.txz.asc --rw-r--r-- 1 root root 362 2023-03-15 17:38 ./slackware64/x/mesa-23.0.0-x86_64-1.txt --rw-r--r-- 1 root root 25756520 2023-03-15 17:38 ./slackware64/x/mesa-23.0.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2023-03-15 17:38 ./slackware64/x/mesa-23.0.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 362 2023-03-25 17:16 ./slackware64/x/mesa-23.0.1-x86_64-1.txt +-rw-r--r-- 1 root root 25754128 2023-03-25 17:16 ./slackware64/x/mesa-23.0.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2023-03-25 17:16 ./slackware64/x/mesa-23.0.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 425 2022-04-04 18:48 ./slackware64/x/mkcomposecache-1.2.2-x86_64-1.txt -rw-r--r-- 1 root root 13532 2022-04-04 18:48 ./slackware64/x/mkcomposecache-1.2.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2022-04-04 18:48 ./slackware64/x/mkcomposecache-1.2.2-x86_64-1.txz.asc @@ -5550,11 +5550,11 @@ drwxr-xr-x 2 root root 4096 2023-03-08 20:34 ./slackware64/y -rw-r--r-- 1 root root 1491108 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-02-19 18:31 ./slackware64/y/nethack-3.6.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2023-03-24 19:49 ./source --rw-r--r-- 1 root root 595550 2023-03-24 19:49 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2023-03-24 19:49 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 828413 2023-03-24 19:49 ./source/FILE_LIST --rw-r--r-- 1 root root 24420300 2023-03-24 19:49 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2023-03-25 19:02 ./source +-rw-r--r-- 1 root root 595550 2023-03-25 19:02 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2023-03-25 19:02 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 828413 2023-03-25 19:02 ./source/FILE_LIST +-rw-r--r-- 1 root root 24437655 2023-03-25 19:02 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT drwxr-xr-x 123 root root 4096 2023-03-16 18:59 ./source/a -rw-r--r-- 1 root root 234 2022-10-16 18:39 ./source/a/FTBFSlog @@ -11177,8 +11177,8 @@ drwxr-xr-x 2 root root 4096 2023-03-07 21:39 ./source/l/neon -rwxr-xr-x 1 root root 4451 2023-03-07 21:39 ./source/l/neon/neon.SlackBuild -rw-r--r-- 1 root root 31 2020-04-18 18:41 ./source/l/neon/neon.url -rw-r--r-- 1 root root 797 2020-04-18 18:41 ./source/l/neon/slack-desc -drwxr-xr-x 2 root root 4096 2023-03-23 19:57 ./source/l/netpbm --rw-r--r-- 1 root root 3241381 2023-03-23 19:33 ./source/l/netpbm/netpbm-11.01.03.tar.lz +drwxr-xr-x 2 root root 4096 2023-03-25 17:05 ./source/l/netpbm +-rw-r--r-- 1 root root 3245135 2023-03-25 17:05 ./source/l/netpbm/netpbm-11.02.00.tar.lz -rw-r--r-- 1 root root 381 2019-04-17 08:07 ./source/l/netpbm/netpbm-CAN-2005-2471.patch.gz -rw-r--r-- 1 root root 382 2019-04-17 08:07 ./source/l/netpbm/netpbm-CVE-2017-2587.patch.gz -rw-r--r-- 1 root root 284 2019-04-17 08:07 ./source/l/netpbm/netpbm-bmptopnm.patch.gz @@ -13413,7 +13413,7 @@ drwxr-xr-x 2 root root 4096 2022-03-06 20:46 ./source/x/marisa -rwxr-xr-x 1 root root 4717 2022-12-25 19:46 ./source/x/marisa/marisa.SlackBuild -rw-r--r-- 1 root root 38 2020-12-08 18:39 ./source/x/marisa/marisa.url -rw-r--r-- 1 root root 972 2020-11-28 00:57 ./source/x/marisa/slack-desc -drwxr-xr-x 5 root root 4096 2023-03-15 17:32 ./source/x/mesa +drwxr-xr-x 5 root root 4096 2023-03-25 17:13 ./source/x/mesa drwxr-xr-x 4 root root 4096 2022-08-08 18:18 ./source/x/mesa/amber -rw-r--r-- 1 root root 16607716 2022-06-08 18:26 ./source/x/mesa/amber/mesa-21.3.9.tar.xz -rw-r--r-- 1 root root 119 2022-06-08 18:26 ./source/x/mesa/amber/mesa-21.3.9.tar.xz.sig @@ -13423,9 +13423,9 @@ drwxr-xr-x 2 root root 4096 2021-03-12 01:31 ./source/x/mesa/amber/patches -rw-r--r-- 1 root root 1259 2021-03-12 01:31 ./source/x/mesa/amber/patches-revert/80817b6e344258ac9b955f824ebf9019a0fc1610.patch -rw-r--r-- 1 root root 388 2018-12-07 19:28 ./source/x/mesa/doinst.sh.gz -rwxr-xr-x 1 root root 720 2015-12-11 03:09 ./source/x/mesa/get-mesa.sh --rw-r--r-- 1 root root 17492236 2023-02-23 03:07 ./source/x/mesa/mesa-23.0.0.tar.xz --rw-r--r-- 1 root root 119 2023-02-23 03:07 ./source/x/mesa/mesa-23.0.0.tar.xz.sig --rwxr-xr-x 1 root root 2527 2023-02-24 19:30 ./source/x/mesa/mesa-amber.build +-rw-r--r-- 1 root root 17559472 2023-03-25 05:42 ./source/x/mesa/mesa-23.0.1.tar.xz +-rw-r--r-- 1 root root 119 2023-03-25 05:42 ./source/x/mesa/mesa-23.0.1.tar.xz.sig +-rwxr-xr-x 1 root root 2551 2023-03-25 17:13 ./source/x/mesa/mesa-amber.build -rw-r--r-- 1 root root 7322153 2022-05-30 14:26 ./source/x/mesa/mesa-demos-8.5.0.tar.lz -rwxr-xr-x 1 root root 1347 2022-08-08 19:08 ./source/x/mesa/mesa-demos.build -rwxr-xr-x 1 root root 6122 2023-03-09 18:55 ./source/x/mesa/mesa.SlackBuild diff --git a/source/x/mesa/mesa-amber.build b/source/x/mesa/mesa-amber.build index 1c39b04e9..650dd8d8a 100755 --- a/source/x/mesa/mesa-amber.build +++ b/source/x/mesa/mesa-amber.build @@ -29,15 +29,15 @@ find . \ # Patches obtained by: # git checkout origin/17.2 # git format-patch 93c2beafc0a7fa2f210b006d22aba61caa71f773 # 17.2.6 release -if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then - for patch in $CWD/patches/*.patch ; do +if /bin/ls $CWD/amber/patches/*.patch 1> /dev/null 2> /dev/null ; then + for patch in $CWD/amber/patches/*.patch ; do patch -p1 --verbose < $patch || exit 1 ; done fi # Revert these patches from git (and maybe elsewhere): -if /bin/ls $CWD/patches-revert/*.patch 1> /dev/null 2> /dev/null ; then - for patch in $CWD/patches-revert/*.patch ; do +if /bin/ls $CWD/amber/patches-revert/*.patch 1> /dev/null 2> /dev/null ; then + for patch in $CWD/amber/patches-revert/*.patch ; do patch -p1 -R --verbose < $patch || exit 1 ; done fi