Rebuilt for Python 3.15.0b4 ABI change

- fix pam_lastlog2 libpam linking (rhbz#2453457)

.fmf/version

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

.gitignore

@@ -95,3 +95,14 @@
 /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
+

libmount-Fix-regression-when-mounting-with-atime.patch

@@ -1,133 +0,0 @@
-From 2b99ee2526ae61be761b0e31c50e106dbec5e9e4 Mon Sep 17 00:00:00 2001
-From: Filipe Manana <fdmanana@kernel.org>
-Date: Thu, 17 Aug 2023 10:20:13 +0100
-Subject: [PATCH] libmount: Fix regression when mounting with atime
-
-A regression was introduced in v2.39 that causes mounting with the atime
-option to fail:
-
-  $ mkfs.ext4 -F /dev/sdi
-  $ mount -o atime /dev/sdi /mnt/sdi
-  mount: /mnt/sdi: not mount point or bad option.
-         dmesg(1) may have more information after failed mount system call.
-
-The failure comes from the mount_setattr(2) call returning -EINVAL. This
-is because we pass an invalid value for the attr_clr argument. From a
-strace capture we have:
-
-  mount_setattr(4, "", AT_EMPTY_PATH, {attr_set=0, attr_clr=MOUNT_ATTR_NOATIME, propagation=0 /* MS_??? */, userns_fd=0}, 32) = -1 EINVAL (Invalid argument)
-
-We can't pass MOUNT_ATTR_NOATIME to mount_setattr(2) through the attr_clr
-argument because all atime options are exclusive, so in order to set atime
-one has to pass MOUNT_ATTR__ATIME to attr_clr and leave attr_set as
-MOUNT_ATTR_RELATIME (which is defined as a value of 0).
-
-This can be read from the man page for mount_setattr(2) and also from the
-kernel source:
-
-  $ cat fs/namespace.c
-  static int build_mount_kattr(const struct mount_attr *attr, size_t usize,
-                               struct mount_kattr *kattr, unsigned int flags)
-  {
-      (...)
-      /*
-       * Since the MOUNT_ATTR_<atime> values are an enum, not a bitmap,
-       * users wanting to transition to a different atime setting cannot
-       * simply specify the atime setting in @attr_set, but must also
-       * specify MOUNT_ATTR__ATIME in the @attr_clr field.
-       * So ensure that MOUNT_ATTR__ATIME can't be partially set in
-       * @attr_clr and that @attr_set can't have any atime bits set if
-       * MOUNT_ATTR__ATIME isn't set in @attr_clr.
-       */
-      if (attr->attr_clr & MOUNT_ATTR__ATIME) {
-          if ((attr->attr_clr & MOUNT_ATTR__ATIME) != MOUNT_ATTR__ATIME)
-              return -EINVAL;
-
-              /*
-               * Clear all previous time settings as they are mutually
-               * exclusive.
-               */
-              kattr->attr_clr |= MNT_RELATIME | MNT_NOATIME;
-              switch (attr->attr_set & MOUNT_ATTR__ATIME) {
-              case MOUNT_ATTR_RELATIME:
-                  kattr->attr_set |= MNT_RELATIME;
-                  break;
-              case MOUNT_ATTR_NOATIME:
-                  kattr->attr_set |= MNT_NOATIME;
-                  break;
-              case MOUNT_ATTR_STRICTATIME:
-                  break;
-              default:
-                  return -EINVAL;
-              }
-    (...)
-
-So fix this by setting attr_clr MOUNT_ATTR__ATIME if we want to clear any
-atime related option.
-
-Signed-off-by: Filipe Manana <fdmanana@kernel.org>
----
- libmount/src/optlist.c                      | 13 ++++++++++++-
- tests/expected/libmount/context-mount-flags |  3 +++
- tests/ts/libmount/context                   |  9 ++++++++-
- 3 files changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/libmount/src/optlist.c b/libmount/src/optlist.c
-index e93810b47..d0afc94f7 100644
---- a/libmount/src/optlist.c
-+++ b/libmount/src/optlist.c
-@@ -875,7 +875,18 @@ int mnt_optlist_get_attrs(struct libmnt_optlist *ls, uint64_t *set, uint64_t *cl
- 
- 		if (opt->ent->mask & MNT_INVERT) {
- 			DBG(OPTLIST, ul_debugobj(ls, " clr: %s", opt->ent->name));
--			*clr |= x;
-+			/*
-+			 * All atime settings are mutually exclusive so *clr must
-+			 * have MOUNT_ATTR__ATIME set.
-+			 *
-+			 * See the function fs/namespace.c:build_mount_kattr()
-+			 * in the linux kernel source.
-+			 */
-+			if (x == MOUNT_ATTR_RELATIME || x == MOUNT_ATTR_NOATIME ||
-+			    x == MOUNT_ATTR_STRICTATIME)
-+				*clr |= MOUNT_ATTR__ATIME;
-+			else
-+				*clr |= x;
- 		} else {
- 			DBG(OPTLIST, ul_debugobj(ls, " set: %s", opt->ent->name));
- 			*set |= x;
-diff --git a/tests/expected/libmount/context-mount-flags b/tests/expected/libmount/context-mount-flags
-index 960641863..eb71323dd 100644
---- a/tests/expected/libmount/context-mount-flags
-+++ b/tests/expected/libmount/context-mount-flags
-@@ -3,3 +3,6 @@ ro,nosuid,noexec
- successfully mounted
- rw,nosuid,noexec
- successfully umounted
-+successfully mounted
-+rw,relatime
-+successfully umounted
-diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
-index f5b47185e..a5d2e81a3 100755
---- a/tests/ts/libmount/context
-+++ b/tests/ts/libmount/context
-@@ -116,8 +116,15 @@ $TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPU
- 
- ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
- is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
--ts_finalize_subtest
- 
-+# Test that the atime option works after the migration to use the new kernel mount APIs.
-+ts_run $TESTPROG --mount -o atime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-+$TS_CMD_FINDMNT --kernel --mountpoint $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>> $TS_ERRLOG
-+is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
-+ts_run $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>> $TS_ERRLOG
-+is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>> $TS_ERRLOG
-+
-+ts_finalize_subtest
- 
- ts_init_subtest "mount-loopdev"
- mkdir -p $MOUNTPOINT &> /dev/null
--- 
-2.40.1
-

login-default-motd-file.patch

@@ -1,13 +0,0 @@
-diff --git a/include/pathnames.h b/include/pathnames.h
-index 3845d4c33..fac3a0783 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

login-lastlog-create.patch

@@ -1,12 +0,0 @@
-diff -up util-linux-2.36/login-utils/login.c.kzak util-linux-2.36/login-utils/login.c
---- util-linux-2.36/login-utils/login.c.kzak	2020-07-23 14:13:26.777030764 +0200
-+++ util-linux-2.36/login-utils/login.c	2020-07-23 14:11:22.793686983 +0200
-@@ -585,7 +585,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;
- 	offset = cxt->pwd->pw_uid * sizeof(ll);

plans/ci.fmf

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

sources

@@ -1 +1 @@
-SHA512 (util-linux-2.40-rc1.tar.xz) = ba307c4686c7989c1d563f19ca6a1c06c237de2fe063a51e28aaefee7a1afab49deb94abd80b4263c2d671f791798112b287dc3f1b3d73d755119e01883aaeb0
+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-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

util-linux.spec

@@ -1,13 +1,14 @@
 ### Header
 Summary: Collection of basic system utilities
 Name: util-linux
-Version: 2.40
+Version: 2.42.2
-Release: %autorelease -p -e rc1
+# -p -e rc1
-License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
+Release: %autorelease
+License: GPL-1.0-or-later AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND LGPL-2.1-or-later AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-Fedora-Public-Domain
 URL: https://en.wikipedia.org/wiki/Util-linux
 
 ### Macros
-%global upstream_version %{version}-rc1
+%global upstream_version %{version}
 %global upstream_major %(eval echo %{version} | sed -e 's/\([[:digit:]]*\)\.\([[:digit:]]*\)\.[[:digit:]]*$/\1.\2/')
 
 %global compldir %{_datadir}/bash-completion/completions/
@@ -20,6 +21,7 @@ BuildRequires: make
 BuildRequires: audit-libs-devel >= 1.0.6
 BuildRequires: gettext-devel
 BuildRequires: libselinux-devel
+BuildRequires: libxcrypt-devel
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
 BuildRequires: pam-devel
@@ -33,6 +35,7 @@ BuildRequires: %{pypkg}-devel
 BuildRequires: gcc
 BuildRequires: rubygem-asciidoctor
 BuildRequires: po4a
+BuildRequires: sqlite-devel
 %ifarch ppc64le
 BuildRequires: librtas-devel
 %endif
@@ -41,14 +44,14 @@ BuildRequires: librtas-devel
 #BuildRequires: autoconf
 #BuildRequires: automake
 #BuildRequires: libtool
-#BuildRequires: bison
+BuildRequires: bison
+BuildRequires: flex
 
 ### Sources
 Source0: https://www.kernel.org/pub/linux/utils/util-linux/v%{upstream_major}/util-linux-%{upstream_version}.tar.xz
 Source1: util-linux-login.pamd
 Source2: util-linux-remote.pamd
 Source3: util-linux-chsh-chfn.pamd
-Source4: uuidd-tmpfiles.conf
 Source5: adjtime
 Source12: util-linux-su.pamd
 Source13: util-linux-su-l.pamd
@@ -81,22 +84,28 @@ Obsoletes: util-linux-user < 2.39-1
 Provides: util-linux-user = %{version}-%{release}
 
 Requires(post): coreutils
-Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth
+Requires: (pam >= 1.1.3-7 if systemd)
+Requires: (/etc/pam.d/system-auth if systemd)
 Requires: audit-libs >= 1.0.6
 Requires: libuuid = %{version}-%{release}
 Requires: libblkid = %{version}-%{release}
 Requires: libmount = %{version}-%{release}
 Requires: libsmartcols = %{version}-%{release}
 Requires: libfdisk = %{version}-%{release}
+Requires: liblastlog2 = %{version}-%{release}
 Requires: util-linux-core = %{version}-%{release}
 
-### Ready for upstream?
+%if "%{_sbindir}" == "%{_bindir}"
-###
+# Compat symlinks for Requires in other packages.
-# 151635 - makeing /var/log/lastlog
+# We rely on filesystem to create the symlinks for us.
-Patch0: login-lastlog-create.patch
+Requires:       filesystem(unmerged-sbin-symlinks)
-# Add `/run/motd.d` to the hardcoded MOTD_FILE
+Provides:       /usr/sbin/runuser
-# https://github.com/coreos/console-login-helper-messages/issues/60
+Provides:       /usr/sbin/sfdisk
-Patch1: login-default-motd-file.patch
+%endif
+
+### Fedora specific patches
+Patch0: 0000-login-use-O_CREAT-on-lastlog.patch
+Patch1: 0001-login-add-run-motd.d-to-the-hardcoded-MOTD_FILE.patch
 
 %description
 The util-linux package contains a large variety of low-level system
@@ -107,7 +116,8 @@ program.
 
 %package -n util-linux-core
 Summary: The most essential utilities from the util-linux suite
-License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
+License: GPL-2.0-only AND GPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause-UC AND LicenseRef-Fedora-Public-Domain
+
 Provides: /bin/dmesg
 Provides: /bin/kill
 Provides: /bin/more
@@ -126,6 +136,13 @@ Requires: libsmartcols = %{version}-%{release}
 # old versions of e2fsprogs contain fsck, uuidgen
 Conflicts: e2fsprogs < 1.41.8-5
 
+%if "%{_sbindir}" == "%{_bindir}"
+# Compat symlinks for Requires in other packages.
+# We rely on filesystem to create the symlinks for us.
+Requires:       filesystem(unmerged-sbin-symlinks)
+Provides:       /usr/sbin/fsck
+%endif
+
 %description -n util-linux-core
 This is a very basic set of Linux utilities that is necessary on
 minimal installations.
@@ -133,7 +150,7 @@ minimal installations.
 
 %package -n libfdisk
 Summary: Partitioning library for fdisk-like programs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 
 %description -n libfdisk
 This is library for fdisk-like programs, part of util-linux.
@@ -141,7 +158,7 @@ This is library for fdisk-like programs, part of util-linux.
 
 %package -n libfdisk-devel
 Summary:  Partitioning library for fdisk-like programs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libfdisk%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -152,7 +169,7 @@ part of util-linux.
 
 %package -n libsmartcols
 Summary: Formatting library for ls-like programs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 
 %description -n libsmartcols
 This is library for ls-like terminal programs, part of util-linux.
@@ -160,7 +177,7 @@ This is library for ls-like terminal programs, part of util-linux.
 
 %package -n libsmartcols-devel
 Summary: Formatting library for ls-like programs
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libsmartcols%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -171,7 +188,7 @@ part of util-linux.
 
 %package -n libmount
 Summary: Device mounting library
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libblkid%{?_isa} = %{version}-%{release}
 Requires: libuuid%{?_isa} = %{version}-%{release}
 Conflicts: filesystem < 3
@@ -182,7 +199,7 @@ This is the device mounting library, part of util-linux.
 
 %package -n libmount-devel
 Summary: Device mounting library
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libmount%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -191,9 +208,28 @@ This is the device mounting development library and headers,
 part of util-linux.
 
 
+%package -n liblastlog2
+Summary: lastlog database library and PAM module
+License: BSD-2-Clause
+
+%description -n liblastlog2
+This is the lastlog database library and PAM module, part of util-linux.
+
+
+%package -n liblastlog2-devel
+Summary: lastlog database library
+License: BSD-2-Clause
+Requires: liblastlog2%{?_isa} = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n liblastlog2-devel
+This is the lastlog database development library and headers,
+part of util-linux.
+
+
 %package -n libblkid
 Summary: Block device ID library
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libuuid%{?_isa} = %{version}-%{release}
 Conflicts: filesystem < 3
 
@@ -203,7 +239,7 @@ This is block device identification library, part of util-linux.
 
 %package -n libblkid-devel
 Summary: Block device ID library
-License: LGPLv2+
+License: LGPL-2.1-or-later
 Requires: libblkid%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -214,7 +250,7 @@ part of util-linux.
 
 %package -n libuuid
 Summary: Universally unique ID library
-License: BSD
+License: BSD-3-Clause
 Conflicts: filesystem < 3
 
 %description -n libuuid
@@ -231,7 +267,7 @@ See also the "uuid" package, which is a separate implementation.
 
 %package -n libuuid-devel
 Summary: Universally unique ID library
-License: BSD
+License: BSD-3-Clause AND LGPL-2.1-or-later
 Requires: libuuid%{?_isa} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -252,7 +288,7 @@ See also the "uuid-devel" package, which is a separate implementation.
 %package -n uuidd
 Summary: Helper daemon to guarantee uniqueness of time-based UUIDs
 Requires: libuuid = %{version}-%{release}
-License: GPLv2
+License: GPL-2.0-only
 Requires(pre): shadow-utils
 %{?systemd_ordering}
 
@@ -265,7 +301,7 @@ SMP systems.
 %package -n %{pypkg}-libmount
 Summary: Python bindings for the libmount library
 Requires: libmount%{?_isa} = %{version}-%{release}
-License: LGPLv2+
+License: LGPL-2.1-or-later
 
 %description -n %{pypkg}-libmount
 The libmount-python package contains a module that permits applications
@@ -277,12 +313,18 @@ mountinfo, etc) and mount filesystems.
 %package -n util-linux-i18n
 Summary: Internationalization pack for util-linux
 Requires: util-linux = %{version}-%{release}
-License: GPLv2
+License: GPL-2.0-or-later
 
 %description -n util-linux-i18n
 Internationalization pack with translated messages and manual pages for
 util-linux commands.
 
+%package -n util-linux-script
+Summary: Utilities for creating and replaying typescripts of terminal session
+Requires: util-linux = %{version}-%{release}
+
+%description -n util-linux-script
+The utilities scripts, scriptreplay, and scriptlive are used to create and replay terminal sessions.
 
 %prep
 %autosetup -p1 -n %{name}-%{upstream_version}
@@ -305,7 +347,6 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS"
 	--disable-silent-rules \
 	--disable-bfs \
 	--disable-pg \
-	--disable-liblastlog2 \
 	--enable-chfn-chsh \
 	--enable-usrdir-path \
 	--enable-write \
@@ -340,15 +381,14 @@ mkdir -p %{buildroot}%{_bindir}
 mkdir -p %{buildroot}%{_mandir}/man{1,6,8,5}
 mkdir -p %{buildroot}%{_sbindir}
 mkdir -p %{buildroot}%{_sysconfdir}/{pam.d,security/console.apps}
-mkdir -p %{buildroot}%{_tmpfilesdir}/tmpfiles.d
 
 # install util-linux
 %make_install
 
-# And a dirs uuidd needs that the makefiles don't create
+# And a dirs that the makefiles don't create
-install -m 644 %{SOURCE4} %{buildroot}%{_tmpfilesdir}/uuidd.conf
+install -d %{buildroot}%{_rundir}/uuidd
-install -d %{buildroot}/run/uuidd
+install -d %{buildroot}%{_sharedstatedir}/libuuid
-install -d %{buildroot}/var/lib/libuuid
+install -d %{buildroot}%{_sharedstatedir}/lastlog
 
 # /etc/adjtime
 install -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/adjtime
@@ -410,7 +450,7 @@ rm -f %{buildroot}/sbin/sfdisk \
 ln -sf ../proc/self/mounts %{buildroot}/etc/mtab
 
 # remove static libs
-rm -f %{buildroot}%{_libdir}/lib{uuid,blkid,mount,smartcols,fdisk}.a
+rm -f %{buildroot}%{_libdir}/lib{uuid,blkid,mount,smartcols,fdisk,lastlog2}.a
 
 # temporary remove to avoid conflicts with bash-completion pkg
 rm -f %{buildroot}%{compldir}/{mount,umount}
@@ -435,22 +475,30 @@ find  %{buildroot}%{_mandir}/man8 -regextype posix-egrep  \
 	-regex ".*(linux32|linux64|s390|s390x|i386|ppc|ppc64|ppc32|sparc|sparc64|sparc32|sparc32bash|mips|mips64|mips32|ia64|x86_64|uname26)\.8.*" \
 	-printf "%{_mandir}/man8/%f*\n" >> %{name}.files
 
+%if "%{_sbindir}" == "%{_bindir}"
+# Autotools installation script gets the location wrong :(
+mv -v %{buildroot}/usr/sbin/* %{buildroot}/usr/bin/
+%endif
+
+
 %post
 %systemd_post fstrim.{service,timer}
 
+%post -n liblastlog2
+%systemd_post lastlog2-import.service
+
+
 %preun
 %systemd_preun fstrim.{service,timer}
 
+
 %postun
 %systemd_postun_with_restart fstrim.timer
 %systemd_postun fstrim.service
 
-%pre -n uuidd
+%postun -n liblastlog2
-getent group uuidd >/dev/null || groupadd -r uuidd
+%systemd_postun lastlog2-import.service
-getent passwd uuidd >/dev/null || \
+
-useradd -r -g uuidd -d /var/lib/libuuid -s /sbin/nologin \
-    -c "UUID generator helper daemon" uuidd
-exit 0
 
 # Please, keep uuidd running after installation! Note that systemd_post is
 # "systemctl preset" and it enable/disable service only.
@@ -475,7 +523,7 @@ fi
 
 %files -f %{name}.files
 %doc README NEWS AUTHORS
-%doc Documentation/deprecated.txt 
+%doc Documentation/deprecated.txt
 %license Documentation/licenses/*
 %doc misc-utils/getopt-*.{bash,tcsh}
 
@@ -492,12 +540,12 @@ fi
 
 %attr(4755,root,root)	%{_bindir}/su
 %attr(755,root,root)	%{_bindir}/login
-%attr(2755,root,tty)	%{_bindir}/write
 %attr(4711,root,root)	%{_bindir}/chfn
 %attr(4711,root,root)	%{_bindir}/chsh
 
 %{_unitdir}/fstrim.*
 
+%{_bindir}/bits
 %{_bindir}/cal
 %{_bindir}/chmem
 %{_bindir}/choom
@@ -505,18 +553,22 @@ fi
 %{_bindir}/colcrt
 %{_bindir}/colrm
 %{_bindir}/column
+%{_bindir}/copyfilerange
+%{_bindir}/coresched
 %{_bindir}/eject
 %{_bindir}/enosys
 %{_bindir}/exch
 %{_bindir}/fallocate
 %{_bindir}/fincore
 %{_bindir}/fadvise
+%{_bindir}/getino
 %{_bindir}/getopt
 %{_bindir}/hexdump
 %{_bindir}/irqtop
 %{_bindir}/isosize
 %{_bindir}/last
 %{_bindir}/lastb
+%{_bindir}/lastlog2
 %{_bindir}/look
 %{_bindir}/lsblk
 %{_bindir}/lscpu
@@ -535,9 +587,6 @@ fi
 %{_bindir}/prlimit
 %{_bindir}/rename
 %{_bindir}/rev
-%{_bindir}/script
-%{_bindir}/scriptlive
-%{_bindir}/scriptreplay
 %{_bindir}/setarch
 %{_bindir}/setpgid
 %{_bindir}/setpriv
@@ -551,6 +600,9 @@ fi
 %{_bindir}/wall
 %{_bindir}/wdctl
 %{_bindir}/whereis
+%{_bindir}/write
+
+%{_mandir}/man1/bits.1*
 %{_mandir}/man1/cal.1*
 %{_mandir}/man1/chfn.1*
 %{_mandir}/man1/choom.1*
@@ -559,12 +611,15 @@ fi
 %{_mandir}/man1/colcrt.1*
 %{_mandir}/man1/colrm.1*
 %{_mandir}/man1/column.1*
+%{_mandir}/man1/copyfilerange.1*
+%{_mandir}/man1/coresched.1.*
 %{_mandir}/man1/eject.1*
 %{_mandir}/man1/enosys.1*
 %{_mandir}/man1/exch.1*
 %{_mandir}/man1/fadvise.1*
 %{_mandir}/man1/fallocate.1*
 %{_mandir}/man1/fincore.1*
+%{_mandir}/man1/getino.1*
 %{_mandir}/man1/getopt.1*
 %{_mandir}/man1/hexdump.1*
 %{_mandir}/man1/irqtop.1*
@@ -587,9 +642,6 @@ fi
 %{_mandir}/man1/rename.1*
 %{_mandir}/man1/rev.1*
 %{_mandir}/man1/runuser.1*
-%{_mandir}/man1/script.1*
-%{_mandir}/man1/scriptlive.1*
-%{_mandir}/man1/scriptreplay.1*
 %{_mandir}/man1/setpgid.1*
 %{_mandir}/man1/setpriv.1*
 %{_mandir}/man1/setterm.1*
@@ -621,6 +673,7 @@ fi
 %{_mandir}/man8/fsfreeze.8*
 %{_mandir}/man8/fstrim.8*
 %{_mandir}/man8/isosize.8*
+%{_mandir}/man8/lastlog2.8*
 %{_mandir}/man8/ldattach.8*
 %{_mandir}/man8/lsblk.8*
 %{_mandir}/man8/lslocks.8*
@@ -668,17 +721,22 @@ fi
 %{_sbindir}/zramctl
 
 %{compldir}/addpart
+%{compldir}/bits
 %{compldir}/blkdiscard
+%{compldir}/blkpr
 %{compldir}/blkzone
 %{compldir}/cal
 %{compldir}/chcpu
 %{compldir}/chfn
 %{compldir}/chmem
+%{compldir}/choom
 %{compldir}/chsh
 %{compldir}/col
 %{compldir}/colcrt
 %{compldir}/colrm
 %{compldir}/column
+%{compldir}/copyfilerange
+%{compldir}/coresched
 %{compldir}/ctrlaltdel
 %{compldir}/delpart
 %{compldir}/eject
@@ -693,17 +751,20 @@ fi
 %{compldir}/fsck.minix
 %{compldir}/fsfreeze
 %{compldir}/fstrim
+%{compldir}/getino
 %{compldir}/getopt
 %{compldir}/hexdump
 %{compldir}/irqtop
 %{compldir}/isosize
 %{compldir}/last
 %{compldir}/lastb
+%{compldir}/lastlog2
 %{compldir}/ldattach
 %{compldir}/look
 %{compldir}/lsblk
 %{compldir}/lscpu
 %{compldir}/lsclocks
+%{compldir}/lsfd
 %{compldir}/lsipc
 %{compldir}/lsirq
 %{compldir}/lslocks
@@ -726,9 +787,6 @@ fi
 %{compldir}/rfkill
 %{compldir}/rtcwake
 %{compldir}/runuser
-%{compldir}/script
-%{compldir}/scriptlive
-%{compldir}/scriptreplay
 %{compldir}/setarch
 %{compldir}/setpriv
 %{compldir}/setpgid
@@ -775,6 +833,7 @@ fi
 
 
 %files -n util-linux-core
+%license Documentation/licenses/*
 %attr(4755,root,root)	%{_bindir}/mount
 %attr(4755,root,root)	%{_bindir}/umount
 %{_bindir}/chrt
@@ -866,52 +925,82 @@ fi
 
 
 %files -n uuidd
-%license Documentation/licenses/COPYING.GPL-2.0-or-later
+%license Documentation/licenses/COPYING.GPL-2.0-only
 %{_mandir}/man8/uuidd.8*
 %{_sbindir}/uuidd
 %{_unitdir}/uuidd.*
-%dir %attr(2775, uuidd, uuidd) /var/lib/libuuid
+%dir %attr(2775, uuidd, uuidd) %{_sharedstatedir}/libuuid
-%dir %attr(2775, uuidd, uuidd) /run/uuidd
+%dir %attr(2775, uuidd, uuidd) %{_rundir}/uuidd
 %{compldir}/uuidd
-%{_tmpfilesdir}/uuidd.conf
+%{_tmpfilesdir}/uuidd-tmpfiles.conf
+%{_sysusersdir}/uuidd-sysusers.conf
 
 
 %files -n libfdisk
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libfdisk/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libfdisk.so.*
 
 %files -n libfdisk-devel
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libfdisk.so
 %{_includedir}/libfdisk
 %{_libdir}/pkgconfig/fdisk.pc
 
 
 %files -n libsmartcols
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libsmartcols/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libsmartcols.so.*
 
 %files -n libsmartcols-devel
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libsmartcols.so
 %{_includedir}/libsmartcols
 %{_libdir}/pkgconfig/smartcols.pc
 
 
 %files -n libmount
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libmount/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libmount.so.*
 
 %files -n libmount-devel
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libmount.so
 %{_includedir}/libmount
 %{_libdir}/pkgconfig/mount.pc
 
 
+%files -n liblastlog2
+%license Documentation/licenses/COPYING.BSD-2-Clause
+%dir %{_sharedstatedir}/lastlog
+%{_libdir}/liblastlog2.so.*
+%{_pam_moduledir}/pam_lastlog2.so
+%{_tmpfilesdir}/lastlog2-tmpfiles.conf
+%{_unitdir}/lastlog2*
+%{_mandir}/man8/pam_lastlog2.8*
+
+%files -n liblastlog2-devel
+%license Documentation/licenses/COPYING.BSD-2-Clause
+%{_libdir}/liblastlog2.so
+%{_includedir}/liblastlog2
+%{_libdir}/pkgconfig/lastlog2.pc
+%{_mandir}/man3/lastlog2.3.*
+%{_mandir}/man3/ll2_import_lastlog.3*
+%{_mandir}/man3/ll2_new_context.3*
+%{_mandir}/man3/ll2_read_all.3*
+%{_mandir}/man3/ll2_read_entry.3*
+%{_mandir}/man3/ll2_remove_entry.3*
+%{_mandir}/man3/ll2_rename_user.3*
+%{_mandir}/man3/ll2_unref_context.3*
+%{_mandir}/man3/ll2_update_login_time.3*
+%{_mandir}/man3/ll2_write_entry.3*
+
+
 %files -n libblkid
-%doc libblkid/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libblkid.so.*
 
 %files -n libblkid-devel
-%doc libblkid/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libblkid.so
 %{_includedir}/blkid
 %{_mandir}/man3/libblkid.3*
@@ -919,10 +1008,11 @@ fi
 
 
 %files -n libuuid
-%license Documentation/licenses/COPYING.BSD-3-Clause libuuid/COPYING
+%license Documentation/licenses/COPYING.BSD-3-Clause
 %{_libdir}/libuuid.so.*
 
 %files -n libuuid-devel
+%license Documentation/licenses/COPYING.BSD-3-Clause Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/libuuid.so
 %{_includedir}/uuid
 %{_mandir}/man3/uuid.3*
@@ -940,11 +1030,22 @@ fi
 %{_libdir}/pkgconfig/uuid.pc
 
 %files -n %{pypkg}-libmount
-%license Documentation/licenses/COPYING.LGPL-2.1-or-later libmount/COPYING
+%license Documentation/licenses/COPYING.LGPL-2.1-or-later
 %{_libdir}/python*/site-packages/libmount/
 
 %files -n util-linux-i18n -f %{name}.lang
+%license Documentation/licenses/COPYING.GPL-2.0-or-later
+
+%files -n util-linux-script
+%{_bindir}/script
+%{_bindir}/scriptlive
+%{_bindir}/scriptreplay
+%{_mandir}/man1/script.1*
+%{_mandir}/man1/scriptlive.1*
+%{_mandir}/man1/scriptreplay.1*
+%{compldir}/script
+%{compldir}/scriptlive
+%{compldir}/scriptreplay
 
 %changelog
 %autochangelog
-