util-linux: Update to version 2.25.2.

This is a major update to the latest stable version of the util-linux
software suite.

* Update project URL.
* Enable the "runuser" binary and add pam files.
* Force libmount python bindings to be build for python3.
* Add new subpackages for libsmartcols and libsmartcols-devel and
  python3-libmount.

diff --git a/util-linux/pam.d/runuser b/util-linux/pam.d/runuser
new file mode 100644 (file)
index 0000000..37f0e84
--- /dev/null
+++ b/util-linux/pam.d/runuser
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           sufficient      pam_rootok.so
+session                optional        pam_keyinit.so revoke
+session                required        pam_limits.so
+session                required        pam_unix.so

diff --git a/util-linux/pam.d/runuser-l b/util-linux/pam.d/runuser-l
new file mode 100644 (file)
index 0000000..7a9a48c
--- /dev/null
+++ b/util-linux/pam.d/runuser-l
@@ -0,0 +1,5 @@
+#%PAM-1.0
+auth           include         runuser
+session                optional        pam_keyinit.so force revoke
+-session       optional        pam_systemd.so
+session                include         runuser

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 60a54fcf03edd72db34c9362fe40b09a7c4c0fee..a8f3629a508d7dfdcb58429147619c50e64fa067 100644 (file)
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -4,14 +4,14 @@
 ###############################################################################
 
 name       = util-linux
-major_ver  = 2.22
-minor_ver  = 1
+major_ver  = 2.25
+minor_ver  = 2
 version    = %{major_ver}.%{minor_ver}
 release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
 groups     = System/Base
-url        = http://kernel.org/~kzak/util-linux/
+url        = https://github.com/karelzak/util-linux
 license    = GPLv2 and GPLv2+ and BSD with advertising and Public Domain
 summary    = A collection of basic system utilities.
 
@@ -27,14 +27,18 @@ source_dl  = ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{major_ver}/
 build
        requires
                audit-devel
+               automake >= 1.13
                coreutils >= 8.19
                gettext
                libcap-devel
+               libcap-ng-devel
                libselinux-devel
                libsepol-devel
+               libudev-devel
                ncurses-devel
                pam-devel
-               libudev-devel
+               python3-devel
+               systemd-devel >= 215
                zlib-devel
        end
 
@@ -50,14 +54,16 @@ build
                --enable-kill \
                --enable-partx \
                --enable-write \
+               --enable-runuser \
                --enable-su \
-               --enable-socket-activation \
-               --enable-libmount-mount \
+               --with-systemd \
                --with-selinux \
                --with-audit \
                --with-udev \
                --disable-makeinstall-chown \
-               --disable-static
+               --disable-static \
+               --disable-rpath \
+               --with-python=3
 
        prepare_cmds
                sed -e 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
@@ -124,6 +130,7 @@ packages
                        /sbin/findfs
                        /sbin/fsck
                        /sbin/nologin
+                       /sbin/runuser
                end
 
                obsoletes
@@ -133,6 +140,7 @@ packages
 
                conflicts
                        filesystem < 002
+                       bash-completion <= 2.1-2
                        coreutils < 8.19
                        setup < 3.0-2
                        util-linux-ng
@@ -242,6 +250,31 @@ packages
                end
        end
 
+       # Package information for libsmartcols.
+       package libsmartcols
+               summary = Formatting library for ls-like programs.
+               description
+                       This is a library for ls-like terminal
+                       programs, part of util-linux.
+               end
+
+               files
+                       %{libdir}/libsmartcols.*
+               end
+       end
+
+       # Package information for libsmartcols-devel.
+       package libsmartcols-devel
+               summary = Development library and header of libsmartcols.
+               description = %{summary}
+
+               files
+                       %{includedir}/libsmartcols/*
+                       %{libdir}/libsmartcols.so
+                       %{libdir}/pkgconfig/smartcols.pc
+               end
+       end
+
        package uuidd
                summary = Helper daemon to guarantee uniqueness of time-based UUIDs.
                description
@@ -262,6 +295,10 @@ packages
 
                prerequires += shadow-utils
 
+               requires
+                       systemd-libs >= 215
+               end
+
                script prein
                        getent group uuidd >/dev/null || groupadd -r uuidd
                        getent passwd uuidd >/dev/null || \
@@ -288,6 +325,10 @@ packages
                        systemctl try-restart uuidd.service >/dev/null 2>&1 || :
                end
        end
+
+       package python3-libmount
+               template PYTHON3
+       end
        
        package %{name}-debuginfo
                template DEBUGINFO