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