util-linux: Update to 2.22.

Now util-linux will provide the "su" command.
The new util-linux also will bring the new uuid daemon.

Reference #10212.

Conflicts:
	util-linux/util-linux.nm

diff --git a/util-linux/pam.d/su b/util-linux/pam.d/su
new file mode 100644 (file)
index 0000000..85e67a8
--- /dev/null
+++ b/util-linux/pam.d/su
@@ -0,0 +1,12 @@
+#%PAM-1.0
+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
+# Uncomment the following line to require a user to be in the "wheel" group.
+#auth          required        pam_wheel.so use_uid
+auth           include         system-auth
+account                sufficient      pam_succeed_if.so uid = 0 use_uid quiet
+account                include         system-auth
+password       include         system-auth
+session                include         system-auth
+session                optional        pam_xauth.so

diff --git a/util-linux/pam.d/su-l b/util-linux/pam.d/su-l
new file mode 100644 (file)
index 0000000..656a139
--- /dev/null
+++ b/util-linux/pam.d/su-l
@@ -0,0 +1,6 @@
+#%PAM-1.0
+auth           include         su
+account                include         su
+password       include         su
+session                optional        pam_keyinit.so force revoke
+session                include         su

diff --git a/util-linux/util-linux.nm b/util-linux/util-linux.nm
index 040c415778e643a640d22a2509992c62e3daff8d..676683d6607042a8dcb40d356a114b4d19a22dae 100644 (file)
--- a/util-linux/util-linux.nm
+++ b/util-linux/util-linux.nm
@@ -4,9 +4,9 @@
 ###############################################################################
 
 name       = util-linux
-major_ver  = 2.21
+major_ver  = 2.22
 version    = %{major_ver}
-release    = 4
+release    = 1
 
 groups     = System/Base
 url        = http://kernel.org/~kzak/util-linux/
@@ -25,12 +25,14 @@ source_dl  = ftp://ftp.kernel.org/pub/linux/utils/util-linux/v%{major_ver}/
 build
        requires
                audit-devel
+               coreutils >= 8.19
                gettext
                libcap-devel
                libselinux-devel
                libsepol-devel
                ncurses-devel
                pam-devel
+               libudev-devel
                zlib-devel
        end
 
@@ -40,14 +42,18 @@ build
                -D_FILE_OFFSET_BITS=64
 
        configure_options += \
+               --with-systemdsystemunitdir=%{unitdir} \
                --disable-wall \
+               --enable-eject \
                --enable-kill \
-               --enable-login-utils \
                --enable-partx \
                --enable-write \
+               --enable-su \
+               --enable-socket-activation \
                --enable-libmount-mount \
                --with-selinux \
                --with-audit \
+               --with-udev \
                --disable-makeinstall-chown \
                --disable-static
 
@@ -63,8 +69,10 @@ build
 
        install_cmds
                mkdir -pv \
+                       %{BUILDROOT}/var/lib/libuuid \
                        %{BUILDROOT}/var/lib/hwclock \
                        %{BUILDROOT}/usr/share/man/man8 \
+                       %{BUILDROOT}/run/uuidd \
                        %{BUILDROOT}/var/log
 
                install -m 755 %{DIR_APP}/nologin %{BUILDROOT}%{sbindir}
@@ -85,6 +93,10 @@ build
                setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/mount
                chmod -v -s %{BUILDROOT}%{bindir}/umount
                setcap CAP_DAC_OVERRIDE,CAP_SYS_ADMIN=ep %{BUILDROOT}%{bindir}/umount
+
+               # su (set right capabilities)
+               chmod -v u-s %{BUILDROOT}%{bindir}/su
+               setcap cap_setgid,cap_setuid+ep %{BUILDROOT}%{bindir}/su
        end
 end
 
@@ -97,10 +109,13 @@ packages
                end
 
                provides
+                       eject = %{thisver}
                        /bin/dmesg
+                       /bin/eject
                        /bin/kill
                        /bin/more
                        /bin/mount
+                       /bin/su
                        /bin/umount
                        /sbin/blkid
                        /sbin/blockdev
@@ -109,10 +124,14 @@ packages
                        /sbin/nologin
                end
 
-               obsoletes = util-linux-ng
+               obsoletes
+                       util-linux-ng
+                       eject <= 2.1.5
+               end
 
                conflicts
                        filesystem < 002
+                       coreutils < 8.19
                        setup < 3.0-2
                        util-linux-ng
                        sysvinit <= 2.86-2
@@ -169,6 +188,10 @@ packages
                        part of util-linux.
                end
 
+               requires
+                       uuidd=%{thisver}
+               end
+
                conflicts = filesystem < 002
 
                files
@@ -217,6 +240,53 @@ packages
                end
        end
 
+       package uuidd
+               summary = Helper daemon to guarantee uniqueness of time-based UUIDs.
+               description
+                       The uuidd package contains a userspace daemon (uuidd) which guarantees
+                       uniqueness of time-based UUID generation even at very high rates on
+                       SMP systems.
+               end
+
+               groups += Base
+
+               files
+                       %{sbindir}/uuidd
+                       %{mandir}/man8/uuidd.8*
+                       %{sharedstatedir}/libuuid
+                       %{unitdir}/uuidd*
+                       /run/uuidd
+               end
+
+               prerequires += shadow-utils
+
+               script prein
+                       getent group uuidd >/dev/null || groupadd -r uuidd
+                       getent passwd uuidd >/dev/null || \
+                               useradd -r -g uuidd -d %{sharedstatedir}/libuuid -s /sbin/nologin \
+                                       -c "UUID generator helper daemon" uuidd
+               end
+       
+               script postin
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+                       systemctl enable uuidd.service >/dev/null 2>&1 || :
+               end
+
+               script preun
+                       systemctl --no-reload disable uuidd.service >/dev/null 2>&1 || :
+                       systemctl stop uuidd.service >/dev/null 2>&1 || :
+               end
+
+               script postun
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+               end
+
+               script postup
+                       systemctl daemon-reload >/dev/null 2>&1 || :
+                       systemctl try-restart uuidd.service >/dev/null 2>&1 || :
+               end
+       end
+       
        package %{name}-debuginfo
                template DEBUGINFO
        end