From f7f92f04d8c2b1aecd6ecbbfb6177216e7cbf5c63b0746f7354fd8bc80dd4c63 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sun, 24 Apr 2016 09:08:55 +0000 Subject: [PATCH 1/4] Accepting request 390044 from home:rudi_m:branches:Base:System Just a minor cosmetical cleanup which should not change anything for the Factory build. Changes: - fix build for openSUSE >= 13.1 (inclusive SLE 12) - drop build for openSUSE < 13.1 - remove old build conditions: sysvinit_tools, enable_su and enable_eject - cosmetics: reorder configure options old: Base:System/util-linux new: home:rudi_m:branches:Base:System/util-linux rev None Index: python-libmount.changes =================================================================== --- python-libmount.changes (revision 302) +++ python-libmount.changes (revision 13) @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de + +- fix build for openSUSE >= 13.1 (inclusive SLE 12) +- drop build for openSUSE < 13.1 +- remove old build conditions: sysvinit_tools, enable_su and + enable_eject +- cosmetics: reorder configure options + +------------------------------------------------------------------- Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de - Update to version 2.28: Index: python-libmount.spec =================================================================== --- python-libmount.spec (revision 302) +++ python-libmount.spec (revision 13) @@ -16,9 +16,6 @@ # -%bcond_without sysvinit_tools -%bcond_without enable_su -%bcond_without enable_eject %bcond_without enable_last Name: python-libmount @@ -97,14 +94,10 @@ %endif %if %build_util_linux_systemd BuildRequires: socat -%if 0%{?suse_version} <= 1230 -BuildRequires: pkgconfig(systemd) -%else BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-journal) %endif -%endif %if %build_python_libmount BuildRequires: python-devel %endif @@ -170,25 +163,17 @@ PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -%if %{with enable_eject} Provides: eject = 2.1.0-166.8 -%endif Provides: login = 4.0-33.7 -%if %{with enable_eject} # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 -%endif # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 -%if %{with enable_su} # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 -%endif -%if %{with sysvinit_tools} # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 -%endif # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -538,6 +523,7 @@ # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. AUTOPOINT=true autoreconf -vfi %configure \ + --disable-silent-rules \ --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ @@ -546,46 +532,33 @@ --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion \ - --enable-all-programs \ - --disable-reset \ + --with-systemdsystemunitdir=%{_unitdir} \ + --enable-libmount-force-mountinfo \ + --enable-sulogin-emergency-mount \ --disable-use-tty-group \ - --disable-silent-rules \ --enable-static \ --disable-rpath \ + --enable-all-programs \ + --disable-reset \ %if %{without enable_last} --disable-last \ %endif -%if %{without enable_eject} - --disable-eject \ -%endif -%if %{with sysvinit_tools} - --enable-sulogin-emergency-mount \ -%else - --disable-sulogin \ - --disable-mountpoint \ -%endif -%if %{without enable_su} - --disable-su \ - --disable-kill \ -%endif %if %build_util_linux_systemd + --with-systemd \ --enable-logger \ --enable-lslogins \ --enable-uuidd \ - --with-systemd \ - --with-systemdsystemunitdir=%{_unitdir} \ %else + --without-systemd \ --disable-logger \ --disable-lslogins \ --disable-uuidd \ - --without-systemd \ %endif %if %build_python_libmount --with-python \ %else --without-python \ %endif - --enable-libmount-force-mountinfo \ # # Safety check: HAVE_UUIDD should be always 1: @@ -637,11 +610,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -%endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install @@ -655,10 +626,8 @@ rm -f %{buildroot}%{python_sitearch}/libmount/*.*a %if %build_util_linux #UsrMerge -%if %{with enable_su} ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin -%endif ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin @@ -798,7 +767,6 @@ %post %{fillup_and_insserv raw} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount -%if %{with enable_su} %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux # (openSUSE 12.3->13.1, SLE11->SLE12) @@ -817,7 +785,6 @@ mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE fi done -%endif # mount option 'code=' is now called 'codepage=' so change fstab if [ -f etc/fstab ]; then @@ -829,9 +796,7 @@ %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount -%if %{with enable_su} %verify_permissions -e %{_bindir}/su -%endif %post -n libblkid1 -p /sbin/ldconfig @@ -857,9 +822,8 @@ %endif %if %build_util_linux_systemd -# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons). -# If only util-linux is updated, restart of fstrim service does not happen. -# Maybe we should move fstrim to util-linux-systemd in the next version. +# fstrim(8) and fstrim.service are from different packages. But it's a oneshot +# service (timer), no restart needed on binary updates (unless path is changed). %pre -n util-linux-systemd %{service_add_pre fstrim.service fstrim.timer} @@ -877,7 +841,7 @@ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%systemd_preset_pre +%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -889,7 +853,7 @@ %{service_del_postun uuidd.socket uuidd.service} %posttrans -p /bin/bash -n uuidd -%systemd_preset_posttrans +%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -920,16 +884,12 @@ %config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/default/su -%endif #UsrMerge -%if %{with enable_su} /bin/kill /bin/su -%endif /bin/dmesg /bin/more /bin/mount @@ -963,13 +923,9 @@ /sbin/fstrim /sbin/chcpu #EndUsrMerge -%if %{with enable_su} %{_bindir}/kill %{_bindir}/su -%endif -%if %{with enable_eject} %{_bindir}/eject -%endif %{_bindir}/cal %{_bindir}/chrt %{_bindir}/col @@ -1018,10 +974,8 @@ %{_bindir}/ul %{_bindir}/umount %{_bindir}/unshare -%if %{with sysvinit_tools} %{_bindir}/mountpoint %{_bindir}/utmpdump -%endif %{_bindir}/uuidgen %{_bindir}/uname26 %ifnarch ppc ppc64 @@ -1059,9 +1013,7 @@ %{_sbindir}/rtcwake %{_sbindir}/runuser %{_sbindir}/setctsid -%if %{with sysvinit_tools} %{_sbindir}/sulogin -%endif %{_sbindir}/swaplabel %{_sbindir}/swapoff %{_sbindir}/swapon @@ -1071,10 +1023,8 @@ %{_bindir}/whereis %verify(not mode) %attr(0755,root,tty) %{_bindir}/write %{_sbindir}/zramctl -%if %{with enable_su} %{_mandir}/man1/kill.1.gz %{_mandir}/man1/su.1.gz -%endif %{_mandir}/man1/cal.1.gz %{_mandir}/man1/chrt.1.gz %{_mandir}/man1/col.1.gz @@ -1082,9 +1032,7 @@ %{_mandir}/man1/colrm.1.gz %{_mandir}/man1/column.1.gz %{_mandir}/man1/dmesg.1.gz -%if %{with enable_eject} %{_mandir}/man1/eject.1.gz -%endif %{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz @@ -1123,10 +1071,8 @@ %{_mandir}/man1/whereis.1.gz %{_mandir}/man1/write.1.gz %{_mandir}/man1/ipcmk.1.gz -%if %{with sysvinit_tools} %{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/utmpdump.1.gz -%endif %{_mandir}/man1/runuser.1.gz %{_mandir}/man1/uuidgen.1.gz %{_mandir}/man5/fstab.5.gz @@ -1178,9 +1124,7 @@ %{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/resizepart.8.gz -%if %{with sysvinit_tools} %{_mandir}/man8/sulogin.8.gz -%endif %{_mandir}/man8/wdctl.8.gz %{_sbindir}/flushb %{_sbindir}/readprofile Index: util-linux-systemd.changes =================================================================== --- util-linux-systemd.changes (revision 302) +++ util-linux-systemd.changes (revision 13) @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de + +- fix build for openSUSE >= 13.1 (inclusive SLE 12) +- drop build for openSUSE < 13.1 +- remove old build conditions: sysvinit_tools, enable_su and + enable_eject +- cosmetics: reorder configure options + +------------------------------------------------------------------- Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de - Update to version 2.28: Index: util-linux-systemd.spec =================================================================== --- util-linux-systemd.spec (revision 302) +++ util-linux-systemd.spec (revision 13) @@ -16,9 +16,6 @@ # -%bcond_without sysvinit_tools -%bcond_without enable_su -%bcond_without enable_eject %bcond_without enable_last Name: util-linux-systemd @@ -97,14 +94,10 @@ %endif %if %build_util_linux_systemd BuildRequires: socat -%if 0%{?suse_version} <= 1230 -BuildRequires: pkgconfig(systemd) -%else BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-journal) %endif -%endif %if %build_python_libmount BuildRequires: python-devel %endif @@ -170,25 +163,17 @@ PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -%if %{with enable_eject} Provides: eject = 2.1.0-166.8 -%endif Provides: login = 4.0-33.7 -%if %{with enable_eject} # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 -%endif # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 -%if %{with enable_su} # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 -%endif -%if %{with sysvinit_tools} # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 -%endif # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -538,6 +523,7 @@ # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. AUTOPOINT=true autoreconf -vfi %configure \ + --disable-silent-rules \ --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ @@ -546,46 +532,33 @@ --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion \ - --enable-all-programs \ - --disable-reset \ + --with-systemdsystemunitdir=%{_unitdir} \ + --enable-libmount-force-mountinfo \ + --enable-sulogin-emergency-mount \ --disable-use-tty-group \ - --disable-silent-rules \ --enable-static \ --disable-rpath \ + --enable-all-programs \ + --disable-reset \ %if %{without enable_last} --disable-last \ %endif -%if %{without enable_eject} - --disable-eject \ -%endif -%if %{with sysvinit_tools} - --enable-sulogin-emergency-mount \ -%else - --disable-sulogin \ - --disable-mountpoint \ -%endif -%if %{without enable_su} - --disable-su \ - --disable-kill \ -%endif %if %build_util_linux_systemd + --with-systemd \ --enable-logger \ --enable-lslogins \ --enable-uuidd \ - --with-systemd \ - --with-systemdsystemunitdir=%{_unitdir} \ %else + --without-systemd \ --disable-logger \ --disable-lslogins \ --disable-uuidd \ - --without-systemd \ %endif %if %build_python_libmount --with-python \ %else --without-python \ %endif - --enable-libmount-force-mountinfo \ # # Safety check: HAVE_UUIDD should be always 1: @@ -637,11 +610,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -%endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install @@ -655,10 +626,8 @@ rm -f %{buildroot}%{python_sitearch}/libmount/*.*a %if %build_util_linux #UsrMerge -%if %{with enable_su} ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin -%endif ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin @@ -798,7 +767,6 @@ %post %{fillup_and_insserv raw} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount -%if %{with enable_su} %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux # (openSUSE 12.3->13.1, SLE11->SLE12) @@ -817,7 +785,6 @@ mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE fi done -%endif # mount option 'code=' is now called 'codepage=' so change fstab if [ -f etc/fstab ]; then @@ -829,9 +796,7 @@ %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount -%if %{with enable_su} %verify_permissions -e %{_bindir}/su -%endif %post -n libblkid1 -p /sbin/ldconfig @@ -857,9 +822,8 @@ %endif %if %build_util_linux_systemd -# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons). -# If only util-linux is updated, restart of fstrim service does not happen. -# Maybe we should move fstrim to util-linux-systemd in the next version. +# fstrim(8) and fstrim.service are from different packages. But it's a oneshot +# service (timer), no restart needed on binary updates (unless path is changed). %pre -n util-linux-systemd %{service_add_pre fstrim.service fstrim.timer} @@ -877,7 +841,7 @@ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%systemd_preset_pre +%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -889,7 +853,7 @@ %{service_del_postun uuidd.socket uuidd.service} %posttrans -p /bin/bash -n uuidd -%systemd_preset_posttrans +%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -920,16 +884,12 @@ %config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/default/su -%endif #UsrMerge -%if %{with enable_su} /bin/kill /bin/su -%endif /bin/dmesg /bin/more /bin/mount @@ -963,13 +923,9 @@ /sbin/fstrim /sbin/chcpu #EndUsrMerge -%if %{with enable_su} %{_bindir}/kill %{_bindir}/su -%endif -%if %{with enable_eject} %{_bindir}/eject -%endif %{_bindir}/cal %{_bindir}/chrt %{_bindir}/col @@ -1018,10 +974,8 @@ %{_bindir}/ul %{_bindir}/umount %{_bindir}/unshare -%if %{with sysvinit_tools} %{_bindir}/mountpoint %{_bindir}/utmpdump -%endif %{_bindir}/uuidgen %{_bindir}/uname26 %ifnarch ppc ppc64 @@ -1059,9 +1013,7 @@ %{_sbindir}/rtcwake %{_sbindir}/runuser %{_sbindir}/setctsid -%if %{with sysvinit_tools} %{_sbindir}/sulogin -%endif %{_sbindir}/swaplabel %{_sbindir}/swapoff %{_sbindir}/swapon @@ -1071,10 +1023,8 @@ %{_bindir}/whereis %verify(not mode) %attr(0755,root,tty) %{_bindir}/write %{_sbindir}/zramctl -%if %{with enable_su} %{_mandir}/man1/kill.1.gz %{_mandir}/man1/su.1.gz -%endif %{_mandir}/man1/cal.1.gz %{_mandir}/man1/chrt.1.gz %{_mandir}/man1/col.1.gz @@ -1082,9 +1032,7 @@ %{_mandir}/man1/colrm.1.gz %{_mandir}/man1/column.1.gz %{_mandir}/man1/dmesg.1.gz -%if %{with enable_eject} %{_mandir}/man1/eject.1.gz -%endif %{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz @@ -1123,10 +1071,8 @@ %{_mandir}/man1/whereis.1.gz %{_mandir}/man1/write.1.gz %{_mandir}/man1/ipcmk.1.gz -%if %{with sysvinit_tools} %{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/utmpdump.1.gz -%endif %{_mandir}/man1/runuser.1.gz %{_mandir}/man1/uuidgen.1.gz %{_mandir}/man5/fstab.5.gz @@ -1178,9 +1124,7 @@ %{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/resizepart.8.gz -%if %{with sysvinit_tools} %{_mandir}/man8/sulogin.8.gz -%endif %{_mandir}/man8/wdctl.8.gz %{_sbindir}/flushb %{_sbindir}/readprofile Index: util-linux.changes =================================================================== --- util-linux.changes (revision 302) +++ util-linux.changes (revision 13) @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de + +- fix build for openSUSE >= 13.1 (inclusive SLE 12) +- drop build for openSUSE < 13.1 +- remove old build conditions: sysvinit_tools, enable_su and + enable_eject +- cosmetics: reorder configure options + +------------------------------------------------------------------- Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de - Update to version 2.28: Index: util-linux.spec =================================================================== --- util-linux.spec (revision 302) +++ util-linux.spec (revision 13) @@ -16,9 +16,6 @@ # -%bcond_without sysvinit_tools -%bcond_without enable_su -%bcond_without enable_eject %bcond_without enable_last Name: util-linux @@ -97,14 +94,10 @@ %endif %if %build_util_linux_systemd BuildRequires: socat -%if 0%{?suse_version} <= 1230 -BuildRequires: pkgconfig(systemd) -%else BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-journal) %endif -%endif %if %build_python_libmount BuildRequires: python-devel %endif @@ -170,25 +163,17 @@ PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -%if %{with enable_eject} Provides: eject = 2.1.0-166.8 -%endif Provides: login = 4.0-33.7 -%if %{with enable_eject} # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 -%endif # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 -%if %{with enable_su} # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 -%endif -%if %{with sysvinit_tools} # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 -%endif # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -538,6 +523,7 @@ # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. AUTOPOINT=true autoreconf -vfi %configure \ + --disable-silent-rules \ --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ @@ -546,46 +532,33 @@ --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion \ - --enable-all-programs \ - --disable-reset \ + --with-systemdsystemunitdir=%{_unitdir} \ + --enable-libmount-force-mountinfo \ + --enable-sulogin-emergency-mount \ --disable-use-tty-group \ - --disable-silent-rules \ --enable-static \ --disable-rpath \ + --enable-all-programs \ + --disable-reset \ %if %{without enable_last} --disable-last \ %endif -%if %{without enable_eject} - --disable-eject \ -%endif -%if %{with sysvinit_tools} - --enable-sulogin-emergency-mount \ -%else - --disable-sulogin \ - --disable-mountpoint \ -%endif -%if %{without enable_su} - --disable-su \ - --disable-kill \ -%endif %if %build_util_linux_systemd + --with-systemd \ --enable-logger \ --enable-lslogins \ --enable-uuidd \ - --with-systemd \ - --with-systemdsystemunitdir=%{_unitdir} \ %else + --without-systemd \ --disable-logger \ --disable-lslogins \ --disable-uuidd \ - --without-systemd \ %endif %if %build_python_libmount --with-python \ %else --without-python \ %endif - --enable-libmount-force-mountinfo \ # # Safety check: HAVE_UUIDD should be always 1: @@ -637,11 +610,9 @@ install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -%endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install @@ -655,10 +626,8 @@ rm -f %{buildroot}%{python_sitearch}/libmount/*.*a %if %build_util_linux #UsrMerge -%if %{with enable_su} ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin -%endif ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin @@ -798,7 +767,6 @@ %post %{fillup_and_insserv raw} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount -%if %{with enable_su} %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux # (openSUSE 12.3->13.1, SLE11->SLE12) @@ -817,7 +785,6 @@ mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE fi done -%endif # mount option 'code=' is now called 'codepage=' so change fstab if [ -f etc/fstab ]; then @@ -829,9 +796,7 @@ %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount -%if %{with enable_su} %verify_permissions -e %{_bindir}/su -%endif %post -n libblkid1 -p /sbin/ldconfig @@ -857,9 +822,8 @@ %endif %if %build_util_linux_systemd -# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons). -# If only util-linux is updated, restart of fstrim service does not happen. -# Maybe we should move fstrim to util-linux-systemd in the next version. +# fstrim(8) and fstrim.service are from different packages. But it's a oneshot +# service (timer), no restart needed on binary updates (unless path is changed). %pre -n util-linux-systemd %{service_add_pre fstrim.service fstrim.timer} @@ -877,7 +841,7 @@ /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%systemd_preset_pre +%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -889,7 +853,7 @@ %{service_del_postun uuidd.socket uuidd.service} %posttrans -p /bin/bash -n uuidd -%systemd_preset_posttrans +%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -920,16 +884,12 @@ %config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/default/su -%endif #UsrMerge -%if %{with enable_su} /bin/kill /bin/su -%endif /bin/dmesg /bin/more /bin/mount @@ -963,13 +923,9 @@ /sbin/fstrim /sbin/chcpu #EndUsrMerge -%if %{with enable_su} %{_bindir}/kill %{_bindir}/su -%endif -%if %{with enable_eject} %{_bindir}/eject -%endif %{_bindir}/cal %{_bindir}/chrt %{_bindir}/col @@ -1018,10 +974,8 @@ %{_bindir}/ul %{_bindir}/umount %{_bindir}/unshare -%if %{with sysvinit_tools} %{_bindir}/mountpoint %{_bindir}/utmpdump -%endif %{_bindir}/uuidgen %{_bindir}/uname26 %ifnarch ppc ppc64 @@ -1059,9 +1013,7 @@ %{_sbindir}/rtcwake %{_sbindir}/runuser %{_sbindir}/setctsid -%if %{with sysvinit_tools} %{_sbindir}/sulogin -%endif %{_sbindir}/swaplabel %{_sbindir}/swapoff %{_sbindir}/swapon @@ -1071,10 +1023,8 @@ %{_bindir}/whereis %verify(not mode) %attr(0755,root,tty) %{_bindir}/write %{_sbindir}/zramctl -%if %{with enable_su} %{_mandir}/man1/kill.1.gz %{_mandir}/man1/su.1.gz -%endif %{_mandir}/man1/cal.1.gz %{_mandir}/man1/chrt.1.gz %{_mandir}/man1/col.1.gz @@ -1082,9 +1032,7 @@ %{_mandir}/man1/colrm.1.gz %{_mandir}/man1/column.1.gz %{_mandir}/man1/dmesg.1.gz -%if %{with enable_eject} %{_mandir}/man1/eject.1.gz -%endif %{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz @@ -1123,10 +1071,8 @@ %{_mandir}/man1/whereis.1.gz %{_mandir}/man1/write.1.gz %{_mandir}/man1/ipcmk.1.gz -%if %{with sysvinit_tools} %{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/utmpdump.1.gz -%endif %{_mandir}/man1/runuser.1.gz %{_mandir}/man1/uuidgen.1.gz %{_mandir}/man5/fstab.5.gz @@ -1178,9 +1124,7 @@ %{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/resizepart.8.gz -%if %{with sysvinit_tools} %{_mandir}/man8/sulogin.8.gz -%endif %{_mandir}/man8/wdctl.8.gz %{_sbindir}/flushb %{_sbindir}/readprofile OBS-URL: https://build.opensuse.org/request/show/390044 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=304 --- python-libmount.changes | 9 +++++ python-libmount.spec | 80 ++++++-------------------------------- util-linux-systemd.changes | 9 +++++ util-linux-systemd.spec | 80 ++++++-------------------------------- util-linux.changes | 9 +++++ util-linux.spec | 80 ++++++-------------------------------- 6 files changed, 63 insertions(+), 204 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 96bd473..3d10eab 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de + +- fix build for openSUSE >= 13.1 (inclusive SLE 12) +- drop build for openSUSE < 13.1 +- remove old build conditions: sysvinit_tools, enable_su and + enable_eject +- cosmetics: reorder configure options + ------------------------------------------------------------------- Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de diff --git a/python-libmount.spec b/python-libmount.spec index 4ace376..2c8989c 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -16,9 +16,6 @@ # -%bcond_without sysvinit_tools -%bcond_without enable_su -%bcond_without enable_eject %bcond_without enable_last Name: python-libmount @@ -97,14 +94,10 @@ BuildRequires: gpg-offline %endif %if %build_util_linux_systemd BuildRequires: socat -%if 0%{?suse_version} <= 1230 -BuildRequires: pkgconfig(systemd) -%else BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-journal) %endif -%endif %if %build_python_libmount BuildRequires: python-devel %endif @@ -170,25 +163,17 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -%if %{with enable_eject} Provides: eject = 2.1.0-166.8 -%endif Provides: login = 4.0-33.7 -%if %{with enable_eject} # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 -%endif # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 -%if %{with enable_su} # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 -%endif -%if %{with sysvinit_tools} # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 -%endif # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -538,6 +523,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now" # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. AUTOPOINT=true autoreconf -vfi %configure \ + --disable-silent-rules \ --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ @@ -546,46 +532,33 @@ AUTOPOINT=true autoreconf -vfi --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion \ - --enable-all-programs \ - --disable-reset \ + --with-systemdsystemunitdir=%{_unitdir} \ + --enable-libmount-force-mountinfo \ + --enable-sulogin-emergency-mount \ --disable-use-tty-group \ - --disable-silent-rules \ --enable-static \ --disable-rpath \ + --enable-all-programs \ + --disable-reset \ %if %{without enable_last} --disable-last \ %endif -%if %{without enable_eject} - --disable-eject \ -%endif -%if %{with sysvinit_tools} - --enable-sulogin-emergency-mount \ -%else - --disable-sulogin \ - --disable-mountpoint \ -%endif -%if %{without enable_su} - --disable-su \ - --disable-kill \ -%endif %if %build_util_linux_systemd + --with-systemd \ --enable-logger \ --enable-lslogins \ --enable-uuidd \ - --with-systemd \ - --with-systemdsystemunitdir=%{_unitdir} \ %else + --without-systemd \ --disable-logger \ --disable-lslogins \ --disable-uuidd \ - --without-systemd \ %endif %if %build_python_libmount --with-python \ %else --without-python \ %endif - --enable-libmount-force-mountinfo \ # # Safety check: HAVE_UUIDD should be always 1: @@ -637,11 +610,9 @@ install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -%endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install @@ -655,10 +626,8 @@ popd rm -f %{buildroot}%{python_sitearch}/libmount/*.*a %if %build_util_linux #UsrMerge -%if %{with enable_su} ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin -%endif ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin @@ -798,7 +767,6 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system %post %{fillup_and_insserv raw} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount -%if %{with enable_su} %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux # (openSUSE 12.3->13.1, SLE11->SLE12) @@ -817,7 +785,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE fi done -%endif # mount option 'code=' is now called 'codepage=' so change fstab if [ -f etc/fstab ]; then @@ -829,9 +796,7 @@ fi %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount -%if %{with enable_su} %verify_permissions -e %{_bindir}/su -%endif %post -n libblkid1 -p /sbin/ldconfig @@ -857,9 +822,8 @@ fi %endif %if %build_util_linux_systemd -# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons). -# If only util-linux is updated, restart of fstrim service does not happen. -# Maybe we should move fstrim to util-linux-systemd in the next version. +# fstrim(8) and fstrim.service are from different packages. But it's a oneshot +# service (timer), no restart needed on binary updates (unless path is changed). %pre -n util-linux-systemd %{service_add_pre fstrim.service fstrim.timer} @@ -877,7 +841,7 @@ fi /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%systemd_preset_pre +%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -889,7 +853,7 @@ fi %{service_del_postun uuidd.socket uuidd.service} %posttrans -p /bin/bash -n uuidd -%systemd_preset_posttrans +%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -920,16 +884,12 @@ fi %config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/default/su -%endif #UsrMerge -%if %{with enable_su} /bin/kill /bin/su -%endif /bin/dmesg /bin/more /bin/mount @@ -963,13 +923,9 @@ fi /sbin/fstrim /sbin/chcpu #EndUsrMerge -%if %{with enable_su} %{_bindir}/kill %{_bindir}/su -%endif -%if %{with enable_eject} %{_bindir}/eject -%endif %{_bindir}/cal %{_bindir}/chrt %{_bindir}/col @@ -1018,10 +974,8 @@ fi %{_bindir}/ul %{_bindir}/umount %{_bindir}/unshare -%if %{with sysvinit_tools} %{_bindir}/mountpoint %{_bindir}/utmpdump -%endif %{_bindir}/uuidgen %{_bindir}/uname26 %ifnarch ppc ppc64 @@ -1059,9 +1013,7 @@ fi %{_sbindir}/rtcwake %{_sbindir}/runuser %{_sbindir}/setctsid -%if %{with sysvinit_tools} %{_sbindir}/sulogin -%endif %{_sbindir}/swaplabel %{_sbindir}/swapoff %{_sbindir}/swapon @@ -1071,10 +1023,8 @@ fi %{_bindir}/whereis %verify(not mode) %attr(0755,root,tty) %{_bindir}/write %{_sbindir}/zramctl -%if %{with enable_su} %{_mandir}/man1/kill.1.gz %{_mandir}/man1/su.1.gz -%endif %{_mandir}/man1/cal.1.gz %{_mandir}/man1/chrt.1.gz %{_mandir}/man1/col.1.gz @@ -1082,9 +1032,7 @@ fi %{_mandir}/man1/colrm.1.gz %{_mandir}/man1/column.1.gz %{_mandir}/man1/dmesg.1.gz -%if %{with enable_eject} %{_mandir}/man1/eject.1.gz -%endif %{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz @@ -1123,10 +1071,8 @@ fi %{_mandir}/man1/whereis.1.gz %{_mandir}/man1/write.1.gz %{_mandir}/man1/ipcmk.1.gz -%if %{with sysvinit_tools} %{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/utmpdump.1.gz -%endif %{_mandir}/man1/runuser.1.gz %{_mandir}/man1/uuidgen.1.gz %{_mandir}/man5/fstab.5.gz @@ -1178,9 +1124,7 @@ fi %{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/resizepart.8.gz -%if %{with sysvinit_tools} %{_mandir}/man8/sulogin.8.gz -%endif %{_mandir}/man8/wdctl.8.gz %{_sbindir}/flushb %{_sbindir}/readprofile diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 96bd473..3d10eab 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de + +- fix build for openSUSE >= 13.1 (inclusive SLE 12) +- drop build for openSUSE < 13.1 +- remove old build conditions: sysvinit_tools, enable_su and + enable_eject +- cosmetics: reorder configure options + ------------------------------------------------------------------- Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index cce4ec2..aeea1a7 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -16,9 +16,6 @@ # -%bcond_without sysvinit_tools -%bcond_without enable_su -%bcond_without enable_eject %bcond_without enable_last Name: util-linux-systemd @@ -97,14 +94,10 @@ BuildRequires: gpg-offline %endif %if %build_util_linux_systemd BuildRequires: socat -%if 0%{?suse_version} <= 1230 -BuildRequires: pkgconfig(systemd) -%else BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-journal) %endif -%endif %if %build_python_libmount BuildRequires: python-devel %endif @@ -170,25 +163,17 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -%if %{with enable_eject} Provides: eject = 2.1.0-166.8 -%endif Provides: login = 4.0-33.7 -%if %{with enable_eject} # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 -%endif # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 -%if %{with enable_su} # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 -%endif -%if %{with sysvinit_tools} # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 -%endif # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -538,6 +523,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now" # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. AUTOPOINT=true autoreconf -vfi %configure \ + --disable-silent-rules \ --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ @@ -546,46 +532,33 @@ AUTOPOINT=true autoreconf -vfi --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion \ - --enable-all-programs \ - --disable-reset \ + --with-systemdsystemunitdir=%{_unitdir} \ + --enable-libmount-force-mountinfo \ + --enable-sulogin-emergency-mount \ --disable-use-tty-group \ - --disable-silent-rules \ --enable-static \ --disable-rpath \ + --enable-all-programs \ + --disable-reset \ %if %{without enable_last} --disable-last \ %endif -%if %{without enable_eject} - --disable-eject \ -%endif -%if %{with sysvinit_tools} - --enable-sulogin-emergency-mount \ -%else - --disable-sulogin \ - --disable-mountpoint \ -%endif -%if %{without enable_su} - --disable-su \ - --disable-kill \ -%endif %if %build_util_linux_systemd + --with-systemd \ --enable-logger \ --enable-lslogins \ --enable-uuidd \ - --with-systemd \ - --with-systemdsystemunitdir=%{_unitdir} \ %else + --without-systemd \ --disable-logger \ --disable-lslogins \ --disable-uuidd \ - --without-systemd \ %endif %if %build_python_libmount --with-python \ %else --without-python \ %endif - --enable-libmount-force-mountinfo \ # # Safety check: HAVE_UUIDD should be always 1: @@ -637,11 +610,9 @@ install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -%endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install @@ -655,10 +626,8 @@ popd rm -f %{buildroot}%{python_sitearch}/libmount/*.*a %if %build_util_linux #UsrMerge -%if %{with enable_su} ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin -%endif ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin @@ -798,7 +767,6 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system %post %{fillup_and_insserv raw} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount -%if %{with enable_su} %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux # (openSUSE 12.3->13.1, SLE11->SLE12) @@ -817,7 +785,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE fi done -%endif # mount option 'code=' is now called 'codepage=' so change fstab if [ -f etc/fstab ]; then @@ -829,9 +796,7 @@ fi %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount -%if %{with enable_su} %verify_permissions -e %{_bindir}/su -%endif %post -n libblkid1 -p /sbin/ldconfig @@ -857,9 +822,8 @@ fi %endif %if %build_util_linux_systemd -# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons). -# If only util-linux is updated, restart of fstrim service does not happen. -# Maybe we should move fstrim to util-linux-systemd in the next version. +# fstrim(8) and fstrim.service are from different packages. But it's a oneshot +# service (timer), no restart needed on binary updates (unless path is changed). %pre -n util-linux-systemd %{service_add_pre fstrim.service fstrim.timer} @@ -877,7 +841,7 @@ fi /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%systemd_preset_pre +%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -889,7 +853,7 @@ fi %{service_del_postun uuidd.socket uuidd.service} %posttrans -p /bin/bash -n uuidd -%systemd_preset_posttrans +%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -920,16 +884,12 @@ fi %config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/default/su -%endif #UsrMerge -%if %{with enable_su} /bin/kill /bin/su -%endif /bin/dmesg /bin/more /bin/mount @@ -963,13 +923,9 @@ fi /sbin/fstrim /sbin/chcpu #EndUsrMerge -%if %{with enable_su} %{_bindir}/kill %{_bindir}/su -%endif -%if %{with enable_eject} %{_bindir}/eject -%endif %{_bindir}/cal %{_bindir}/chrt %{_bindir}/col @@ -1018,10 +974,8 @@ fi %{_bindir}/ul %{_bindir}/umount %{_bindir}/unshare -%if %{with sysvinit_tools} %{_bindir}/mountpoint %{_bindir}/utmpdump -%endif %{_bindir}/uuidgen %{_bindir}/uname26 %ifnarch ppc ppc64 @@ -1059,9 +1013,7 @@ fi %{_sbindir}/rtcwake %{_sbindir}/runuser %{_sbindir}/setctsid -%if %{with sysvinit_tools} %{_sbindir}/sulogin -%endif %{_sbindir}/swaplabel %{_sbindir}/swapoff %{_sbindir}/swapon @@ -1071,10 +1023,8 @@ fi %{_bindir}/whereis %verify(not mode) %attr(0755,root,tty) %{_bindir}/write %{_sbindir}/zramctl -%if %{with enable_su} %{_mandir}/man1/kill.1.gz %{_mandir}/man1/su.1.gz -%endif %{_mandir}/man1/cal.1.gz %{_mandir}/man1/chrt.1.gz %{_mandir}/man1/col.1.gz @@ -1082,9 +1032,7 @@ fi %{_mandir}/man1/colrm.1.gz %{_mandir}/man1/column.1.gz %{_mandir}/man1/dmesg.1.gz -%if %{with enable_eject} %{_mandir}/man1/eject.1.gz -%endif %{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz @@ -1123,10 +1071,8 @@ fi %{_mandir}/man1/whereis.1.gz %{_mandir}/man1/write.1.gz %{_mandir}/man1/ipcmk.1.gz -%if %{with sysvinit_tools} %{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/utmpdump.1.gz -%endif %{_mandir}/man1/runuser.1.gz %{_mandir}/man1/uuidgen.1.gz %{_mandir}/man5/fstab.5.gz @@ -1178,9 +1124,7 @@ fi %{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/resizepart.8.gz -%if %{with sysvinit_tools} %{_mandir}/man8/sulogin.8.gz -%endif %{_mandir}/man8/wdctl.8.gz %{_sbindir}/flushb %{_sbindir}/readprofile diff --git a/util-linux.changes b/util-linux.changes index 96bd473..3d10eab 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de + +- fix build for openSUSE >= 13.1 (inclusive SLE 12) +- drop build for openSUSE < 13.1 +- remove old build conditions: sysvinit_tools, enable_su and + enable_eject +- cosmetics: reorder configure options + ------------------------------------------------------------------- Wed Apr 13 09:53:21 UTC 2016 - sweet_f_a@gmx.de diff --git a/util-linux.spec b/util-linux.spec index 5c687aa..9147590 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -16,9 +16,6 @@ # -%bcond_without sysvinit_tools -%bcond_without enable_su -%bcond_without enable_eject %bcond_without enable_last Name: util-linux @@ -97,14 +94,10 @@ BuildRequires: gpg-offline %endif %if %build_util_linux_systemd BuildRequires: socat -%if 0%{?suse_version} <= 1230 -BuildRequires: pkgconfig(systemd) -%else BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(libsystemd-daemon) BuildRequires: pkgconfig(libsystemd-journal) %endif -%endif %if %build_python_libmount BuildRequires: python-devel %endif @@ -170,25 +163,17 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -%if %{with enable_eject} Provides: eject = 2.1.0-166.8 -%endif Provides: login = 4.0-33.7 -%if %{with enable_eject} # File conflict of eject (up to 12.3 and SLE11). Obsoletes: eject < 2.1.0-166.8 -%endif # File conflict of login (up to 12.1 and SLE11). Obsoletes: login < 4.0-33.7 -%if %{with enable_su} # File conflict of su and kill (up to 12.3 and SLE11). # It should be coreutils < 8.21-4, but coreutils provide Release-less symbol. Conflicts: coreutils < 8.21 -%endif -%if %{with sysvinit_tools} # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 -%endif # bnc#805684: %ifarch s390x Obsoletes: s390-32 @@ -538,6 +523,7 @@ export LDFLAGS="-Wl,-z,relro,-z,now" # sysvinit-only versions of UTIL_LINUX_SYSTEMD_SOURCES utilities. AUTOPOINT=true autoreconf -vfi %configure \ + --disable-silent-rules \ --localstatedir=/run \ --docdir=%{_docdir}/%{_name} \ --with-audit \ @@ -546,46 +532,33 @@ AUTOPOINT=true autoreconf -vfi --with-selinux \ $uhead \ --with-bashcompletiondir=%{_datadir}/bash-completion \ - --enable-all-programs \ - --disable-reset \ + --with-systemdsystemunitdir=%{_unitdir} \ + --enable-libmount-force-mountinfo \ + --enable-sulogin-emergency-mount \ --disable-use-tty-group \ - --disable-silent-rules \ --enable-static \ --disable-rpath \ + --enable-all-programs \ + --disable-reset \ %if %{without enable_last} --disable-last \ %endif -%if %{without enable_eject} - --disable-eject \ -%endif -%if %{with sysvinit_tools} - --enable-sulogin-emergency-mount \ -%else - --disable-sulogin \ - --disable-mountpoint \ -%endif -%if %{without enable_su} - --disable-su \ - --disable-kill \ -%endif %if %build_util_linux_systemd + --with-systemd \ --enable-logger \ --enable-lslogins \ --enable-uuidd \ - --with-systemd \ - --with-systemdsystemunitdir=%{_unitdir} \ %else + --without-systemd \ --disable-logger \ --disable-lslogins \ --disable-uuidd \ - --without-systemd \ %endif %if %build_python_libmount --with-python \ %else --without-python \ %endif - --enable-libmount-force-mountinfo \ # # Safety check: HAVE_UUIDD should be always 1: @@ -637,11 +610,9 @@ install -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/pam.d/login install -m 644 %{SOURCE9} %{buildroot}%{_sysconfdir}/pam.d/remote install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser install -m 644 %{SOURCE14} %{buildroot}%{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su install -m 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/su-l install -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/default/su -%endif mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates pushd ../klogconsole # klogconsole install @@ -655,10 +626,8 @@ popd rm -f %{buildroot}%{python_sitearch}/libmount/*.*a %if %build_util_linux #UsrMerge -%if %{with enable_su} ln -s %{_bindir}/kill %{buildroot}/bin ln -s %{_bindir}/su %{buildroot}/bin -%endif ln -s %{_bindir}/dmesg %{buildroot}/bin ln -s %{_bindir}/more %{buildroot}/bin ln -s %{_bindir}/mount %{buildroot}/bin @@ -798,7 +767,6 @@ echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/system %post %{fillup_and_insserv raw} %set_permissions %{_bindir}/wall %{_bindir}/write %{_bindir}/mount %{_bindir}/umount -%if %{with enable_su} %set_permissions %{_bindir}/su # Safely migrate PAM files from coreutils to util-linux # (openSUSE 12.3->13.1, SLE11->SLE12) @@ -817,7 +785,6 @@ for PAM_FILE in default/su pam.d/su pam.d/su-l ; do mv %{_sysconfdir}/$PAM_FILE.rpmsave %{_sysconfdir}/$PAM_FILE fi done -%endif # mount option 'code=' is now called 'codepage=' so change fstab if [ -f etc/fstab ]; then @@ -829,9 +796,7 @@ fi %verifyscript %verify_permissions -e %{_bindir}/wall -e %{_bindir}/write -e %{_bindir}/mount -e %{_bindir}/umount -%if %{with enable_su} %verify_permissions -e %{_bindir}/su -%endif %post -n libblkid1 -p /sbin/ldconfig @@ -857,9 +822,8 @@ fi %endif %if %build_util_linux_systemd -# Note: This is not a perfect solution: fstrim is part of util-linux, fstrim services are part of util-linux-systemd (for build loop prevention reasons). -# If only util-linux is updated, restart of fstrim service does not happen. -# Maybe we should move fstrim to util-linux-systemd in the next version. +# fstrim(8) and fstrim.service are from different packages. But it's a oneshot +# service (timer), no restart needed on binary updates (unless path is changed). %pre -n util-linux-systemd %{service_add_pre fstrim.service fstrim.timer} @@ -877,7 +841,7 @@ fi /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : %{service_add_pre uuidd.socket uuidd.service} -%systemd_preset_pre +%{?systemd_preset_pre} %post -n uuidd %{service_add_post uuidd.socket uuidd.service} @@ -889,7 +853,7 @@ fi %{service_del_postun uuidd.socket uuidd.service} %posttrans -p /bin/bash -n uuidd -%systemd_preset_posttrans +%{?systemd_preset_posttrans} %endif %if %build_util_linux @@ -920,16 +884,12 @@ fi %config(noreplace) %{_sysconfdir}/pam.d/remote %config(noreplace) %{_sysconfdir}/pam.d/runuser %config(noreplace) %{_sysconfdir}/pam.d/runuser-l -%if %{with enable_su} %config(noreplace) %{_sysconfdir}/pam.d/su %config(noreplace) %{_sysconfdir}/pam.d/su-l %config(noreplace) %{_sysconfdir}/default/su -%endif #UsrMerge -%if %{with enable_su} /bin/kill /bin/su -%endif /bin/dmesg /bin/more /bin/mount @@ -963,13 +923,9 @@ fi /sbin/fstrim /sbin/chcpu #EndUsrMerge -%if %{with enable_su} %{_bindir}/kill %{_bindir}/su -%endif -%if %{with enable_eject} %{_bindir}/eject -%endif %{_bindir}/cal %{_bindir}/chrt %{_bindir}/col @@ -1018,10 +974,8 @@ fi %{_bindir}/ul %{_bindir}/umount %{_bindir}/unshare -%if %{with sysvinit_tools} %{_bindir}/mountpoint %{_bindir}/utmpdump -%endif %{_bindir}/uuidgen %{_bindir}/uname26 %ifnarch ppc ppc64 @@ -1059,9 +1013,7 @@ fi %{_sbindir}/rtcwake %{_sbindir}/runuser %{_sbindir}/setctsid -%if %{with sysvinit_tools} %{_sbindir}/sulogin -%endif %{_sbindir}/swaplabel %{_sbindir}/swapoff %{_sbindir}/swapon @@ -1071,10 +1023,8 @@ fi %{_bindir}/whereis %verify(not mode) %attr(0755,root,tty) %{_bindir}/write %{_sbindir}/zramctl -%if %{with enable_su} %{_mandir}/man1/kill.1.gz %{_mandir}/man1/su.1.gz -%endif %{_mandir}/man1/cal.1.gz %{_mandir}/man1/chrt.1.gz %{_mandir}/man1/col.1.gz @@ -1082,9 +1032,7 @@ fi %{_mandir}/man1/colrm.1.gz %{_mandir}/man1/column.1.gz %{_mandir}/man1/dmesg.1.gz -%if %{with enable_eject} %{_mandir}/man1/eject.1.gz -%endif %{_mandir}/man1/fallocate.1.gz %{_mandir}/man1/flock.1.gz %{_mandir}/man1/getopt.1.gz @@ -1123,10 +1071,8 @@ fi %{_mandir}/man1/whereis.1.gz %{_mandir}/man1/write.1.gz %{_mandir}/man1/ipcmk.1.gz -%if %{with sysvinit_tools} %{_mandir}/man1/mountpoint.1.gz %{_mandir}/man1/utmpdump.1.gz -%endif %{_mandir}/man1/runuser.1.gz %{_mandir}/man1/uuidgen.1.gz %{_mandir}/man5/fstab.5.gz @@ -1178,9 +1124,7 @@ fi %{_mandir}/man8/fstrim.8.gz %{_mandir}/man8/lsblk.8.gz %{_mandir}/man8/resizepart.8.gz -%if %{with sysvinit_tools} %{_mandir}/man8/sulogin.8.gz -%endif %{_mandir}/man8/wdctl.8.gz %{_sbindir}/flushb %{_sbindir}/readprofile From a15bb30f6090e41d17e8431240db6a0ba9a0abf5baa54da8870c1e4cc97cfaa7 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 26 Apr 2016 22:14:30 +0000 Subject: [PATCH 2/4] Accepting request 391743 from home:sbrabec:branches:util-linux-bsc977259 - Remove incorrect --with-bashcompletiondir that breaks bash-completion, use path in bash-completion.pc instead (boo#977259). OBS-URL: https://build.opensuse.org/request/show/391743 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=305 --- python-libmount.changes | 7 +++++++ python-libmount.spec | 18 ++++++++---------- util-linux-systemd.changes | 7 +++++++ util-linux-systemd.spec | 18 ++++++++---------- util-linux.changes | 7 +++++++ util-linux.spec | 18 ++++++++---------- 6 files changed, 45 insertions(+), 30 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 3d10eab..d711a89 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com + +- Remove incorrect --with-bashcompletiondir that breaks + bash-completion, use path in bash-completion.pc instead + (boo#977259). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/python-libmount.spec b/python-libmount.spec index 2c8989c..59d4ee1 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -75,6 +75,7 @@ Summary: %main_summary License: GPL-2.0+ Group: %main_group BuildRequires: audit-devel +BuildRequires: bash-completion BuildRequires: bc BuildRequires: binutils-devel BuildRequires: fdupes @@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi --with-ncurses \ --with-selinux \ $uhead \ - --with-bashcompletiondir=%{_datadir}/bash-completion \ --with-systemdsystemunitdir=%{_unitdir} \ --enable-libmount-force-mountinfo \ --enable-sulogin-emergency-mount \ @@ -1131,13 +1131,11 @@ fi %dir %{_datadir}/getopt %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh -# FIXME: Fix directory ownership. -%dir %{_datadir}/bash-completion -%{_datadir}/bash-completion/* +%{_datadir}/bash-completion/completions/* %if %build_util_linux_systemd -%exclude %{_datadir}/bash-completion/logger -%exclude %{_datadir}/bash-completion/lslogins -%exclude %{_datadir}/bash-completion/uuidd +%exclude %{_datadir}/bash-completion/completions/logger +%exclude %{_datadir}/bash-completion/completions/lslogins +%exclude %{_datadir}/bash-completion/completions/uuidd %endif %ifnarch ia64 m68k #XXX: post our patches upstream @@ -1267,8 +1265,8 @@ fi /bin/logger %{_bindir}/logger %{_bindir}/lslogins -%{_datadir}/bash-completion/logger -%{_datadir}/bash-completion/lslogins +%{_datadir}/bash-completion/completions/logger +%{_datadir}/bash-completion/completions/lslogins %{_mandir}/man1/logger.1.gz %{_mandir}/man1/lslogins.1.gz %{_sbindir}/rcfstrim @@ -1281,7 +1279,7 @@ fi %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %ghost %{_localstatedir}/lib/libuuid/clock.txt %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd -%{_datadir}/bash-completion/uuidd +%{_datadir}/bash-completion/completions/uuidd %{_mandir}/man8/uuidd.8.gz %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 3d10eab..d711a89 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com + +- Remove incorrect --with-bashcompletiondir that breaks + bash-completion, use path in bash-completion.pc instead + (boo#977259). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index aeea1a7..a182243 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -75,6 +75,7 @@ Summary: %main_summary License: GPL-2.0+ Group: %main_group BuildRequires: audit-devel +BuildRequires: bash-completion BuildRequires: bc BuildRequires: binutils-devel BuildRequires: fdupes @@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi --with-ncurses \ --with-selinux \ $uhead \ - --with-bashcompletiondir=%{_datadir}/bash-completion \ --with-systemdsystemunitdir=%{_unitdir} \ --enable-libmount-force-mountinfo \ --enable-sulogin-emergency-mount \ @@ -1131,13 +1131,11 @@ fi %dir %{_datadir}/getopt %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh -# FIXME: Fix directory ownership. -%dir %{_datadir}/bash-completion -%{_datadir}/bash-completion/* +%{_datadir}/bash-completion/completions/* %if %build_util_linux_systemd -%exclude %{_datadir}/bash-completion/logger -%exclude %{_datadir}/bash-completion/lslogins -%exclude %{_datadir}/bash-completion/uuidd +%exclude %{_datadir}/bash-completion/completions/logger +%exclude %{_datadir}/bash-completion/completions/lslogins +%exclude %{_datadir}/bash-completion/completions/uuidd %endif %ifnarch ia64 m68k #XXX: post our patches upstream @@ -1267,8 +1265,8 @@ fi /bin/logger %{_bindir}/logger %{_bindir}/lslogins -%{_datadir}/bash-completion/logger -%{_datadir}/bash-completion/lslogins +%{_datadir}/bash-completion/completions/logger +%{_datadir}/bash-completion/completions/lslogins %{_mandir}/man1/logger.1.gz %{_mandir}/man1/lslogins.1.gz %{_sbindir}/rcfstrim @@ -1281,7 +1279,7 @@ fi %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %ghost %{_localstatedir}/lib/libuuid/clock.txt %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd -%{_datadir}/bash-completion/uuidd +%{_datadir}/bash-completion/completions/uuidd %{_mandir}/man8/uuidd.8.gz %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service diff --git a/util-linux.changes b/util-linux.changes index 3d10eab..d711a89 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com + +- Remove incorrect --with-bashcompletiondir that breaks + bash-completion, use path in bash-completion.pc instead + (boo#977259). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/util-linux.spec b/util-linux.spec index 9147590..78a10de 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -75,6 +75,7 @@ Summary: %main_summary License: GPL-2.0+ Group: %main_group BuildRequires: audit-devel +BuildRequires: bash-completion BuildRequires: bc BuildRequires: binutils-devel BuildRequires: fdupes @@ -531,7 +532,6 @@ AUTOPOINT=true autoreconf -vfi --with-ncurses \ --with-selinux \ $uhead \ - --with-bashcompletiondir=%{_datadir}/bash-completion \ --with-systemdsystemunitdir=%{_unitdir} \ --enable-libmount-force-mountinfo \ --enable-sulogin-emergency-mount \ @@ -1131,13 +1131,11 @@ fi %dir %{_datadir}/getopt %attr (755,root,root) %{_datadir}/getopt/getopt-parse.bash %attr (755,root,root) %{_datadir}/getopt/getopt-parse.tcsh -# FIXME: Fix directory ownership. -%dir %{_datadir}/bash-completion -%{_datadir}/bash-completion/* +%{_datadir}/bash-completion/completions/* %if %build_util_linux_systemd -%exclude %{_datadir}/bash-completion/logger -%exclude %{_datadir}/bash-completion/lslogins -%exclude %{_datadir}/bash-completion/uuidd +%exclude %{_datadir}/bash-completion/completions/logger +%exclude %{_datadir}/bash-completion/completions/lslogins +%exclude %{_datadir}/bash-completion/completions/uuidd %endif %ifnarch ia64 m68k #XXX: post our patches upstream @@ -1267,8 +1265,8 @@ fi /bin/logger %{_bindir}/logger %{_bindir}/lslogins -%{_datadir}/bash-completion/logger -%{_datadir}/bash-completion/lslogins +%{_datadir}/bash-completion/completions/logger +%{_datadir}/bash-completion/completions/lslogins %{_mandir}/man1/logger.1.gz %{_mandir}/man1/lslogins.1.gz %{_sbindir}/rcfstrim @@ -1281,7 +1279,7 @@ fi %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %ghost %{_localstatedir}/lib/libuuid/clock.txt %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd -%{_datadir}/bash-completion/uuidd +%{_datadir}/bash-completion/completions/uuidd %{_mandir}/man8/uuidd.8.gz %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service From 15f40b602e9c2e2220e60b9176d077821b3ecd56b6f7bae7a42e048c8a311566 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Mon, 2 May 2016 22:32:08 +0000 Subject: [PATCH 3/4] Accepting request 393319 from home:sbrabec:branches:util-linux-bsc977259 - Add librtas-devel to BuildRequires on Power platforms. Needed for proper function of lscpu (bsc#975082). Also add Conflicts to bash-completion change. OBS-URL: https://build.opensuse.org/request/show/393319 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=306 --- python-libmount.changes | 6 ++++++ python-libmount.spec | 5 +++++ util-linux-systemd.changes | 6 ++++++ util-linux-systemd.spec | 5 +++++ util-linux.changes | 6 ++++++ util-linux.spec | 5 +++++ 6 files changed, 33 insertions(+) diff --git a/python-libmount.changes b/python-libmount.changes index d711a89..302d6f4 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -5,6 +5,12 @@ Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com bash-completion, use path in bash-completion.pc instead (boo#977259). +------------------------------------------------------------------- +Fri Apr 22 16:41:34 CEST 2016 - sbrabec@suse.com + +- Add librtas-devel to BuildRequires on Power platforms. Needed for + proper function of lscpu (bsc#975082). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/python-libmount.spec b/python-libmount.spec index 59d4ee1..88695ca 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -90,6 +90,9 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +%ifarch ppc ppc64 ppc64le +BuildRequires: librtas-devel +%endif %if %verify_sig BuildRequires: gpg-offline %endif @@ -175,6 +178,8 @@ Obsoletes: login < 4.0-33.7 Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 +# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). +Conflicts: bash-completion <= 2.1-13.1 # bnc#805684: %ifarch s390x Obsoletes: s390-32 diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index d711a89..302d6f4 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -5,6 +5,12 @@ Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com bash-completion, use path in bash-completion.pc instead (boo#977259). +------------------------------------------------------------------- +Fri Apr 22 16:41:34 CEST 2016 - sbrabec@suse.com + +- Add librtas-devel to BuildRequires on Power platforms. Needed for + proper function of lscpu (bsc#975082). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index a182243..7a96495 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -90,6 +90,9 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +%ifarch ppc ppc64 ppc64le +BuildRequires: librtas-devel +%endif %if %verify_sig BuildRequires: gpg-offline %endif @@ -175,6 +178,8 @@ Obsoletes: login < 4.0-33.7 Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 +# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). +Conflicts: bash-completion <= 2.1-13.1 # bnc#805684: %ifarch s390x Obsoletes: s390-32 diff --git a/util-linux.changes b/util-linux.changes index d711a89..302d6f4 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -5,6 +5,12 @@ Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com bash-completion, use path in bash-completion.pc instead (boo#977259). +------------------------------------------------------------------- +Fri Apr 22 16:41:34 CEST 2016 - sbrabec@suse.com + +- Add librtas-devel to BuildRequires on Power platforms. Needed for + proper function of lscpu (bsc#975082). + ------------------------------------------------------------------- Wed Apr 13 21:29:00 UTC 2016 - sweet_f_a@gmx.de diff --git a/util-linux.spec b/util-linux.spec index 78a10de..608f8cd 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -90,6 +90,9 @@ BuildRequires: pkg-config BuildRequires: readline-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +%ifarch ppc ppc64 ppc64le +BuildRequires: librtas-devel +%endif %if %verify_sig BuildRequires: gpg-offline %endif @@ -175,6 +178,8 @@ Obsoletes: login < 4.0-33.7 Conflicts: coreutils < 8.21 # File conflict of sulogin and utmpdump (up to 12.3 and SLE11). Conflicts: sysvinit-tools < 2.88+-87 +# File conflicts of completion files with <= Leap 42.1 and <= SLE12 SP1 (fixed by SLE12 Update, boo#977259#c3). +Conflicts: bash-completion <= 2.1-13.1 # bnc#805684: %ifarch s390x Obsoletes: s390-32 From 02b4738ea86654dfb840a8fd7fc09dc26c7f514538bcf496ec1744c73700f300 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 23 May 2016 15:22:26 +0000 Subject: [PATCH 4/4] Accepting request 396830 from home:sbrabec:branches:util-linux-bsc976141 According to Arvin Schnell, we need these fixes in openSUSE Factory now. Otherwise they cannot commit code using parted --wipesignatures. - blkid: Wipe corect area for probes with offset (bsc#976141, util-linux-libblkid-wipe-offset.patch). OBS-URL: https://build.opensuse.org/request/show/396830 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=307 --- python-libmount.changes | 6 ++ python-libmount.spec | 3 + util-linux-libblkid-wipe-offset.patch | 100 ++++++++++++++++++++++++++ util-linux-systemd.changes | 6 ++ util-linux-systemd.spec | 3 + util-linux.changes | 6 ++ util-linux.spec | 3 + 7 files changed, 127 insertions(+) create mode 100644 util-linux-libblkid-wipe-offset.patch diff --git a/python-libmount.changes b/python-libmount.changes index 302d6f4..e0a1faf 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 19 14:29:27 CEST 2016 - sbrabec@suse.com + +- blkid: Wipe corect area for probes with offset (bsc#976141, + util-linux-libblkid-wipe-offset.patch). + ------------------------------------------------------------------- Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com diff --git a/python-libmount.spec b/python-libmount.spec index 88695ca..c48bcda 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -155,6 +155,8 @@ Source51: blkid.conf ## ## util-linux patches ## +# PATCH-FIX-UPSTREAM util-linux-libblkid-wipe-offset.patch bsc976141 sbrabec@suse.com -- blkid: Wipe corect area for probes with offset +Patch: util-linux-libblkid-wipe-offset.patch # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -392,6 +394,7 @@ library. xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %endif %setup -q -n %{_name}-%{version} -b 40 +%patch -p1 %patch4 -p1 # # setctsid diff --git a/util-linux-libblkid-wipe-offset.patch b/util-linux-libblkid-wipe-offset.patch new file mode 100644 index 0000000..e2b82d7 --- /dev/null +++ b/util-linux-libblkid-wipe-offset.patch @@ -0,0 +1,100 @@ +From 445e6b1ec82642a298419bdd18a81110593bfbaa Mon Sep 17 00:00:00 2001 +From: Petr Uzel +Date: Mon, 18 Apr 2016 16:22:05 +0200 +Subject: [PATCH] libblkid: make blkid_do_wipe() work with probes with offset + +When a probe is created with an offset, e.g. via +blkid_probe_set_device(), this offset is correctly used when looking for +the signatures, but is not respected by blkid_do_wipe() function. +Therefore the signature is removed from an invalid location. + +Usecase: Wiping signatures from an area on the block device where +partition is to be created (but as it does not exist yet, there's no +device node for it and probe on the whole block device has to be used +with correct offset and length). + +Reproducer: +======================== wiper.c =========================== + +const char *dev; +unsigned long offset; +unsigned long size; + +int main(int argc, char** argv) { + + if (argc != 4) { + printf("usage: wiper dev offset size\n"); + exit(1); + } + + dev = argv[1]; + offset = strtoull(argv[2], NULL, 10); + size = strtoull(argv[3], NULL, 10); + + printf("dev=%s, off=%llu, size=%llu\n", dev, offset, size); + + int fd = open (dev, O_RDWR); + if (fd == -1) { + perror("open"); + exit(1); + } + + blkid_loff_t wipe_offset = offset * SECTOR_SIZE; + blkid_loff_t wipe_size = size * SECTOR_SIZE; + + int ret; + + blkid_probe pr; + pr = blkid_new_probe(); + if (!pr) + return 0; + ret = blkid_probe_set_device(pr, fd, wipe_offset, wipe_size); + ret = blkid_probe_enable_superblocks(pr, 1); + ret = blkid_probe_set_superblocks_flags(pr, BLKID_SUBLKS_MAGIC); + + while (blkid_do_probe(pr) == 0) { + ret = blkid_do_wipe(pr, 0); + } + + blkid_free_probe(pr); + close(fd); +} +======================== wiper.c =========================== + +Steps to reproduce: +modprobe scsi_debug +parted -s /dev/sdX mklabel gpt +parted -s /dev/sdX mkpart first 2048s 4095s +mkfs.ext2 /dev/sdX1 + +wipefs -np /dev/sdX1 + +./wiper /dev/sdX1 2048 2048 + +Actual result: wiper gets into endless loop, because +blkid_do_wipe() wipes at wrong location (1080), leaving the signature +on /dev/sdc1. So it is again found by blkid_do_probe(), and so on. + +Expected result: wiper clears the ext2 signature at offset 1049656(=1080+2048*512). + +Signed-off-by: Petr Uzel +--- + libblkid/src/probe.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libblkid/src/probe.c b/libblkid/src/probe.c +index 34d97b8..0c8625c 100644 +--- a/libblkid/src/probe.c ++++ b/libblkid/src/probe.c +@@ -1121,7 +1121,7 @@ int blkid_do_wipe(blkid_probe pr, int dryrun) + if (rc || len == 0 || off == NULL) + return 0; + +- offset = strtoumax(off, NULL, 10); ++ offset = strtoumax(off, NULL, 10) + pr->off; + fd = blkid_probe_get_fd(pr); + if (fd < 0) + return -1; +-- +2.8.1 + diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 302d6f4..e0a1faf 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 19 14:29:27 CEST 2016 - sbrabec@suse.com + +- blkid: Wipe corect area for probes with offset (bsc#976141, + util-linux-libblkid-wipe-offset.patch). + ------------------------------------------------------------------- Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 7a96495..1564473 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -155,6 +155,8 @@ Source51: blkid.conf ## ## util-linux patches ## +# PATCH-FIX-UPSTREAM util-linux-libblkid-wipe-offset.patch bsc976141 sbrabec@suse.com -- blkid: Wipe corect area for probes with offset +Patch: util-linux-libblkid-wipe-offset.patch # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -392,6 +394,7 @@ library. xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %endif %setup -q -n %{_name}-%{version} -b 40 +%patch -p1 %patch4 -p1 # # setctsid diff --git a/util-linux.changes b/util-linux.changes index 302d6f4..e0a1faf 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 19 14:29:27 CEST 2016 - sbrabec@suse.com + +- blkid: Wipe corect area for probes with offset (bsc#976141, + util-linux-libblkid-wipe-offset.patch). + ------------------------------------------------------------------- Tue Apr 26 18:24:40 CEST 2016 - sbrabec@suse.com diff --git a/util-linux.spec b/util-linux.spec index 608f8cd..6ca47c7 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -155,6 +155,8 @@ Source51: blkid.conf ## ## util-linux patches ## +# PATCH-FIX-UPSTREAM util-linux-libblkid-wipe-offset.patch bsc976141 sbrabec@suse.com -- blkid: Wipe corect area for probes with offset +Patch: util-linux-libblkid-wipe-offset.patch # PATCH-EXTEND-UPSTREAM: Let `su' handle /sbin and /usr/sbin in path Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -392,6 +394,7 @@ library. xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %endif %setup -q -n %{_name}-%{version} -b 40 +%patch -p1 %patch4 -p1 # # setctsid