From 2cdd1d4264c64f092921f168b668361f0b5182fe Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Tue, 10 Dec 2024 23:53:46 +0000 Subject: [PATCH] Tue Dec 10 23:53:46 UTC 2024 a/mkinitrd-1.4.11-x86_64-55.txz: Rebuilt. mkinitrd_command_generator.sh: fix handling of -h -l and -K options for hibernate partition, keyboard map, and LUKS keyfile. Thanks to alienBOB. l/json-glib-1.10.6-x86_64-1.txz: Upgraded. x/egl-wayland-1.1.17-x86_64-1.txz: Upgraded. --- ChangeLog.rss | 19 ++++- ChangeLog.txt | 7 ++ FILELIST.TXT | 79 ++++++++++--------- recompress.sh | 1 + .../a/mkinitrd/0011-fix-LUKS-handling.patch | 31 ++++++++ source/a/mkinitrd/mkinitrd.SlackBuild | 7 +- 6 files changed, 101 insertions(+), 43 deletions(-) create mode 100644 source/a/mkinitrd/0011-fix-LUKS-handling.patch diff --git a/ChangeLog.rss b/ChangeLog.rss index 8d186015e..558b37168 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,24 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Mon, 9 Dec 2024 22:25:16 GMT - Mon, 9 Dec 2024 23:53:16 GMT + Tue, 10 Dec 2024 23:53:46 GMT + Wed, 11 Dec 2024 00:28:32 GMT maintain_current_git.sh v 1.17 + + Tue, 10 Dec 2024 23:53:46 GMT + Tue, 10 Dec 2024 23:53:46 GMT + https://git.slackware.nl/current/tag/?h=20241210235346 + 20241210235346 + + +a/mkinitrd-1.4.11-x86_64-55.txz: Rebuilt. + mkinitrd_command_generator.sh: fix handling of -h -l and -K options for + hibernate partition, keyboard map, and LUKS keyfile. Thanks to alienBOB. +l/json-glib-1.10.6-x86_64-1.txz: Upgraded. +x/egl-wayland-1.1.17-x86_64-1.txz: Upgraded. + ]]> + + Mon, 9 Dec 2024 22:25:16 GMT Mon, 9 Dec 2024 22:25:16 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index 80e1a9b3f..c5aef8d2f 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +Tue Dec 10 23:53:46 UTC 2024 +a/mkinitrd-1.4.11-x86_64-55.txz: Rebuilt. + mkinitrd_command_generator.sh: fix handling of -h -l and -K options for + hibernate partition, keyboard map, and LUKS keyfile. Thanks to alienBOB. +l/json-glib-1.10.6-x86_64-1.txz: Upgraded. +x/egl-wayland-1.1.17-x86_64-1.txz: Upgraded. ++--------------------------+ Mon Dec 9 22:25:16 UTC 2024 a/kernel-firmware-20241209_633e866-noarch-1.txz: Upgraded. a/kernel-generic-6.12.4-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 98de6fa55..8cd158373 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Dec 9 22:32:04 UTC 2024 +Wed Dec 11 00:01:31 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-12-09 22:25 . +drwxr-xr-x 12 root root 4096 2024-12-10 23:53 . -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 1160038 2024-12-07 22:20 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-12-07 22:20 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 1160038 2024-12-09 22:32 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-12-09 22:32 ./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 1264568 2024-12-09 22:25 ./ChangeLog.txt +-rw-r--r-- 1 root root 1264908 2024-12-10 23:53 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2024-12-09 22:24 ./EFI/BOOT -rw-r--r-- 1 root root 1200128 2024-09-12 20:40 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-12-09 22:24 ./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 1521579 2024-12-07 22:19 ./FILELIST.TXT +-rw-r--r-- 1 root root 1521579 2024-12-09 22:32 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 914199 2024-12-09 22:31 ./PACKAGES.TXT +-rw-r--r-- 1 root root 914199 2024-12-11 00:00 ./PACKAGES.TXT -rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT -rw-r--r-- 1 root root 2640 2024-12-09 22:13 ./README.initrd -rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT @@ -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-12-09 22:31 ./slackware64 --rw-r--r-- 1 root root 356951 2024-12-09 22:31 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-12-09 22:31 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 443467 2024-12-09 22:30 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 4818616 2024-12-09 22:30 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 17 root root 4096 2024-12-11 00:01 ./slackware64 +-rw-r--r-- 1 root root 356951 2024-12-11 00:01 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-12-11 00:01 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 443467 2024-12-11 00:00 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 4827410 2024-12-11 00:00 ./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-12-09 22:30 ./slackware64/a +drwxr-xr-x 2 root root 32768 2024-12-11 00: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 @@ -898,9 +898,9 @@ drwxr-xr-x 2 root root 32768 2024-12-09 22:30 ./slackware64/a -rw-r--r-- 1 root root 378 2023-09-23 18:06 ./slackware64/a/minicom-2.9-x86_64-1.txt -rw-r--r-- 1 root root 336888 2023-09-23 18:06 ./slackware64/a/minicom-2.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2023-09-23 18:06 ./slackware64/a/minicom-2.9-x86_64-1.txz.asc --rw-r--r-- 1 root root 527 2024-12-07 19:16 ./slackware64/a/mkinitrd-1.4.11-x86_64-54.txt --rw-r--r-- 1 root root 637000 2024-12-07 19:16 ./slackware64/a/mkinitrd-1.4.11-x86_64-54.txz --rw-r--r-- 1 root root 195 2024-12-07 19:16 ./slackware64/a/mkinitrd-1.4.11-x86_64-54.txz.asc +-rw-r--r-- 1 root root 527 2024-12-10 18:54 ./slackware64/a/mkinitrd-1.4.11-x86_64-55.txt +-rw-r--r-- 1 root root 637000 2024-12-10 18:54 ./slackware64/a/mkinitrd-1.4.11-x86_64-55.txz +-rw-r--r-- 1 root root 195 2024-12-10 18:54 ./slackware64/a/mkinitrd-1.4.11-x86_64-55.txz.asc -rw-r--r-- 1 root root 668 2021-02-13 11:11 ./slackware64/a/mlocate-0.26-x86_64-4.txt -rw-r--r-- 1 root root 106260 2021-02-13 11:11 ./slackware64/a/mlocate-0.26-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 11:11 ./slackware64/a/mlocate-0.26-x86_64-4.txz.asc @@ -2780,7 +2780,7 @@ drwxr-xr-x 2 root root 86016 2024-12-09 22:30 ./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-12-09 22:30 ./slackware64/l +drwxr-xr-x 2 root root 102400 2024-12-11 00: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 @@ -3212,9 +3212,9 @@ drwxr-xr-x 2 root root 102400 2024-12-09 22:30 ./slackware64/l -rw-r--r-- 1 root root 445 2024-09-16 17:45 ./slackware64/l/json-c-0.18_20240915-x86_64-1.txt -rw-r--r-- 1 root root 195160 2024-09-16 17:45 ./slackware64/l/json-c-0.18_20240915-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-09-16 17:45 ./slackware64/l/json-c-0.18_20240915-x86_64-1.txz.asc --rw-r--r-- 1 root root 364 2024-08-30 19:49 ./slackware64/l/json-glib-1.10.0-x86_64-1.txt --rw-r--r-- 1 root root 168864 2024-08-30 19:49 ./slackware64/l/json-glib-1.10.0-x86_64-1.txz --rw-r--r-- 1 root root 195 2024-08-30 19:49 ./slackware64/l/json-glib-1.10.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 364 2024-12-10 19:00 ./slackware64/l/json-glib-1.10.6-x86_64-1.txt +-rw-r--r-- 1 root root 169632 2024-12-10 19:00 ./slackware64/l/json-glib-1.10.6-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-12-10 19:00 ./slackware64/l/json-glib-1.10.6-x86_64-1.txz.asc -rw-r--r-- 1 root root 450 2021-02-13 06:55 ./slackware64/l/judy-1.0.5-x86_64-4.txt -rw-r--r-- 1 root root 141616 2021-02-13 06:55 ./slackware64/l/judy-1.0.5-x86_64-4.txz -rw-r--r-- 1 root root 163 2021-02-13 06:55 ./slackware64/l/judy-1.0.5-x86_64-4.txz.asc @@ -4637,7 +4637,7 @@ drwxr-xr-x 2 root root 4096 2024-12-05 21:43 ./slackware64/tcl -rw-r--r-- 1 root root 227 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txt -rw-r--r-- 1 root root 1813700 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-09-17 23:06 ./slackware64/tcl/tk-8.6.15-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2024-12-06 22:26 ./slackware64/x +drwxr-xr-x 2 root root 65536 2024-12-11 00:00 ./slackware64/x -rw-r--r-- 1 root root 440 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txt -rw-r--r-- 1 root root 649604 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-08-09 18:16 ./slackware64/x/OpenCC-1.1.9-x86_64-1.txz.asc @@ -4668,9 +4668,9 @@ drwxr-xr-x 2 root root 65536 2024-12-06 22:26 ./slackware64/x -rw-r--r-- 1 root root 305 2024-03-03 19:33 ./slackware64/x/editres-1.0.9-x86_64-1.txt -rw-r--r-- 1 root root 50760 2024-03-03 19:33 ./slackware64/x/editres-1.0.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2024-03-03 19:33 ./slackware64/x/editres-1.0.9-x86_64-1.txz.asc --rw-r--r-- 1 root root 234 2024-08-23 02:43 ./slackware64/x/egl-wayland-1.1.16-x86_64-1.txt --rw-r--r-- 1 root root 34540 2024-08-23 02:43 ./slackware64/x/egl-wayland-1.1.16-x86_64-1.txz --rw-r--r-- 1 root root 195 2024-08-23 02:43 ./slackware64/x/egl-wayland-1.1.16-x86_64-1.txz.asc +-rw-r--r-- 1 root root 234 2024-12-10 18:59 ./slackware64/x/egl-wayland-1.1.17-x86_64-1.txt +-rw-r--r-- 1 root root 34828 2024-12-10 18:59 ./slackware64/x/egl-wayland-1.1.17-x86_64-1.txz +-rw-r--r-- 1 root root 195 2024-12-10 18:59 ./slackware64/x/egl-wayland-1.1.17-x86_64-1.txz.asc -rw-r--r-- 1 root root 347 2024-09-04 18:02 ./slackware64/x/eglexternalplatform-1.2-x86_64-1.txt -rw-r--r-- 1 root root 8160 2024-09-04 18:02 ./slackware64/x/eglexternalplatform-1.2-x86_64-1.txz -rw-r--r-- 1 root root 195 2024-09-04 18:02 ./slackware64/x/eglexternalplatform-1.2-x86_64-1.txz.asc @@ -5801,11 +5801,11 @@ drwxr-xr-x 2 root root 4096 2024-11-10 20:41 ./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-12-09 22:32 ./source --rw-r--r-- 1 root root 626557 2024-12-09 22:32 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 195 2024-12-09 22:32 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 877336 2024-12-09 22:31 ./source/FILE_LIST --rw-r--r-- 1 root root 31646825 2024-12-09 22:31 ./source/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2024-12-11 00:01 ./source +-rw-r--r-- 1 root root 626636 2024-12-11 00:01 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 195 2024-12-11 00:01 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 877428 2024-12-11 00:01 ./source/FILE_LIST +-rw-r--r-- 1 root root 31647141 2024-12-11 00:01 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT drwxr-xr-x 125 root root 4096 2024-12-01 22:02 ./source/a -rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog @@ -6501,7 +6501,7 @@ drwxr-xr-x 2 root root 4096 2023-09-23 18:05 ./source/a/minicom -rwxr-xr-x 1 root root 5460 2024-05-10 21:27 ./source/a/minicom/minicom.SlackBuild -rw-r--r-- 1 root root 570 2004-09-04 21:17 ./source/a/minicom/minicom.users.gz -rw-r--r-- 1 root root 833 2020-07-25 17:50 ./source/a/minicom/slack-desc -drwxr-xr-x 2 root root 4096 2024-11-24 22:34 ./source/a/mkinitrd +drwxr-xr-x 2 root root 4096 2024-12-10 18:52 ./source/a/mkinitrd -rw-r--r-- 1 root root 468 2019-12-15 18:10 ./source/a/mkinitrd/0001-Fix-LUKSTRIM-with-C-T-and-UUID.patch.gz -rw-r--r-- 1 root root 420 2021-07-16 18:07 ./source/a/mkinitrd/0002-bail-if-temp-dir-is-not-created.patch.gz -rw-r--r-- 1 root root 217 2021-10-12 18:52 ./source/a/mkinitrd/0003-blacklist.40-usb_modeswitch.rules.patch.gz @@ -6512,6 +6512,7 @@ drwxr-xr-x 2 root root 4096 2024-11-24 22:34 ./source/a/mkinitrd -rw-r--r-- 1 root root 369 2023-02-28 21:23 ./source/a/mkinitrd/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch.gz -rw-r--r-- 1 root root 184 2023-08-09 21:27 ./source/a/mkinitrd/0009-exclude-99-nfs.rules.patch.gz -rw-r--r-- 1 root root 620 2023-11-20 18:50 ./source/a/mkinitrd/0010-fix-test-for-jfs-xfs-repair-tools.patch.gz +-rw-r--r-- 1 root root 531 2024-12-10 18:51 ./source/a/mkinitrd/0011-fix-LUKS-handling.patch.gz -rw-r--r-- 1 root root 4184 2024-07-24 19:30 ./source/a/mkinitrd/README.initrd -rw-r--r-- 1 root root 2700 2023-03-31 17:12 ./source/a/mkinitrd/_initrd-tree.tar.gz -rw-r--r-- 1 root root 2565764 2024-09-26 21:31 ./source/a/mkinitrd/busybox-1.37.0.tar.bz2 @@ -6524,7 +6525,7 @@ drwxr-xr-x 2 root root 4096 2024-11-24 22:34 ./source/a/mkinitrd -rw-r--r-- 1 root root 29903 2009-12-18 05:10 ./source/a/mkinitrd/keymaps.tar.gz -rw-r--r-- 1 root root 28756 2024-11-24 22:08 ./source/a/mkinitrd/mkinitrd -rw-r--r-- 1 root root 9549 2022-04-26 19:12 ./source/a/mkinitrd/mkinitrd.8 --rwxr-xr-x 1 root root 8205 2024-12-07 18:40 ./source/a/mkinitrd/mkinitrd.SlackBuild +-rwxr-xr-x 1 root root 8492 2024-12-10 18:54 ./source/a/mkinitrd/mkinitrd.SlackBuild -rw-r--r-- 1 root root 7449 2022-04-26 19:12 ./source/a/mkinitrd/mkinitrd.conf.5 -rw-r--r-- 1 root root 529 2017-06-29 16:52 ./source/a/mkinitrd/mkinitrd.conf.sample -rw-r--r-- 1 root root 535 2020-04-26 23:53 ./source/a/mkinitrd/mkinitrd.tempfile.to.mktemp.patch.gz @@ -10939,8 +10940,8 @@ drwxr-xr-x 2 root root 4096 2024-10-10 17:43 ./source/l/json-c -rw-r--r-- 1 root root 275691 2024-09-15 16:22 ./source/l/json-c/json-c-0.18-20240915.tar.lz -rwxr-xr-x 1 root root 3885 2024-10-10 17:40 ./source/l/json-c/json-c.SlackBuild -rw-r--r-- 1 root root 932 2018-05-01 17:59 ./source/l/json-c/slack-desc -drwxr-xr-x 2 root root 4096 2024-08-30 19:48 ./source/l/json-glib --rw-r--r-- 1 root root 252652 2024-08-30 16:50 ./source/l/json-glib/json-glib-1.10.0.tar.xz +drwxr-xr-x 2 root root 4096 2024-12-10 19:00 ./source/l/json-glib +-rw-r--r-- 1 root root 253324 2024-12-10 13:12 ./source/l/json-glib/json-glib-1.10.6.tar.xz -rwxr-xr-x 1 root root 4289 2024-08-30 19:48 ./source/l/json-glib/json-glib.SlackBuild -rw-r--r-- 1 root root 824 2018-05-01 17:06 ./source/l/json-glib/slack-desc drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/l/judy @@ -11946,9 +11947,9 @@ drwxr-xr-x 2 root root 4096 2024-11-21 21:52 ./source/l/pygobject3 -rw-r--r-- 1 root root 929848 2024-09-12 12:05 ./source/l/pygobject3/pygobject-3.50.0.tar.xz -rwxr-xr-x 1 root root 3989 2024-11-21 21:52 ./source/l/pygobject3/pygobject3.SlackBuild -rw-r--r-- 1 root root 50 2015-03-08 06:48 ./source/l/pygobject3/pygobject3.url --rw-r--r-- 1 root root 901 2024-04-01 17:19 ./source/l/pygobject3/slack-desc -drwxr-xr-x 2 root root 4096 2024-05-11 06:39 ./source/l/pygtk --rw-r--r-- 1 root root 1978692 2011-04-01 13:05 ./source/l/pygtk/pygtk-2.24.0.tar.xz +-rw-r--r-- 1 root root 901 2024-04-01 17:19 ./source/l/pygobject3/slack-desc +drwxr-xr-x 2 root root 4096 2024-05-11 06:39 ./source/l/pygtk +-rw-r--r-- 1 root root 1978692 2011-04-01 13:05 ./source/l/pygtk/pygtk-2.24.0.tar.xz -rw-r--r-- 1 root root 630 2021-01-15 20:04 ./source/l/pygtk/pygtk-Drop-the-PangoFont-find_shaper-virtual-method.patch.gz -rw-r--r-- 1 root root 805 2017-04-11 19:58 ./source/l/pygtk/pygtk-fix-pango-object-leaks.patch.gz -rwxr-xr-x 1 root root 4213 2024-05-11 06:38 ./source/l/pygtk/pygtk.SlackBuild @@ -13848,9 +13849,9 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/x/dejavu-fonts-ttf -rwxr-xr-x 1 root root 3032 2024-11-27 22:45 ./source/x/dejavu-fonts-ttf/dejavu-fonts-ttf.SlackBuild -rw-r--r-- 1 root root 169 2018-06-05 22:36 ./source/x/dejavu-fonts-ttf/doinst.sh.gz -rw-r--r-- 1 root root 904 2018-02-27 06:13 ./source/x/dejavu-fonts-ttf/slack-desc -drwxr-xr-x 2 root root 4096 2024-08-23 02:43 ./source/x/egl-wayland +drwxr-xr-x 2 root root 4096 2024-12-10 18:59 ./source/x/egl-wayland -rw-r--r-- 1 root root 115 2021-04-17 18:31 ./source/x/egl-wayland/10_nvidia_wayland.json --rw-r--r-- 1 root root 58320 2024-08-22 19:56 ./source/x/egl-wayland/egl-wayland-1.1.16.tar.lz +-rw-r--r-- 1 root root 59256 2024-11-18 14:56 ./source/x/egl-wayland/egl-wayland-1.1.17.tar.lz -rwxr-xr-x 1 root root 4507 2024-08-10 16:58 ./source/x/egl-wayland/egl-wayland.SlackBuild -rw-r--r-- 1 root root 38 2021-04-17 18:32 ./source/x/egl-wayland/egl-wayland.url -rw-r--r-- 1 root root 694 2021-04-17 18:31 ./source/x/egl-wayland/slack-desc @@ -15287,7 +15288,7 @@ drwxr-xr-x 2 root root 4096 2024-03-03 19:29 ./source/x/x11/src/font -rw-r--r-- 1 root root 633212 2023-02-27 23:47 ./source/x/x11/src/font/font-bh-type1-1.0.4.tar.xz -rw-r--r-- 1 root root 176520 2023-02-27 23:50 ./source/x/x11/src/font/font-bitstream-100dpi-1.0.4.tar.xz -rw-r--r-- 1 root root 159708 2023-02-27 23:53 ./source/x/x11/src/font/font-bitstream-75dpi-1.0.4.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 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 393644 2023-02-27 23:56 ./source/x/x11/src/font/font-bitstream-type1-1.0.4.tar.xz -rw-r--r-- 1 root root 235908 2023-02-28 00:02 ./source/x/x11/src/font/font-cronyx-cyrillic-1.0.4.tar.xz -rw-r--r-- 1 root root 97384 2023-02-28 00:05 ./source/x/x11/src/font/font-cursor-misc-1.0.4.tar.xz diff --git a/recompress.sh b/recompress.sh index ddfa5474a..3acfd4a2d 100755 --- a/recompress.sh +++ b/recompress.sh @@ -134,6 +134,7 @@ gzip ./source/a/mkinitrd/0007-kmod30.patch gzip ./source/a/mkinitrd/0004-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch gzip ./source/a/mkinitrd/0009-exclude-99-nfs.rules.patch gzip ./source/a/mkinitrd/0002-bail-if-temp-dir-is-not-created.patch +gzip ./source/a/mkinitrd/0011-fix-LUKS-handling.patch gzip ./source/a/mkinitrd/0003-blacklist.40-usb_modeswitch.rules.patch gzip ./source/a/mkinitrd/0010-fix-test-for-jfs-xfs-repair-tools.patch gzip ./source/a/mlocate/doinst.sh diff --git a/source/a/mkinitrd/0011-fix-LUKS-handling.patch b/source/a/mkinitrd/0011-fix-LUKS-handling.patch new file mode 100644 index 000000000..c6a5cc127 --- /dev/null +++ b/source/a/mkinitrd/0011-fix-LUKS-handling.patch @@ -0,0 +1,31 @@ +--- ./mkinitrd_command_generator.sh.orig 2024-11-08 16:01:47.271041636 -0600 ++++ ./mkinitrd_command_generator.sh 2024-12-10 12:50:57.114973388 -0600 +@@ -442,11 +442,19 @@ + SRCHLIST=$(echo $SRCHLIST | cut -d' ' -f2-) # cut ELEM from the list + if [ "$ELEM" = "-o" ]; then + IMGFILE=$(echo $SRCHLIST | cut -d' ' -f1) +- break ++ elif [ "$ELEM" = "-h" ]; then ++ RESUMEDEV=$(echo $SRCHLIST | cut -d' ' -f1) ++ elif [ "$ELEM" = "-l" ]; then ++ KEYMAP=$(echo $SRCHLIST | cut -d' ' -f1) ++ elif [ "$ELEM" = "-K" ]; then ++ LUKSKEY="$(echo $SRCHLIST | cut -d' ' -f1)" + fi + done + fi + IMGFILE=${IMGFILE:-"/boot/initrd.gz"} ++RESUMEDEV=${RESUMEDEV:-""} ++KEYMAP="${KEYMAP:-"us"}" ++LUKSKEY="${LUKSKEY:-""}" + + # Get information about the root device / root filesystem: + ROOTDEV=${ROOTDEV:-$(get_root_device)} +@@ -859,6 +867,7 @@ + KEYMAP="$KEYMAP" + MODULE_LIST="$(echo $MLIST | cut -f2 -d\ )" + LUKSDEV="$REALDEV" ++ LUKSKEY="${LUKSKEY}" + ROOTDEV="$ROOTDEV" + ROOTFS="$ROOTFS" + RESUMEDEV="$RESUMEDEV" diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index e7ab652d4..9b0cc1134 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mkinitrd VERSION=${VERSION:-1.4.11} BB=1.37.0 -BUILD=${BUILD:-54} +BUILD=${BUILD:-55} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -137,13 +137,16 @@ rm -f $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh.orig ( cd $PKG/sbin ; zcat $CWD/0007-kmod30.patch.gz | patch -p1 --verbose || exit 1) || exit 1 # Bugfix for previous RAID partition patch: ( cd $PKG/usr/share/mkinitrd ; zcat $CWD/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch.gz | patch -p1 --verbose || exit 1) || exit 1 -rm -f $PKG/sbin/mkinitrd.orig +rm -f $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh.orig # Don't include the 99-nfs.rules on the initrd: ( cd $PKG/sbin ; zcat $CWD/0009-exclude-99-nfs.rules.patch.gz | patch -p1 --verbose || exit 1) || exit 1 rm -f $PKG/sbin/mkinitrd.orig # Fix test for including JFS or XFS repair tools: ( cd $PKG/sbin ; zcat $CWD/0010-fix-test-for-jfs-xfs-repair-tools.patch.gz | patch -p1 --verbose || exit 1) || exit 1 rm -f $PKG/sbin/mkinitrd.orig +# Fix handling of -h -l -K options for LUKS and encrypted hibernation: +( cd $PKG/usr/share/mkinitrd ; zcat $CWD/0011-fix-LUKS-handling.patch.gz | patch -p1 --verbose || exit 1) || exit 1 +rm -f $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh.orig mkdir -p $PKG/usr/man/man{5,8} cat $CWD/mkinitrd.conf.5 | gzip -9c > $PKG/usr/man/man5/mkinitrd.conf.5.gz