Commit Graph

249 Commits

Author SHA256 Message Date
a15bb30f60 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
2016-04-26 22:14:30 +00:00
f7f92f04d8 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
2016-04-24 09:08:55 +00:00
afb635ea16 Accepting request 389157 from home:rudi_m:branches:Base:System
- Update to version 2.28:
  * Many changes and improvements, most notably ...
  * Security issue: CVE-2016-2779 is NOT FIXED yet.
- Remove old util-linux-noenc-suse.patch

OBS-URL: https://build.opensuse.org/request/show/389157
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=302
2016-04-13 16:27:53 +00:00
ad43cdf969 Accepting request 346995 from home:rudi_m:branches:Base:System
- enable last binary

OBS-URL: https://build.opensuse.org/request/show/346995
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=300
2015-12-02 15:46:14 +00:00
8ae9c81d4b Accepting request 344239 from home:rudi_m:branches:Base:System
- Update to version 2.27.1, bugfix release, see
  ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.27/v2.27.1-ReleaseNotes

OBS-URL: https://build.opensuse.org/request/show/344239
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=298
2015-11-18 13:40:14 +00:00
Ruediger Meier
0f95aba1a5 Accepting request 343844 from home:Andreas_Schwab:Factory
- Change condition for known fail markers from test for armv6 and aarch64
  architecture to test for qemu user-space build

OBS-URL: https://build.opensuse.org/request/show/343844
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=297
2015-11-11 15:13:29 +00:00
084885cb28 Add changes line for the new bug.
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=295
2015-10-21 17:27:20 +00:00
3e79b1f05f Accepting request 333182 from home:sbrabec:branches:util-linux-2.27
- Update to version 2.27:
  * Many changes and improvements, most notably:
    * lsipc: new command
    * unshare provides a new option --propagation=
    * mount(8) supports read-only binds in one (not atomic) step by
      "bind,ro".
    * GNU readline support in fdisk and sfdisk.
    * JSON support in libsmartcols and findmnt, losetup, lsblk,
      lslocks, sfdisk and lsipc.
    * script has been massively improved to be more robust and less
      complex (bsc#888678, bsc#930236).
    * sulogin supports locked root accounts by --force.
    * colors support by default. It is possible to change this
      with --disable-colors-default.
    * more information in cfdisk
    * fdisk provides new commands 'F' and 'i'
    * cal supports the new options --twelve and --months <n>
    * rtcwake supports a news option --list-modes and --date, no
      support RTC_ALM_READ and RTC_ALM_SET fallbacks any more.
  * Many fixes, most notably:
    * fsck: now supports -r {fd} (bsc#903738)
    * better handling of multi-path devices
      (bsc#880468, bsc#924994)
    * flock: improve timeout handling (bsc#926945)
    * lsblk: display mountpoint even for top-level device
      (bsc#943415)

OBS-URL: https://build.opensuse.org/request/show/333182
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=293
2015-09-27 10:49:19 +00:00
28f19aa913 Accepting request 324668 from home:sbrabec:branches:util-linux-license
- Add licenses.

OBS-URL: https://build.opensuse.org/request/show/324668
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=292
2015-08-26 15:18:04 +00:00
ae1b79cbf4 Accepting request 321271 from home:sbrabec:branches:systemd-preset
Submit to Factory depends on request 320740.
- Add %systemd_preset_pre and %systemd_preset_posttrans that will
  do one shot presetting of uuidd.service on upgrade.
  (bnc#900935#c46, FATE#318949).
- Remove one shot presetting hacks.

OBS-URL: https://build.opensuse.org/request/show/321271
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=291
2015-08-17 20:19:53 +00:00
eb649bd6cc Fix characters broken on UTF-8 conversion of changes file.
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=288
2015-06-08 15:29:20 +00:00
Stefan Seyfried
ef6afabe04 Accepting request 308635 from home:elvigia:branches:Base:System
- Build with --enable-libmount-force-mountinfo the rationale is
 identical to the following commit message --> http://bit.ly/1eqf5GO
 The default behaviour is undesirable and fragile when using
 systemd.

- Build with --enable-libmount-force-mountinfo the rationale is
 identical to the following commit message --> http://bit.ly/1eqf5GO
 The default behaviour is undesirable and fragile when using
 systemd.

- Build with --enable-libmount-force-mountinfo the rationale is
 identical to the following commit message --> http://bit.ly/1eqf5GO
 The default behaviour is undesirable and fragile when using
 systemd.

OBS-URL: https://build.opensuse.org/request/show/308635
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=286
2015-05-30 13:36:10 +00:00
e043c3494a Accepting request 305074 from home:rudi_m:branches:Base:System
- Update to util-linux-2.26.2:
  * many fixes, most notable for logger, *fdisks and mount
  * (lib)mount, add support for MS_LAZYTIME
- disable libmount/lock test to avoid random timeouts
- socat is needed for logger tests

OBS-URL: https://build.opensuse.org/request/show/305074
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=284
2015-05-07 21:30:28 +00:00
9d98665aee Accepting request 290677 from home:rudi_m:branches:Base:System
- Update to util-linux-2.26.1:
  * cal(1): do not segfault when TERM is not defined or wrong
    (bnc#903440)
  * logger(1): major fixes and enhancements
  * agetty(8): support /usr/lib/os-release too 
  * some more fixes, mostly minor ones, see ReleaseNotes
- re-enable fixed tests (fdisk/bsd, ppc64le)

OBS-URL: https://build.opensuse.org/request/show/290677
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=282
2015-03-13 16:45:58 +00:00
49ba4278c4 Accepting request 287948 from home:sbrabec:branches:util-linux-2.26
- Update to util-linux-2.26:
  * based on the git master branch of util-linux, remove backported
    patches (util-linux-libblkid-unsafe-chars.patch,
    util-linux-libblkid-overflow.patch)
  * zramctl(8): this NEW COMMAND allows to control /dev/zramN
    devices
  * agetty(8): supports new option --reload to force already
    running agetty processes to reprint the /etc/issue file
  * cfdisk(8), sfdisk(8) and fdisk(8): support sfdisk-compatible
    scripts; it's possible to save your partitioning layout to text
    files and (re)use it in all fdisks
  * fdisk(8), sfdisk(8): support new command-line option "--output
    <list>" to specify output columns for --list or print commands
  * nsenter(1): has been updated to work with the latest kernel
    changes in user namespaces supports new command-line option
    --preserve-credentials
  * unshare(1): has been updated to work with the latest kernel
    changes in user namespaces supports new command-line option
    "--setgroups=<deny|allow>"
  * swapon(8): supports new command-line option "-o <list>" with
    the same semantics as -o for mount(8); it's now possible to
    specify swap options on the command line by the same string as
    in fstab
  * fdformat(8): supports new command-line options --from and --to
    to specify tracks and --repair for broken floppies
  * getopt(1): has been updated to the latest version (originally
    maintained outside of util-linux) and refactored
  * ldattach(8): has been improved to support GSM0710 and intro
    modem commands
  * logger(1): supports new command-line option --id= to specify
    PID (or another ID) allows to specify --rfc3164 or --rfc5424
    syslog protocols
  * libfdisk: the library is distributed as a shared library with a
    stable API and a standard header file
  * libmount: provides a new simple API to monitor mount-table
    changes (including changes in userspace mount options)
- Fix lack of I18N support in util-linux-systemd (mis-compilation).

OBS-URL: https://build.opensuse.org/request/show/287948
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=280
2015-02-26 16:53:58 +00:00
81b4c54379 Accepting request 287249 from home:elvigia:branches:Base:System
- Build with FULL RELRO. 

- Build with FULL RELRO. 

- Build with FULL RELRO.

OBS-URL: https://build.opensuse.org/request/show/287249
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=279
2015-02-26 14:56:32 +00:00
Ruediger Meier
adcdd75a4f Accepting request 285782 from home:rudi_m:branches:Base:System
update Changelog to reference removed patches

OBS-URL: https://build.opensuse.org/request/show/285782
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=277
2015-02-12 10:24:09 +00:00
Ruediger Meier
4ff0b958d1 Accepting request 285684 from home:rudi_m:branches:Base:System
- define upstream source for klogconsole and remove patches
- remove openSUSE 13.1 specific eject permissions, did not worked
  anyway since eject-fpie.patch was removed
- always call autoreconf, not only for splitted packages, skip
  autopoint (gettext)

Both removed patches are upstream. We only import whitespace
changes from upstream.

BTW python-libmount.spec was again not in sync ...

OBS-URL: https://build.opensuse.org/request/show/285684
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=276
2015-02-12 10:11:35 +00:00
Stephan Kulow
5108010c84 Accepting request 284526 from home:dimstar:Factory
- Do not try to unregister an info file (ipc.info.gz) which we do
  not own. Already in May 2011, we stopped registering it: "do not
  register ipc.info.gz (not provided by this package)".

OBS-URL: https://build.opensuse.org/request/show/284526
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=275
2015-02-06 20:28:51 +00:00
2228e7f396 - libblkid: care about unsafe chars and possible buffer overflow
in cache (CVE-2014-9114, util-linux-libblkid-unsafe-chars.patch,
  util-linux-libblkid-overflow.patch, bsc#907434)

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=274
2015-02-04 18:38:40 +00:00
74542b9d34 2.25.2 does not fix CVE-2014-9114 = bsc#907434, only boo#908742!
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=273
2015-02-04 17:39:12 +00:00
09c19db627 Accepting request 284097 from home:sbrabec:branches:Base:System
Include upgrade bug#.

OBS-URL: https://build.opensuse.org/request/show/284097
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=272
2015-02-04 17:32:09 +00:00
762e4eea01 Accepting request 283347 from home:rudi_m:branches:Base:System
- Update to version 2.25.2: mostly minor fixes
- re-enable utmpdump and ipcs tests for all archs

OBS-URL: https://build.opensuse.org/request/show/283347
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=271
2015-02-04 17:16:01 +00:00
cfb71fe912 Accepting request 281437 from home:AndreasSchwab:f
- Use util-linux:/bin/logger as split-provide,
  /usr/lib/systemd/system/fstrim.service didn't exist in 13.1

OBS-URL: https://build.opensuse.org/request/show/281437
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=270
2015-01-30 15:19:56 +00:00
Tomáš Chvátal
7075a24d0a Accepting request 280719 from home:jengelh:branches:Base:System
OBS-URL: https://build.opensuse.org/request/show/280719
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=268
2015-01-15 14:35:14 +00:00
dae2b34561 Accepting request 260840 from home:Andreas_Schwab:Factory
- Remove known fail marker for fdisk/bsd on ppc, ppc64, s390, s390x

OBS-URL: https://build.opensuse.org/request/show/260840
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=266
2014-11-12 20:02:45 +00:00
758223c093 Accepting request 258555 from home:sbrabec:branches:util-linux
- Fix mis-compilation of libuuid without uuidd support
  (bnc#900935).
- Fix uuidd socket activation (bnc#900935).
- Remove obsolete sysvinit script for uuidd.
- Remove no more needed uuidd permissions stuff.
- Replace PreReq for obsolete pwdutils by names of binaries.
- Add fstrim service scripts and rcfstrim helper.

OBS-URL: https://build.opensuse.org/request/show/258555
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=264
2014-10-31 15:22:34 +00:00
da8e6cf85d Accepting request 248084 from home:sbrabec:branches:Base:System
- Install runuser and runuser-l PAM file
  (runuser.pamd, bnc#892079).

OBS-URL: https://build.opensuse.org/request/show/248084
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=262
2014-09-12 17:54:43 +00:00
ae9de3e9c5 Accepting request 247592 from home:sbrabec:branches:Base:System
- Update to version 2.25.1:
  * bug fixes (removed util-linux-bash-completion-blockdev.patch,
    util-linux-slash-in-format-string.patch)
  * translation updates
  * correct support for plurals
  * gpt: use real sector size to set PTMAGIC_OFFSET
  * gpt: add Microsoft Storage Spaces GUID
  * libmount: use -t for type.subtype in helpers API
  * erase all traces of the long-obsolete xiafs

OBS-URL: https://build.opensuse.org/request/show/247592
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=260
2014-09-05 10:56:25 +00:00
f4901b361d Accepting request 246531 from home:Andreas_Schwab:Factory
- Always mark ipcs/limits and misc/setarch as known failure

OBS-URL: https://build.opensuse.org/request/show/246531
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=254
2014-08-26 14:12:01 +00:00
fc2658a44f Accepting request 246438 from home:pgajdos
- fix parsing of slash in the format string [bnc#889934] (internal)
- added patches:
  * util-linux-slash-in-format-string.patch

OBS-URL: https://build.opensuse.org/request/show/246438
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=253
2014-08-26 13:58:36 +00:00
5ae4f018c0 - Remove hacks for format_spec_file and source_validator
(bnc#891152, bnc#891829).
- Use macro defined summary that passes both SLE and openSUSE
  check-in QA scripts (invented by Ruediger Oertel).

OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=250
2014-08-21 20:06:54 +00:00
Tomáš Chvátal
4b9855b405 Accepting request 244468 from home:sbrabec:branches:Base:System
This update needs a special care:

1)
After first successful build on all platforms, "osc meta prjconf Base:System" must include:

%if 0%{?suse_version} > 1310
Preinstall: libsmartcols1
%endif

2)
You also need to make symlinks to util-linux-systemd and python-libmount.

And finally, this package is intended only for > 1310 (i. e. Factory).

3)
The spec file can have problems with (buggy) Factory check-in check:
ERROR: python-libmount: group for main package not set

There is false error and I have no work-around for this just now.

(If you want, please ping me (by mail) after package review, and I'll do all needed changes.)

- Update to version 2.25
  (using work of Ruediger Meier <sweet_f_a@gmx.de>):
  * based on the git master branch of util-linux
  * many fixes (including bnc#869355, bnc#871951 and
    bnc#871698#c49)
  * new Python binding sub-package for libmount: python-libmount
  * new library: libsmartcols
  * new commands: lslogins, setpriv
  * add fstrim systemd timer
  * better systemd integration
  * DROPPED command:
    * cytune: Upstream decided to remove tool untested for years
      that supports this old hardware.
- Dropped patches included in the upstream:
    (*git) Included with no changes
    (+git) Included with improvements
    (!git) Included with differences
  * support-other-tty-lines-not-vconsole.patch           (*b9c7390)
  * agetty-fooled-on-serial-line-due-plymouth.patch,
  * sulogin-fooled-on-tty-line-due-plymouth.patch        (*bb280f7)
  * agetty-on-s390-on-dev-3270-tty1-line.patch           (*f2bcda5)
  * sulogin-does-not-find-any-console.patch              (*624b204)
  * util-linux-setarch-uname26.patch                     (*f6eb160)
  * util-linux-ng-2.16-squashfs3-detect.patch            (*11402f5)
  * util-linux-lscpu-improve-hypervisor-detection.patch
                     (!b774473, b32488c, 5bd31c6, 0f0c558, 96ce475)
    WARNING, INCOMPATIBLE CHANGE: "lscpu -p" no more reports
    hypervisor, as it breaks standard behavior. Use standard output
    instead! (FATE#310255)
  * blkid-stop-scanning-on-I-O-error.patch               (+296d96e)
  * blkid-convert-superblocks-to-new-calling-convention.patch
                                                         (+37f4060)
  * util-linux-libblkid-ext-probe.patch                  (*a1ca32f)
  * util-linux-hwclock-drift-check.patch                 (*f196fd1)
  * util-linux-hwclock-adjtime-check.patch               (*db8fc5f)
- Dropped obsolete patch:
  * util-linux-2.23.1-eject-fpie.patch      (eject is no more SUID)
  * util-linux-2.24-fdisk_remove_bogus_warnings.patch
                             (upstream fixed it in a different way)
  * util-linux-HACK-boot.localfs.diff
                         (MOUNT_PRINT_SOURCE is no more referenced)
- Ported and renamed:
  * util-linux-2.23.1-noenc-suse.diff
    -> util-linux-noenc-suse.patch
- Split spec file to three stages:
  * util-linux.spec: Everything that do not need python or systemd.
  * util-linux-systemd.spec: Stuff that needs systemd:
    util-linux-systemd and uuidd
    NOTE: Not building systemd-less variants of utilities.
  * python-libmount.spec: Just python-libmount
- Move bash-completion files to correct packages.
- Add patch util-linux-bash-completion-blockdev.patch.
- Add hacks to prevent damaging of spec files by format_spec_file
  (bnc#891152, also edited util-linux-rpmlintrc).
- use nologin from upstream (was added in 2.24)

OBS-URL: https://build.opensuse.org/request/show/244468
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=248
2014-08-21 09:54:57 +00:00
Stephan Kulow
ed823ddc37 Accepting request 242479 from home:dimstar:branches:Base:System
Really fix it

OBS-URL: https://build.opensuse.org/request/show/242479
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=246
2014-07-26 11:53:59 +00:00
Stephan Kulow
8470bfdd47 - fix requires of devel-static packages
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=245
2014-07-26 09:39:46 +00:00
Stephan Kulow
8a35765de5 Accepting request 242233 from home:dsterba:branches:Base:System
SR: the static packages should not be used normally, but can be used
by standalone rescue utilities (planned for btrfsprogs).

- enable build of libmount-devel-static, libuuid-devel-static and
  libblkid-devel-static

OBS-URL: https://build.opensuse.org/request/show/242233
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=244
2014-07-25 07:31:27 +00:00
Ruediger Meier
4f89b2fa1a Accepting request 235657 from home:rudi_m:xxx
- use nologin from upstream (was added in 2.24) 
- remove unknown configure options
- remove unused and outdated suse READMEs
- require bc for checks

OBS-URL: https://build.opensuse.org/request/show/235657
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=242
2014-05-28 10:59:39 +00:00
Ruediger Meier
c56100b554 Accepting request 234334 from home:rudi_m:branches:uuu
squashed sr234195  and re-submitted

- Prevent excessive clock drift calculations (bnc#871698,
  util-linux-prevent-excessive-clock-drift-calculations.patch),
  committed by sbrabec@suse.cz

OBS-URL: https://build.opensuse.org/request/show/234334
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=240
2014-05-20 18:42:15 +00:00
Dr. Werner Fink
32c852e202 .
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=239
2014-05-08 08:24:58 +00:00
Dr. Werner Fink
d478c097f8 .
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=237
2014-05-07 14:13:18 +00:00
Dr. Werner Fink
23975498de .
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=235
2014-05-07 13:37:00 +00:00
e41b22aefc Accepting request 231272 from home:rudi_m:branches:util-linux
- minor update to util-linux 2.24.2
- remove tty3270-on-serial-line-of-s390.patch (was already upstream
  since 2.24.1)
- remove barrier_documentation.patch (applied upstream)
- rebase blkid-convert-superblocks-to-new-calling-convention.patch

OBS-URL: https://build.opensuse.org/request/show/231272
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=233
2014-04-28 09:28:44 +00:00
737b1a31db Accepting request 230696 from home:sbrabec:branches:Base:System
- Enable socket activation needed by systemd service (bnc#872807).

- libblkid: Drop the broken ext2/ext3/ext4 discrimination logic
  (util-linux-libblkid-ext-probe.patch, bnc#864703).

- Abort blkid probing on I/O errors (bnc#859062,
  blkid-stop-scanning-on-I-O-error.patch,
  blkid-convert-superblocks-to-new-calling-convention.patch,
  http://www.spinics.net/lists/util-linux-ng/msg08976.html)

OBS-URL: https://build.opensuse.org/request/show/230696
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=231
2014-04-17 21:31:05 +00:00
Stephan Kulow
4cf84bd5f1 Accepting request 228719 from home:rudi_m:uuu
- remove unnecessarily added patches from SLE11:
  * util-linux-update-default-commit-interval.patch, openSUSE  has
    never changed the default and neither will SLE12
  * sfdisk-warn-about-2TB-limit.patch, fixed by upstream years ago
  * umount-avoid-readlink.patch, this patch only affects unused
    code and the used code does not have this bug
- edit util-linux-lscpu-improve-hypervisor-detection.patch to not
  change the default behaviour of "lscpu -p" as documented in it's
  man page. Now this patch only affects the summary output.

Also see discussion here
http://lists.opensuse.org/opensuse-factory/2014-03/msg00256.html

OBS-URL: https://build.opensuse.org/request/show/228719
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=229
2014-04-04 14:54:05 +00:00
1806747cca Accepting request 226509 from home:sbrabec:branches:Base:System
- Merge fixes and features from SLE11 (bnc#831868):
  * Detect squashfs version <= 3 as squashfs3 and version >= 4 as
    squashfs. (mszeredi@suse.cz,
    util-linux-ng-2.16-squashfs3-detect.patch, bnc#666893)
  * add sfdisk-warn-about-2TB-limit.patch (puzel@novell.com,
    bnc#495657)
  * Document barrier option in mount.8 (jack@suse.cz,
    hvogel@suse.de,
    util-linux-ng-2.19.1-barrier_documentation.patch, bnc#489740)
  * lscpu: improve hypervisor detection (puzel@novell.com,
    fate#310255)
    - util-linux-lscpu-improve-hypervisor-detection.patch
  * umount: avoid calling readlink on mountpoints if not necessary
    - add: umount-avoid-readlink.patch (puzel@suse.com, bnc#794529)
  * fix file conflict between util-linux and s390-32
    (puzel@suse.com, bnc#805684)
  * util-linux-update-default-commit-interval.patch:
    mount(8): update default commit interval (puzel@suse.com,
    bnc#809480)
  * Obsolete no more packaged uuid-runtime.
- Add uname26 (util-linux-setarch-uname26.patch, FATE#313476).

OBS-URL: https://build.opensuse.org/request/show/226509
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=227
2014-03-20 08:19:43 +00:00
Dr. Werner Fink
7309d0e418 .
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=225
2014-03-06 09:46:46 +00:00
d4b4a095b8 Accepting request 221543 from home:AndreasStieger:branches:Base:System
util-linux 2.24.1

OBS-URL: https://build.opensuse.org/request/show/221543
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=223
2014-02-13 08:09:46 +00:00
Dr. Werner Fink
1cc5bcfa90 .
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=221
2014-02-07 16:00:10 +00:00
Dr. Werner Fink
e66e0cdc2e .
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=219
2014-02-06 10:05:12 +00:00
Dr. Werner Fink
447cc5648c .
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=217
2014-02-04 12:04:58 +00:00