diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2024-06-23 18:58:33 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2024-06-23 21:28:36 +0200 |
commit | 56f32a284b081ee617e6f485125cfb2d378a6654 (patch) | |
tree | 0c768a7add2337665494831f49ed92d24bddd705 | |
parent | 6d5b573830a8e5ed1c4cf6003286e8ae7f29e89f (diff) | |
download | current-56f32a284b081ee617e6f485125cfb2d378a6654.tar.gz current-56f32a284b081ee617e6f485125cfb2d378a6654.tar.xz |
Sun Jun 23 18:58:33 UTC 202420240623185833
a/grub-2.12-x86_64-3.txz: Rebuilt.
A few more changes, and moved out of /testing.
Disable stack protector so that legacy BIOS works.
Add a hint about .cfg suffix requirement in /etc/default/grub.d/.
Add Richard Cranium's 09_slackware_linux. Thanks to Daedra for POSIX fixes.
l/python-hatchling-1.25.0-x86_64-1.txz: Upgraded.
l/python-importlib_metadata-7.2.1-x86_64-1.txz: Upgraded.
EFI/BOOT/bootx64.efi: Rebuilt.
isolinux/efiboot.img: Rebuilt.
21 files changed, 302 insertions, 690 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index af162ac09..dda009b71 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,29 @@ <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>Sat, 22 Jun 2024 20:05:28 GMT</pubDate> - <lastBuildDate>Sat, 22 Jun 2024 20:30:42 GMT</lastBuildDate> + <pubDate>Sun, 23 Jun 2024 18:58:33 GMT</pubDate> + <lastBuildDate>Sun, 23 Jun 2024 19:28:29 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.17</generator> <item> + <title>Sun, 23 Jun 2024 18:58:33 GMT</title> + <pubDate>Sun, 23 Jun 2024 18:58:33 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20240623185833</link> + <guid isPermaLink="false">20240623185833</guid> + <description> + <![CDATA[<pre> +a/grub-2.12-x86_64-3.txz: Rebuilt. + A few more changes, and moved out of /testing. + Disable stack protector so that legacy BIOS works. + Add a hint about .cfg suffix requirement in /etc/default/grub.d/. + Add Richard Cranium's 09_slackware_linux. Thanks to Daedra for POSIX fixes. +l/python-hatchling-1.25.0-x86_64-1.txz: Upgraded. +l/python-importlib_metadata-7.2.1-x86_64-1.txz: Upgraded. +EFI/BOOT/bootx64.efi: Rebuilt. +isolinux/efiboot.img: Rebuilt. + </pre>]]> + </description> + </item> + <item> <title>Sat, 22 Jun 2024 20:05:28 GMT</title> <pubDate>Sat, 22 Jun 2024 20:05:28 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20240622200528</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index 6afcd5ecf..8dfb7f26e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,14 @@ +Sun Jun 23 18:58:33 UTC 2024 +a/grub-2.12-x86_64-3.txz: Rebuilt. + A few more changes, and moved out of /testing. + Disable stack protector so that legacy BIOS works. + Add a hint about .cfg suffix requirement in /etc/default/grub.d/. + Add Richard Cranium's 09_slackware_linux. Thanks to Daedra for POSIX fixes. +l/python-hatchling-1.25.0-x86_64-1.txz: Upgraded. +l/python-importlib_metadata-7.2.1-x86_64-1.txz: Upgraded. +EFI/BOOT/bootx64.efi: Rebuilt. +isolinux/efiboot.img: Rebuilt. ++--------------------------+ Sat Jun 22 20:05:28 UTC 2024 Today's episode of emacs versus vi: ap/vim-9.1.0514-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 8bb7e2cb8..17100748f 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,23 +1,23 @@ -Sat Jun 22 20:10:52 UTC 2024 +Sun Jun 23 19:02:12 UTC 2024 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 2024-06-22 20:05 . +drwxr-xr-x 12 root root 4096 2024-06-23 18:58 . -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 1154244 2024-06-22 18:22 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-06-22 18:22 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1154244 2024-06-22 20:11 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-06-22 20:11 ./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 1104682 2024-06-22 20:05 ./ChangeLog.txt +-rw-r--r-- 1 root root 1105198 2024-06-23 18:58 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI -drwxr-xr-x 2 root root 4096 2024-06-21 18:53 ./EFI/BOOT --rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi +drwxr-xr-x 2 root root 4096 2024-06-23 18:50 ./EFI/BOOT +-rw-r--r-- 1 root root 1200128 2024-06-23 18:50 ./EFI/BOOT/bootx64.efi -rw-r--r-- 1 root root 78 2013-09-23 20:35 ./EFI/BOOT/grub-embedded.cfg -rw-r--r-- 1 root root 893 2018-04-17 21:17 ./EFI/BOOT/grub.cfg -rw-r--r-- 2 root root 15098368 2024-06-21 18:17 ./EFI/BOOT/huge.s @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-06-21 18:53 ./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 1510785 2024-06-22 18:22 ./FILELIST.TXT +-rw-r--r-- 1 root root 1510785 2024-06-22 20:10 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 912353 2024-06-22 20:10 ./PACKAGES.TXT +-rw-r--r-- 1 root root 912447 2024-06-23 19:01 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 3623 2024-06-21 18:40 ./README.initrd -rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT @@ -618,10 +618,10 @@ drwxr-xr-x 2 root root 4096 2024-02-07 20:10 ./extra/xv -rw-r--r-- 1 root root 233 2024-02-07 19:12 ./extra/xv/xv-5.0.0-x86_64-1.txt -rw-r--r-- 1 root root 1097524 2024-02-07 19:12 ./extra/xv/xv-5.0.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2024-02-07 19:12 ./extra/xv/xv-5.0.0-x86_64-1.txz.asc -drwxr-xr-x 3 root root 4096 2024-06-21 18:53 ./isolinux +drwxr-xr-x 3 root root 4096 2024-06-23 18:50 ./isolinux -rw-r--r-- 1 root root 6185 2022-02-03 06:53 ./isolinux/README.TXT -rw-r--r-- 1 root root 788 2007-03-17 19:50 ./isolinux/README_SPLIT.TXT --rw-r--r-- 1 root root 1474560 2021-06-15 19:16 ./isolinux/efiboot.img +-rw-r--r-- 1 root root 1474560 2024-06-23 18:50 ./isolinux/efiboot.img -rw-r--r-- 1 root root 574 2013-10-24 00:19 ./isolinux/f2.txt -rw-r--r-- 2 root root 53603032 2024-06-21 18:53 ./isolinux/initrd.img -rw-r--r-- 1 root root 50 2003-01-18 00:02 ./isolinux/iso.sort @@ -662,13 +662,13 @@ 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 2024-06-22 20:10 ./slackware64 --rw-r--r-- 1 root root 355833 2024-06-22 20:10 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-06-22 20:10 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 440674 2024-06-22 20:09 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4693390 2024-06-22 20:09 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2024-06-23 19:01 ./slackware64 +-rw-r--r-- 1 root root 355833 2024-06-23 19:01 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-06-23 19:01 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 440674 2024-06-23 19:00 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4696964 2024-06-23 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 2024-06-21 18:56 ./slackware64/a +drwxr-xr-x 2 root root 32768 2024-06-23 19:00 ./slackware64/a -rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt -rw-r--r-- 1 root root 10720 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz -rw-r--r-- 1 root root 163 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txz.asc @@ -795,9 +795,9 @@ drwxr-xr-x 2 root root 32768 2024-06-21 18:56 ./slackware64/a -rw-r--r-- 1 root root 291 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txt -rw-r--r-- 1 root root 271096 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-05-14 00:12 ./slackware64/a/grep-3.11-x86_64-1.txz.asc --rw-r--r-- 1 root root 182 2023-03-28 18:03 ./slackware64/a/grub-2.06-x86_64-5.txt --rw-r--r-- 1 root root 10190324 2023-03-28 18:03 ./slackware64/a/grub-2.06-x86_64-5.txz --rw-r--r-- 1 root root 163 2023-03-28 18:03 ./slackware64/a/grub-2.06-x86_64-5.txz.asc +-rw-r--r-- 1 root root 269 2024-06-23 18:45 ./slackware64/a/grub-2.12-x86_64-3.txt +-rw-r--r-- 1 root root 10449952 2024-06-23 18:45 ./slackware64/a/grub-2.12-x86_64-3.txz +-rw-r--r-- 1 root root 195 2024-06-23 18:45 ./slackware64/a/grub-2.12-x86_64-3.txz.asc -rw-r--r-- 1 root root 314 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txt -rw-r--r-- 1 root root 117772 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-08-20 19:07 ./slackware64/a/gzip-1.13-x86_64-1.txz.asc @@ -2777,7 +2777,7 @@ drwxr-xr-x 2 root root 86016 2024-06-14 00:04 ./slackware64/kde -rw-r--r-- 1 root root 517 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txt -rw-r--r-- 1 root root 686104 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2024-02-15 21:47 ./slackware64/kde/zanshin-23.08.5-x86_64-1.txz.asc -drwxr-xr-x 2 root root 102400 2024-06-22 18:20 ./slackware64/l +drwxr-xr-x 2 root root 102400 2024-06-23 19:00 ./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 @@ -3850,9 +3850,9 @@ drwxr-xr-x 2 root root 102400 2024-06-22 18:20 ./slackware64/l -rw-r--r-- 1 root root 316 2024-03-29 04:28 ./slackware64/l/python-glad2-2.0.6-x86_64-2.txt -rw-r--r-- 1 root root 471200 2024-03-29 04:28 ./slackware64/l/python-glad2-2.0.6-x86_64-2.txz -rw-r--r-- 1 root root 195 2024-03-29 04:28 ./slackware64/l/python-glad2-2.0.6-x86_64-2.txz.asc --rw-r--r-- 1 root root 355 2024-04-22 19:01 ./slackware64/l/python-hatchling-1.24.2-x86_64-1.txt --rw-r--r-- 1 root root 158428 2024-04-22 19:01 ./slackware64/l/python-hatchling-1.24.2-x86_64-1.txz --rw-r--r-- 1 root root 195 2024-04-22 19:01 ./slackware64/l/python-hatchling-1.24.2-x86_64-1.txz.asc +-rw-r--r-- 1 root root 355 2024-06-23 17:05 ./slackware64/l/python-hatchling-1.25.0-x86_64-1.txt +-rw-r--r-- 1 root root 159952 2024-06-23 17:05 ./slackware64/l/python-hatchling-1.25.0-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-06-23 17:05 ./slackware64/l/python-hatchling-1.25.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 381 2024-03-29 04:28 ./slackware64/l/python-html5lib-1.1-x86_64-2.txt -rw-r--r-- 1 root root 239216 2024-03-29 04:28 ./slackware64/l/python-html5lib-1.1-x86_64-2.txz -rw-r--r-- 1 root root 195 2024-03-29 04:28 ./slackware64/l/python-html5lib-1.1-x86_64-2.txz.asc @@ -3862,9 +3862,9 @@ drwxr-xr-x 2 root root 102400 2024-06-22 18:20 ./slackware64/l -rw-r--r-- 1 root root 480 2024-03-29 04:28 ./slackware64/l/python-imagesize-1.4.1-x86_64-2.txt -rw-r--r-- 1 root root 12268 2024-03-29 04:28 ./slackware64/l/python-imagesize-1.4.1-x86_64-2.txz -rw-r--r-- 1 root root 195 2024-03-29 04:28 ./slackware64/l/python-imagesize-1.4.1-x86_64-2.txz.asc --rw-r--r-- 1 root root 597 2024-06-20 20:03 ./slackware64/l/python-importlib_metadata-7.2.0-x86_64-1.txt --rw-r--r-- 1 root root 49148 2024-06-20 20:03 ./slackware64/l/python-importlib_metadata-7.2.0-x86_64-1.txz --rw-r--r-- 1 root root 195 2024-06-20 20:03 ./slackware64/l/python-importlib_metadata-7.2.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 597 2024-06-23 17:07 ./slackware64/l/python-importlib_metadata-7.2.1-x86_64-1.txt +-rw-r--r-- 1 root root 49924 2024-06-23 17:07 ./slackware64/l/python-importlib_metadata-7.2.1-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-06-23 17:07 ./slackware64/l/python-importlib_metadata-7.2.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 461 2024-03-31 22:35 ./slackware64/l/python-installer-0.7.0-x86_64-3.txt -rw-r--r-- 1 root root 38808 2024-03-31 22:35 ./slackware64/l/python-installer-0.7.0-x86_64-3.txz -rw-r--r-- 1 root root 195 2024-03-31 22:35 ./slackware64/l/python-installer-0.7.0-x86_64-3.txz.asc @@ -5786,13 +5786,13 @@ drwxr-xr-x 2 root root 4096 2024-05-05 18:37 ./slackware64/y -rw-r--r-- 1 root root 1488844 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz -rw-r--r-- 1 root root 195 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz.asc -rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile -drwxr-xr-x 18 root root 4096 2024-06-22 20:10 ./source --rw-r--r-- 1 root root 621269 2024-06-22 20:10 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-06-22 20:10 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 866299 2024-06-22 20:10 ./source/FILE_LIST --rw-r--r-- 1 root root 29711364 2024-06-22 20:10 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2024-06-23 19:02 ./source +-rw-r--r-- 1 root root 621418 2024-06-23 19:02 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-06-23 19:02 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 866481 2024-06-23 19:01 ./source/FILE_LIST +-rw-r--r-- 1 root root 29696391 2024-06-23 19:01 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT -drwxr-xr-x 124 root root 4096 2024-06-18 17:37 ./source/a +drwxr-xr-x 124 root root 4096 2024-06-23 18:42 ./source/a -rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog drwxr-xr-x 2 root root 4096 2022-02-15 18:15 ./source/a/aaa_base -rw-r--r-- 1 root root 11041 2022-02-15 04:49 ./source/a/aaa_base/_aaa_base.tar.gz @@ -6204,19 +6204,21 @@ drwxr-xr-x 2 root root 4096 2022-09-07 16:29 ./source/a/grep/scripts -rw-r--r-- 1 root root 104 2022-09-07 16:29 ./source/a/grep/scripts/egrep -rw-r--r-- 1 root root 104 2022-09-07 16:29 ./source/a/grep/scripts/fgrep -rw-r--r-- 1 root root 743 2018-02-27 06:13 ./source/a/grep/slack-desc -drwxr-xr-x 2 root root 4096 2023-03-28 18:00 ./source/a/grub --rw-r--r-- 1 root root 291 2021-09-10 18:33 ./source/a/grub/0001-skip-new-files-in-etc-grub.d.patch.gz --rw-r--r-- 1 root root 639 2018-05-16 15:18 ./source/a/grub/0198-align-struct-efi_variable-better.patch.gz --rw-r--r-- 1 root root 1200 2023-03-28 17:57 ./source/a/grub/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch.gz --rw-r--r-- 1 root root 1743 2021-09-09 03:04 ./source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch.gz +drwxr-xr-x 2 root root 4096 2024-06-23 18:43 ./source/a/grub +-rw-r--r-- 1 root root 1167 2023-12-21 19:26 ./source/a/grub/0001-00_header-add-GRUB_COLOR_-variables.patch +-rw-r--r-- 1 root root 444 2024-01-02 19:45 ./source/a/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch +-rw-r--r-- 1 root root 766 2023-12-21 19:30 ./source/a/grub/0003-support-dropins-for-default-configuration.patch +-rw-r--r-- 1 root root 1103 2018-05-16 15:18 ./source/a/grub/0198-align-struct-efi_variable-better.patch +-rw-r--r-- 1 root root 5719 2024-03-31 20:37 ./source/a/grub/09_slackware_linux +-rw-r--r-- 1 root root 1320 2023-12-21 07:17 ./source/a/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch -rw-r--r-- 1 root root 307 2021-09-10 18:36 ./source/a/grub/doinst.sh.gz -rw-r--r-- 1 root root 926 2016-06-13 03:14 ./source/a/grub/etc.default.grub --rw-r--r-- 1 root root 6581924 2021-06-08 17:22 ./source/a/grub/grub-2.06.tar.xz --rw-r--r-- 1 root root 566 2021-06-08 17:22 ./source/a/grub/grub-2.06.tar.xz.sig --rwxr-xr-x 1 root root 7698 2023-03-28 18:01 ./source/a/grub/grub.SlackBuild --rw-r--r-- 1 root root 704 2016-12-25 09:49 ./source/a/grub/grub.dejavusansmono.gfxterm.font.diff.gz --rw-r--r-- 1 root root 299 2012-09-29 04:34 ./source/a/grub/initrd_naming.patch.gz --rw-r--r-- 1 root root 634 2018-11-29 19:15 ./source/a/grub/slack-desc +-rw-r--r-- 1 root root 6675608 2023-12-20 16:53 ./source/a/grub/grub-2.12.tar.xz +-rw-r--r-- 1 root root 566 2023-12-20 16:53 ./source/a/grub/grub-2.12.tar.xz.sig +-rwxr-xr-x 1 root root 8477 2024-06-23 18:42 ./source/a/grub/grub.SlackBuild +-rw-r--r-- 1 root root 1458 2016-12-25 09:49 ./source/a/grub/grub.dejavusansmono.gfxterm.font.diff +-rw-r--r-- 1 root root 619 2012-09-29 04:34 ./source/a/grub/initrd_naming.patch +-rw-r--r-- 1 root root 721 2023-12-21 19:34 ./source/a/grub/slack-desc drwxr-xr-x 2 root root 4096 2023-08-20 19:07 ./source/a/gzip -rw-r--r-- 1 root root 838248 2023-08-20 00:20 ./source/a/gzip/gzip-1.13.tar.xz -rw-r--r-- 1 root root 833 2023-08-20 00:20 ./source/a/gzip/gzip-1.13.tar.xz.sig @@ -12015,8 +12017,8 @@ drwxr-xr-x 2 root root 4096 2024-03-29 03:06 ./source/l/python-glad2 -rw-r--r-- 1 root root 31 2024-01-24 21:16 ./source/l/python-glad2/glad2.url -rwxr-xr-x 1 root root 3094 2024-03-29 03:06 ./source/l/python-glad2/python-glad2.SlackBuild -rw-r--r-- 1 root root 776 2022-11-17 18:47 ./source/l/python-glad2/slack-desc -drwxr-xr-x 2 root root 4096 2024-04-22 19:01 ./source/l/python-hatchling --rw-r--r-- 1 root root 63973 2024-04-22 02:21 ./source/l/python-hatchling/hatchling-1.24.2.tar.gz +drwxr-xr-x 2 root root 4096 2024-06-23 17:05 ./source/l/python-hatchling +-rw-r--r-- 1 root root 64632 2024-06-22 17:27 ./source/l/python-hatchling/hatchling-1.25.0.tar.gz -rw-r--r-- 1 root root 35 2024-01-24 20:36 ./source/l/python-hatchling/hatchling.url -rwxr-xr-x 1 root root 3123 2024-04-05 17:26 ./source/l/python-hatchling/python-hatchling.SlackBuild -rw-r--r-- 1 root root 819 2024-02-04 18:45 ./source/l/python-hatchling/slack-desc @@ -12035,8 +12037,8 @@ drwxr-xr-x 2 root root 4096 2024-03-29 03:06 ./source/l/python-imagesize -rw-r--r-- 1 root root 35 2022-04-29 18:20 ./source/l/python-imagesize/imagesize.url -rwxr-xr-x 1 root root 2924 2024-03-29 03:06 ./source/l/python-imagesize/python-imagesize.SlackBuild -rw-r--r-- 1 root root 976 2022-04-29 18:25 ./source/l/python-imagesize/slack-desc -drwxr-xr-x 2 root root 4096 2024-06-20 20:03 ./source/l/python-importlib_metadata --rw-r--r-- 1 root root 52330 2024-06-20 16:46 ./source/l/python-importlib_metadata/importlib_metadata-7.2.0.tar.gz +drwxr-xr-x 2 root root 4096 2024-06-23 17:07 ./source/l/python-importlib_metadata +-rw-r--r-- 1 root root 52834 2024-06-23 15:17 ./source/l/python-importlib_metadata/importlib_metadata-7.2.1.tar.gz -rw-r--r-- 1 root root 44 2022-04-29 18:26 ./source/l/python-importlib_metadata/importlib_metadata.url -rwxr-xr-x 1 root root 2936 2024-06-20 20:03 ./source/l/python-importlib_metadata/python-importlib_metadata.SlackBuild -rw-r--r-- 1 root root 1102 2022-04-29 18:30 ./source/l/python-importlib_metadata/slack-desc @@ -15274,8 +15276,8 @@ drwxr-xr-x 2 root root 4096 2024-04-17 18:00 ./source/x/x11/src/lib -rw-r--r-- 1 root root 64452 2024-03-23 23:00 ./source/x/x11/src/lib/libpciaccess-0.18.1.tar.xz -rw-r--r-- 1 root root 455208 2024-04-15 15:11 ./source/x/x11/src/lib/libxcb-1.17.0.tar.xz -rw-r--r-- 1 root root 9648 2022-07-19 08:56 ./source/x/x11/src/lib/libxcvt-0.1.2.tar.xz --rw-r--r-- 1 root root 314520 2024-02-04 22:15 ./source/x/x11/src/lib/libxkbfile-1.1.3.tar.xz --rw-r--r-- 1 root root 259024 2022-12-08 16:08 ./source/x/x11/src/lib/libxshmfence-1.3.2.tar.xz +-rw-r--r-- 1 root root 314520 2024-02-04 22:15 ./source/x/x11/src/lib/libxkbfile-1.1.3.tar.xz +-rw-r--r-- 1 root root 259024 2022-12-08 16:08 ./source/x/x11/src/lib/libxshmfence-1.3.2.tar.xz -rw-r--r-- 1 root root 636900 2024-02-29 16:19 ./source/x/x11/src/lib/pixman-0.43.4.tar.xz -rw-r--r-- 1 root root 266788 2023-10-19 20:39 ./source/x/x11/src/lib/xcb-util-cursor-0.1.5.tar.xz -rw-r--r-- 1 root root 170388 2023-06-03 00:35 ./source/x/x11/src/lib/xtrans-1.5.0.tar.xz @@ -15986,31 +15988,14 @@ drwxr-xr-x 2 root root 4096 2023-02-19 18:29 ./source/y/nethack -rwxr-xr-x 1 root root 4972 2024-05-05 17:20 ./source/y/nethack/nethack.SlackBuild -rw-r--r-- 1 root root 59 2023-02-19 18:28 ./source/y/nethack/nethack.url -rw-r--r-- 1 root root 1031 2020-12-30 21:50 ./source/y/nethack/slack-desc -drwxr-xr-x 4 root root 4096 2024-04-22 19:41 ./testing --rw-r--r-- 1 root root 1777 2024-04-22 19:41 ./testing/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-04-22 19:41 ./testing/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 2245 2024-04-22 19:41 ./testing/FILE_LIST --rw-r--r-- 1 root root 30756 2024-04-22 19:41 ./testing/MANIFEST.bz2 --rw-r--r-- 1 root root 652 2024-04-22 19:41 ./testing/PACKAGES.TXT -drwxr-xr-x 2 root root 4096 2024-02-12 20:44 ./testing/packages --rw-r--r-- 1 root root 269 2024-01-02 19:49 ./testing/packages/grub-2.12-x86_64-2.txt --rw-r--r-- 1 root root 10454116 2024-01-02 19:49 ./testing/packages/grub-2.12-x86_64-2.txz --rw-r--r-- 1 root root 163 2024-01-02 19:49 ./testing/packages/grub-2.12-x86_64-2.txz.asc -drwxr-xr-x 3 root root 4096 2024-04-22 19:19 ./testing/source -drwxr-xr-x 2 root root 4096 2024-01-02 19:45 ./testing/source/grub --rw-r--r-- 1 root root 1167 2023-12-21 19:26 ./testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch --rw-r--r-- 1 root root 444 2024-01-02 19:45 ./testing/source/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch --rw-r--r-- 1 root root 766 2023-12-21 19:30 ./testing/source/grub/0003-support-dropins-for-default-configuration.patch --rw-r--r-- 1 root root 1103 2018-05-16 15:18 ./testing/source/grub/0198-align-struct-efi_variable-better.patch --rw-r--r-- 1 root root 1320 2023-12-21 07:17 ./testing/source/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch --rw-r--r-- 1 root root 307 2021-09-10 18:36 ./testing/source/grub/doinst.sh.gz --rw-r--r-- 1 root root 926 2016-06-13 03:14 ./testing/source/grub/etc.default.grub --rw-r--r-- 1 root root 6675608 2023-12-20 16:53 ./testing/source/grub/grub-2.12.tar.xz --rw-r--r-- 1 root root 566 2023-12-20 16:53 ./testing/source/grub/grub-2.12.tar.xz.sig --rwxr-xr-x 1 root root 7911 2024-01-02 19:46 ./testing/source/grub/grub.SlackBuild --rw-r--r-- 1 root root 1458 2016-12-25 09:49 ./testing/source/grub/grub.dejavusansmono.gfxterm.font.diff --rw-r--r-- 1 root root 619 2012-09-29 04:34 ./testing/source/grub/initrd_naming.patch --rw-r--r-- 1 root root 721 2023-12-21 19:34 ./testing/source/grub/slack-desc +drwxr-xr-x 4 root root 4096 2024-06-23 19:02 ./testing +-rw-r--r-- 1 root root 552 2024-06-23 19:02 ./testing/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-06-23 19:02 ./testing/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 693 2024-06-23 19:02 ./testing/FILE_LIST +-rw-r--r-- 1 root root 14 2024-06-23 19:02 ./testing/MANIFEST.bz2 +-rw-r--r-- 1 root root 224 2024-06-23 19:02 ./testing/PACKAGES.TXT +drwxr-xr-x 2 root root 4096 2024-06-23 18:42 ./testing/packages +drwxr-xr-x 2 root root 4096 2024-06-23 18:42 ./testing/source drwxr-xr-x 2 root root 4096 2024-06-21 18:53 ./usb-and-pxe-installers -rw-r--r-- 1 root root 31203 2011-03-21 21:21 ./usb-and-pxe-installers/README_PXE.TXT -rw-r--r-- 1 root root 9197 2013-09-25 04:33 ./usb-and-pxe-installers/README_USB.TXT diff --git a/recompress.sh b/recompress.sh index 6ec0edcd4..94cb0c19f 100755 --- a/recompress.sh +++ b/recompress.sh @@ -98,13 +98,7 @@ gzip ./source/a/dialog/dialog.smaller.min.height.diff gzip ./source/a/dialog/doinst.sh gzip ./source/a/dialog/dialog.no.aspect.ratio.autoajust.patch gzip ./source/a/haveged/doinst.sh -gzip ./source/a/grub/initrd_naming.patch -gzip ./source/a/grub/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch -gzip ./source/a/grub/0001-skip-new-files-in-etc-grub.d.patch -gzip ./source/a/grub/0198-align-struct-efi_variable-better.patch gzip ./source/a/grub/doinst.sh -gzip ./source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch -gzip ./source/a/grub/grub.dejavusansmono.gfxterm.font.diff gzip ./source/a/devs/makedev_2.3.1.hd.diff gzip ./source/a/devs/makedev_2.3.1-46.2.diff gzip ./source/a/devs/makedev.hd.diff @@ -1080,4 +1074,3 @@ gzip ./source/x/ibus/doinst.sh gzip ./source/x/ibus/emoji-test.txt gzip ./source/x/xcm/xcm.udev.rules.diff gzip ./source/x/libva/doinst.sh -gzip ./testing/source/grub/doinst.sh diff --git a/testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch b/source/a/grub/0001-00_header-add-GRUB_COLOR_-variables.patch index 867e8feeb..867e8feeb 100644 --- a/testing/source/grub/0001-00_header-add-GRUB_COLOR_-variables.patch +++ b/source/a/grub/0001-00_header-add-GRUB_COLOR_-variables.patch diff --git a/testing/source/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch b/source/a/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch index 601a05b9a..601a05b9a 100644 --- a/testing/source/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch +++ b/source/a/grub/0001-skip-new-and-orig-files-in-etc-grub.d.patch diff --git a/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch b/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch deleted file mode 100644 index e1b4b8dcc..000000000 --- a/source/a/grub/0001-skip-new-files-in-etc-grub.d.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./util/grub-mkconfig.in.orig 2021-03-10 07:42:22.000000000 -0600 -+++ ./util/grub-mkconfig.in 2021-09-10 13:33:17.602163090 -0500 -@@ -278,6 +278,8 @@ - *~) ;; - # emacsen autosave files. FIXME: support other editors - */\#*\#) ;; -+ # Slackware incoming config files should be skipped as well: -+ *.new) ;; - *) - if grub_file_is_not_garbage "$i" && test -x "$i" ; then - echo diff --git a/testing/source/grub/0003-support-dropins-for-default-configuration.patch b/source/a/grub/0003-support-dropins-for-default-configuration.patch index 4840487a1..4840487a1 100644 --- a/testing/source/grub/0003-support-dropins-for-default-configuration.patch +++ b/source/a/grub/0003-support-dropins-for-default-configuration.patch diff --git a/source/a/grub/09_slackware_linux b/source/a/grub/09_slackware_linux new file mode 100644 index 000000000..e897cb130 --- /dev/null +++ b/source/a/grub/09_slackware_linux @@ -0,0 +1,177 @@ +#! /bin/sh +set -e +# grub-mkconfig helper script. +# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc. +# +# GRUB is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# GRUB is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GRUB. If not, see <http://www.gnu.org/licenses/>. +# +# Save this file in /etc/grub.d/09_slackware_linux + +prefix="/usr" +exec_prefix="${prefix}" +datarootdir="${prefix}/share" + +. "${datarootdir}/grub/grub-mkconfig_lib" + +export TEXTDOMAIN=grub +export TEXTDOMAINDIR="${datarootdir}/locale" + +CLASS="--class gnu-linux --class gnu --class os" + +if [ "${GRUB_DISTRIBUTOR}" = "" ] ; then + OS=GNU/Linux +else + OS="${GRUB_DISTRIBUTOR} GNU/Linux" + CLASS="--class $(echo "${GRUB_DISTRIBUTOR}" | tr '[:upper:]' '[:lower:]') ${CLASS}" +fi + +# loop-AES arranges things so that /dev/loop/X can be our root device, but +# the initrds that Linux uses don't like that. +case ${GRUB_DEVICE} in + /dev/loop/*|/dev/loop[0-9]) + GRUB_DEVICE=$(losetup "${GRUB_DEVICE}" | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/") + ;; +esac + +if [ "${GRUB_DEVICE_UUID}" = "" ] || [ "${GRUB_DISABLE_LINUX_UUID}" = "true" ] \ + || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" ; then + LINUX_ROOT_DEVICE=${GRUB_DEVICE} +else + LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} +fi + +linux_entry () +{ + os="$1" + tag="$2" + version="$3" + recovery="$4" + args="$5" + if ${recovery} ; then + title="$(gettext "%s, with Linux %s [%s] (recovery mode)")" + else + title="$(gettext "%s, with Linux %s [%s]")" + fi + printf "menuentry \"${title}\" ${CLASS} {\n" "${os}" "${version}" "${tag}" + save_default_entry | sed -e "s/^/\t/" + + # Use ELILO's generic "efifb" when it's known to be available. + # FIXME: We need an interface to select vesafb in case efifb can't be used. + if [ "$GRUB_GFXPAYLOAD_LINUX" = "" ]; then + if grep -qx "CONFIG_FB_EFI=y" /boot/config-"${version}" 2> /dev/null \ + && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" /boot/config-"${version}" 2> /dev/null; then + cat << EOF + set gfxpayload=keep +EOF + fi + else + cat << EOF + set gfxpayload=$GRUB_GFXPAYLOAD_LINUX +EOF + fi + + if [ -z "${prepare_boot_cache}" ]; then + prepare_boot_cache="$(prepare_grub_to_access_device "${GRUB_DEVICE_BOOT}" | sed -e "s/^/\t/")" + fi + printf '%s\n' "${prepare_boot_cache}" + cat << EOF + echo $(printf "$(gettext "Loading Linux %s ...")" "${version}") + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} +EOF + if test -n "${initrd}" ; then + cat << EOF + echo $(gettext "Loading initial ramdisk ...") + initrd ${rel_dirname}/${initrd} +EOF + fi + cat << EOF +} +EOF +} + +process_list() { + mylist="$1" + tag="$2" + initrd_allowed="$3" + + # Version-sort the kernels + sorted_kernels=$(echo "$mylist" | version_sort -r) + + # Use portable command substitution + kernels=$(echo "$sorted_kernels" | tr ' ' '\n') + + for kernel in $kernels; do + # Skip symbolic links + if [ -L "$kernel" ]; then + continue + fi + + printf "Found linux image: %s\n" "$kernel" >&2 + basename=$(basename "$kernel") + dirname=$(dirname "$kernel") + rel_dirname=$(make_system_path_relative_to_its_root "$dirname") + version=$(echo "$basename" | sed -e "s,^[^0-9]*-,,g") + alt_version=$(echo "$version" | sed -e "s,\.old$,,g") + linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" + initrd= + + if [ "${initrd_allowed}" = "true" ]; then + for i in "initrd-${version}.gz" "initrd.gz" \ + "initrd.img-${version}" "initrd-${version}.img" \ + "initrd-${version}" "initrd.img-${alt_version}" \ + "initrd-${alt_version}.img" "initrd-${alt_version}"; do + if [ -e "${dirname}/${i}" ]; then + initrd="$i" + break + fi + done + + if [ -n "${initrd}" ]; then + printf "Found initrd image: %s/%s\n" "${dirname}" "${initrd}" >&2 + else + # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. + linux_root_device_thisversion=${GRUB_DEVICE} + fi + else + # "UUID=" magic is parsed by initrds. Since there's no initrd, it can't work here. + linux_root_device_thisversion=${GRUB_DEVICE} + fi + + linux_entry "${OS}" "${tag}" "${version}" false \ + "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" + + if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then + linux_entry "${OS}" "${tag}" "${version}" true \ + "single ${GRUB_CMDLINE_LINUX}" + fi + done +} + +prepare_boot_cache= + +list=$(for i in /boot/vmlinu[xz]-generic-* /vmlinu[xz]-generic-* ; do + if grub_file_is_not_garbage "$i" ; then printf "%s " "$i"; fi + done) + +process_list "${list}" "generic" "true" + +list=$(for i in /boot/vmlinu[xz]-custom-* /vmlinu[xz]-custom-* ; do + if grub_file_is_not_garbage "$i" ; then printf "%s " "$i"; fi + done) +process_list "${list}" "custom" "true" + +list=$(for i in /boot/vmlinu[xz]-huge-* /vmlinu[xz]-huge-* ; do + if grub_file_is_not_garbage "$i" ; then printf "%s " "$i"; fi + done) +process_list "${list}" "huge" "false" diff --git a/source/a/grub/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch b/source/a/grub/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch deleted file mode 100644 index 27b2277c4..000000000 --- a/source/a/grub/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763 Mon Sep 17 00:00:00 2001 -From: Javier Martinez Canillas <javierm@redhat.com> -Date: Fri, 11 Jun 2021 21:36:16 +0200 -Subject: fs/ext2: Ignore checksum seed incompat feature - -This incompat feature is used to denote that the filesystem stored its -metadata checksum seed in the superblock. This is used to allow tune2fs -changing the UUID on a mounted metdata_csum filesystem without having -to rewrite all the disk metadata. However, the GRUB doesn't use the -metadata checksum at all. So, it can just ignore this feature if it -is enabled. This is consistent with the GRUB filesystem code in general -which just does a best effort to access the filesystem's data. - -The checksum seed incompat feature has to be removed from the ignore -list if the support for metadata checksum verification is added to the -GRUB ext2 driver later. - -Suggested-by: Eric Sandeen <esandeen@redhat.com> -Suggested-by: Lukas Czerner <lczerner@redhat.com> -Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> -Reviewed-by: Lukas Czerner <lczerner@redhat.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/fs/ext2.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c -index e7dd78e..4953a15 100644 ---- a/grub-core/fs/ext2.c -+++ b/grub-core/fs/ext2.c -@@ -103,6 +103,7 @@ GRUB_MOD_LICENSE ("GPLv3+"); - #define EXT4_FEATURE_INCOMPAT_64BIT 0x0080 - #define EXT4_FEATURE_INCOMPAT_MMP 0x0100 - #define EXT4_FEATURE_INCOMPAT_FLEX_BG 0x0200 -+#define EXT4_FEATURE_INCOMPAT_CSUM_SEED 0x2000 - #define EXT4_FEATURE_INCOMPAT_ENCRYPT 0x10000 - - /* The set of back-incompatible features this driver DOES support. Add (OR) -@@ -123,10 +124,15 @@ GRUB_MOD_LICENSE ("GPLv3+"); - * mmp: Not really back-incompatible - was added as such to - * avoid multiple read-write mounts. Safe to ignore for this - * RO driver. -+ * checksum seed: Not really back-incompatible - was added to allow tools -+ * such as tune2fs to change the UUID on a mounted metadata -+ * checksummed filesystem. Safe to ignore for now since the -+ * driver doesn't support checksum verification. However, it -+ * has to be removed from this list if the support is added later. - */ - #define EXT2_DRIVER_IGNORED_INCOMPAT ( EXT3_FEATURE_INCOMPAT_RECOVER \ -- | EXT4_FEATURE_INCOMPAT_MMP) -- -+ | EXT4_FEATURE_INCOMPAT_MMP \ -+ | EXT4_FEATURE_INCOMPAT_CSUM_SEED) - - #define EXT3_JOURNAL_MAGIC_NUMBER 0xc03b3998U - --- -cgit v1.1 - diff --git a/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch b/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch deleted file mode 100644 index 5abc747af..000000000 --- a/source/a/grub/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch +++ /dev/null @@ -1,121 +0,0 @@ -From a4b495520e4dc41a896a8b916a64eda9970c50ea Mon Sep 17 00:00:00 2001 -From: Erwan Velu <erwanaliasr1@gmail.com> -Date: Wed, 25 Aug 2021 15:31:52 +0200 -Subject: fs/xfs: Fix unreadable filesystem with v4 superblock - -The commit 8b1e5d193 (fs/xfs: Add bigtime incompat feature support) -introduced the bigtime support by adding some features in v3 inodes. -This change extended grub_xfs_inode struct by 76 bytes but also changed -the computation of XFS_V2_INODE_SIZE and XFS_V3_INODE_SIZE. Prior this -commit, XFS_V2_INODE_SIZE was 100 bytes. After the commit it's 84 bytes -XFS_V2_INODE_SIZE becomes 16 bytes too small. - -As a result, the data structures aren't properly aligned and the GRUB -generates "attempt to read or write outside of partition" errors when -trying to read the XFS filesystem: - - GNU GRUB version 2.11 - .... - grub> set debug=efi,gpt,xfs - grub> insmod part_gpt - grub> ls (hd0,gpt1)/ - partmap/gpt.c:93: Read a valid GPT header - partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125 - fs/xfs.c:931: Reading sb - fs/xfs.c:270: Validating superblock - fs/xfs.c:295: XFS v4 superblock detected - fs/xfs.c:962: Reading root ino 128 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (739521961424144223) - 344365866970255880, 3840 - error: attempt to read or write outside of partition. - -This commit change the XFS_V2_INODE_SIZE computation by subtracting 76 -bytes instead of 92 bytes from the actual size of grub_xfs_inode struct. -This 76 bytes value comes from added members: - 20 grub_uint8_t unused5 - 1 grub_uint64_t flags2 - 48 grub_uint8_t unused6 - -This patch explicitly splits the v2 and v3 parts of the structure. -The unused4 is still ending of the v2 structures and the v3 starts -at unused5. Thanks to this we will avoid future corruptions of v2 -or v3 inodes. - -The XFS_V2_INODE_SIZE is returning to its expected size and the -filesystem is back to a readable state: - - GNU GRUB version 2.11 - .... - grub> set debug=efi,gpt,xfs - grub> insmod part_gpt - grub> ls (hd0,gpt1)/ - partmap/gpt.c:93: Read a valid GPT header - partmap/gpt.c:115: GPT entry 0: start=4096, length=1953125 - fs/xfs.c:931: Reading sb - fs/xfs.c:270: Validating superblock - fs/xfs.c:295: XFS v4 superblock detected - fs/xfs.c:962: Reading root ino 128 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:931: Reading sb - fs/xfs.c:270: Validating superblock - fs/xfs.c:295: XFS v4 superblock detected - fs/xfs.c:962: Reading root ino 128 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (128) - 64, 0 - fs/xfs.c:515: Reading inode (131) - 64, 768 - efi/ fs/xfs.c:515: Reading inode (3145856) - 1464904, 0 - grub2/ fs/xfs.c:515: Reading inode (132) - 64, 1024 - grub/ fs/xfs.c:515: Reading inode (139) - 64, 2816 - grub> - -Fixes: 8b1e5d193 (fs/xfs: Add bigtime incompat feature support) - -Signed-off-by: Erwan Velu <e.velu@criteo.com> -Tested-by: Carlos Maiolino <cmaiolino@redhat.com> -Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> ---- - grub-core/fs/xfs.c | 14 ++++++++++---- - 1 file changed, 10 insertions(+), 4 deletions(-) - -diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c -index 0f524c3a8..e3816d1ec 100644 ---- a/grub-core/fs/xfs.c -+++ b/grub-core/fs/xfs.c -@@ -192,6 +192,11 @@ struct grub_xfs_time_legacy - grub_uint32_t nanosec; - } GRUB_PACKED; - -+/* -+ * The struct grub_xfs_inode layout was taken from the -+ * struct xfs_dinode_core which is described here: -+ * https://mirrors.edge.kernel.org/pub/linux/utils/fs/xfs/docs/xfs_filesystem_structure.pdf -+ */ - struct grub_xfs_inode - { - grub_uint8_t magic[2]; -@@ -208,14 +213,15 @@ struct grub_xfs_inode - grub_uint32_t nextents; - grub_uint16_t unused3; - grub_uint8_t fork_offset; -- grub_uint8_t unused4[37]; -+ grub_uint8_t unused4[17]; /* Last member of inode v2. */ -+ grub_uint8_t unused5[20]; /* First member of inode v3. */ - grub_uint64_t flags2; -- grub_uint8_t unused5[48]; -+ grub_uint8_t unused6[48]; /* Last member of inode v3. */ - } GRUB_PACKED; - - #define XFS_V3_INODE_SIZE sizeof(struct grub_xfs_inode) --/* Size of struct grub_xfs_inode until fork_offset (included). */ --#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 92) -+/* Size of struct grub_xfs_inode v2, up to unused4 member included. */ -+#define XFS_V2_INODE_SIZE (XFS_V3_INODE_SIZE - 76) - - struct grub_xfs_dirblock_tail - { --- -cgit v1.2.1 - - diff --git a/testing/source/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch b/source/a/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch index 6670f7677..6670f7677 100644 --- a/testing/source/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch +++ b/source/a/grub/b835601c7639ed1890f2d3db91900a8506011a8e.patch diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index b2bbb7223..0c5d57ed0 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2013, 2016, 2017, 2018, 2019, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2013, 2016, 2017, 2018, 2019, 2023, 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,7 +28,10 @@ PKGNAM=grub VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # Better to use _ than ~ in the package filenames version: PKGVER=$(echo $VERSION | tr '~' '_') -BUILD=${BUILD:-5} +BUILD=${BUILD:-3} + +# If you use stack-protector, then grub will not work with legacy BIOS: +STACKPROTECT=${STACKPROTECT:---enable-stack-protector=no} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -104,23 +107,28 @@ find . \ -exec chmod 644 {} \+ # Use /boot/initrd.gz as a valid initrd name: -zcat $CWD/initrd_naming.patch | patch -p1 --verbose || exit 1 +cat $CWD/initrd_naming.patch | patch -p1 --verbose || exit 1 # Support DejaVuSansMono font (dejavusansmono.pf2) by default: -zcat $CWD/grub.dejavusansmono.gfxterm.font.diff.gz | patch -p1 --verbose || exit 1 +cat $CWD/grub.dejavusansmono.gfxterm.font.diff | patch -p1 --verbose || exit 1 # Fix alignment error with gcc8: -zcat $CWD/0198-align-struct-efi_variable-better.patch.gz | patch -p1 --verbose || exit 1 +cat $CWD/0198-align-struct-efi_variable-better.patch | patch -p1 --verbose || exit 1 + +# Skip processing any files in /etc/grub.d/ that end in .new or .orig: +cat $CWD/0001-skip-new-and-orig-files-in-etc-grub.d.patch | patch -p1 --verbose || exit 1 -# Fix unreadable XFS filesystem with v4 superblock: -zcat $CWD/a4b495520e4dc41a896a8b916a64eda9970c50ea.patch.gz | patch -p1 --verbose || exit 1 +# From Arch, add a couple more GRUB_COLOR options: +cat $CWD/0001-00_header-add-GRUB_COLOR_-variables.patch | patch -p1 --verbose || exit 1 -# Skip processing any files in /etc/grub.d/ that end in .new: -zcat $CWD/0001-skip-new-files-in-etc-grub.d.patch.gz | patch -p1 --verbose || exit 1 +# Also from Arch, support drop-in config bits in /etc/default/grub.d/: +cat $CWD/0003-support-dropins-for-default-configuration.patch | patch -p1 --verbose || exit 1 -# Since upstream apparently can't be bothered, let's fix using ext* filesystems -# created with what are now the default options: -zcat $CWD/7fd5feff97c4b1f446f8fcf6d37aca0c64e7c763.patch.gz | patch -p1 --verbose || exit 1 +# Fix 2.12 release with upstream commit (won't compile otherwise): +cat $CWD/b835601c7639ed1890f2d3db91900a8506011a8e.patch | patch -p1 --verbose || exit 1 + +# Still won't compile. Someday they'll remember how to cut a new release. +touch grub-core/extra_deps.lst # Regenerate build system to fix dependency on outdated automake: autoreconf -vif @@ -137,6 +145,7 @@ build_grub() { --infodir=/usr/info \ --mandir=/usr/man \ --disable-werror \ + $STACKPROTECT \ $EFI_DO || exit 1 # Build and install: @@ -158,6 +167,12 @@ fi # Always end with regular build: build_grub || exit 1 +# Add custom 09_slackware_linux config. Thanks to Richard Cranium for the +# initial version, and Daedra for making it POSIX compliant: +cp -a $CWD/09_slackware_linux $PKG/etc/grub.d/09_slackware_linux +chown root:root $PKG/etc/grub.d/09_slackware_linux +chmod 755 $PKG/etc/grub.d/09_slackware_linux + # Preserve files in /etc/grub.d/: for file in $PKG/etc/grub.d/*_* ; do mv ${file} ${file}.new @@ -176,8 +191,10 @@ mv $PKG/etc/bash_completion.d/grub \ rmdir --parents $PKG/etc/bash_completion.d 2>/dev/null # Install default options file: -mkdir -p $PKG/etc/default +mkdir -p $PKG/etc/default/grub.d cat $CWD/etc.default.grub > $PKG/etc/default/grub.new +# Add a hint: +echo "Files in this directory must end in .cfg to be processed." > $PKG/etc/default/grub.d/README # Create a directory for grub.cfg: mkdir -p $PKG/boot/grub diff --git a/source/a/grub/slack-desc b/source/a/grub/slack-desc index 1f7a31e09..b07c8a3b2 100644 --- a/source/a/grub/slack-desc +++ b/source/a/grub/slack-desc @@ -8,10 +8,10 @@ |-----handy-ruler------------------------------------------------------| grub: grub (the GRand Unified Bootloader) grub: -grub: GNU GRUB is a multiboot boot loader. -grub: -grub: Website: http://www.gnu.org/software/grub/ +grub: GNU GRUB, the GRand Unified Bootloader, is a flexible and powerful +grub: boot loader program for a wide range of architectures. grub: +grub: Homepage: https://www.gnu.org/software/grub/ grub: grub: grub: diff --git a/testing/source/grub/0198-align-struct-efi_variable-better.patch b/testing/source/grub/0198-align-struct-efi_variable-better.patch deleted file mode 100644 index 8ce8bdc82..000000000 --- a/testing/source/grub/0198-align-struct-efi_variable-better.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2485633ada06c11c07a34a696a92b14e58f1e846 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Tue, 27 Feb 2018 13:55:35 -0500 -Subject: [PATCH 198/250] align struct efi_variable better... - ---- - include/grub/efiemu/runtime.h | 2 +- - include/grub/types.h | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/grub/efiemu/runtime.h b/include/grub/efiemu/runtime.h -index 9b6b729f4cc..856774a7c34 100644 ---- a/include/grub/efiemu/runtime.h -+++ b/include/grub/efiemu/runtime.h -@@ -33,5 +33,5 @@ struct efi_variable - grub_uint32_t namelen; - grub_uint32_t size; - grub_efi_uint32_t attributes; --} GRUB_PACKED; -+} GRUB_PACKED GRUB_ALIGNED(8); - #endif /* ! GRUB_EFI_EMU_RUNTIME_HEADER */ -diff --git a/include/grub/types.h b/include/grub/types.h -index b93e4820194..f6a9723971d 100644 ---- a/include/grub/types.h -+++ b/include/grub/types.h -@@ -29,6 +29,7 @@ - #else - #define GRUB_PACKED __attribute__ ((packed)) - #endif -+#define GRUB_ALIGNED(x) __attribute__((aligned (x))) - - #ifdef GRUB_BUILD - # define GRUB_CPU_SIZEOF_VOID_P BUILD_SIZEOF_VOID_P --- -2.14.3 - diff --git a/testing/source/grub/doinst.sh b/testing/source/grub/doinst.sh deleted file mode 100644 index 54c06904f..000000000 --- a/testing/source/grub/doinst.sh +++ /dev/null @@ -1,18 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -# Process config files in etc/grub.d/: -for file in etc/grub.d/*.new ; do - config $file -done -config etc/default/grub.new diff --git a/testing/source/grub/etc.default.grub b/testing/source/grub/etc.default.grub deleted file mode 100644 index b2d4080a0..000000000 --- a/testing/source/grub/etc.default.grub +++ /dev/null @@ -1,28 +0,0 @@ -# If you change this file, run grub-mkconfig -o /boot/grub/grub.cfg -# afterwards to update /boot/grub/grub.cfg. - -GRUB_DEFAULT=0 -#GRUB_HIDDEN_TIMEOUT=0 -GRUB_HIDDEN_TIMEOUT_QUIET=false -GRUB_TIMEOUT=10 -GRUB_DISTRIBUTOR=$( sed 's/Slackware /Slackware-/' /etc/slackware-version ) -GRUB_CMDLINE_LINUX_DEFAULT="" -GRUB_CMDLINE_LINUX="" - -# Uncomment to disable graphical terminal (grub-pc only) -#GRUB_TERMINAL=console - -# The resolution used on graphical terminal -# note that you can use only modes which your graphic card supports via VBE -# you can see them in real GRUB with the command `vbeinfo' -#GRUB_GFXMODE=640x480 -#GRUB_GFXMODE=1024x768x32 - -# Font used on the graphical terminal: -#GRUB_FONT=/usr/share/grub/dejavusansmono.pf2 - -# Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux -#GRUB_DISABLE_LINUX_UUID=true - -# Uncomment to disable generation of recovery mode menu entries -#GRUB_DISABLE_RECOVERY="true" diff --git a/testing/source/grub/grub.SlackBuild b/testing/source/grub/grub.SlackBuild deleted file mode 100755 index 67cdb21fc..000000000 --- a/testing/source/grub/grub.SlackBuild +++ /dev/null @@ -1,244 +0,0 @@ -#!/bin/bash - -# Copyright 2013, 2016, 2017, 2018, 2019, 2023 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. - -# Modified 2016 by Eric Hameleers <alien@slackware.com> for Slackware Live Edition. - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=grub -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -# Better to use _ than ~ in the package filenames version: -PKGVER=$(echo $VERSION | tr '~' '_') -BUILD=${BUILD:-2} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) ARCH=$(uname -m) ;; - esac - export ARCH -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-$PKGVER-$ARCH-$BUILD.txz" - exit 0 -fi - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -if [ "$ARCH" = "i386" ]; then - SLKCFLAGS="-march=i386 -mcpu=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-march=i486 -mtune=i686" - EFI32_FLAGS=" --with-platform=efi --target=i386 --program-prefix= " - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-march=i586 -mtune=i686" - EFI32_FLAGS=" --with-platform=efi --target=i386 --program-prefix= " - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-march=i686" - EFI32_FLAGS=" --with-platform=efi --target=i386 --program-prefix= " - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="" - EFI32_FLAGS=" --with-platform=efi --target=i386 --program-prefix= " - EFI_FLAGS=" --with-platform=efi --target=x86_64 --program-prefix= " - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="" - LIBDIRSUFFIX="" -fi - -# Don't use icecream: -PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g") - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 -cd $PKGNAM-$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 {} \+ - -# Use /boot/initrd.gz as a valid initrd name: -cat $CWD/initrd_naming.patch | patch -p1 --verbose || exit 1 - -# Support DejaVuSansMono font (dejavusansmono.pf2) by default: -cat $CWD/grub.dejavusansmono.gfxterm.font.diff | patch -p1 --verbose || exit 1 - -# Fix alignment error with gcc8: -cat $CWD/0198-align-struct-efi_variable-better.patch | patch -p1 --verbose || exit 1 - -# Skip processing any files in /etc/grub.d/ that end in .new or .orig: -cat $CWD/0001-skip-new-and-orig-files-in-etc-grub.d.patch | patch -p1 --verbose || exit 1 - -# From Arch, add a couple more GRUB_COLOR options: -cat $CWD/0001-00_header-add-GRUB_COLOR_-variables.patch | patch -p1 --verbose || exit 1 - -# Also from Arch, support drop-in config bits in /etc/default/grub.d/: -cat $CWD/0003-support-dropins-for-default-configuration.patch | patch -p1 --verbose || exit 1 - -# Fix 2.12 release with upstream commit (won't compile otherwise): -cat $CWD/b835601c7639ed1890f2d3db91900a8506011a8e.patch | patch -p1 --verbose || exit 1 - -# Still won't compile. Someday they'll remember how to cut a new release. -touch grub-core/extra_deps.lst - -# Regenerate build system to fix dependency on outdated automake: -autoreconf -vif - -build_grub() { - EFI_DO="$*" - # Configure: - CFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --infodir=/usr/info \ - --mandir=/usr/man \ - --disable-werror \ - $EFI_DO || exit 1 - - # Build and install: - make clean || exit 1 - make $NUMJOBS || make || exit 1 - make install DESTDIR=$PKG || exit 1 - - # Clear $EFI_DO : - unset EFI_DO -} - -# Build 32bit and 64bit efi targets if requested: -if [ -n "$EFI32_FLAGS" ]; then - build_grub $EFI32_FLAGS || exit 1 -fi -if [ -n "$EFI_FLAGS" ]; then - build_grub $EFI_FLAGS || exit 1 -fi -# Always end with regular build: -build_grub || exit 1 - -# Preserve files in /etc/grub.d/: -for file in $PKG/etc/grub.d/*_* ; do - mv ${file} ${file}.new -done - -# Strip binaries: -( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -) - -# Put bash-completion file in system directory: -mkdir -p $PKG/usr/share/bash-completion/completions/ -mv $PKG/etc/bash_completion.d/grub \ - $PKG/usr/share/bash-completion/completions/grub -rmdir --parents $PKG/etc/bash_completion.d 2>/dev/null - -# Install default options file: -mkdir -p $PKG/etc/default/grub.d -cat $CWD/etc.default.grub > $PKG/etc/default/grub.new - -# Create a directory for grub.cfg: -mkdir -p $PKG/boot/grub - -# Add fonts, if found on the system: -FONT_SIZE=${FONT_SIZE:-19} -if [ -r /usr/share/fonts/TTF/unifont.ttf ]; then - $PKG/usr/bin/grub-mkfont -o $PKG/usr/share/grub/unifont.pf2 -abv \ - -s $FONT_SIZE /usr/share/fonts/TTF/unifont.ttf -fi -if [ -r /usr/share/fonts/TTF/DejaVuSansMono.ttf ]; then - $PKG/usr/bin/grub-mkfont -o $PKG/usr/share/grub/dejavusansmono.pf2 -abv \ - -s $FONT_SIZE /usr/share/fonts/TTF/DejaVuSansMono.ttf -fi - -# Add a documentation directory: -mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION -cp -a \ - AUTHORS BUGS COPYING* INSTALL NEWS README* THANKS TODO \ - $PKG/usr/doc/${PKGNAM}-$VERSION - -# Compress and if needed symlink the man pages: -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 - -# Compress info files, if any: -if [ -d $PKG/usr/info ]; then - ( cd $PKG/usr/info - rm -f dir - gzip -9 * - ) -fi - -# 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 -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKGVER-$ARCH-$BUILD.txz - diff --git a/testing/source/grub/grub.dejavusansmono.gfxterm.font.diff b/testing/source/grub/grub.dejavusansmono.gfxterm.font.diff deleted file mode 100644 index 2890f16f9..000000000 --- a/testing/source/grub/grub.dejavusansmono.gfxterm.font.diff +++ /dev/null @@ -1,41 +0,0 @@ ---- ./util/grub.d/00_header.in.orig 2012-05-03 18:04:39.000000000 -0500 -+++ ./util/grub.d/00_header.in 2013-09-17 01:43:37.870841064 -0500 -@@ -143,7 +143,7 @@ - EOF - else - for dir in "${pkgdatadir}" "`echo '/@bootdirname@/@grubdirname@' | sed "s,//*,/,g"`" /usr/share/grub ; do -- for basename in unicode unifont ascii; do -+ for basename in unicode unifont dejavusansmono ascii; do - path="${dir}/${basename}.pf2" - if is_path_readable_by_grub "${path}" > /dev/null ; then - font_path="${path}" -@@ -156,7 +156,7 @@ - if [ -n "${font_path}" ] ; then - cat << EOF - if [ x\$feature_default_font_path = xy ] ; then -- font=unicode -+ font=dejavusansmono - else - EOF - # Make the font accessible -@@ -169,7 +169,7 @@ - EOF - else - cat << EOF --if loadfont unicode ; then -+if loadfont dejavusansmono ; then - EOF - fi - fi -diff -Naur grub-2.02~beta2.orig/util/grub-install.c grub-2.02~beta2/util/grub-install.c ---- grub-2.02~beta2.orig/util/grub-install.c 2013-12-24 08:40:31.000000000 -0800 -+++ grub-2.02~beta2/util/grub-install.c.new 2015-01-27 22:07:56.714000000 -0800 -@@ -827,7 +827,7 @@ - grub_util_host_init (&argc, &argv); - product_version = xstrdup (PACKAGE_VERSION); - pkgdatadir = grub_util_get_pkgdatadir (); -- label_font = grub_util_path_concat (2, pkgdatadir, "unicode.pf2"); -+ label_font = grub_util_path_concat (2, pkgdatadir, "dejavusansmono.pf2"); - - argp_parse (&argp, argc, argv, 0, 0, 0); - diff --git a/testing/source/grub/initrd_naming.patch b/testing/source/grub/initrd_naming.patch deleted file mode 100644 index 6b62778b0..000000000 --- a/testing/source/grub/initrd_naming.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur grub-2.00.orig/util/grub.d/10_linux.in grub-2.00/util/grub.d/10_linux.in ---- grub-2.00.orig/util/grub.d/10_linux.in 2012-04-18 23:24:38.000000000 +0200 -+++ grub-2.00/util/grub.d/10_linux.in 2012-06-30 07:53:03.765625589 +0200 -@@ -198,7 +198,8 @@ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}" \ - "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ -- "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do -+ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}" \ -+ "initrd.gz"; do - if test -e "${dirname}/${i}" ; then - initrd="$i" - break diff --git a/testing/source/grub/slack-desc b/testing/source/grub/slack-desc deleted file mode 100644 index b07c8a3b2..000000000 --- a/testing/source/grub/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -grub: grub (the GRand Unified Bootloader) -grub: -grub: GNU GRUB, the GRand Unified Bootloader, is a flexible and powerful -grub: boot loader program for a wide range of architectures. -grub: -grub: Homepage: https://www.gnu.org/software/grub/ -grub: -grub: -grub: -grub: -grub: |