From 5dc76a5911d1d2d05eddbdd78b02cf282c587207f95864ffc83cfb6efe272490 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Aug 2021 12:33:00 +0000 Subject: [PATCH 1/4] Accepting request 909748 from home:pgajdos - package motd.5 man page as link to login.1 [bsc#1133929] OBS-URL: https://build.opensuse.org/request/show/909748 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=451 --- util-linux.changes | 5 +++++ util-linux.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/util-linux.changes b/util-linux.changes index d905d7b..00d9861 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 2 10:45:31 UTC 2021 - pgajdos@suse.com + +- package motd.5 man page as link to login.1 [bsc#1133929] + ------------------------------------------------------------------- Tue May 25 15:02:00 UTC 2021 - Thorsten Kukuk diff --git a/util-linux.spec b/util-linux.spec index 1b06957..205e0f9 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -705,6 +705,8 @@ chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh # login is always and only in /bin mv %{buildroot}%{_bindir}/login %{buildroot}/bin/ %endif +# bsc#1188724 +echo '.so man1/login.1' > %{buildroot}%{_mandir}/man5/motd.5 # arch dependent %ifarch s390 s390x rm -f %{buildroot}%{_sysconfdir}/fdprm @@ -1143,6 +1145,7 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_mandir}/man1/uuidparse.1.gz %{_mandir}/man5/adjtime_config.5.gz %{_mandir}/man5/fstab.5.gz +%{_mandir}/man5/motd.5.gz %{_mandir}/man5/terminal-colors.d.5.gz %{_mandir}/man8/addpart.8.gz %{_mandir}/man8/agetty.8.gz From c05781d16ab5863c55788a02c56e5f7f45b7eb5b49eca30af0193c0a83a01050 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 3 Aug 2021 13:12:24 +0000 Subject: [PATCH 2/4] osc copypac from project:Base:System package:util-linux revision:450 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=452 --- util-linux.changes | 5 ----- util-linux.spec | 3 --- 2 files changed, 8 deletions(-) diff --git a/util-linux.changes b/util-linux.changes index 00d9861..d905d7b 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Aug 2 10:45:31 UTC 2021 - pgajdos@suse.com - -- package motd.5 man page as link to login.1 [bsc#1133929] - ------------------------------------------------------------------- Tue May 25 15:02:00 UTC 2021 - Thorsten Kukuk diff --git a/util-linux.spec b/util-linux.spec index 205e0f9..1b06957 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -705,8 +705,6 @@ chmod 644 %{buildroot}%{_datadir}/getopt/getopt*.tcsh # login is always and only in /bin mv %{buildroot}%{_bindir}/login %{buildroot}/bin/ %endif -# bsc#1188724 -echo '.so man1/login.1' > %{buildroot}%{_mandir}/man5/motd.5 # arch dependent %ifarch s390 s390x rm -f %{buildroot}%{_sysconfdir}/fdprm @@ -1145,7 +1143,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_mandir}/man1/uuidparse.1.gz %{_mandir}/man5/adjtime_config.5.gz %{_mandir}/man5/fstab.5.gz -%{_mandir}/man5/motd.5.gz %{_mandir}/man5/terminal-colors.d.5.gz %{_mandir}/man8/addpart.8.gz %{_mandir}/man8/agetty.8.gz From 83054a757f02964362dbb369d88c75e837bbead3e4964f5c1dae1af0d4220090 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Sep 2021 20:13:02 +0000 Subject: [PATCH 3/4] Compact symlink lists OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=453 --- python3-libmount.changes | 6 ++++++ python3-libmount.spec | 44 ++++++++------------------------------ util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 44 ++++++++------------------------------ util-linux.spec | 44 ++++++++------------------------------ 5 files changed, 39 insertions(+), 105 deletions(-) diff --git a/python3-libmount.changes b/python3-libmount.changes index 5362af6..d905d7b 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 25 15:02:00 UTC 2021 - Thorsten Kukuk + +- login.pamd: use pam_motd to unify motd handling [bsc#1185897]. + Else motd snippets of e.g. cockpit will not be shown. + ------------------------------------------------------------------- Tue Feb 16 19:33:08 UTC 2021 - Stanislav Brabec diff --git a/python3-libmount.spec b/python3-libmount.spec index d7aa86f..ecb625b 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -653,41 +653,15 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a %if %build_util_linux %if !0%{?usrmerged} -ln -s %{_bindir}/kill %{buildroot}/bin -ln -s %{_bindir}/su %{buildroot}/bin -ln -s %{_bindir}/dmesg %{buildroot}/bin -ln -s %{_bindir}/more %{buildroot}/bin -ln -s %{_bindir}/mount %{buildroot}/bin -ln -s %{_bindir}/umount %{buildroot}/bin -ln -s %{_sbindir}/agetty %{buildroot}/sbin -ln -s %{_sbindir}/blockdev %{buildroot}/sbin -ln -s %{_sbindir}/cfdisk %{buildroot}/sbin -ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin -ln -s %{_sbindir}/fdisk %{buildroot}/sbin -ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin -ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin -ln -s %{_sbindir}/hwclock %{buildroot}/sbin -ln -s %{_sbindir}/losetup %{buildroot}/sbin -ln -s %{_sbindir}/mkfs %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin -ln -s %{_sbindir}/mkswap %{buildroot}/sbin -ln -s %{_sbindir}/nologin %{buildroot}/sbin -ln -s %{_sbindir}/pivot_root %{buildroot}/sbin -ln -s %{_sbindir}/raw %{buildroot}/sbin -ln -s %{_sbindir}/sfdisk %{buildroot}/sbin -ln -s %{_sbindir}/swapoff %{buildroot}/sbin -ln -s %{_sbindir}/swapon %{buildroot}/sbin -ln -s %{_sbindir}/blkid %{buildroot}/sbin -ln -s %{_sbindir}/findfs %{buildroot}/sbin -ln -s %{_sbindir}/fsck %{buildroot}/sbin -ln -s %{_sbindir}/switch_root %{buildroot}/sbin -ln -s %{_sbindir}/wipefs %{buildroot}/sbin -ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin -ln -s %{_sbindir}/swaplabel %{buildroot}/sbin -ln -s %{_sbindir}/fstrim %{buildroot}/sbin -ln -s %{_sbindir}/chcpu %{buildroot}/sbin +for i in kill su dmesg more mount umount; do + ln -s "%{_bindir}/$i" "%{buildroot}/bin/" +done +for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \ + hwclock losetup mkfs mkfs.bfs mkfs.minix mkfs.cramfs mkswap nologin \ + pivot_root raw sfdisk swapoff swapon blkid findfs fsck switch_root \ + wipefs fsfreeze swaplabel fstrim chcpu; do + ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/" +done %endif install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 5362af6..d905d7b 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 25 15:02:00 UTC 2021 - Thorsten Kukuk + +- login.pamd: use pam_motd to unify motd handling [bsc#1185897]. + Else motd snippets of e.g. cockpit will not be shown. + ------------------------------------------------------------------- Tue Feb 16 19:33:08 UTC 2021 - Stanislav Brabec diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index dda7854..b5acf8f 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -653,41 +653,15 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a %if %build_util_linux %if !0%{?usrmerged} -ln -s %{_bindir}/kill %{buildroot}/bin -ln -s %{_bindir}/su %{buildroot}/bin -ln -s %{_bindir}/dmesg %{buildroot}/bin -ln -s %{_bindir}/more %{buildroot}/bin -ln -s %{_bindir}/mount %{buildroot}/bin -ln -s %{_bindir}/umount %{buildroot}/bin -ln -s %{_sbindir}/agetty %{buildroot}/sbin -ln -s %{_sbindir}/blockdev %{buildroot}/sbin -ln -s %{_sbindir}/cfdisk %{buildroot}/sbin -ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin -ln -s %{_sbindir}/fdisk %{buildroot}/sbin -ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin -ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin -ln -s %{_sbindir}/hwclock %{buildroot}/sbin -ln -s %{_sbindir}/losetup %{buildroot}/sbin -ln -s %{_sbindir}/mkfs %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin -ln -s %{_sbindir}/mkswap %{buildroot}/sbin -ln -s %{_sbindir}/nologin %{buildroot}/sbin -ln -s %{_sbindir}/pivot_root %{buildroot}/sbin -ln -s %{_sbindir}/raw %{buildroot}/sbin -ln -s %{_sbindir}/sfdisk %{buildroot}/sbin -ln -s %{_sbindir}/swapoff %{buildroot}/sbin -ln -s %{_sbindir}/swapon %{buildroot}/sbin -ln -s %{_sbindir}/blkid %{buildroot}/sbin -ln -s %{_sbindir}/findfs %{buildroot}/sbin -ln -s %{_sbindir}/fsck %{buildroot}/sbin -ln -s %{_sbindir}/switch_root %{buildroot}/sbin -ln -s %{_sbindir}/wipefs %{buildroot}/sbin -ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin -ln -s %{_sbindir}/swaplabel %{buildroot}/sbin -ln -s %{_sbindir}/fstrim %{buildroot}/sbin -ln -s %{_sbindir}/chcpu %{buildroot}/sbin +for i in kill su dmesg more mount umount; do + ln -s "%{_bindir}/$i" "%{buildroot}/bin/" +done +for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \ + hwclock losetup mkfs mkfs.bfs mkfs.minix mkfs.cramfs mkswap nologin \ + pivot_root raw sfdisk swapoff swapon blkid findfs fsck switch_root \ + wipefs fsfreeze swaplabel fstrim chcpu; do + ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/" +done %endif install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb diff --git a/util-linux.spec b/util-linux.spec index 1b06957..e2ff0f3 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -653,41 +653,15 @@ install -m 644 runuser.default %{buildroot}%{_distconfdir}/default/runuser rm -f %{buildroot}%{python3_sitearch}/libmount/*.*a %if %build_util_linux %if !0%{?usrmerged} -ln -s %{_bindir}/kill %{buildroot}/bin -ln -s %{_bindir}/su %{buildroot}/bin -ln -s %{_bindir}/dmesg %{buildroot}/bin -ln -s %{_bindir}/more %{buildroot}/bin -ln -s %{_bindir}/mount %{buildroot}/bin -ln -s %{_bindir}/umount %{buildroot}/bin -ln -s %{_sbindir}/agetty %{buildroot}/sbin -ln -s %{_sbindir}/blockdev %{buildroot}/sbin -ln -s %{_sbindir}/cfdisk %{buildroot}/sbin -ln -s %{_sbindir}/ctrlaltdel %{buildroot}/sbin -ln -s %{_sbindir}/fdisk %{buildroot}/sbin -ln -s %{_sbindir}/fsck.minix %{buildroot}/sbin -ln -s %{_sbindir}/fsck.cramfs %{buildroot}/sbin -ln -s %{_sbindir}/hwclock %{buildroot}/sbin -ln -s %{_sbindir}/losetup %{buildroot}/sbin -ln -s %{_sbindir}/mkfs %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.bfs %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.minix %{buildroot}/sbin -ln -s %{_sbindir}/mkfs.cramfs %{buildroot}/sbin -ln -s %{_sbindir}/mkswap %{buildroot}/sbin -ln -s %{_sbindir}/nologin %{buildroot}/sbin -ln -s %{_sbindir}/pivot_root %{buildroot}/sbin -ln -s %{_sbindir}/raw %{buildroot}/sbin -ln -s %{_sbindir}/sfdisk %{buildroot}/sbin -ln -s %{_sbindir}/swapoff %{buildroot}/sbin -ln -s %{_sbindir}/swapon %{buildroot}/sbin -ln -s %{_sbindir}/blkid %{buildroot}/sbin -ln -s %{_sbindir}/findfs %{buildroot}/sbin -ln -s %{_sbindir}/fsck %{buildroot}/sbin -ln -s %{_sbindir}/switch_root %{buildroot}/sbin -ln -s %{_sbindir}/wipefs %{buildroot}/sbin -ln -s %{_sbindir}/fsfreeze %{buildroot}/sbin -ln -s %{_sbindir}/swaplabel %{buildroot}/sbin -ln -s %{_sbindir}/fstrim %{buildroot}/sbin -ln -s %{_sbindir}/chcpu %{buildroot}/sbin +for i in kill su dmesg more mount umount; do + ln -s "%{_bindir}/$i" "%{buildroot}/bin/" +done +for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \ + hwclock losetup mkfs mkfs.bfs mkfs.minix mkfs.cramfs mkswap nologin \ + pivot_root raw sfdisk swapoff swapon blkid findfs fsck switch_root \ + wipefs fsfreeze swaplabel fstrim chcpu; do + ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/" +done %endif install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb From bcbc304a359aadb04bbb8b47e470e2d2dae9fda1999df50371ce6deedce08c20 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 9 Sep 2021 20:58:33 +0000 Subject: [PATCH 4/4] - Remove the raw utility altogether OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=454 --- etc.raw | 15 --------------- python3-libmount.changes | 6 ++++++ python3-libmount.spec | 22 ++-------------------- raw.service | 18 ------------------ util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 22 ++-------------------- util-linux.changes | 6 ++++++ util-linux.spec | 22 ++-------------------- 8 files changed, 24 insertions(+), 93 deletions(-) delete mode 100644 etc.raw delete mode 100644 raw.service diff --git a/etc.raw b/etc.raw deleted file mode 100644 index 8eff0a0..0000000 --- a/etc.raw +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/raw -# -# sample configuration to bind raw devices -# to block devices -# -# The format of this file is: -# raw: -# -# example: -# --------- -# raw1:sdb1 -# -# this means: bind /dev/raw/raw1 to /dev/sdb1 -# -# ... diff --git a/python3-libmount.changes b/python3-libmount.changes index d905d7b..8fa0baa 100644 --- a/python3-libmount.changes +++ b/python3-libmount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 9 20:52:00 UTC 2021 - Jan Engelhardt + +- Remove the raw utility altogether, as it is not even built any + more with glibc >=2.34. + ------------------------------------------------------------------- Tue May 25 15:02:00 UTC 2021 - Thorsten Kukuk diff --git a/python3-libmount.spec b/python3-libmount.spec index ecb625b..30c8652 100644 --- a/python3-libmount.spec +++ b/python3-libmount.spec @@ -132,8 +132,6 @@ URL: https://www.kernel.org/pub/linux/utils/util-linux/ Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh -Source4: raw.service -Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf Source8: login.pamd @@ -663,13 +661,11 @@ for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \ ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/" done %endif +rm -fv "%{buildroot}/%{_sbindir}/raw" "%{buildroot}/sbin/raw" \ + "%{buildroot}/%{_mandir}/man8/raw.8"* install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb chmod 755 %{buildroot}%{_sbindir}/flushb -# Install scripts to configure raw devices at boot time -install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} -ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -747,14 +743,12 @@ rm -f %{buildroot}%{_mandir}/man8/lsblk.8* %if %build_util_linux %pre -%service_add_pre raw.service # move outdated pam.d/*.rpmsave files away for i in login remote runuser runuser-l su su-l ; do test -f /etc/pam.d/${i}.rpmsave && mv -v /etc/pam.d/${i}.rpmsave /etc/pam.d/${i}.rpmsave.old ||: done %post -%service_add_post raw.service %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su %if ! %{defined no_config} @@ -792,12 +786,6 @@ for i in login remote runuser runuser-l su su-l; do done %endif -%preun -%service_del_preun raw.service - -%postun -%service_del_postun raw.service - %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount %verify_permissions -e %{_bindir}/su @@ -886,8 +874,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%{_unitdir}/raw.service -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf %if %{defined no_config} @@ -934,7 +920,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : /sbin/mkswap /sbin/nologin /sbin/pivot_root -/sbin/raw /sbin/swapoff /sbin/swapon /sbin/blkid @@ -1040,8 +1025,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_sbindir}/nologin %{_sbindir}/partx %{_sbindir}/pivot_root -%{_sbindir}/raw -%{_sbindir}/rcraw %{_sbindir}/resizepart %{_sbindir}/rfkill %{_sbindir}/rtcwake @@ -1153,7 +1136,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_mandir}/man8/chcpu.8.gz %{_mandir}/man8/partx.8.gz %{_mandir}/man8/pivot_root.8.gz -%{_mandir}/man8/raw.8.gz %{_mandir}/man8/rtcwake.8.gz %{_mandir}/man8/setarch.8.gz %{_mandir}/man8/swapoff.8.gz diff --git a/raw.service b/raw.service deleted file mode 100644 index 40f52a1..0000000 --- a/raw.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=raw devices -After=local-fs.target remote-fs.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/bin/sh -c "\ - /sbin/modprobe raw;\ - /sbin/udevadm settle;\ - for i in `grep -v ^# /etc/raw`; do\ - rawdev=`echo $i | cut -f1 -d:`;\ - rawbind=`echo $i | cut -f2- -d:`;\ - /usr/sbin/raw /dev/raw/$rawdev /dev/$rawbind;\ - done" - -[Install] -WantedBy=multi-user.target diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index d905d7b..8fa0baa 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 9 20:52:00 UTC 2021 - Jan Engelhardt + +- Remove the raw utility altogether, as it is not even built any + more with glibc >=2.34. + ------------------------------------------------------------------- Tue May 25 15:02:00 UTC 2021 - Thorsten Kukuk diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index b5acf8f..8d3861d 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -132,8 +132,6 @@ URL: https://www.kernel.org/pub/linux/utils/util-linux/ Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh -Source4: raw.service -Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf Source8: login.pamd @@ -663,13 +661,11 @@ for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \ ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/" done %endif +rm -fv "%{buildroot}/%{_sbindir}/raw" "%{buildroot}/sbin/raw" \ + "%{buildroot}/%{_mandir}/man8/raw.8"* install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb chmod 755 %{buildroot}%{_sbindir}/flushb -# Install scripts to configure raw devices at boot time -install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} -ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -747,14 +743,12 @@ rm -f %{buildroot}%{_mandir}/man8/lsblk.8* %if %build_util_linux %pre -%service_add_pre raw.service # move outdated pam.d/*.rpmsave files away for i in login remote runuser runuser-l su su-l ; do test -f /etc/pam.d/${i}.rpmsave && mv -v /etc/pam.d/${i}.rpmsave /etc/pam.d/${i}.rpmsave.old ||: done %post -%service_add_post raw.service %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su %if ! %{defined no_config} @@ -792,12 +786,6 @@ for i in login remote runuser runuser-l su su-l; do done %endif -%preun -%service_del_preun raw.service - -%postun -%service_del_postun raw.service - %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount %verify_permissions -e %{_bindir}/su @@ -886,8 +874,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%{_unitdir}/raw.service -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf %if %{defined no_config} @@ -934,7 +920,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : /sbin/mkswap /sbin/nologin /sbin/pivot_root -/sbin/raw /sbin/swapoff /sbin/swapon /sbin/blkid @@ -1040,8 +1025,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_sbindir}/nologin %{_sbindir}/partx %{_sbindir}/pivot_root -%{_sbindir}/raw -%{_sbindir}/rcraw %{_sbindir}/resizepart %{_sbindir}/rfkill %{_sbindir}/rtcwake @@ -1153,7 +1136,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_mandir}/man8/chcpu.8.gz %{_mandir}/man8/partx.8.gz %{_mandir}/man8/pivot_root.8.gz -%{_mandir}/man8/raw.8.gz %{_mandir}/man8/rtcwake.8.gz %{_mandir}/man8/setarch.8.gz %{_mandir}/man8/swapoff.8.gz diff --git a/util-linux.changes b/util-linux.changes index d905d7b..8fa0baa 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 9 20:52:00 UTC 2021 - Jan Engelhardt + +- Remove the raw utility altogether, as it is not even built any + more with glibc >=2.34. + ------------------------------------------------------------------- Tue May 25 15:02:00 UTC 2021 - Thorsten Kukuk diff --git a/util-linux.spec b/util-linux.spec index e2ff0f3..251f19e 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -132,8 +132,6 @@ URL: https://www.kernel.org/pub/linux/utils/util-linux/ Source: https://www.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-%{version}.tar.xz Source1: util-linux-rpmlintrc Source2: util-linux-login_defs-check.sh -Source4: raw.service -Source5: etc.raw Source6: etc_filesystems Source7: baselibs.conf Source8: login.pamd @@ -663,13 +661,11 @@ for i in agetty blockdev cfdisk ctrlaltdel fdisk fsck.minix fsck.cramfs \ ln -s "%{_sbindir}/$i" "%{buildroot}/sbin/" done %endif +rm -fv "%{buildroot}/%{_sbindir}/raw" "%{buildroot}/sbin/raw" \ + "%{buildroot}/%{_mandir}/man8/raw.8"* install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/filesystems echo -e "#!/bin/sh\n/sbin/blockdev --flushbufs \$1" > %{buildroot}%{_sbindir}/flushb chmod 755 %{buildroot}%{_sbindir}/flushb -# Install scripts to configure raw devices at boot time -install -m 644 $RPM_SOURCE_DIR%{_sysconfdir}.raw %{buildroot}%{_sysconfdir}/raw -install -m 644 $RPM_SOURCE_DIR/raw.service %{buildroot}%{_unitdir} -ln -sf service %{buildroot}%{_sbindir}/rcraw # upstream moved getopt examples from datadir to docdir but we keep # the old location because we would need to fix the manpage first mv %{buildroot}%{_docdir}/%{_name}/getopt %{buildroot}%{_datadir}/ @@ -747,14 +743,12 @@ rm -f %{buildroot}%{_mandir}/man8/lsblk.8* %if %build_util_linux %pre -%service_add_pre raw.service # move outdated pam.d/*.rpmsave files away for i in login remote runuser runuser-l su su-l ; do test -f /etc/pam.d/${i}.rpmsave && mv -v /etc/pam.d/${i}.rpmsave /etc/pam.d/${i}.rpmsave.old ||: done %post -%service_add_post raw.service %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount %set_permissions %{_bindir}/su %if ! %{defined no_config} @@ -792,12 +786,6 @@ for i in login remote runuser runuser-l su su-l; do done %endif -%preun -%service_del_preun raw.service - -%postun -%service_del_postun raw.service - %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount %verify_permissions -e %{_bindir}/su @@ -886,8 +874,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %doc Documentation/modems-with-agetty.txt %doc Documentation/mount.txt %doc Documentation/pg.txt -%{_unitdir}/raw.service -%config(noreplace) %attr(644,root,root) %{_sysconfdir}/raw %config(noreplace) %{_sysconfdir}/filesystems %config(noreplace) %{_sysconfdir}/blkid.conf %if %{defined no_config} @@ -934,7 +920,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : /sbin/mkswap /sbin/nologin /sbin/pivot_root -/sbin/raw /sbin/swapoff /sbin/swapon /sbin/blkid @@ -1040,8 +1025,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_sbindir}/nologin %{_sbindir}/partx %{_sbindir}/pivot_root -%{_sbindir}/raw -%{_sbindir}/rcraw %{_sbindir}/resizepart %{_sbindir}/rfkill %{_sbindir}/rtcwake @@ -1153,7 +1136,6 @@ rmdir --ignore-fail-on-non-empty /run/run >/dev/null 2>&1 || : %{_mandir}/man8/chcpu.8.gz %{_mandir}/man8/partx.8.gz %{_mandir}/man8/pivot_root.8.gz -%{_mandir}/man8/raw.8.gz %{_mandir}/man8/rtcwake.8.gz %{_mandir}/man8/setarch.8.gz %{_mandir}/man8/swapoff.8.gz