gentoo auto-resync : 12:05:2024 - 00:01:15

5 files changed, 53 insertions, 7 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index ca6c847f1f74..d8709b5d98e0 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -10,6 +10,7 @@ AUX util-linux-2.39.3-libblkid-luks.patch 1499 BLAKE2B d08f33f3be0709abb3969a898
 AUX util-linux-2.39.3-libmount-Fix-export-of-mnt_context_is_lazy-and-mnt_c.patch 1710 BLAKE2B 04a3b4db45447556edbf66bdb9bf9c895cdf47a801b41743603b14420bcffe9618c17c8153b6800b872dbc28d1e5c33a55667f2a31e9ff63f7f026c1beb9f524 SHA512 da91fb5f9443907558f6245d4eee3f578e0f0549866a6e9f39bd82d6123868180c1d2aa357e5ef47f163b7ddf67d1c24f6a4768837f21577b2887555a956afe9
 AUX util-linux-2.39.3-musl-1.2.5-basename.patch 1814 BLAKE2B 29463f6aedec98cbd7edaa68e3ef0b6c7a4932e6f1b02948237689e75cb720d406970a6521564dd97c68c922b087f23683c219550c5092755057e734f94bc338 SHA512 74f6ccd530766fdbaac55a20becc8e2ce8dc8aeb65aaba3d22430a7c72e19e9483031b508b4448507d245d42e6d730d0d17ec6bc8edb63eaf0cb8ce0365be4d7
 AUX util-linux-2.39.4-umount-readonly.patch 1519 BLAKE2B 80fdd82a9fda61e8cb03a5ceed5f601687cc8a621e8cf2c8d71125bf2aa849d32c413253050d2e4680bbf1636b8add212fe6dd4f7802ccd59b0ff677854b600f SHA512 240863efa932d385aa6b6d999624d4630bbbf0b5ae92f1f341df940167009eeebe0ccec2c460fce69a19988f96a6fa988a740682b3da864ebfc21b1bbeddd3b5
+AUX uuidd.initd 209 BLAKE2B 6c5cb40a6a51643b3588552b3eda5617bd4ee2977b7f11240c354b27225538cfe2a5980b814e0034fdce28cfff790424a7cb8a1aa96d6cb3a6e6f618784d0760 SHA512 7db3e5519c1957f8bcf4611cb1e69762a2714e251f4063ad231d558866535fce30fe88d4adca973bfeb4a5aac38cb276ff2eb271353508857cb97bb127f31ac9
 DIST util-linux-2.39.3.tar.sign 833 BLAKE2B 433b9ad6e97d9e2ffbd516addf8406587d009d9c7661ac126ae89b370f22a39f1f1243e86ef383133d656833d3ad35054397d60e0e0c67bd1e9402939903570b SHA512 d9993d7a77531ca8fe3e58458d65e7d721c38aa53838547479fea169941a69b1c07fb02ac90ed5a0360025814b0999167621dbc4215348810584947a9e67756d
 DIST util-linux-2.39.3.tar.xz 8526168 BLAKE2B cd7b2b3c820e920d4a6ecd46fd807e018fc8e54439292f5e62c5f6863dd0f2505df3ec02c470d9be255a437c6ee8e4077908ac78d19a0d1273854d99eb571df0 SHA512 a2de1672f06ca5d2d431db1265a8499808770c3781019ec4a3a40170df4685826d8e3ca120841dcc5df4681ca8c935a993317bd0dc70465b21bf8e0efef65afa
 DIST util-linux-2.39.4.tar.sign 833 BLAKE2B cbefaa4968ac82491c9eaa467c5e84e9b4a0c8dac74855aa04536a08f2c924e5f027f1a6389bd75e4366671addfe10a292f293295734041da7dc90971209134c SHA512 3f29551913cf8206c144edb0f3575beabf6e228564cf4aaf8f83d44d45ec8f24c22c7d178cc225804ecdfc66f6c24ee790e3b3660622975fdeec98fe7e2500aa
@@ -20,6 +21,6 @@ EBUILD util-linux-2.39.3-r2.ebuild 10872 BLAKE2B c44068bc288acf9c77d4c697cc8b784
 EBUILD util-linux-2.39.3-r7.ebuild 11232 BLAKE2B 09dcc169238dbec2e428420511062be1571484086784925f8c727ad89c10e4db37d164f2777c7f259f43ef6399c8a36d7478fe2ccb5215fbb683f6e79a81a73a SHA512 ca017f44d330ca86e64413fc78353118cbb75304e60d8c700f1e30e466a614fd888670e9232a12445311828bc356fa00008ea60b935840115da7b96347b40e42
 EBUILD util-linux-2.39.4-r1.ebuild 11142 BLAKE2B 1ee7d40ec8a47faafe30845a712be27f31689db47882d95195474970d0ad4dc8fc741782a6b2e8b46e8ed6a87d106f689f226c86e65bfd155bd7739271a282f8 SHA512 f7767ef10dfde3b1c8342a87f576ec2994018b7d22283e9dde2fed33e0711ade68d95f8a2d8e31ba2fea883f8720a9f6024ce02068950fead868436b9fc5ddaa
 EBUILD util-linux-2.39.4.ebuild 11092 BLAKE2B eddaf690fd796e95c66a8965c207960ba8184833e40593b590d78d58baf58bfaa369055d1a5766a6ff8c7a33a549289d6dec316c0661ac1c7b2e632375e89acb SHA512 43467deb4af0e6a9de45f3c9f9af49b741e457d564e6cb5928a580d3e605b09c8f612b09d5493f0903a0e8cb1a0e1b2b1f58c4e7ef43dc467a2bec32bfc1f2d7
-EBUILD util-linux-2.40.1.ebuild 10990 BLAKE2B 3475fd3c526682b3472ca51b06837c45e8b497a55329571ada5d942af015e3437ee086225d650d65be6087825dc0f11925ec99c65f376b151ba2c73c0e22254c SHA512 4762cf9a4df02848c55a1ee2ff807f795b22b82c9806f9ce0568739dc8afa36ff6eed04f95e67eaf0894f65f10e0889c9e8a399fd08b630acfdc00cfa790689a
-EBUILD util-linux-9999.ebuild 10934 BLAKE2B 7fdf6877800c580544ea5a31b7e09276822fadeb54fccb5d14f7e5087ba6706c7fc9740455a9e8c5911af214f79a86e532b381ac87684843cf5510ec30ebe537 SHA512 ad84402170eb5fa1afba21bb7c99470544532186d7546254fc486c4f774961ab7cdedb40120dbc4a580557347892c3e932bd2b9d007d301f4675218e6731b8ba
-MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
+EBUILD util-linux-2.40.1-r1.ebuild 11331 BLAKE2B afff7841cc378a8ea14631f1cc4fc28cd93c23f5d1ed7ec5bc1b23f6f505c4ff37e5d60cc5508dac692554a1aeae10a6eba14230e8da7faabbd3c752d5480600 SHA512 525715bc25ef55a6f323c6d91151a36ab21d6483f098db83f001e9df964dc55e60b84a0e48896df4f4b263489608011916db235dc891832e3ec3bd0086349f01
+EBUILD util-linux-9999.ebuild 11275 BLAKE2B 7bb396dfafd83a1b8e3fe68792240277ca0f3a2b7c067c3b11e954be3231ad841ac0d98977df46133ef9d4373c9c6c7b72eef42b4f515a73b3f57ccd61239239 SHA512 e321c6ac7afb959707ad8d7ab2e65d9b1fc29de252424af0a77c687fe78a0f1c0dfedbf093bb054351b6847292260f582b50cf6eeebc9d87d61d104861ad31c4
+MISC metadata.xml 1600 BLAKE2B c36342513e86655c4e4bfee627d9b516d4dc008abce3a7397d6cf3fb65f562bb58bcdc5b9d7daa801da01c77d19415b0dc6bf3407c5cca7d51327bb3689f94f6 SHA512 56b041dcbcc2c048a642bb8b44927cc0bed40de1c531f6445feaf0a87673fa19efffa3a5dabed5178b427d1fe5fdf41c2f7b8c0386f9adf1545c5ff9fa30169b
diff --git a/sys-apps/util-linux/files/uuidd.initd b/sys-apps/util-linux/files/uuidd.initd
new file mode 100644
index 000000000000..329929e9a9ab
--- /dev/null
+++ b/sys-apps/util-linux/files/uuidd.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/sbin/uuidd
+pidfile=/run/uuidd/uuidd.pid
+
+depend() {
+	need clock localmount
+}
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index 2d9b8b837fe2..291587be5409 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -24,6 +24,7 @@
 		su: non-root users may become root
 		</flag>
 		<flag name="tty-helpers">install the mesg/wall/write tools for talking to local users</flag>
+		<flag name="uuidd">build uuidd daemon</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
diff --git a/sys-apps/util-linux/util-linux-2.40.1.ebuild b/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild
index fefca19af628..c112b4749522 100644
--- a/sys-apps/util-linux/util-linux-2.40.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.40.1-r1.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
+TMPFILES_OPTIONAL=1
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-r1 multilib-minimal multiprocessing systemd
+	pam python-r1 multilib-minimal multiprocessing systemd tmpfiles
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
@@ -33,7 +34,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode uuidd"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -84,6 +85,10 @@ RDEPEND+="
 		!<sys-apps/shadow-4.7-r2
 		!>=sys-apps/shadow-4.7-r2[su]
 	)
+	uuidd? (
+		acct-user/uuidd
+		virtual/tmpfiles
+	)
 	!net-wireless/rfkill
 "
 
@@ -230,6 +235,7 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
+		$(multilib_native_use_enable uuidd)
 
 		# TODO: Wire this up (bug #931118)
 		--without-econf
@@ -303,6 +309,9 @@ multilib_src_configure() {
 			--enable-libsmartcols
 			--enable-libfdisk
 			--enable-libmount
+
+			# Support uuidd for non-native libuuid
+			$(use_enable uuidd libuuid-force-uuidd)
 		)
 	fi
 
@@ -388,6 +397,10 @@ multilib_src_install_all() {
 		fperms u+s /bin/su
 	fi
 
+	if use uuidd; then
+		newinitd "${FILESDIR}/uuidd.initd" uuidd
+	fi
+
 	# Note:
 	# Bash completion for "runuser" command is provided by same file which
 	# would also provide bash completion for "su" command. However, we don't
@@ -412,4 +425,8 @@ pkg_postinst() {
 		elog "The agetty util now clears the terminal by default. You"
 		elog "might want to add --noclear to your /etc/inittab lines."
 	fi
+
+	if use uuidd; then
+		tmpfiles_process uuidd-tmpfiles.conf
+	fi
 }
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index a3c518db9e1d..053f45a99077 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -4,9 +4,10 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
+TMPFILES_OPTIONAL=1
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-r1 multilib-minimal multiprocessing systemd
+	pam python-r1 multilib-minimal multiprocessing systemd tmpfiles
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-${MY_PV}"
@@ -33,7 +34,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode"
+IUSE="audit build caps +cramfs cryptsetup fdformat +hardlink kill +logger magic ncurses nls pam python +readline rtas selinux slang static-libs +su +suid systemd test tty-helpers udev unicode uuidd"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
@@ -84,6 +85,10 @@ RDEPEND+="
 		!<sys-apps/shadow-4.7-r2
 		!>=sys-apps/shadow-4.7-r2[su]
 	)
+	uuidd? (
+		acct-user/uuidd
+		virtual/tmpfiles
+	)
 	!net-wireless/rfkill
 "
 
@@ -230,6 +235,7 @@ multilib_src_configure() {
 		$(use_enable static-libs static)
 		$(use_with ncurses tinfo)
 		$(use_with selinux)
+		$(multilib_native_use_enable uuidd)
 
 		# TODO: Wire this up (bug #931118)
 		--without-econf
@@ -303,6 +309,9 @@ multilib_src_configure() {
 			--enable-libsmartcols
 			--enable-libfdisk
 			--enable-libmount
+
+			# Support uuidd for non-native libuuid
+			$(use_enable uuidd libuuid-force-uuidd)
 		)
 	fi
 
@@ -387,6 +396,10 @@ multilib_src_install_all() {
 		fperms u+s /bin/su
 	fi
 
+	if use uuidd; then
+		newinitd "${FILESDIR}/uuidd.initd" uuidd
+	fi
+
 	# Note:
 	# Bash completion for "runuser" command is provided by same file which
 	# would also provide bash completion for "su" command. However, we don't
@@ -411,4 +424,8 @@ pkg_postinst() {
 		elog "The agetty util now clears the terminal by default. You"
 		elog "might want to add --noclear to your /etc/inittab lines."
 	fi
+
+	if use uuidd; then
+		tmpfiles_process uuidd-tmpfiles.conf
+	fi
 }