util-linux-selinux 2.39.3-2 update

4 files changed, 147 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e39df1cba905..f6076717d879 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = util-linux-selinux
 	pkgdesc = SELinux aware miscellaneous system utilities for Linux
 	pkgver = 2.39.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/util-linux/util-linux
 	arch = x86_64
 	arch = aarch64
@@ -27,6 +27,7 @@ pkgbase = util-linux-selinux
 	makedepends = libselinux
 	options = strip
 	source = git+https://github.com/util-linux/util-linux#tag=bc0e318941a0539be1205ea1ac1dbfa834b7d033?signed
+	source = 0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch
 	source = util-linux-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
 	source = pam-login
 	source = pam-common
@@ -39,6 +40,7 @@ pkgbase = util-linux-selinux
 	source = rfkill-block_.service
 	validpgpkeys = B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284
 	sha256sums = SKIP
+	sha256sums = d0864b925b14aaf0560afeb8df4257c0603c4e5bfce70f25e0ed3c6ab6fc58f6
 	sha256sums = 6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a
 	sha256sums = ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275
 	sha256sums = 57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af
@@ -71,8 +73,8 @@ pkgname = util-linux-selinux
 	optdepends = words: default dictionary for look
 	provides = rfkill
 	provides = hardlink
-	provides = util-linux=2.39.3-1
-	provides = selinux-util-linux=2.39.3-1
+	provides = util-linux=2.39.3-2
+	provides = selinux-util-linux=2.39.3-2
 	conflicts = rfkill
 	conflicts = hardlink
 	conflicts = util-linux
@@ -96,7 +98,7 @@ pkgname = util-linux-libs-selinux
 	provides = libmount.so
 	provides = libsmartcols.so
 	provides = libuuid.so
-	provides = util-linux-libs=2.39.3-1
+	provides = util-linux-libs=2.39.3-2
 	provides = libutil-linux-selinux
 	conflicts = util-linux-libs
 	conflicts = libutil-linux-selinux
diff --git a/0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch b/0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch
new file mode 100644
index 000000000000..1bad1fdde534
--- /dev/null
+++ b/0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch
@@ -0,0 +1,83 @@
+From 127ac4c8de64e954dbb4d1cf9b5e365639796cc7 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Thu, 22 Feb 2024 08:48:55 +0100
+Subject: [PATCH 1/1] tmpfiles: add and install for uuidd, generate /run/uuidd
+ & /var/lib/libuuid
+
+These directories are requird for uuidd, so let systemd-tmpfiles create them.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+(cherry picked from commit 2b7410544c90f56fbb9abca999ed48feffbe31ef)
+---
+ misc-utils/.gitignore             | 1 +
+ misc-utils/Makemodule.am          | 4 +++-
+ misc-utils/meson.build            | 8 ++++++++
+ misc-utils/uuidd-tmpfiles.conf.in | 6 ++++++
+ 4 files changed, 18 insertions(+), 1 deletion(-)
+ create mode 100644 misc-utils/uuidd-tmpfiles.conf.in
+
+diff --git a/misc-utils/.gitignore b/misc-utils/.gitignore
+index c0287917d..6ceec2057 100644
+--- a/misc-utils/.gitignore
++++ b/misc-utils/.gitignore
+@@ -3,3 +3,4 @@ uuidd.8
+ uuidd.rc
+ uuidd.service
+ uuidd.socket
++uuidd-tmpfiles.conf
+diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am
+index 71548c9f9..05804ccff 100644
+--- a/misc-utils/Makemodule.am
++++ b/misc-utils/Makemodule.am
+@@ -128,6 +128,7 @@ uuidd_SOURCES = misc-utils/uuidd.c lib/monotonic.c lib/timer.c
+ if HAVE_SYSTEMD
+ uuidd_LDADD += $(SYSTEMD_LIBS) $(SYSTEMD_DAEMON_LIBS)
+ uuidd_CFLAGS += $(SYSTEMD_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
++tmpfiles_DATA += misc-utils/uuidd-tmpfiles.conf
+ systemdsystemunit_DATA += \
+ 	misc-utils/uuidd.service \
+ 	misc-utils/uuidd.socket
+@@ -142,7 +143,8 @@ endif # BUILD_UUIDD
+ PATHFILES += \
+ 	misc-utils/uuidd.rc \
+ 	misc-utils/uuidd.service \
+-	misc-utils/uuidd.socket
++	misc-utils/uuidd.socket \
++	misc-utils/uuidd-tmpfiles.conf
+ 
+ if BUILD_BLKID
+ sbin_PROGRAMS += blkid
+diff --git a/misc-utils/meson.build b/misc-utils/meson.build
+index 7d21d02c1..026d92d11 100644
+--- a/misc-utils/meson.build
++++ b/misc-utils/meson.build
+@@ -76,6 +76,14 @@ test_uuidd_sources = files(
+ )
+ 
+ if build_uuidd and systemd.found()
++  uuidd_tmpfiles = configure_file(
++    input : 'uuidd-tmpfiles.conf.in',
++    output : 'uuidd-tmpfiles.conf',
++    configuration : conf)
++  install_data(
++    uuidd_tmpfiles,
++    install_dir : '/usr/lib/tmpfiles.d')
++
+   uuidd_service = configure_file(
+     input : 'uuidd.service.in',
+     output : 'uuidd.service',
+diff --git a/misc-utils/uuidd-tmpfiles.conf.in b/misc-utils/uuidd-tmpfiles.conf.in
+new file mode 100644
+index 000000000..9c2005bdf
+--- /dev/null
++++ b/misc-utils/uuidd-tmpfiles.conf.in
+@@ -0,0 +1,6 @@
++# This file is part of uuidd.
++#
++# See tmpfiles.d(5) for details
++#
++d @runstatedir@/uuidd 2775 uuidd uuidd -
++d /var/lib/libuuid 0755 uuidd uuidd -
+-- 
+2.44.0
+
diff --git a/PKGBUILD b/PKGBUILD
index 2a52f0623b72..074ac96a7c50 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=(util-linux-selinux util-linux-libs-selinux)
 _tag='bc0e318941a0539be1205ea1ac1dbfa834b7d033' # git rev-parse v${_tag_name}
 _tag_name=2.39.3
 pkgver=${_tag_name/-/}
-pkgrel=1
+pkgrel=2
 pkgdesc='SELinux aware miscellaneous system utilities for Linux'
 url='https://github.com/util-linux/util-linux'
 arch=('x86_64' 'aarch64')
@@ -39,6 +39,7 @@ license=(
 options=('strip')
 validpgpkeys=('B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284')  # Karel Zak
 source=("git+https://github.com/util-linux/util-linux#tag=${_tag}?signed"
+        '0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch'
         ${pkgbase/-selinux}-BSD-2-Clause.txt::https://raw.githubusercontent.com/Cyan4973/xxHash/f035303b8a86c1db9be70cbb638678ef6ef4cb2d/LICENSE
         pam-{login,common,remote,runuser,su}
         'util-linux.sysusers'
@@ -46,6 +47,7 @@ source=("git+https://github.com/util-linux/util-linux#tag=${_tag}?signed"
         'rfkill-unblock_.service'
         'rfkill-block_.service')
 sha256sums=('SKIP'
+            'd0864b925b14aaf0560afeb8df4257c0603c4e5bfce70f25e0ed3c6ab6fc58f6'
             '6ffedbc0f7878612d2b23589f1ff2ab15633e1df7963a5d9fc750ec5500c7e7a'
             'ee917d55042f78b8bb03f5467e5233e3e2ddc2fe01e302bc53b218003fe22275'
             '57e057758944f4557762c6def939410c04ca5803cbdd2bfa2153ce47ffe7a4af'
@@ -80,6 +82,9 @@ prepare() {
 
   # do not mark dirty
   sed -i '/dirty=/c dirty=' tools/git-version-gen
+
+  # tmpfiles: add and install for uuidd, generate /run/uuidd & /var/lib/libuuid
+  patch -Np1 < ../0001-tmpfiles-add-and-install-for-uuidd-generate-run-uuid.patch
 }
 
 build() {
diff --git a/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc b/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc
new file mode 100644
index 000000000000..306d645e06b9
--- /dev/null
+++ b/keys/pgp/B0C64D14301CC6EFAEDF60E4E4B71D5EEC39C284.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+Zh9rvA==
+=cevX
+-----END PGP PUBLIC KEY BLOCK-----