Accepting request 492807 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/492807
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=254

systemd-232.tar.xz

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51c12300bec369cb034266fc885beaefd9460ed04b039b341bc7dc39157aa5f8
+oid sha256:81d3fc89d42d3f3f27d898e94ef8e7d6b5b6bae6deccaffc0a778b30f4b7c570
-size 3212352
+size 3213256

systemd-mini.changes

@@ -1,3 +1,83 @@
+-------------------------------------------------------------------
+Tue May  2 16:17:08 UTC 2017 - fbui@suse.com
+
+- Ship /var/log/README
+
+  Unfortunately it's not possible to also ship /etc/init.d/README
+  because of rpm "sanity" checks that prevent executable in
+  /etc/init.d
+
+-------------------------------------------------------------------
+Tue May  2 14:33:58 UTC 2017 - fbui@suse.com
+
+- Drop systemd-{journalctl,loginctl} legacy symlinks.
+
+-------------------------------------------------------------------
+Tue May  2 13:55:31 UTC 2017 - fbui@suse.com
+
+- Drop %preun section
+
+  Currently the only use of this section is to remove the symlinks
+  enabling systemd services on package removal. Those symlinks were
+  initially installed by the systemd package installation but could
+  have been overriden by the sysadmin later. If so the symlinks
+  shouldn't be uninstalled.
+
+  Also in a near futur disabling services will install a symlink to
+  /dev/null.
+
+-------------------------------------------------------------------
+Tue May  2 13:40:12 UTC 2017 - fbui@suse.com
+
+- Import commit 9e33c2ae69fbb705e8ad143536e419a231e93020
+
+  04ef0eab8 importd: support SUSE style checksums supplementary (#5800)
+  fb601ad9a importd: support SUSE style checksums (#5206) (fate#322054)
+  b76b27c76 hwdb: fix warning "atkbd serio0: Unknown key pressed" (#5772) (boo#1010220)
+  cb0d991f6 loginctl: fix typo causing ignoring multiple session IDs (#5732)
+
+-------------------------------------------------------------------
+Tue May  2 13:37:44 UTC 2017 - fbui@suse.com
+
+- Make use of %systemd_postun()
+
+-------------------------------------------------------------------
+Tue May  2 13:28:17 UTC 2017 - fbui@suse.com
+
+- Restart a couple of systemd services on package update
+
+  Those services (most notably journald) should support restarting
+  these days. However logind still doesn't but that should be fixed
+  pretty soon, well I hope :)
+
+-------------------------------------------------------------------
+Tue May  2 13:13:25 UTC 2017 - fbui@suse.com
+
+- Don't buildrequire pam-config, it's not used at this step.
+
+  Also drop the use of it in %postun as it can't realistically
+  happen...
+
+-------------------------------------------------------------------
+Thu Apr 20 09:26:21 UTC 2017 - fbui@suse.com
+
+- Don't call /sbin/ldconfig in %post of the main package
+
+  systemd main package doesn't ship any shared libs so there's no
+  point in calling ldconfig in %post/%postun
+
+-------------------------------------------------------------------
+Thu Apr 20 09:20:03 UTC 2017 - fbui@suse.com
+
+- Silent %tmpfiles_create in %post (bsc#1034938)
+
+  Due to bsc#1024740, we stopped generating /etc/machine-id during
+  systemd package installation making the specifier '%m' unavailable
+  in the tmpfiles.d configuration files at this time.
+
+  Make it simple for now and silent %tmpfiles_create, after all that's
+  how the macro was implemented originally.
+
 -------------------------------------------------------------------
 Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com
 

systemd-mini.spec

@@ -76,7 +76,6 @@ BuildRequires:  libcap-devel
 BuildRequires:  libmount-devel >= 2.27.1
 BuildRequires:  libsepol-devel
 BuildRequires:  libtool
-BuildRequires:  pam-config >= 0.79-5
 BuildRequires:  pam-devel
 # regenerate_initrd_post macro is expanded during build, hence this
 # BR. Also this macro was introduced since version 12.4.
@@ -117,7 +116,6 @@ Requires:       dbus-1 >= 1.4.0
 Requires:       kbd
 Requires:       kmod >= 15
 Requires:       netcfg >= 11.5
-Requires:       pam-config >= 0.79-5
 Requires:       pwdutils
 Requires:       systemd-presets-branding
 Requires:       sysvinit-tools
@@ -523,11 +521,9 @@ rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so
 # aaa_base (in procps for now)
 rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf
 
-# remove README file for now
+# Remove README file in init.d as (SUSE) rpm requires executable files
+# in this directory... oh well.
 rm -f %{buildroot}/etc/init.d/README
-%if 0%{?bootstrap}
-rm -f %{buildroot}%{_localstatedir}/log/README
-%endif
 
 # journal-upload is built if libcurl is installed which can happen
 # when importd is enabled (whereas journal_remote is not).
@@ -537,13 +533,7 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload
 rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.*
 %endif
 
-# legacy links
+# legacy link
-for f in loginctl journalctl ; do
-        ln -s $f %{buildroot}%{_bindir}/systemd-$f
-%if ! 0%{?bootstrap}
-        ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
-%endif
-done
 ln -s /usr/lib/udev %{buildroot}/lib/udev
 
 # Create the /var/log/journal directory to change the volatile journal
@@ -661,12 +651,11 @@ fi
 %if ! 0%{?bootstrap}
 pam-config -a --systemd || :
 %endif
-ldconfig
 [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
 /usr/lib/systemd/systemd-random-seed save || :
 systemctl daemon-reexec  || :
 %journal_catalog_update
-%tmpfiles_create
+%tmpfiles_create 2>/dev/null
 
 # Try to read default runlevel from the old inittab if it exists
 if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then
@@ -744,29 +733,12 @@ if [ $1 -gt 1 ]; then
 fi
 
 %postun
-ldconfig
+%systemd_postun
-if [ $1 -ge 1 ]; then
+# Avoid restarting logind until fixed upstream (issue #1163)
-        systemctl daemon-reload || :
+%systemd_postun_with_restart systemd-journald.service
-        # Avoid restarting logind [bnc#934901] until fixed upstream
+%systemd_postun_with_restart systemd-networkd.service
-        #systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
+%systemd_postun_with_restart systemd-timesyncd.service
-fi
+%systemd_postun_with_restart systemd-resolved.service
-%if ! 0%{?bootstrap}
-if [ $1 -eq 0 ]; then
-        pam-config -d --systemd || :
-fi
-%endif
-
-%preun
-if [ $1 -eq 0 ]; then
-        systemctl disable remote-fs.target || :
-        systemctl disable getty@.service   || :
-        systemctl disable systemd-networkd.service || :
-        systemctl disable systemd-networkd-wait-online.service || :
-        systemctl disable systemd-timesyncd.service || :
-        systemctl disable systemd-resolved.service  || :
-
-        rm -f /etc/systemd/system/default.target
-fi >/dev/null
 
 %pretrans -n udev%{?mini} -p <lua>
 if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
@@ -899,11 +871,9 @@ fi
 %{_bindir}/systemd-mount
 %{_bindir}/systemd-notify
 %{_bindir}/systemd-run
-%{_bindir}/systemd-journalctl
 %{_bindir}/journalctl
 %{_bindir}/systemd-ask-password
 %{_bindir}/loginctl
-%{_bindir}/systemd-loginctl
 %{_bindir}/systemd-inhibit
 %{_bindir}/systemd-tty-ask-password-agent
 %{_bindir}/systemd-tmpfiles
@@ -1122,6 +1092,7 @@ fi
 %{_mandir}/man8/systemd-u[ps]*
 %endif
 %{_docdir}/systemd
+
 %{_prefix}/lib/udev/rules.d/70-uaccess.rules
 %{_prefix}/lib/udev/rules.d/71-seat.rules
 %{_prefix}/lib/udev/rules.d/73-seat-late.rules
@@ -1241,9 +1212,7 @@ fi
 %files logger
 %defattr(-,root,root)
 %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
-%if %{with sysvcompat}
+%doc %{_localstatedir}/log/README
-%{_localstatedir}/log/README
-%endif
 
 %files -n nss-myhostname
 %defattr(-, root, root)

systemd.changes

@@ -1,3 +1,83 @@
+-------------------------------------------------------------------
+Tue May  2 16:17:08 UTC 2017 - fbui@suse.com
+
+- Ship /var/log/README
+
+  Unfortunately it's not possible to also ship /etc/init.d/README
+  because of rpm "sanity" checks that prevent executable in
+  /etc/init.d
+
+-------------------------------------------------------------------
+Tue May  2 14:33:58 UTC 2017 - fbui@suse.com
+
+- Drop systemd-{journalctl,loginctl} legacy symlinks.
+
+-------------------------------------------------------------------
+Tue May  2 13:55:31 UTC 2017 - fbui@suse.com
+
+- Drop %preun section
+
+  Currently the only use of this section is to remove the symlinks
+  enabling systemd services on package removal. Those symlinks were
+  initially installed by the systemd package installation but could
+  have been overriden by the sysadmin later. If so the symlinks
+  shouldn't be uninstalled.
+
+  Also in a near futur disabling services will install a symlink to
+  /dev/null.
+
+-------------------------------------------------------------------
+Tue May  2 13:40:12 UTC 2017 - fbui@suse.com
+
+- Import commit 9e33c2ae69fbb705e8ad143536e419a231e93020
+
+  04ef0eab8 importd: support SUSE style checksums supplementary (#5800)
+  fb601ad9a importd: support SUSE style checksums (#5206) (fate#322054)
+  b76b27c76 hwdb: fix warning "atkbd serio0: Unknown key pressed" (#5772) (boo#1010220)
+  cb0d991f6 loginctl: fix typo causing ignoring multiple session IDs (#5732)
+
+-------------------------------------------------------------------
+Tue May  2 13:37:44 UTC 2017 - fbui@suse.com
+
+- Make use of %systemd_postun()
+
+-------------------------------------------------------------------
+Tue May  2 13:28:17 UTC 2017 - fbui@suse.com
+
+- Restart a couple of systemd services on package update
+
+  Those services (most notably journald) should support restarting
+  these days. However logind still doesn't but that should be fixed
+  pretty soon, well I hope :)
+
+-------------------------------------------------------------------
+Tue May  2 13:13:25 UTC 2017 - fbui@suse.com
+
+- Don't buildrequire pam-config, it's not used at this step.
+
+  Also drop the use of it in %postun as it can't realistically
+  happen...
+
+-------------------------------------------------------------------
+Thu Apr 20 09:26:21 UTC 2017 - fbui@suse.com
+
+- Don't call /sbin/ldconfig in %post of the main package
+
+  systemd main package doesn't ship any shared libs so there's no
+  point in calling ldconfig in %post/%postun
+
+-------------------------------------------------------------------
+Thu Apr 20 09:20:03 UTC 2017 - fbui@suse.com
+
+- Silent %tmpfiles_create in %post (bsc#1034938)
+
+  Due to bsc#1024740, we stopped generating /etc/machine-id during
+  systemd package installation making the specifier '%m' unavailable
+  in the tmpfiles.d configuration files at this time.
+
+  Make it simple for now and silent %tmpfiles_create, after all that's
+  how the macro was implemented originally.
+
 -------------------------------------------------------------------
 Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com
 

systemd.spec

@@ -74,7 +74,6 @@ BuildRequires:  libcap-devel
 BuildRequires:  libmount-devel >= 2.27.1
 BuildRequires:  libsepol-devel
 BuildRequires:  libtool
-BuildRequires:  pam-config >= 0.79-5
 BuildRequires:  pam-devel
 # regenerate_initrd_post macro is expanded during build, hence this
 # BR. Also this macro was introduced since version 12.4.
@@ -115,7 +114,6 @@ Requires:       dbus-1 >= 1.4.0
 Requires:       kbd
 Requires:       kmod >= 15
 Requires:       netcfg >= 11.5
-Requires:       pam-config >= 0.79-5
 Requires:       pwdutils
 Requires:       systemd-presets-branding
 Requires:       sysvinit-tools
@@ -521,11 +519,9 @@ rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so
 # aaa_base (in procps for now)
 rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf
 
-# remove README file for now
+# Remove README file in init.d as (SUSE) rpm requires executable files
+# in this directory... oh well.
 rm -f %{buildroot}/etc/init.d/README
-%if 0%{?bootstrap}
-rm -f %{buildroot}%{_localstatedir}/log/README
-%endif
 
 # journal-upload is built if libcurl is installed which can happen
 # when importd is enabled (whereas journal_remote is not).
@@ -535,13 +531,7 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload
 rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.*
 %endif
 
-# legacy links
+# legacy link
-for f in loginctl journalctl ; do
-        ln -s $f %{buildroot}%{_bindir}/systemd-$f
-%if ! 0%{?bootstrap}
-        ln -s $f.1 %{buildroot}%{_mandir}/man1/systemd-$f.1
-%endif
-done
 ln -s /usr/lib/udev %{buildroot}/lib/udev
 
 # Create the /var/log/journal directory to change the volatile journal
@@ -659,12 +649,11 @@ fi
 %if ! 0%{?bootstrap}
 pam-config -a --systemd || :
 %endif
-ldconfig
 [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || :
 /usr/lib/systemd/systemd-random-seed save || :
 systemctl daemon-reexec  || :
 %journal_catalog_update
-%tmpfiles_create
+%tmpfiles_create 2>/dev/null
 
 # Try to read default runlevel from the old inittab if it exists
 if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then
@@ -742,29 +731,12 @@ if [ $1 -gt 1 ]; then
 fi
 
 %postun
-ldconfig
+%systemd_postun
-if [ $1 -ge 1 ]; then
+# Avoid restarting logind until fixed upstream (issue #1163)
-        systemctl daemon-reload || :
+%systemd_postun_with_restart systemd-journald.service
-        # Avoid restarting logind [bnc#934901] until fixed upstream
+%systemd_postun_with_restart systemd-networkd.service
-        #systemctl try-restart systemd-logind.service >/dev/null 2>&1 || :
+%systemd_postun_with_restart systemd-timesyncd.service
-fi
+%systemd_postun_with_restart systemd-resolved.service
-%if ! 0%{?bootstrap}
-if [ $1 -eq 0 ]; then
-        pam-config -d --systemd || :
-fi
-%endif
-
-%preun
-if [ $1 -eq 0 ]; then
-        systemctl disable remote-fs.target || :
-        systemctl disable getty@.service   || :
-        systemctl disable systemd-networkd.service || :
-        systemctl disable systemd-networkd-wait-online.service || :
-        systemctl disable systemd-timesyncd.service || :
-        systemctl disable systemd-resolved.service  || :
-
-        rm -f /etc/systemd/system/default.target
-fi >/dev/null
 
 %pretrans -n udev%{?mini} -p <lua>
 if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then
@@ -897,11 +869,9 @@ fi
 %{_bindir}/systemd-mount
 %{_bindir}/systemd-notify
 %{_bindir}/systemd-run
-%{_bindir}/systemd-journalctl
 %{_bindir}/journalctl
 %{_bindir}/systemd-ask-password
 %{_bindir}/loginctl
-%{_bindir}/systemd-loginctl
 %{_bindir}/systemd-inhibit
 %{_bindir}/systemd-tty-ask-password-agent
 %{_bindir}/systemd-tmpfiles
@@ -1120,6 +1090,7 @@ fi
 %{_mandir}/man8/systemd-u[ps]*
 %endif
 %{_docdir}/systemd
+
 %{_prefix}/lib/udev/rules.d/70-uaccess.rules
 %{_prefix}/lib/udev/rules.d/71-seat.rules
 %{_prefix}/lib/udev/rules.d/73-seat-late.rules
@@ -1239,9 +1210,7 @@ fi
 %files logger
 %defattr(-,root,root)
 %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/
-%if %{with sysvcompat}
+%doc %{_localstatedir}/log/README
-%{_localstatedir}/log/README
-%endif
 
 %files -n nss-myhostname
 %defattr(-, root, root)