Bugfix release. https://github.com/util-linux/util-linux/blob/v2.41.1/Documentation/releases/v2.41.1-ReleaseNotes
* Update patchset, remove already applied fix. Signed-off-by: Christian Melki <[email protected]> --- ...-bug-in-posixipc_libs-configuration.patch} | 4 +-- patches/util-linux-2.41.1/series | 4 +++ ...nadocs-for-libsmartcols-and-libblkid.patch | 27 ------------------- patches/util-linux-2.41/series | 5 ---- rules/util-linux.make | 4 +-- 5 files changed, 8 insertions(+), 36 deletions(-) rename patches/{util-linux-2.41/0002-meson-fix-a-bug-in-posixipc_libs-configuration.patch => util-linux-2.41.1/0001-meson-fix-a-bug-in-posixipc_libs-configuration.patch} (89%) create mode 100644 patches/util-linux-2.41.1/series delete mode 100644 patches/util-linux-2.41/0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch delete mode 100644 patches/util-linux-2.41/series diff --git a/patches/util-linux-2.41/0002-meson-fix-a-bug-in-posixipc_libs-configuration.patch b/patches/util-linux-2.41.1/0001-meson-fix-a-bug-in-posixipc_libs-configuration.patch similarity index 89% rename from patches/util-linux-2.41/0002-meson-fix-a-bug-in-posixipc_libs-configuration.patch rename to patches/util-linux-2.41.1/0001-meson-fix-a-bug-in-posixipc_libs-configuration.patch index 541f68c90..6f624093c 100644 --- a/patches/util-linux-2.41/0002-meson-fix-a-bug-in-posixipc_libs-configuration.patch +++ b/patches/util-linux-2.41.1/0001-meson-fix-a-bug-in-posixipc_libs-configuration.patch @@ -10,10 +10,10 @@ meson.build:1482:22: ERROR: Object <[ExternalLibraryHolder] holds [ExternalLibra 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 6aeac2137941..56b14a171384 100644 +index 84fa4c805f59..839db6fb206e 100644 --- a/meson.build +++ b/meson.build -@@ -1475,7 +1475,7 @@ has_seminfo_type = cc.has_type('struct seminfo', args : '-D_GNU_SOURCE', prefix +@@ -1473,7 +1473,7 @@ has_seminfo_type = cc.has_type('struct seminfo', args : '-D_GNU_SOURCE', prefix posixipc_libs = [] if not cc.has_function('shm_open') and conf.get('HAVE_SYS_MMAN_H').to_string() == '1' diff --git a/patches/util-linux-2.41.1/series b/patches/util-linux-2.41.1/series new file mode 100644 index 000000000..d69fea8f0 --- /dev/null +++ b/patches/util-linux-2.41.1/series @@ -0,0 +1,4 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-meson-fix-a-bug-in-posixipc_libs-configuration.patch +# f2cf55d5187bed3b82ddc2a93f7c0c0e - git-ptx-patches magic diff --git a/patches/util-linux-2.41/0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch b/patches/util-linux-2.41/0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch deleted file mode 100644 index 84469b57a..000000000 --- a/patches/util-linux-2.41/0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Karel Zak <[email protected]> -Date: Mon, 24 Mar 2025 15:18:24 +0100 -Subject: [PATCH] meson: fix manadocs for libsmartcols and libblkid - -Fixes: https://github.com/util-linux/util-linux/issues/3475 -Signed-off-by: Karel Zak <[email protected]> ---- - meson.build | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1537f5e61d90..6aeac2137941 100644 ---- a/meson.build -+++ b/meson.build -@@ -4028,7 +4028,11 @@ run_target( - - manadocs += lib_tcolors_manadocs - if build_libblkid -- manadocs += lib_blkid_manadocs + lib_smartcols_manadocs -+ manadocs += lib_blkid_manadocs -+endif -+ -+if build_libsmartcols -+ manadocs += lib_smartcols_manadocs - endif - - if build_libuuid diff --git a/patches/util-linux-2.41/series b/patches/util-linux-2.41/series deleted file mode 100644 index a956331ac..000000000 --- a/patches/util-linux-2.41/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-meson-fix-manadocs-for-libsmartcols-and-libblkid.patch -0002-meson-fix-a-bug-in-posixipc_libs-configuration.patch -# 49884de83edaea910c4df0a73f857047 - git-ptx-patches magic diff --git a/rules/util-linux.make b/rules/util-linux.make index cebaf9c45..ee7b94111 100644 --- a/rules/util-linux.make +++ b/rules/util-linux.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux # # Paths and names # -UTIL_LINUX_VERSION := 2.41 -UTIL_LINUX_MD5 := 1596f41840811a880b87fa0d360407be +UTIL_LINUX_VERSION := 2.41.1 +UTIL_LINUX_MD5 := 0feef1f700c5576a11ed97c47c1776d3 UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION) UTIL_LINUX_SUFFIX := tar.gz UTIL_LINUX_URL := https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX) -- 2.34.1
