From dc9a13a0967becb2beb21ea5256cd79fd8fb9188 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 1 Jun 2021 12:23:41 +0200 Subject: [PATCH] RHEL-9.0: 2.37-1: upgrade, add util-linux-core Resolves: #1969348 --- .gitignore | 1 + sources | 2 +- util-linux.spec | 243 ++++++++++++++++++++++++++---------------------- 3 files changed, 134 insertions(+), 112 deletions(-) diff --git a/.gitignore b/.gitignore index fa06b03..5cd3454 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ /util-linux-2.36.tar.xz /util-linux-2.36.1.tar.xz /util-linux-2.36.2.tar.xz +/util-linux-2.37.tar.xz diff --git a/sources b/sources index cb31284..249ef34 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (util-linux-2.36.2.tar.xz) = 6ab141f44ca4cb6b600081f10eae17e15d23abd122a37eb3ac6c845513a6a4396dc9dcff30b3032de80116ddde50e27dfbc86f92708c1051f84f0c919194664b +SHA512 (util-linux-2.37.tar.xz) = 84cf1df46165f286caa1a1204b335dc1fc826a8e1d52a817c28eb80ef19734eccd6efdfb078e87ade9e4381a9102e59d4df83e9bb100e4c73aff2aa4bfb85615 diff --git a/util-linux.spec b/util-linux.spec index fa78ac2..c76158d 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -1,8 +1,8 @@ ### Header Summary: A collection of basic system utilities Name: util-linux -Version: 2.36.2 -Release: 2%{?dist} +Version: 2.37 +Release: 1%{?dist} License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: http://en.wikipedia.org/wiki/Util-linux @@ -36,6 +36,7 @@ BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool +BuildRequires: rubygem-asciidoctor %ifarch ppc64le BuildRequires: librtas-devel %endif @@ -69,28 +70,15 @@ Provides: eject = 2.1.6 # rfkill has been merged into util-linux v2.31 Obsoletes: rfkill <= 0.5 Provides: rfkill = 0.5 -# hardlink has been merged into util-linux v2.34 -Obsoletes: hardlink <= 1:1.3-9 -Provides: hardlink = 1:1.3-9 # sulogin, utmpdump merged into util-linux v2.22; # last, lastb merged into util-linux v2.24 Conflicts: sysvinit-tools < 2.88-14 -# old versions of e2fsprogs contain fsck, uuidgen -Conflicts: e2fsprogs < 1.41.8-5 # rename from util-linux-ng back to util-linux Obsoletes: util-linux-ng < 2.19 Provides: util-linux-ng = %{version}-%{release} Conflicts: filesystem < 3 -Provides: /bin/dmesg -Provides: /bin/kill -Provides: /bin/more -Provides: /bin/mount -Provides: /bin/umount -Provides: /sbin/blkid -Provides: /sbin/blockdev -Provides: /sbin/findfs -Provides: /sbin/fsck Provides: /sbin/nologin +Provides: /sbin/findfs Requires(post): coreutils Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth @@ -100,17 +88,15 @@ Requires: libblkid = %{version}-%{release} Requires: libmount = %{version}-%{release} Requires: libsmartcols = %{version}-%{release} Requires: libfdisk = %{version}-%{release} +Requires: util-linux-core = %{version}-%{release} ### Ready for upstream? ### # 151635 - makeing /var/log/lastlog Patch0: login-lastlog-create.patch -# https://github.com/karelzak/util-linux/commit/57898c3a7ee8fc5933cddd4526bb3980bef85a02 -# The workaround is unnecessary on Fedora with kernel >= 5.8. -Patch1: libmount-remove-read-mountinfo-workaround.patch # Add `/run/motd.d` to the hardcoded MOTD_FILE # https://github.com/coreos/console-login-helper-messages/issues/60 -Patch2: login-default-motd-file.patch +Patch1: login-default-motd-file.patch %description The util-linux package contains a large variety of low-level system @@ -119,6 +105,32 @@ others, Util-linux contains the fdisk configuration tool and the login 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 +Provides: /bin/dmesg +Provides: /bin/kill +Provides: /bin/more +Provides: /bin/mount +Provides: /bin/umount +Provides: /sbin/blkid +Provides: /sbin/blockdev +Provides: /sbin/fsck +# hardlink has been merged into util-linux v2.34 +Obsoletes: hardlink <= 1:1.3-9 +Provides: hardlink = 1:1.3-9 +Requires: libuuid = %{version}-%{release} +Requires: libblkid = %{version}-%{release} +Requires: libmount = %{version}-%{release} +Requires: libsmartcols = %{version}-%{release} +# old versions of e2fsprogs contain fsck, uuidgen +Conflicts: e2fsprogs < 1.41.8-5 + +%description -n util-linux-core +This is a very basic set of Linux utilities that is necessary on +minimal installations. + + %package -n libfdisk Summary: Partitioning library for fdisk-like programs. License: LGPLv2+ @@ -295,6 +307,8 @@ export DAEMON_LDFLAGS="$SUID_LDFLAGS" --enable-write \ --enable-raw \ --enable-hardlink \ + --enable-fdformat \ + --enable-asciidoc \ --with-python=%{pyver} \ --with-systemd \ --with-udev \ @@ -402,11 +416,6 @@ for I in /sbin/sfdisk \ done %endif -# we install getopt-*.{bash,tcsh} by doc directive -chmod 644 misc-utils/getopt-*.{bash,tcsh} -rm -f ${RPM_BUILD_ROOT}%{_datadir}/doc/util-linux/getopt/* -rmdir ${RPM_BUILD_ROOT}%{_datadir}/doc/util-linux/getopt - ln -sf ../proc/self/mounts %{buildroot}/etc/mtab # remove static libs @@ -430,6 +439,7 @@ find $RPM_BUILD_ROOT%{_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 + %post # only for minimal buildroots without /var/log [ -d /var/log ] || mkdir -p /var/log @@ -447,6 +457,8 @@ if [ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled; then /usr/bin/chcon "$SECXT" /var/log/lastlog >/dev/null 2>&1 || : fi fi + +%post -n util-linux-core if [ ! -L /etc/mtab ]; then ln -sf ../proc/self/mounts /etc/mtab || : fi @@ -509,44 +521,30 @@ fi %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/adjtime -%attr(4755,root,root) %{_bindir}/mount -%attr(4755,root,root) %{_bindir}/umount %attr(4755,root,root) %{_bindir}/su %attr(755,root,root) %{_bindir}/login %attr(2755,root,tty) %{_bindir}/write %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog -%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab %{_unitdir}/fstrim.* %{_bindir}/cal %{_bindir}/chmem %{_bindir}/choom -%{_bindir}/chrt %{_bindir}/col %{_bindir}/colcrt %{_bindir}/colrm %{_bindir}/column -%{_bindir}/dmesg %{_bindir}/eject %{_bindir}/fallocate %{_bindir}/fincore -%{_bindir}/findmnt -%{_bindir}/flock %{_bindir}/getopt -%{_bindir}/hardlink %{_bindir}/hexdump -%{_bindir}/ionice -%{_bindir}/ipcmk -%{_bindir}/ipcrm -%{_bindir}/ipcs %{_bindir}/irqtop %{_bindir}/isosize -%{_bindir}/kill %{_bindir}/last %{_bindir}/lastb -%{_bindir}/logger %{_bindir}/look %{_bindir}/lsblk %{_bindir}/lscpu @@ -558,25 +556,19 @@ fi %{_bindir}/lsns %{_bindir}/mcookie %{_bindir}/mesg -%{_bindir}/more -%{_bindir}/mountpoint %{_bindir}/namei -%{_bindir}/nsenter %{_bindir}/prlimit %{_bindir}/raw %{_bindir}/rename -%{_bindir}/renice %{_bindir}/rev %{_bindir}/script %{_bindir}/scriptlive %{_bindir}/scriptreplay %{_bindir}/setarch %{_bindir}/setpriv -%{_bindir}/setsid %{_bindir}/setterm -%{_bindir}/taskset +%{_bindir}/uclampset %{_bindir}/ul -%{_bindir}/unshare %{_bindir}/utmpdump %{_bindir}/uuidgen %{_bindir}/uuidparse @@ -585,28 +577,18 @@ fi %{_bindir}/whereis %{_mandir}/man1/cal.1* %{_mandir}/man1/choom.1* -%{_mandir}/man1/chrt.1* %{_mandir}/man1/col.1* %{_mandir}/man1/colcrt.1* %{_mandir}/man1/colrm.1* %{_mandir}/man1/column.1* -%{_mandir}/man1/dmesg.1* %{_mandir}/man1/eject.1* %{_mandir}/man1/fallocate.1* %{_mandir}/man1/fincore.1* -%{_mandir}/man1/flock.1* %{_mandir}/man1/getopt.1* -%{_mandir}/man1/hardlink.1* %{_mandir}/man1/hexdump.1* -%{_mandir}/man1/ionice.1* -%{_mandir}/man1/ipcmk.1* -%{_mandir}/man1/ipcrm.1* -%{_mandir}/man1/ipcs.1* %{_mandir}/man1/irqtop.1* -%{_mandir}/man1/kill.1* %{_mandir}/man1/last.1* %{_mandir}/man1/lastb.1* -%{_mandir}/man1/logger.1* %{_mandir}/man1/login.1* %{_mandir}/man1/look.1* %{_mandir}/man1/lscpu.1* @@ -616,25 +598,19 @@ fi %{_mandir}/man1/lsmem.1* %{_mandir}/man1/mcookie.1* %{_mandir}/man1/mesg.1* -%{_mandir}/man1/more.1* -%{_mandir}/man1/mountpoint.1* %{_mandir}/man1/namei.1* -%{_mandir}/man1/nsenter.1* %{_mandir}/man1/prlimit.1* %{_mandir}/man1/rename.1* -%{_mandir}/man1/renice.1* %{_mandir}/man1/rev.1* %{_mandir}/man1/runuser.1* %{_mandir}/man1/script.1* %{_mandir}/man1/scriptlive.1* %{_mandir}/man1/scriptreplay.1* %{_mandir}/man1/setpriv.1* -%{_mandir}/man1/setsid.1* %{_mandir}/man1/setterm.1* %{_mandir}/man1/su.1* -%{_mandir}/man1/taskset.1* +%{_mandir}/man1/uclampset.1.* %{_mandir}/man1/ul.1* -%{_mandir}/man1/unshare.1* %{_mandir}/man1/utmpdump.1.gz %{_mandir}/man1/uuidgen.1* %{_mandir}/man1/uuidparse.1* @@ -644,36 +620,27 @@ fi %{_mandir}/man5/fstab.5* %{_mandir}/man5/terminal-colors.d.5* %{_mandir}/man8/addpart.8* -%{_mandir}/man8/agetty.8* %{_mandir}/man8/blkdiscard.8* -%{_mandir}/man8/blkid.8* %{_mandir}/man8/blkzone.8* -%{_mandir}/man8/blockdev.8* %{_mandir}/man8/chcpu.8* %{_mandir}/man8/chmem.8* %{_mandir}/man8/ctrlaltdel.8* %{_mandir}/man8/delpart.8* %{_mandir}/man8/fdisk.8* %{_mandir}/man8/findfs.8* -%{_mandir}/man8/findmnt.8* -%{_mandir}/man8/fsck.8* %{_mandir}/man8/fsck.cramfs.8* %{_mandir}/man8/fsck.minix.8* %{_mandir}/man8/fsfreeze.8* %{_mandir}/man8/fstrim.8* %{_mandir}/man8/isosize.8* %{_mandir}/man8/ldattach.8* -%{_mandir}/man8/losetup.8* %{_mandir}/man8/lsblk.8* %{_mandir}/man8/lslocks.8* %{_mandir}/man8/lsns.8* %{_mandir}/man8/mkfs.8* %{_mandir}/man8/mkfs.cramfs.8* %{_mandir}/man8/mkfs.minix.8* -%{_mandir}/man8/mkswap.8* -%{_mandir}/man8/mount.8* %{_mandir}/man8/nologin.8* -%{_mandir}/man8/partx.8* %{_mandir}/man8/pivot_root.8* %{_mandir}/man8/raw.8* %{_mandir}/man8/rawdevices.8* @@ -684,37 +651,26 @@ fi %{_mandir}/man8/setarch.8* %{_mandir}/man8/sulogin.8.gz %{_mandir}/man8/swaplabel.8* -%{_mandir}/man8/swapoff.8* -%{_mandir}/man8/swapon.8* -%{_mandir}/man8/switch_root.8* -%{_mandir}/man8/umount.8* %{_mandir}/man8/wdctl.8.gz %{_mandir}/man8/wipefs.8* %{_mandir}/man8/zramctl.8* %{_sbindir}/addpart -%{_sbindir}/agetty %{_sbindir}/blkdiscard -%{_sbindir}/blkid %{_sbindir}/blkzone -%{_sbindir}/blockdev %{_sbindir}/chcpu %{_sbindir}/ctrlaltdel %{_sbindir}/delpart %{_sbindir}/fdisk %{_sbindir}/findfs -%{_sbindir}/fsck %{_sbindir}/fsck.cramfs %{_sbindir}/fsck.minix %{_sbindir}/fsfreeze %{_sbindir}/fstrim %{_sbindir}/ldattach -%{_sbindir}/losetup %{_sbindir}/mkfs %{_sbindir}/mkfs.cramfs %{_sbindir}/mkfs.minix -%{_sbindir}/mkswap %{_sbindir}/nologin -%{_sbindir}/partx %{_sbindir}/pivot_root %{_sbindir}/readprofile %{_sbindir}/resizepart @@ -723,53 +679,37 @@ fi %{_sbindir}/runuser %{_sbindir}/sulogin %{_sbindir}/swaplabel -%{_sbindir}/swapoff -%{_sbindir}/swapon -%{_sbindir}/switch_root %{_sbindir}/wipefs %{_sbindir}/zramctl %{compldir}/addpart %{compldir}/blkdiscard -%{compldir}/blkid %{compldir}/blkzone -%{compldir}/blockdev %{compldir}/cal %{compldir}/chcpu %{compldir}/chmem -%{compldir}/chrt %{compldir}/col %{compldir}/colcrt %{compldir}/colrm %{compldir}/column %{compldir}/ctrlaltdel %{compldir}/delpart -%{compldir}/dmesg %{compldir}/eject %{compldir}/fallocate %{compldir}/fdisk %{compldir}/fincore %{compldir}/findfs -%{compldir}/findmnt -%{compldir}/flock -%{compldir}/fsck %{compldir}/fsck.cramfs %{compldir}/fsck.minix %{compldir}/fsfreeze %{compldir}/fstrim %{compldir}/getopt %{compldir}/hexdump -%{compldir}/ionice -%{compldir}/ipcmk -%{compldir}/ipcrm -%{compldir}/ipcs %{compldir}/irqtop %{compldir}/isosize %{compldir}/last %{compldir}/ldattach -%{compldir}/logger %{compldir}/look -%{compldir}/losetup %{compldir}/lsblk %{compldir}/lscpu %{compldir}/lsipc @@ -783,18 +723,12 @@ fi %{compldir}/mkfs %{compldir}/mkfs.cramfs %{compldir}/mkfs.minix -%{compldir}/mkswap -%{compldir}/more -%{compldir}/mountpoint %{compldir}/namei -%{compldir}/nsenter -%{compldir}/partx %{compldir}/pivot_root %{compldir}/prlimit %{compldir}/raw %{compldir}/readprofile %{compldir}/rename -%{compldir}/renice %{compldir}/resizepart %{compldir}/rev %{compldir}/rfkill @@ -805,15 +739,11 @@ fi %{compldir}/scriptreplay %{compldir}/setarch %{compldir}/setpriv -%{compldir}/setsid %{compldir}/setterm %{compldir}/su %{compldir}/swaplabel -%{compldir}/swapoff -%{compldir}/swapon -%{compldir}/taskset +%{compldir}/uclampset %{compldir}/ul -%{compldir}/unshare %{compldir}/utmpdump %{compldir}/uuidgen %{compldir}/uuidparse @@ -824,7 +754,6 @@ fi %{compldir}/write %{compldir}/zramctl - %ifnarch s390 s390x %{_sbindir}/clock %{_sbindir}/fdformat @@ -851,6 +780,94 @@ fi %endif +%files -n util-linux-core +%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/mtab +%attr(4755,root,root) %{_bindir}/mount +%attr(4755,root,root) %{_bindir}/umount +%{_bindir}/chrt +%{_bindir}/dmesg +%{_bindir}/findmnt +%{_bindir}/flock +%{_bindir}/hardlink +%{_bindir}/ionice +%{_bindir}/ipcmk +%{_bindir}/ipcrm +%{_bindir}/ipcs +%{_bindir}/kill +%{_bindir}/logger +%{_bindir}/more +%{_bindir}/mountpoint +%{_bindir}/nsenter +%{_bindir}/renice +%{_bindir}/setsid +%{_bindir}/taskset +%{_bindir}/unshare +%{compldir}/blkid +%{compldir}/blockdev +%{compldir}/chrt +%{compldir}/dmesg +%{compldir}/findmnt +%{compldir}/flock +%{compldir}/fsck +%{compldir}/ionice +%{compldir}/ipcmk +%{compldir}/ipcrm +%{compldir}/ipcs +%{compldir}/logger +%{compldir}/losetup +%{compldir}/mkswap +%{compldir}/more +%{compldir}/mountpoint +%{compldir}/nsenter +%{compldir}/partx +%{compldir}/renice +%{compldir}/setsid +%{compldir}/swapoff +%{compldir}/swapon +%{compldir}/taskset +%{compldir}/unshare +%{_mandir}/man1/chrt.1* +%{_mandir}/man1/dmesg.1* +%{_mandir}/man1/flock.1* +%{_mandir}/man1/hardlink.1* +%{_mandir}/man1/ionice.1* +%{_mandir}/man1/ipcmk.1* +%{_mandir}/man1/ipcrm.1* +%{_mandir}/man1/ipcs.1* +%{_mandir}/man1/kill.1* +%{_mandir}/man1/logger.1* +%{_mandir}/man1/more.1* +%{_mandir}/man1/mountpoint.1* +%{_mandir}/man1/nsenter.1* +%{_mandir}/man1/renice.1* +%{_mandir}/man1/setsid.1* +%{_mandir}/man1/taskset.1* +%{_mandir}/man1/unshare.1* +%{_mandir}/man8/agetty.8* +%{_mandir}/man8/blkid.8* +%{_mandir}/man8/blockdev.8* +%{_mandir}/man8/findmnt.8* +%{_mandir}/man8/fsck.8* +%{_mandir}/man8/losetup.8* +%{_mandir}/man8/mkswap.8* +%{_mandir}/man8/mount.8* +%{_mandir}/man8/partx.8* +%{_mandir}/man8/swapoff.8* +%{_mandir}/man8/swapon.8* +%{_mandir}/man8/switch_root.8* +%{_mandir}/man8/umount.8* +%{_sbindir}/agetty +%{_sbindir}/blkid +%{_sbindir}/blockdev +%{_sbindir}/fsck +%{_sbindir}/losetup +%{_sbindir}/mkswap +%{_sbindir}/partx +%{_sbindir}/swapoff +%{_sbindir}/swapon +%{_sbindir}/switch_root + + %files -n util-linux-user %config(noreplace) %{_sysconfdir}/pam.d/chfn %config(noreplace) %{_sysconfdir}/pam.d/chsh @@ -946,6 +963,10 @@ fi %{_libdir}/python*/site-packages/libmount/ %changelog +* Tue Jun 8 2021 Karel Zak - 2.37-1 +- upgrade to v2.37 +- introduce util-linux-core subpackage + * Fri Apr 16 2021 Mohan Boddu - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937