https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes
* Fix missing files in the release. Add patches. 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.me...@t2data.com> --- ...roperly-handle-gettext-non-existence.patch | 29 ----------- patches/util-linux-2.39.3/series | 4 -- ...-distribute-pam_lastlog2-meson.build.patch | 27 ++++++++++ ..._lastlog2-Add-missing-file-for-meson.patch | 52 +++++++++++++++++++ patches/util-linux-2.40/series | 5 ++ rules/util-linux.make | 6 ++- 6 files changed, 88 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 create mode 100644 patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch create mode 100644 patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch create mode 100644 patches/util-linux-2.40/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?= <tho...@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 <tho...@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/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch b/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch new file mode 100644 index 000000000..a0b045def --- /dev/null +++ b/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch @@ -0,0 +1,27 @@ +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= <tho...@t-8ch.de> +Date: Sat, 30 Mar 2024 17:46:19 +0100 +Subject: [PATCH] autotools: distribute pam_lastlog2/meson.build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Otherwise building the dist tarball via meson doesn't work. + +Fixes #2875 +Signed-off-by: Thomas Weißschuh <tho...@t-8ch.de> +--- + pam_lastlog2/Makemodule.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pam_lastlog2/Makemodule.am b/pam_lastlog2/Makemodule.am +index f33c98ba5324..f17cc09f6a14 100644 +--- a/pam_lastlog2/Makemodule.am ++++ b/pam_lastlog2/Makemodule.am +@@ -3,6 +3,6 @@ if BUILD_PAM_LASTLOG2 + include pam_lastlog2/man/Makemodule.am + include pam_lastlog2/src/Makemodule.am + +-EXTRA_DIST += pam_lastlog2/COPYING ++EXTRA_DIST += pam_lastlog2/COPYING pam_lastlog2/meson.build + + endif # BUILD_PAM_LASTLOG2 diff --git a/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch b/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch new file mode 100644 index 000000000..04c2a9141 --- /dev/null +++ b/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch @@ -0,0 +1,52 @@ +From: Christian Melki <christian.me...@t2data.com> +Date: Mon, 1 Apr 2024 19:52:46 +0200 +Subject: [PATCH] pam_lastlog2: Add missing file for meson. + +Signed-off-by: Christian Melki <christian.me...@t2data.com> +--- + pam_lastlog2/meson.build | 36 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 36 insertions(+) + create mode 100644 pam_lastlog2/meson.build + +diff --git a/pam_lastlog2/meson.build b/pam_lastlog2/meson.build +new file mode 100644 +index 000000000000..12f3a6b211e6 +--- /dev/null ++++ b/pam_lastlog2/meson.build +@@ -0,0 +1,36 @@ ++build_pam_lastlog2 = not get_option('build-pam-lastlog2') \ ++ .require(build_liblastlog2) \ ++ .require(conf.get('HAVE_SECURITY_PAM_MODULES_H').to_string() == '1') \ ++ .disabled() ++summary('pam_lastlog2', build_pam_lastlog2 ? 'enabled' : 'disabled', section : 'components') ++ ++cc = meson.get_compiler('c') ++pkg = import('pkgconfig') ++lib_pam_lastlog2_sources = ''' ++ src/pam_lastlog2.c ++'''.split() ++ ++pamlibdir = get_option('pamlibdir') ++if pamlibdir == '' ++ pamlibdir = get_option('libdir') / 'security' ++endif ++ ++if build_pam_lastlog2 ++ pam_lastlog2_sym = 'src/pam_lastlog2.sym' ++ pam_lastlog2_sym_path = '@0@/@1@'.format(meson.current_source_dir(), pam_lastlog2_sym) ++ ++ libpam = cc.find_library('pam') ++ ++ pam_lastlog2 = shared_module( ++ 'pam_lastlog2', ++ lib_pam_lastlog2_sources, ++ name_prefix : '', ++ include_directories : [dir_include], ++ link_args : ['-Wl,--version-script=@0@'.format(pam_lastlog2_sym_path)], ++ link_depends : pam_lastlog2_sym, ++ dependencies : [libpam, lastlog2_dep], ++ install : build_liblastlog2, ++ install_dir : pamlibdir, ++ ) ++ manadocs += ['pam_lastlog2/man/pam_lastlog2.8.adoc'] ++endif diff --git a/patches/util-linux-2.40/series b/patches/util-linux-2.40/series new file mode 100644 index 000000000..0c822e6e1 --- /dev/null +++ b/patches/util-linux-2.40/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-autotools-distribute-pam_lastlog2-meson.build.patch +0002-pam_lastlog2-Add-missing-file-for-meson.patch +# e8b8a0248b920dcf5afe5dbe1b20ed8b - 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