[ptxdist] [PATCH 1/2] util-linux: Version bump. 2.39.3 -> 2.40

[ptxdist] [PATCH 1/2] util-linux: Version bump. 2.39.3 -> 2.40

[Christian Melki]

https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes

* Fix missing files in the release.
New liblastlog2 stuff does seem to have various
building issues etc, so disable them for now.

* Old patches dropped, seem to be included in the new release.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...roperly-handle-gettext-non-existence.patch | 29 -------------------
 patches/util-linux-2.39.3/series              |  4 ---
 rules/util-linux.make                         |  6 ++--
 3 files changed, 4 insertions(+), 35 deletions(-)
 delete mode 100644 patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
 delete mode 100644 patches/util-linux-2.39.3/series

diff --git a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
deleted file mode 100644
index 01d07d3f6..000000000
--- a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <thomas@t-8ch.de>
-Date: Sat, 5 Aug 2023 08:57:28 +0200
-Subject: [PATCH] meson: properly handle gettext non-existence
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit e91a49c9747f ("meson: don't build po if no gettext")
-tried to add the possibility to build util-linux without gettext.
-
-Unfortunately by default the call to find_program() would abort the
-build if the program is not found.
-Avoid aborting the build.
-
-Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>
----
- po/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/meson.build b/po/meson.build
-index c10deafd28a6..8adfa48d8327 100644
---- a/po/meson.build
-+++ b/po/meson.build
-@@ -1,4 +1,4 @@
--if not find_program('gettext').found()
-+if not find_program('gettext', required : false).found()
-   subdir_done()
- endif
- 
diff --git a/patches/util-linux-2.39.3/series b/patches/util-linux-2.39.3/series
deleted file mode 100644
index ca4f8cdfd..000000000
--- a/patches/util-linux-2.39.3/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-meson-properly-handle-gettext-non-existence.patch
-# 58d7fd4eca561971b85d47838b3463cf  - git-ptx-patches magic
diff --git a/rules/util-linux.make b/rules/util-linux.make
index 2a2215570..43ee2c331 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.39.3
-UTIL_LINUX_MD5		:= f3591e6970c017bb4bcd24ae762a98f5
+UTIL_LINUX_VERSION	:= 2.40
+UTIL_LINUX_MD5		:= 46d1423122d310dfd022c799e1e4e259
 UTIL_LINUX		:= util-linux-$(UTIL_LINUX_VERSION)
 UTIL_LINUX_SUFFIX	:= tar.xz
 UTIL_LINUX_BASENAME	:= v$(if $(filter 2,$(basename $(UTIL_LINUX_VERSION))),$(UTIL_LINUX_VERSION),$(basename $(UTIL_LINUX_VERSION)))
@@ -70,6 +70,7 @@ UTIL_LINUX_CONF_OPT	:= \
 	-Dbuild-last=disabled \
 	-Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \
 	-Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \
+	-Dbuild-liblastlog2=disabled \
 	-Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \
 	-Dbuild-libsmartcols=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \
 	-Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \
@@ -88,6 +89,7 @@ UTIL_LINUX_CONF_OPT	:= \
 	-Dbuild-newgrp=disabled \
 	-Dbuild-nologin=disabled \
 	-Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \
+	-Dbuild-pam-lastlog2=disabled \
 	-Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \
 	-Dbuild-pg=disabled \
 	-Dbuild-pipesz=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIPESZ)d \
-- 
2.34.1

[ptxdist] [PATCH 2/2] host-util-linux: Follow target util-linux.

[Christian Melki]

* Disabled new functions.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/host-util-linux.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make
index 849c09c7a..adaf0b86c 100644
--- a/rules/host-util-linux.make
+++ b/rules/host-util-linux.make
@@ -50,6 +50,7 @@ HOST_UTIL_LINUX_CONF_OPT	:= \
 	-Dbuild-last=disabled \
 	-Dbuild-libblkid=enabled \
 	-Dbuild-libfdisk=disabled \
+	-Dbuild-liblastlog2=disabled \
 	-Dbuild-libmount=enabled \
 	-Dbuild-libsmartcols=disabled \
 	-Dbuild-libuuid=enabled \
@@ -68,6 +69,7 @@ HOST_UTIL_LINUX_CONF_OPT	:= \
 	-Dbuild-newgrp=disabled \
 	-Dbuild-nologin=disabled \
 	-Dbuild-nsenter=disabled \
+	-Dbuild-pam-lastlog2=disabled \
 	-Dbuild-partx=disabled \
 	-Dbuild-pg=disabled \
 	-Dbuild-pipesz=disabled \
-- 
2.34.1