From 7bedb1757f7d5fe6f7dec50c0435ade1494f41e6 Mon Sep 17 00:00:00 2001 From: Laszlo Gombos Date: Fri, 27 Oct 2023 23:31:09 -0400 Subject: [PATCH] dracut: update to 059.20231027 --- srcpkgs/dracut/patches/crypt-openssl-3.patch | 24 ------------ srcpkgs/dracut/patches/fix-fsck.patch | 27 -------------- .../dracut/patches/isoscan-udev-trigger.patch | 25 ------------- srcpkgs/dracut/patches/network.patch | 37 ------------------- srcpkgs/dracut/template | 9 +++-- 5 files changed, 5 insertions(+), 117 deletions(-) delete mode 100644 srcpkgs/dracut/patches/crypt-openssl-3.patch delete mode 100644 srcpkgs/dracut/patches/fix-fsck.patch delete mode 100644 srcpkgs/dracut/patches/isoscan-udev-trigger.patch delete mode 100644 srcpkgs/dracut/patches/network.patch diff --git a/srcpkgs/dracut/patches/crypt-openssl-3.patch b/srcpkgs/dracut/patches/crypt-openssl-3.patch deleted file mode 100644 index 39fd3dd3c65e99..00000000000000 --- a/srcpkgs/dracut/patches/crypt-openssl-3.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 5996f6b5d9b0bb957b4bb02c49c95a057761cba5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= -Date: Mon, 13 Feb 2023 20:22:56 +0000 -Subject: [PATCH] fix(crypt): add missing libraries - -Add missing libraries, closes #2137 ---- - modules.d/90crypt/module-setup.sh | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/modules.d/90crypt/module-setup.sh -+++ b/modules.d/90crypt/module-setup.sh -@@ -176,5 +176,11 @@ install() { - systemd-ask-password systemd-tty-ask-password-agent - fi - -+ # Install required libraries. -+ _arch=${DRACUT_ARCH:-$(uname -m)} -+ inst_libdir_file \ -+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/fips.so" \ -+ {"tls/$_arch/",tls/,"$_arch/",}"/ossl-modules/legacy.so" -+ - dracut_need_initqueue - } diff --git a/srcpkgs/dracut/patches/fix-fsck.patch b/srcpkgs/dracut/patches/fix-fsck.patch deleted file mode 100644 index 97c72d05e5543c..00000000000000 --- a/srcpkgs/dracut/patches/fix-fsck.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://github.com/dracutdevs/dracut/pull/2262 - -From 26990cb90bf0f516ccbd56583000d6d02ab18acd Mon Sep 17 00:00:00 2001 -From: Laszlo Gombos -Date: Sat, 4 Mar 2023 23:28:17 +0000 -Subject: [PATCH] fix(fs-lib): remove quoting form the first argument of the - e2fsck call - -Fix regression. ---- - modules.d/99fs-lib/fs-lib.sh | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/modules.d/99fs-lib/fs-lib.sh b/modules.d/99fs-lib/fs-lib.sh -index dd20731f2..c4640fa8a 100755 ---- a/modules.d/99fs-lib/fs-lib.sh -+++ b/modules.d/99fs-lib/fs-lib.sh -@@ -107,7 +107,8 @@ fsck_drv_com() { - - info "issuing $_drv $_fop $_dev" - # we enforce non-interactive run, so $() is fine -- _out=$($_drv "$_fop" "$_dev") -+ # shellcheck disable=SC2086 -+ _out=$($_drv $_fop "$_dev") - _ret=$? - fsck_tail - diff --git a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch b/srcpkgs/dracut/patches/isoscan-udev-trigger.patch deleted file mode 100644 index b80e966266b45d..00000000000000 --- a/srcpkgs/dracut/patches/isoscan-udev-trigger.patch +++ /dev/null @@ -1,25 +0,0 @@ -This upstream accepted patch fixes a bug where the live images don't work when -booted from grub loopback (void-linux/void-mklive#294). - -From d880d62f5f81d7ec69555f5deb60694fdb693c01 Mon Sep 17 00:00:00 2001 -From: 0x5c -Date: Thu, 9 Feb 2023 05:26:30 -0500 -Subject: [PATCH] fix: make iso-scan trigger udev events - -Fixes #2183 ---- - modules.d/90dmsquash-live/iso-scan.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/modules.d/90dmsquash-live/iso-scan.sh b/modules.d/90dmsquash-live/iso-scan.sh -index 886d23033..fa06b33cd 100755 ---- a/modules.d/90dmsquash-live/iso-scan.sh -+++ b/modules.d/90dmsquash-live/iso-scan.sh -@@ -22,6 +22,7 @@ do_iso_scan() { - mount -t auto -o ro "$dev" "/run/initramfs/isoscan" || continue - if [ -f "/run/initramfs/isoscan/$isofile" ]; then - losetup -f "/run/initramfs/isoscan/$isofile" -+ udevadm trigger --action=add > /dev/null 2>&1 - ln -s "$dev" /run/initramfs/isoscandev - rm -f -- "$job" - exit 0 diff --git a/srcpkgs/dracut/patches/network.patch b/srcpkgs/dracut/patches/network.patch deleted file mode 100644 index dce39fdc6f7a53..00000000000000 --- a/srcpkgs/dracut/patches/network.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 11a34f6b55f91610effd79ff1bf6a4bb2db760d3 Mon Sep 17 00:00:00 2001 -From: Laszlo Gombos -Date: Wed, 18 Jan 2023 19:59:24 +0000 -Subject: [PATCH] meta module should check if module exists - -Bug: https://github.com/dracutdevs/dracut/issues/1756 ---- - modules.d/40network/module-setup.sh | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules.d/40network/module-setup.sh b/modules.d/40network/module-setup.sh -index 1ab13ef..078cb4b 100755 ---- a/modules.d/40network/module-setup.sh -+++ b/modules.d/40network/module-setup.sh -@@ -17,15 +17,15 @@ depends() { - done - - if [ -z "$network_handler" ]; then -- if [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then -+ if [[ -d "$dracutbasedir"/modules.d/35network-wicked ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/wicked.service ]]; then - network_handler="network-wicked" -- elif [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then -+ elif [[ -d "$dracutbasedir"/modules.d/35connman ]] && [[ -e $dracutsysrootdir$systemdsystemunitdir/connman.service ]]; then - network_handler="connman" -- elif [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]]; then -+ elif [[ -d "$dracutbasedir"/modules.d/35network-manager ]] && ( [[ -x $dracutsysrootdir/usr/libexec/nm-initrd-generator ]] || [[ -x $dracutsysrootdir/usr/lib/nm-initrd-generator ]] ); then - network_handler="network-manager" -- elif [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then -+ elif [[ -d "$dracutbasedir"/modules.d/01systemd-networkd ]] && [[ -x $dracutsysrootdir$systemdutildir/systemd-networkd ]]; then - network_handler="systemd-networkd" -- else -+ elif [[ -d "$dracutbasedir"/modules.d/35network-legacy ]]; then - network_handler="network-legacy" - fi - fi --- -2.34.1 diff --git a/srcpkgs/dracut/template b/srcpkgs/dracut/template index 6fad8af51d57e9..e7891349e15647 100644 --- a/srcpkgs/dracut/template +++ b/srcpkgs/dracut/template @@ -1,7 +1,8 @@ # Template file for 'dracut' pkgname=dracut -version=059 -revision=4 +version=059.20231027 +revision=5 +_commit=b2af8c8bcfc72802e02e2c0adc2eed9279101624 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc" conf_files="/etc/dracut.conf" @@ -13,8 +14,8 @@ maintainer="Zach Dykstra " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://github.com/dracutdevs/dracut/wiki" changelog="https://raw.githubusercontent.com/dracutdevs/dracut/master/NEWS.md" -distfiles="https://github.com/dracutdevs/dracut/archive/refs/tags/${version}.tar.gz" -checksum=eabf0bb685420c1e1d5475b6855ef787104508f0135ff570312845256e0fcecf +distfiles="https://github.com/dracutdevs/dracut/archive/${_commit}.tar.gz" +checksum=cfd45a6e8457e5d693bd2261214caa9f105ecfad826e0e800df6e990a62c4b69 alternatives=" initramfs:/etc/kernel.d/post-install/20-initramfs:/usr/libexec/dracut/kernel-hook-postinst initramfs:/etc/kernel.d/post-remove/20-initramfs:/usr/libexec/dracut/kernel-hook-postrm