Rebuilt for Python 3.15.0b4 ABI change

- fix pam_lastlog2 libpam linking (rhbz#2453457)

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -65,3 +65,44 @@
 /util-linux-2.32-rc1.tar.xz
 /util-linux-2.32.tar.xz
 /util-linux-2.32.1.tar.xz
+/util-linux-2.33-rc2.tar.xz
+/util-linux-2.33.1.tar.xz
+/util-linux-2.33.2.tar.xz
+/util-linux-2.34-rc1.tar.xz
+/util-linux-2.34-rc2.tar.xz
+/util-linux-2.34.tar.xz
+/util-linux-2.35-rc1.tar.xz
+/util-linux-2.35-rc1-20-63f8.tar.xz
+/util-linux-2.35-rc2.tar.xz
+/util-linux-2.35.tar.xz
+/util-linux-2.35.1.tar.xz
+/util-linux-2.35.2.tar.xz
+/util-linux-2.36.tar.xz
+/util-linux-2.36.1.tar.xz
+/util-linux-2.36.2.tar.xz
+/util-linux-2.37-rc2.tar.xz
+/util-linux-2.37.tar.xz
+/util-linux-2.37.2.tar.xz
+/util-linux-2.38-rc1.tar.xz
+/util-linux-2.38-rc3.tar.xz
+/util-linux-2.38.tar.xz
+/util-linux-2.38.1.tar.xz
+/util-linux-2.39-rc1.tar.xz
+/util-linux-2.39-rc2.tar.xz
+/util-linux-2.39-rc3.tar.xz
+/util-linux-2.39.tar.xz
+/util-linux-2.39.1.tar.xz
+/util-linux-2.39.2.tar.xz
+/util-linux-2.39.3.tar.xz
+/util-linux-2.40-rc1.tar.xz
+/util-linux-2.40.tar.xz
+/util-linux-2.40.1.tar.xz
+/util-linux-2.40.2.tar.xz
+/util-linux-2.40.4.tar.xz
+/util-linux-2.41.tar.xz
+/util-linux-2.41.1.tar.xz
+/util-linux-2.41.2.tar.xz
+/util-linux-2.41.3.tar.xz
+/util-linux-2.42.tar.xz
+/util-linux-2.42.1.tar.xz
+/util-linux-2.42.2.tar.xz

0000-login-use-O_CREAT-on-lastlog.patch

@@ -0,0 +1,27 @@
+From a2357184ff3dc3beb001fcb12e1e4c0dcf8d0dbd Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 2 Dec 2025 16:15:44 +0100
+Subject: login: use O_CREAT on lastlog
+
+Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=151635
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ login-utils/login.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/login-utils/login.c b/login-utils/login.c
+index 321f9d6ce..edc69fd9a 100644
+--- a/login-utils/login.c
++++ b/login-utils/login.c
+@@ -682,7 +682,7 @@ static void log_lastlog(struct login_context *cxt)
+ 	sa.sa_handler = SIG_IGN;
+ 	sigaction(SIGXFSZ, &sa, &oldsa_xfsz);
+ 
+-	fd = open(_PATH_LASTLOG, O_RDWR, 0);
++	fd = open(_PATH_LASTLOG, O_RDWR | O_CREAT, 0);
+ 	if (fd < 0)
+ 		goto done;
+ 	offset = cxt->pwd->pw_uid * sizeof(ll);
+-- 
+2.51.1
+

0001-login-add-run-motd.d-to-the-hardcoded-MOTD_FILE.patch

@@ -0,0 +1,27 @@
+From 617a887a6ec7e433f6a9f4c60592ed38b12b9f18 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 2 Dec 2025 16:17:55 +0100
+Subject: login: add /run/motd.d` to the hardcoded MOTD_FILE
+
+Addresses: https://github.com/coreos/console-login-helper-messages/issues/60
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ include/pathnames.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/pathnames.h b/include/pathnames.h
+index 34ba11ca3..c91a077e1 100644
+--- a/include/pathnames.h
++++ b/include/pathnames.h
+@@ -41,7 +41,7 @@
+ #ifndef _PATH_MAILDIR
+ # define _PATH_MAILDIR		"/var/spool/mail"
+ #endif
+-#define	_PATH_MOTDFILE		"/usr/share/misc/motd:/run/motd:/etc/motd"
++#define	_PATH_MOTDFILE		"/usr/share/misc/motd:/run/motd:/run/motd.d:/etc/motd:/etc/motd.d"
+ #ifndef _PATH_NOLOGIN
+ # define _PATH_NOLOGIN		"/etc/nologin"
+ #endif
+-- 
+2.51.1
+

2.28-login-lastlog-create.patch

@@ -1,12 +0,0 @@
-diff -up util-linux-2.28/login-utils/login.c.kzak util-linux-2.28/login-utils/login.c
---- util-linux-2.28/login-utils/login.c.kzak	2016-03-08 14:28:16.724156218 +0100
-+++ util-linux-2.28/login-utils/login.c	2016-04-26 12:45:29.235326017 +0200
-@@ -510,7 +510,7 @@ static void log_lastlog(struct login_con
- 	sa.sa_handler = SIG_IGN;
- 	sigaction(SIGXFSZ, &sa, &oldsa_xfsz);
- 
--	fd = open(_PATH_LASTLOG, O_RDWR, 0);
-+	fd = open(_PATH_LASTLOG, O_RDWR | O_CREAT, 0);
- 	if (fd < 0)
- 		goto done;
- 

column-fix-leading-space-characters-bug.patch

@@ -1,148 +0,0 @@
-From 651c5d428c2ef103ee8c5b1a310d6f29f0304744 Mon Sep 17 00:00:00 2001
-From: Karel Zak <kzak@redhat.com>
-Date: Tue, 27 Mar 2018 10:40:13 +0200
-Subject: [PATCH] column: fix leading space characters bug
-
-The bug has been introduced during column(1) rewrite. The function
-read_input() need to skip leading space only temporary to detect empty
-lines, but the rest of the code has to use the original buffer (line).
-I've tried to fix one of the symptoms by 5c7b67fbbf41c973ca8d49b1e8bdba22dbb917aa
-(alter), but this solution is unnecessary and too complex.
-
-Changes:
-
-* don't ignore leading space
-* remove unnecessary stuff introduced by 5c7b67fbbf41c973ca8d49b1e8bdba22dbb917aa
-* fix regression test with incorrect separator
-
-Addresses: https://github.com/karelzak/util-linux/issues/575
-Addresses: https://bugzilla.redhat.com/show_bug.cgi?id=1560283
-Signed-off-by: Karel Zak <kzak@redhat.com>
----
- tests/expected/column/table-input-separator-space |  2 +-
- tests/ts/column/table                             |  2 +-
- text-utils/column.c                               | 36 ++---------------------
- 4 files changed, 5 insertions(+), 38 deletions(-)
-
-diff --git a/tests/expected/column/table-input-separator-space b/tests/expected/column/table-input-separator-space
-index 8a6513c11..25d9b5ab0 100644
---- a/tests/expected/column/table-input-separator-space
-+++ b/tests/expected/column/table-input-separator-space
-@@ -1,5 +1,5 @@
- AAA	BBBB	C	DDDD
--BBB	CCCC	DDD
-+	BBB	CCCC	DDD
- AA	BB		DD
- AAAA	B	CC	D
- AA		CC	DD
-diff --git a/tests/ts/column/table b/tests/ts/column/table
-index 27b52e7c8..5c89d5eaf 100755
---- a/tests/ts/column/table
-+++ b/tests/ts/column/table
-@@ -37,7 +37,7 @@ $TS_CMD_COLUMN --separator ',' --table $TS_SELF/files/table-sep >> $TS_OUTPUT 2>
- ts_finalize_subtest
- 
- ts_init_subtest "input-separator-space"
--$TS_CMD_COLUMN --separator ',' --table $TS_SELF/files/table-sep-space >> $TS_OUTPUT 2>&1
-+$TS_CMD_COLUMN --separator "$(echo -e '\t')" --table $TS_SELF/files/table-sep-space >> $TS_OUTPUT 2>&1
- ts_finalize_subtest
- 
- ts_init_subtest "long"
-diff --git a/text-utils/column.c b/text-utils/column.c
-index 89d46d280..195814328 100644
---- a/text-utils/column.c
-+++ b/text-utils/column.c
-@@ -86,7 +86,6 @@ struct column_control {
- 	const char *tree_parent;
- 
- 	wchar_t *input_separator;
--	char *input_separator_raw;
- 	const char *output_separator;
- 
- 	wchar_t	**ents;		/* input entries */
-@@ -96,7 +95,6 @@ struct column_control {
- 	unsigned int greedy :1,
- 		     json :1,
- 		     header_repeat :1,
--		     input_sep_space : 1,	/* input separator contains space chars */
- 		     tab_noheadings :1;
- };
- 
-@@ -470,19 +468,7 @@ static int read_input(struct column_control *ctl, FILE *fp)
- 	char *buf = NULL;
- 	size_t bufsz = 0;
- 	size_t maxents = 0;
--	int rc = 0, is_space_sep = 0;
--
--	/* Check if columns separator contains spaces chars */
--	if (ctl->mode == COLUMN_MODE_TABLE && ctl->input_separator_raw) {
--		char *p;
--
--		for (p = ctl->input_separator_raw; *p; p++) {
--			if (isspace(*p)) {
--				is_space_sep = 1;
--				break;
--			}
--		}
--	}
-+	int rc = 0;
- 
- 	/* Read input */
- 	do {
-@@ -496,19 +482,6 @@ static int read_input(struct column_control *ctl, FILE *fp)
- 			err(EXIT_FAILURE, _("read failed"));
- 		}
- 		str = (char *) skip_space(buf);
--
--		/* The table columns separator could be a space. In this case
--		 * don't skip the separator if at begin of the line. For example:
--		 *
--		 * echo -e "\tcol1\tcol2\nrow\t1\t2" \
--		 *	| column -t -s "$(echo -e '\t')" --table-columns A,B,C
--		 */
--		if (is_space_sep && str > buf) {
--			char *x = strpbrk(buf, ctl->input_separator_raw);
--			if (x && x < str)
--				str = x;
--		}
--
- 		if (str) {
- 			p = strchr(str, '\n');
- 			if (p)
-@@ -517,13 +490,13 @@ static int read_input(struct column_control *ctl, FILE *fp)
- 		if (!str || !*str)
- 			continue;
- 
--		wcs = mbs_to_wcs(str);
-+		wcs = mbs_to_wcs(buf);
- 		if (!wcs) {
- 			/*
- 			 * Convert broken sequences to \x<hex> and continue.
- 			 */
- 			size_t tmpsz = 0;
--			char *tmp = mbs_invalid_encode(str, &tmpsz);
-+			char *tmp = mbs_invalid_encode(buf, &tmpsz);
- 
- 			if (!tmp)
- 				err(EXIT_FAILURE, _("read failed"));
-@@ -720,7 +693,6 @@ int main(int argc, char **argv)
- 
- 	ctl.output_separator = "  ";
- 	ctl.input_separator = mbs_to_wcs("\t ");
--	ctl.input_separator_raw = xstrdup("\t ");
- 
- 	while ((c = getopt_long(argc, argv, "c:dE:eH:hi:JN:n:O:o:p:R:r:s:T:tVW:x", longopts, NULL)) != -1) {
- 
-@@ -775,9 +747,7 @@ int main(int argc, char **argv)
- 			break;
- 		case 's':
- 			free(ctl.input_separator);
--			free(ctl.input_separator_raw);
- 			ctl.input_separator = mbs_to_wcs(optarg);
--			ctl.input_separator_raw = xstrdup(optarg);
- 			ctl.greedy = 0;
- 			break;
- 		case 'T':
--- 
-2.14.3
-

plans/ci.fmf

@@ -0,0 +1,5 @@
+summary: Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: tmt

sources

@@ -1 +1 @@
-SHA512 (util-linux-2.32.1.tar.xz) = 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698
+SHA512 (util-linux-2.42.2.tar.xz) = 7415add0be2930654e322830808dde03ff6d511bd357f0679e6b6287a13ca79fe58ce4ac05edef86b76fb381b3a36ca2da9d3c31b5dc0a1d889c203156a57277

tests/tests.yml

@@ -1,13 +0,0 @@
-# Test which run in classic and docker environemnt
-- hosts: localhost
-  tags:
-  - classic
-  - container
-  - atomic
-  roles:
-  - role: standard-test-beakerlib
-    tests:
-    - various
-    required_packages:
-    - util-linux
-    - util-linux-user

tests/various/main.fmf

@@ -0,0 +1,13 @@
+summary: This test groups small sanity and regression tests for util-linux
+description: ''
+contact: Miroslav Vadkerti <mvadkert@redhat.com>
+component:
+  - util-linux
+test: ./runtest.sh
+framework: beakerlib
+recommend:
+  - util-linux
+  - util-linux-user
+duration: 10m
+extra-summary: /CoreOS/util-linux/Sanity/various
+extra-task: /CoreOS/util-linux/Sanity/various

tests/various/runtest.sh

@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-#. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="util-linux"

util-linux-60-raw.rules

@@ -1,8 +0,0 @@
-#
-# Enter raw device bindings here.
-#
-# An example would be:
-#   ACTION=="add", KERNEL=="sda", RUN+="/usr/bin/raw /dev/raw/raw1 %N"
-# to bind /dev/raw/raw1 to /dev/sda, or
-#   ACTION=="add", ENV{MAJOR}=="8", ENV{MINOR}=="1", RUN+="/usr/bin/raw /dev/raw/raw2 %M %m"
-# to bind /dev/raw/raw2 to the device with major 8, minor 1.

util-linux-login.pamd

@@ -7,7 +7,6 @@ password   include      system-auth
 # pam_selinux.so close should be the first session rule
 session    required     pam_selinux.so close
 session    required     pam_loginuid.so
-session    optional     pam_console.so
 # pam_selinux.so open should only be followed by sessions to be executed in the user context
 session    required     pam_selinux.so open
 session    required     pam_namespace.so

util-linux-su.pamd

@@ -1,4 +1,5 @@
 #%PAM-1.0
+auth		required	pam_env.so
 auth		sufficient	pam_rootok.so
 # Uncomment the following line to implicitly trust users in the "wheel" group.
 #auth		sufficient	pam_wheel.so trust use_uid

uuidd-tmpfiles.conf

@@ -0,0 +1 @@
+d /run/uuidd 2775 uuidd uuidd