Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2014-11-07 14:07:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/python-libmount.changes 2014-09-28 19:53:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new/python-libmount.changes 2014-11-07 14:07:05.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Oct 17 21:18:43 CEST 2014 - [email protected] + +- 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. + +------------------------------------------------------------------- util-linux-systemd.changes: same change util-linux.changes: same change Old: ---- uuidd.rc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libmount.spec ++++++ --- /var/tmp/diff_new_pack.mjUM6g/_old 2014-11-07 14:07:07.000000000 +0100 +++ /var/tmp/diff_new_pack.mjUM6g/_new 2014-11-07 14:07:07.000000000 +0100 @@ -152,7 +152,6 @@ Source29: mkzimage_cmdline.c Source31: addnote.c # -Source50: uuidd.rc Source51: blkid.conf ## ## util-linux patches @@ -219,6 +218,7 @@ Provides: util-linux:/usr/lib/systemd/system/fstrim.service # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 Conflicts: util-linux < 2.25 +%systemd_requires %else # ERROR: No build_* variables are set. %endif @@ -350,12 +350,11 @@ %package -n uuidd Summary: Helper daemon to guarantee uniqueness of time-based UUIDs Group: System/Filesystems -PreReq: %fillup_prereq -PreReq: %insserv_prereq -PreReq: permissions -PreReq: pwdutils +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd # uuidd bash-completion moved to a correct package Conflicts: util-linux < 2.25 +%systemd_requires %description -n uuidd The uuidd package contains a userspace daemon (uuidd) which guarantees @@ -394,6 +393,13 @@ popd %build +#BEGIN CONFIG ALTER +%if !%build_util_linux_systemd +# We are not building util_linux_systemd => we are not building uuidd +# But we want libuuid with support of uuidd. The default configure disables it as well. +sed -i '/^AM_CONDITIONAL.*BUILD_UUIDD/a AC_DEFINE([HAVE_UUIDD], [1], [Define to 1 if you want to use uuid daemon.])' configure.ac +%endif +#END CONFIG ALTER %if %build_util_linux pushd ../klogconsole # klogconsole build @@ -570,6 +576,8 @@ --without-python \ %endif # +# Safety check: HAVE_UUIDD should be always 1: +grep -q 'HAVE_UUIDD 1' config.h make %{?_smp_mflags} # %if %build_util_linux @@ -767,17 +775,18 @@ # install systemd files manually, don't use Makefile that expect build of utilities and its dependencies. %endif %if %build_util_linux_systemd -mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}/bin mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid mkdir -p %{buildroot}/run/uuidd -install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd +mkdir -p %{buildroot}/usr/lib/systemd/system-preset ln -s %{_bindir}/logger %{buildroot}/bin # clock.txt from uuidd is a ghost file touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt -# rcuuidd helper -ln -sf ../..%{_sysconfdir}/init.d/uuidd %{buildroot}%{_sbindir}/rcuuidd +ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd +ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim +# Use socket activated uuidd by default. +echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset %if !%build_util_linux %make_install %endif @@ -845,24 +854,42 @@ %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. +%pre -n util-linux-systemd +%{service_add_pre fstrim.service fstrim.timer} + +%post -n util-linux-systemd +%{service_add_post fstrim.service fstrim.timer} + +%preun -n util-linux-systemd +%{service_del_preun fstrim.service fstrim.timer} + +%postun -n util-linux-systemd +%{service_del_postun fstrim.service fstrim.timer} + %pre -n uuidd -%{_sbindir}/groupadd -r uuidd 2>/dev/null || : -%{_sbindir}/useradd -r -g uuidd -c "User for uuidd" \ +/usr/sbin/groupadd -r uuidd 2>/dev/null || : +/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : - -%preun -n uuidd -%{stop_on_removal uuidd} +%{service_add_pre uuidd.socket uuidd.service} +# trick: service existed before, but it had no preset before 13.2 and in SLE12. Force %%service_add_post to run preset. +if [ $1 -gt 1 ] ; then + if ! test -f /usr/lib/systemd/system-preset/50-uuidd.preset ; then + echo -n "" >/run/rpm-%{name}-update-uuidd.socket-new-in-upgrade + echo -n "" >/run/rpm-%{name}-update-uuidd.service-new-in-upgrade + fi +fi %post -n uuidd -%{fillup_and_insserv -n uuidd} -%set_permissions %{_sbindir}/uuidd +%{service_add_post uuidd.socket uuidd.service} -%postun -n uuidd -%{restart_on_update uuidd} -%{insserv_cleanup} +%preun -n uuidd +%{service_del_preun uuidd.socket uuidd.service} -%verifyscript -n uuidd -%verify_permissions -e %{_sbindir}/uuidd +%postun -n uuidd +%{service_del_postun uuidd.socket uuidd.service} %endif %if %build_util_linux @@ -1276,21 +1303,22 @@ %{_datadir}/bash-completion/logger %{_mandir}/man1/logger.1.gz %{_mandir}/man1/lslogins.1.gz +%{_sbindir}/rcfstrim %{_unitdir}/fstrim.service %{_unitdir}/fstrim.timer %files -n uuidd %defattr(-, root, root) -%verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd +%{_sbindir}/uuidd %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %ghost %{_localstatedir}/lib/libuuid/clock.txt %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd %{_datadir}/bash-completion/uuidd -%{_initddir}/uuidd %{_mandir}/man8/uuidd.8.gz %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service %{_unitdir}/uuidd.socket +/usr/lib/systemd/system-preset/50-uuidd.preset %endif %if %build_python_libmount ++++++ util-linux-systemd.spec ++++++ --- /var/tmp/diff_new_pack.mjUM6g/_old 2014-11-07 14:07:07.000000000 +0100 +++ /var/tmp/diff_new_pack.mjUM6g/_new 2014-11-07 14:07:07.000000000 +0100 @@ -152,7 +152,6 @@ Source29: mkzimage_cmdline.c Source31: addnote.c # -Source50: uuidd.rc Source51: blkid.conf ## ## util-linux patches @@ -219,6 +218,7 @@ Provides: util-linux:/usr/lib/systemd/system/fstrim.service # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 Conflicts: util-linux < 2.25 +%systemd_requires %else # ERROR: No build_* variables are set. %endif @@ -350,12 +350,11 @@ %package -n uuidd Summary: Helper daemon to guarantee uniqueness of time-based UUIDs Group: System/Filesystems -PreReq: %fillup_prereq -PreReq: %insserv_prereq -PreReq: permissions -PreReq: pwdutils +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd # uuidd bash-completion moved to a correct package Conflicts: util-linux < 2.25 +%systemd_requires %description -n uuidd The uuidd package contains a userspace daemon (uuidd) which guarantees @@ -394,6 +393,13 @@ popd %build +#BEGIN CONFIG ALTER +%if !%build_util_linux_systemd +# We are not building util_linux_systemd => we are not building uuidd +# But we want libuuid with support of uuidd. The default configure disables it as well. +sed -i '/^AM_CONDITIONAL.*BUILD_UUIDD/a AC_DEFINE([HAVE_UUIDD], [1], [Define to 1 if you want to use uuid daemon.])' configure.ac +%endif +#END CONFIG ALTER %if %build_util_linux pushd ../klogconsole # klogconsole build @@ -570,6 +576,8 @@ --without-python \ %endif # +# Safety check: HAVE_UUIDD should be always 1: +grep -q 'HAVE_UUIDD 1' config.h make %{?_smp_mflags} # %if %build_util_linux @@ -767,17 +775,18 @@ # install systemd files manually, don't use Makefile that expect build of utilities and its dependencies. %endif %if %build_util_linux_systemd -mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}/bin mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid mkdir -p %{buildroot}/run/uuidd -install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd +mkdir -p %{buildroot}/usr/lib/systemd/system-preset ln -s %{_bindir}/logger %{buildroot}/bin # clock.txt from uuidd is a ghost file touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt -# rcuuidd helper -ln -sf ../..%{_sysconfdir}/init.d/uuidd %{buildroot}%{_sbindir}/rcuuidd +ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd +ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim +# Use socket activated uuidd by default. +echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset %if !%build_util_linux %make_install %endif @@ -845,24 +854,42 @@ %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. +%pre -n util-linux-systemd +%{service_add_pre fstrim.service fstrim.timer} + +%post -n util-linux-systemd +%{service_add_post fstrim.service fstrim.timer} + +%preun -n util-linux-systemd +%{service_del_preun fstrim.service fstrim.timer} + +%postun -n util-linux-systemd +%{service_del_postun fstrim.service fstrim.timer} + %pre -n uuidd -%{_sbindir}/groupadd -r uuidd 2>/dev/null || : -%{_sbindir}/useradd -r -g uuidd -c "User for uuidd" \ +/usr/sbin/groupadd -r uuidd 2>/dev/null || : +/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : - -%preun -n uuidd -%{stop_on_removal uuidd} +%{service_add_pre uuidd.socket uuidd.service} +# trick: service existed before, but it had no preset before 13.2 and in SLE12. Force %%service_add_post to run preset. +if [ $1 -gt 1 ] ; then + if ! test -f /usr/lib/systemd/system-preset/50-uuidd.preset ; then + echo -n "" >/run/rpm-%{name}-update-uuidd.socket-new-in-upgrade + echo -n "" >/run/rpm-%{name}-update-uuidd.service-new-in-upgrade + fi +fi %post -n uuidd -%{fillup_and_insserv -n uuidd} -%set_permissions %{_sbindir}/uuidd +%{service_add_post uuidd.socket uuidd.service} -%postun -n uuidd -%{restart_on_update uuidd} -%{insserv_cleanup} +%preun -n uuidd +%{service_del_preun uuidd.socket uuidd.service} -%verifyscript -n uuidd -%verify_permissions -e %{_sbindir}/uuidd +%postun -n uuidd +%{service_del_postun uuidd.socket uuidd.service} %endif %if %build_util_linux @@ -1276,21 +1303,22 @@ %{_datadir}/bash-completion/logger %{_mandir}/man1/logger.1.gz %{_mandir}/man1/lslogins.1.gz +%{_sbindir}/rcfstrim %{_unitdir}/fstrim.service %{_unitdir}/fstrim.timer %files -n uuidd %defattr(-, root, root) -%verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd +%{_sbindir}/uuidd %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %ghost %{_localstatedir}/lib/libuuid/clock.txt %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd %{_datadir}/bash-completion/uuidd -%{_initddir}/uuidd %{_mandir}/man8/uuidd.8.gz %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service %{_unitdir}/uuidd.socket +/usr/lib/systemd/system-preset/50-uuidd.preset %endif %if %build_python_libmount ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.mjUM6g/_old 2014-11-07 14:07:07.000000000 +0100 +++ /var/tmp/diff_new_pack.mjUM6g/_new 2014-11-07 14:07:07.000000000 +0100 @@ -152,7 +152,6 @@ Source29: mkzimage_cmdline.c Source31: addnote.c # -Source50: uuidd.rc Source51: blkid.conf ## ## util-linux patches @@ -219,6 +218,7 @@ Provides: util-linux:/usr/lib/systemd/system/fstrim.service # Service files are being migrated during the update from SLE < 12 and openSUSE <= 13.1 Conflicts: util-linux < 2.25 +%systemd_requires %else # ERROR: No build_* variables are set. %endif @@ -350,12 +350,11 @@ %package -n uuidd Summary: Helper daemon to guarantee uniqueness of time-based UUIDs Group: System/Filesystems -PreReq: %fillup_prereq -PreReq: %insserv_prereq -PreReq: permissions -PreReq: pwdutils +Requires(pre): /usr/sbin/groupadd +Requires(pre): /usr/sbin/useradd # uuidd bash-completion moved to a correct package Conflicts: util-linux < 2.25 +%systemd_requires %description -n uuidd The uuidd package contains a userspace daemon (uuidd) which guarantees @@ -394,6 +393,13 @@ popd %build +#BEGIN CONFIG ALTER +%if !%build_util_linux_systemd +# We are not building util_linux_systemd => we are not building uuidd +# But we want libuuid with support of uuidd. The default configure disables it as well. +sed -i '/^AM_CONDITIONAL.*BUILD_UUIDD/a AC_DEFINE([HAVE_UUIDD], [1], [Define to 1 if you want to use uuid daemon.])' configure.ac +%endif +#END CONFIG ALTER %if %build_util_linux pushd ../klogconsole # klogconsole build @@ -570,6 +576,8 @@ --without-python \ %endif # +# Safety check: HAVE_UUIDD should be always 1: +grep -q 'HAVE_UUIDD 1' config.h make %{?_smp_mflags} # %if %build_util_linux @@ -767,17 +775,18 @@ # install systemd files manually, don't use Makefile that expect build of utilities and its dependencies. %endif %if %build_util_linux_systemd -mkdir -p %{buildroot}%{_sysconfdir}/init.d mkdir -p %{buildroot}/bin mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_localstatedir}/lib/libuuid mkdir -p %{buildroot}/run/uuidd -install -m 744 %{SOURCE50} %{buildroot}%{_initddir}/uuidd +mkdir -p %{buildroot}/usr/lib/systemd/system-preset ln -s %{_bindir}/logger %{buildroot}/bin # clock.txt from uuidd is a ghost file touch %{buildroot}%{_localstatedir}/lib/libuuid/clock.txt -# rcuuidd helper -ln -sf ../..%{_sysconfdir}/init.d/uuidd %{buildroot}%{_sbindir}/rcuuidd +ln -sf /sbin/service %{buildroot}/usr/sbin/rcuuidd +ln -sf /sbin/service %{buildroot}/usr/sbin/rcfstrim +# Use socket activated uuidd by default. +echo -e 'enable uuidd.socket\nenable uuidd.service' >%{buildroot}/usr/lib/systemd/system-preset/50-uuidd.preset %if !%build_util_linux %make_install %endif @@ -845,24 +854,42 @@ %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. +%pre -n util-linux-systemd +%{service_add_pre fstrim.service fstrim.timer} + +%post -n util-linux-systemd +%{service_add_post fstrim.service fstrim.timer} + +%preun -n util-linux-systemd +%{service_del_preun fstrim.service fstrim.timer} + +%postun -n util-linux-systemd +%{service_del_postun fstrim.service fstrim.timer} + %pre -n uuidd -%{_sbindir}/groupadd -r uuidd 2>/dev/null || : -%{_sbindir}/useradd -r -g uuidd -c "User for uuidd" \ +/usr/sbin/groupadd -r uuidd 2>/dev/null || : +/usr/sbin/useradd -r -g uuidd -c "User for uuidd" \ -d /var/run/uuidd uuidd 2>/dev/null || : - -%preun -n uuidd -%{stop_on_removal uuidd} +%{service_add_pre uuidd.socket uuidd.service} +# trick: service existed before, but it had no preset before 13.2 and in SLE12. Force %%service_add_post to run preset. +if [ $1 -gt 1 ] ; then + if ! test -f /usr/lib/systemd/system-preset/50-uuidd.preset ; then + echo -n "" >/run/rpm-%{name}-update-uuidd.socket-new-in-upgrade + echo -n "" >/run/rpm-%{name}-update-uuidd.service-new-in-upgrade + fi +fi %post -n uuidd -%{fillup_and_insserv -n uuidd} -%set_permissions %{_sbindir}/uuidd +%{service_add_post uuidd.socket uuidd.service} -%postun -n uuidd -%{restart_on_update uuidd} -%{insserv_cleanup} +%preun -n uuidd +%{service_del_preun uuidd.socket uuidd.service} -%verifyscript -n uuidd -%verify_permissions -e %{_sbindir}/uuidd +%postun -n uuidd +%{service_del_postun uuidd.socket uuidd.service} %endif %if %build_util_linux @@ -1276,21 +1303,22 @@ %{_datadir}/bash-completion/logger %{_mandir}/man1/logger.1.gz %{_mandir}/man1/lslogins.1.gz +%{_sbindir}/rcfstrim %{_unitdir}/fstrim.service %{_unitdir}/fstrim.timer %files -n uuidd %defattr(-, root, root) -%verify(not mode) %attr(0755,root,root) %{_sbindir}/uuidd +%{_sbindir}/uuidd %attr(-,uuidd,uuidd) %dir %{_localstatedir}/lib/libuuid %ghost %{_localstatedir}/lib/libuuid/clock.txt %attr(-,uuidd,uuidd) %ghost %dir /run/uuidd %{_datadir}/bash-completion/uuidd -%{_initddir}/uuidd %{_mandir}/man8/uuidd.8.gz %{_sbindir}/rcuuidd %{_unitdir}/uuidd.service %{_unitdir}/uuidd.socket +/usr/lib/systemd/system-preset/50-uuidd.preset %endif %if %build_python_libmount -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
