From 3887b81bd7b4d8aff322c89297d5fc8ed043c76a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20F=C3=B6rster?= <Dessa@gmake.de>
Date: Sat, 20 Jul 2024 04:02:15 +0200
Subject: [PATCH] [sys-kernel/dracut] sync with tree

---
 sys-kernel/dracut/Manifest                    |  2 +-
 ...dracut-102.ebuild => dracut-103-r1.ebuild} |  4 ++
 sys-kernel/dracut/dracut-9999.ebuild          |  2 +
 .../dracut-103-acct-user-group-gentoo.patch   | 30 ++++++++++++++
 .../dracut-103-systemd-udev-256-kmod.patch    | 41 +++++++++++++++++++
 5 files changed, 78 insertions(+), 1 deletion(-)
 rename sys-kernel/dracut/{dracut-102.ebuild => dracut-103-r1.ebuild} (95%)
 create mode 100644 sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch
 create mode 100644 sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 07b9c26..ac759a1 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1 +1 @@
-DIST dracut-102.tar.gz 559538 BLAKE2B 665f1313c71269856b8e5fd540ecf645844ed196d705122752c9577a00a30e91ad8ce4b3336f49507381e78d381e4b5b9982217cc496200b1c97692fa5c6aea9 SHA512 463ad75f0508392431d58796763a41accf5a1dc17fe27d36e37d588153ca9c5b32b453faa9149524ea2dc2906805126d1e023feecb6554206595a972508f6a32
+DIST dracut-103.tar.gz 567713 BLAKE2B 7781c0b7fc83a2c0c461f6398687e053226b489fb5405b3132b30d8e7a4f3cea2bb73aa0fe6e4c4b27187d6270ba623f403916ec38025a912930ae347a7e25ce SHA512 ba0dbefbcbecb09c44ce240664bc4f4ee25dfb8be7bc060028ae3b1ccf7d70410491c105e64fcef3d6f44d2794cb6162bcea9404125906be46bf3dff098e0277
diff --git a/sys-kernel/dracut/dracut-102.ebuild b/sys-kernel/dracut/dracut-103-r1.ebuild
similarity index 95%
rename from sys-kernel/dracut/dracut-102.ebuild
rename to sys-kernel/dracut/dracut-103-r1.ebuild
index 5fad472..8903482 100644
--- a/sys-kernel/dracut/dracut-102.ebuild
+++ b/sys-kernel/dracut/dracut-103-r1.ebuild
@@ -67,6 +67,10 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
 PATCHES=(
 	"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+	# Gentoo specific acct-user and acct-group conf adjustments
+	"${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch
+	# https://github.com/dracut-ng/dracut-ng/pull/507
+	"${FILESDIR}"/${PN}-103-systemd-udev-256-kmod.patch
 )
 
 src_configure() {
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 1af870a..710eaba 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -66,6 +66,8 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
 PATCHES=(
 	"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
+	# Gentoo specific acct-user and acct-group conf adjustments
+	"${FILESDIR}"/${PN}-103-acct-user-group-gentoo.patch
 )
 
 src_configure() {
diff --git a/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch b/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch
new file mode 100644
index 0000000..045528b
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-103-acct-user-group-gentoo.patch
@@ -0,0 +1,30 @@
+diff --git a/dracut-init.sh b/dracut-init.sh
+index 986da96b..bd47bc92 100755
+--- a/dracut-init.sh
++++ b/dracut-init.sh
+@@ -711,10 +711,10 @@ inst_libdir_file() {
+ 
+ # install sysusers files
+ inst_sysusers() {
+-    inst_multiple -o "$sysusers/$*"
++    inst_multiple -o "$sysusers/acct-*-$*"
+ 
+     if [[ $hostonly ]]; then
+-        inst_multiple -H -o "$sysusersconfdir/$*"
++        inst_multiple -H -o "$sysusersconfdir/acct-*-$*"
+     fi
+ }
+ 
+diff --git a/modules.d/91tpm2-tss/module-setup.sh b/modules.d/91tpm2-tss/module-setup.sh
+index 4441f552..4b5654d5 100755
+--- a/modules.d/91tpm2-tss/module-setup.sh
++++ b/modules.d/91tpm2-tss/module-setup.sh
+@@ -30,7 +30,7 @@ installkernel() {
+ 
+ # Install the required file(s) and directories for the module in the initramfs.
+ install() {
+-    inst_sysusers tpm2-tss.conf
++    inst_sysusers tss.conf
+ 
+     inst_multiple -o \
+         "$tmpfilesdir"/tpm2-tss-fapi.conf \
diff --git a/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch b/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch
new file mode 100644
index 0000000..7a1fc1c
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-103-systemd-udev-256-kmod.patch
@@ -0,0 +1,41 @@
+From e16195f28669264227c169d45107ea95b83d8f48 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Tue, 16 Jul 2024 08:48:54 +0300
+Subject: [PATCH] fix(systemd): move installation of libkmod to udev-rules
+ module
+
+libkmod library should be installed even if systemd module is
+omitted, so move its installation to udev-rules module.
+---
+ modules.d/00systemd/module-setup.sh    | 1 -
+ modules.d/95udev-rules/module-setup.sh | 6 +++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
+index ce7bb520c..e4fb9a586 100755
+--- a/modules.d/00systemd/module-setup.sh
++++ b/modules.d/00systemd/module-setup.sh
+@@ -171,6 +171,5 @@ EOF
+     _arch=${DRACUT_ARCH:-$(uname -m)}
+     inst_libdir_file \
+         {"tls/$_arch/",tls/,"$_arch/",}"libgcrypt.so*" \
+-        {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
+         {"tls/$_arch/",tls/,"$_arch/",}"libnss_*"
+ }
+diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
+index d82ed5eb9..6078751f6 100755
+--- a/modules.d/95udev-rules/module-setup.sh
++++ b/modules.d/95udev-rules/module-setup.sh
+@@ -93,7 +93,11 @@ install() {
+         "${udevdir}"/usb_id \
+         "${udevdir}"/v4l_id
+ 
+-    inst_libdir_file "libnss_files*"
++    # Install required libraries.
++    _arch=${DRACUT_ARCH:-$(uname -m)}
++    inst_libdir_file \
++        {"tls/$_arch/",tls/,"$_arch/",}"libkmod.so*" \
++        {"tls/$_arch/",tls/,"$_arch/",}"libnss_files*"
+ 
+     # Install the hosts local user configurations if enabled.
+     if [[ $hostonly ]]; then