Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2020-04-29 20:42:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd" Wed Apr 29 20:42:06 2020 rev:309 rq:798578 version:245 Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-mini.changes 2020-04-27 23:31:14.618687668 +0200 +++ /work/SRC/openSUSE:Factory/.systemd.new.2738/systemd-mini.changes 2020-04-29 20:42:28.107656112 +0200 @@ -1,0 +2,31 @@ +Mon Apr 27 15:45:50 UTC 2020 - Franck Bui <[email protected]> + +- Drop legacy /sbin/{udevd,udevadm) symlinks hopefully for good + + Since boo#1160890 has been fixed since a couple of months now. + +------------------------------------------------------------------- +Mon Apr 27 14:50:36 UTC 2020 - Franck Bui <[email protected]> + +- Drop content of /usr/share/factory/ (bsc#1170146) + + systemd ships several files in /usr/share/factory/etc that are + copied to /etc in case those files are missing there. Unfortunately + the content does not match the openSUSE defaults. + +------------------------------------------------------------------- +Mon Apr 27 14:33:35 UTC 2020 - Franck Bui <[email protected]> + +- Drop most of the tmpfiles that deal with generic paths (bsc#1078466) + + They are problematic because some of them conflict with SUSE + defaults. Therefore it seems better to let the revelant packages + owning these paths to provide their own definitions instead. + + Meanwhile we still keep the homeless definitions in suse.conf until + a better place is found for them. + + Drop 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch + Drop 0001-SUSE-policy-do-not-clean-tmp-by-default.patch + +------------------------------------------------------------------- systemd.changes: same change Old: ---- 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch 0001-SUSE-policy-do-not-clean-tmp-by-default.patch New: ---- tmpfiles-suse.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-mini.spec ++++++ --- /var/tmp/diff_new_pack.RAJYuK/_old 2020-04-29 20:42:29.107658720 +0200 +++ /var/tmp/diff_new_pack.RAJYuK/_new 2020-04-29 20:42:29.107658720 +0200 @@ -151,6 +151,7 @@ Source3: systemd-sysv-convert Source4: systemd-sysv-install %endif +Source5: tmpfiles-suse.conf Source6: baselibs.conf Source11: after-local.service Source14: kbd-model-map.legacy @@ -165,9 +166,7 @@ # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch -Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch -Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch +Patch1: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -582,12 +581,6 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1* %endif -# FIXME: These obsolete symlinks are still needed by YaST so let's -# keep them until boo#1160890 is fixed. -mkdir -p %{buildroot}/sbin -ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm -ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd - %if %{with sysvcompat} mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -741,6 +734,35 @@ echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset +# The tmpfiles dealing with the generic paths is pretty messy +# currently because: +# +# 1. filesystem package wants to define the generic paths and some of +# them conflict with the definition given by systemd in var.conf, +# see bsc#1078466. +# +# 2. /tmp and /var/tmp are not cleaned by default on SUSE distros +# (fate#314974) which conflict with tmp.conf. +# +# 3. There're also legacy.conf which defines various legacy paths +# which either don't match the SUSE defaults or don't look needed +# at all. +# +# 4. And to finish, we don't want the part in etc.conf which imports +# default upstream files in empty /etc, see below. +# +# To keep things simple, we remove all these tmpfiles config files but +# still keep the remaining paths that still don't have a better home +# in suse.conf. +rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf +install -m 644 %{S:5} %{buildroot}%{_tmpfilesdir}/suse.conf + +# The content of the files shipped by systemd doesn't match the +# defaults used by SUSE. Don't ship those files but leave the decision +# to use the mechanism to the individual packages that actually +# consume those configs (like glibc or pam), see bsc#1170146. +rm -fr %{buildroot}%{_datadir}/factory/* + # Add entries for xkeyboard-config converted keymaps; mappings, which # already exist in original systemd mapping table are being ignored # though, i.e. not overwritten; needed as long as YaST uses console @@ -1353,8 +1375,6 @@ %files -n udev%{?mini} %defattr(-,root,root) -/sbin/udevd -/sbin/udevadm %{_bindir}/udevadm %{_bindir}/systemd-hwdb %dir %{_prefix}/lib/udev/ ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.RAJYuK/_old 2020-04-29 20:42:29.131658782 +0200 +++ /var/tmp/diff_new_pack.RAJYuK/_new 2020-04-29 20:42:29.135658793 +0200 @@ -149,6 +149,7 @@ Source3: systemd-sysv-convert Source4: systemd-sysv-install %endif +Source5: tmpfiles-suse.conf Source6: baselibs.conf Source11: after-local.service Source14: kbd-model-map.legacy @@ -163,9 +164,7 @@ # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch -Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch -Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch +Patch1: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -580,12 +579,6 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1* %endif -# FIXME: These obsolete symlinks are still needed by YaST so let's -# keep them until boo#1160890 is fixed. -mkdir -p %{buildroot}/sbin -ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm -ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd - %if %{with sysvcompat} mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -739,6 +732,35 @@ echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset +# The tmpfiles dealing with the generic paths is pretty messy +# currently because: +# +# 1. filesystem package wants to define the generic paths and some of +# them conflict with the definition given by systemd in var.conf, +# see bsc#1078466. +# +# 2. /tmp and /var/tmp are not cleaned by default on SUSE distros +# (fate#314974) which conflict with tmp.conf. +# +# 3. There're also legacy.conf which defines various legacy paths +# which either don't match the SUSE defaults or don't look needed +# at all. +# +# 4. And to finish, we don't want the part in etc.conf which imports +# default upstream files in empty /etc, see below. +# +# To keep things simple, we remove all these tmpfiles config files but +# still keep the remaining paths that still don't have a better home +# in suse.conf. +rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf +install -m 644 %{S:5} %{buildroot}%{_tmpfilesdir}/suse.conf + +# The content of the files shipped by systemd doesn't match the +# defaults used by SUSE. Don't ship those files but leave the decision +# to use the mechanism to the individual packages that actually +# consume those configs (like glibc or pam), see bsc#1170146. +rm -fr %{buildroot}%{_datadir}/factory/* + # Add entries for xkeyboard-config converted keymaps; mappings, which # already exist in original systemd mapping table are being ignored # though, i.e. not overwritten; needed as long as YaST uses console @@ -1351,8 +1373,6 @@ %files -n udev%{?mini} %defattr(-,root,root) -/sbin/udevd -/sbin/udevadm %{_bindir}/udevadm %{_bindir}/systemd-hwdb %dir %{_prefix}/lib/udev/ ++++++ tmpfiles-suse.conf ++++++ # # See tmpfiles.d(5) for details # # Type Path Mode User Group Age Argument # Legacy symlink. Maybe should be owned by util-linux ? L+ /etc/mtab - - - - ../proc/self/mounts # FIXME: Might be moved to lockded. d /run/lock 0775 root lock - # FIXME: Should these one be moved to shadow ? f /var/log/wtmp 0664 root utmp - f /var/log/btmp 0660 root utmp - f /var/log/lastlog 0664 root utmp -
