Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package systemd for openSUSE:Factory checked
in at 2024-06-25 23:06:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/systemd (Old)
and /work/SRC/openSUSE:Factory/.systemd.new.18349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd"
Tue Jun 25 23:06:32 2024 rev:426 rq:1183029 version:255.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/systemd/systemd.changes 2024-06-07
15:02:50.638630047 +0200
+++ /work/SRC/openSUSE:Factory/.systemd.new.18349/systemd.changes
2024-06-25 23:06:40.820554396 +0200
@@ -1,0 +2,26 @@
+Mon Jun 24 14:36:21 UTC 2024 - Franck Bui <f...@suse.com>
+
+- Don't automatically clean unmodified config files up (bsc#1226415)
+
+ Relying on the presence of .rpmsave for detecting unmodified main config
files
+ couldn't work as it created a time window in which some of the systemd
+ services were restarted with no config file. That had the bad side effect to
+ restart them with the upstream defaults, ignoring any user's customization.
+
+-------------------------------------------------------------------
+Tue Jun 18 13:20:26 UTC 2024 - Franck Bui <f...@suse.com>
+
+- testsuite: move a misplaced %endif
+
+-------------------------------------------------------------------
+Tue Jun 18 10:19:19 UTC 2024 - Franck Bui <f...@suse.com>
+
+- Merge systemd-coredump back into the main package (bsc#1091684)
+
+-------------------------------------------------------------------
+Tue Jun 18 10:12:01 UTC 2024 - Franck Bui <f...@suse.com>
+
+- testsuite: only require the devel packages when pulling the dlopen'd
+ dependencies (the libraries are dependencies of the devel packages).
+
+-------------------------------------------------------------------
Old:
----
files.coredump
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ systemd.spec ++++++
--- /var/tmp/diff_new_pack.rvU2ps/_old 2024-06-25 23:06:45.380722494 +0200
+++ /var/tmp/diff_new_pack.rvU2ps/_new 2024-06-25 23:06:45.384722641 +0200
@@ -56,7 +56,6 @@
%else
%global mini %nil
%bcond_without apparmor
-%bcond_without coredump
%bcond_without homed
%bcond_without importd
%bcond_without journal_remote
@@ -81,20 +80,6 @@
# value is independent of the build flavor.
%bcond_without filetriggers
-# We stopped shipping main config files in /etc but we have to restore any
-# config files that might have been backed up by rpm during the migration of
the
-# main config files from /etc to /usr. This needs to be done in %%posttrans
-# because the .rpmsave files are created when the *old* package version is
-# removed. This is not needed by ALP and will be dropped from Factory near the
-# end of 2024.
-%define restore_rpmsave() \
-if [ -e %{_sysconfdir}/%{1}.rpmsave ] && [ ! -e %{_sysconfdir}/%{1} ]; then \
- echo >&2 "Restoring %{_sysconfdir}/%1. Please consider moving your
customizations in a drop-in instead." \
- echo >&2 "For more details, visit
https://en.opensuse.org/Systemd#Configuration."; \
- mv -v %{_sysconfdir}/%{1}.rpmsave %{_sysconfdir}/%{1} || : \
-fi \
-%{nil}
-
Name: systemd%{?mini}
URL: http://www.freedesktop.org/wiki/Software/systemd
Version: %systemd_version
@@ -185,6 +170,8 @@
Provides: nss-systemd = %{version}-%{release}
Obsoletes: nss-myhostname < %{version}-%{release}
Provides: nss-myhostname = %{version}-%{release}
+Provides: systemd-coredump = %{version}-%{release}
+Obsoletes: systemd-coredump < %{version}-%{release}
Provides: systemd-logger = %{version}-%{release}
Obsoletes: systemd-logger < %{version}-%{release}
Provides: systemd-sysvinit = %{version}-%{release}
@@ -216,7 +203,6 @@
Source205: files.sysvcompat
Source206: files.uefi-boot
Source207: files.experimental
-Source208: files.coredump
Source209: files.homed
Source210: files.lang
Source211: files.journal-remote
@@ -422,20 +408,6 @@
This package contains the dynamic library libudev, which provides
access to udev device information
-%if %{with coredump}
-%package coredump
-Summary: Systemd tools for coredump management
-License: LGPL-2.1-or-later
-Requires: %{name} = %{version}-%{release}
-%systemd_requires
-Provides: systemd:%{_bindir}/coredumpctl
-
-%description coredump
-Systemd tools to store and manage coredumps.
-
-Visit https://systemd.io/COREDUMP for more details.
-%endif
-
%if %{with sd_boot}
%package boot
Summary: A simple UEFI boot manager
@@ -545,6 +517,7 @@
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(pwquality)
# These Recommends because some symbols of these libs are dlopen()ed by homed
+Recommends: libcryptsetup12
Recommends: libfido2
Recommends: libpwquality1
Recommends: libqrencode4
@@ -619,32 +592,12 @@
%if %{with resolved}
# Optional dep for knot needed by TEST-75-RESOLVED
Recommends: knot
+%endif
%if %{with selinux}
# Optional deps needed by TEST-06-SELINUX (otherwise skipped)
Recommends: selinux-policy-devel
Recommends: selinux-policy-targeted
%endif
-# System users/groups that some tests rely on.
-Requires: group(bin)
-Requires: group(daemon)
-Requires: group(games)
-Requires: group(nobody)
-Requires: user(bin)
-Requires: user(daemon)
-Requires: user(games)
-Requires: user(nobody)
-# The following deps on libs are for test-dlopen-so whereas the pkgconfig ones
-# are used by test-funtions to find the libs on the host and install them in
the
-# image, see install_missing_libraries() for details.
-Requires: libidn2
-Requires: pkgconfig(libidn2)
-%endif
-%if %{with experimental}
-Requires: libpwquality1
-Requires: libqrencode4
-Requires: pkgconfig(libqrencode)
-Requires: pkgconfig(pwquality)
-%endif
Requires: %{name} = %{version}-%{release}
Requires: attr
Requires: binutils
@@ -655,10 +608,6 @@
Requires: iproute2
Requires: jq
Requires: libcap-progs
-Requires: libfido2
-Requires: libtss2-esys0
-Requires: libtss2-mu0
-Requires: libtss2-rc0
Requires: lz4
Requires: make
Requires: mtools
@@ -669,16 +618,30 @@
Requires: socat
Requires: squashfs
Requires: systemd-container
+# System users/groups that some tests rely on.
+Requires: group(bin)
+Requires: group(daemon)
+Requires: group(games)
+Requires: group(nobody)
+Requires: user(bin)
+Requires: user(daemon)
+Requires: user(games)
+Requires: user(nobody)
+# The following deps on libs are for test-dlopen-so whereas the pkgconfig ones
+# are used by test-funtions to find the libs on the host and install them in
the
+# image, see install_missing_libraries() for details.
Requires: pkgconfig(libfido2)
+Requires: pkgconfig(libidn2)
+%if %{with experimental}
+Requires: pkgconfig(libqrencode)
+Requires: pkgconfig(pwquality)
+%endif
Requires: pkgconfig(tss2-esys)
Requires: pkgconfig(tss2-mu)
Requires: pkgconfig(tss2-rc)
%if %{with sd_boot}
Requires: systemd-boot
%endif
-%if %{with coredump}
-Requires: systemd-coredump
-%endif
%if %{with experimental}
Requires: systemd-experimental
%endif
@@ -848,7 +811,7 @@
-Dzstd=%{disabled_with bootstrap} \
\
-Dapparmor=%{enabled_with apparmor} \
- -Dcoredump=%{when coredump} \
+ -Dcoredump=%{when_not bootstrap} \
-Dhomed=%{enabled_with homed} \
-Dimportd=%{enabled_with importd} \
-Dmachined=%{when machined} \
@@ -1154,12 +1117,6 @@
%systemd_postun_with_restart systemd-timedated.service
%systemd_postun_with_restart systemd-userdbd.service
-%posttrans
-%restore_rpmsave systemd/journald.conf
-%restore_rpmsave systemd/logind.conf
-%restore_rpmsave systemd/system.conf
-%restore_rpmsave systemd/user.conf
-
%pre -n udev%{?mini}
# Units listed below can be enabled at installation accoding to their preset
# setting.
@@ -1214,10 +1171,6 @@
%posttrans -n udev%{?mini}
%regenerate_initrd_posttrans
-%restore_rpmsave systemd/pstore.conf
-%restore_rpmsave systemd/sleep.conf
-%restore_rpmsave systemd/timesyncd.conf
-%restore_rpmsave udev/iocost.conf
%ldconfig_scriptlets -n libsystemd0%{?mini}
%ldconfig_scriptlets -n libudev%{?mini}1
@@ -1244,16 +1197,6 @@
%{_systemd_util_dir}/rpm/fixlet-container-post.sh $1 || :
%endif
-%if %{with coredump}
-%post coredump
-%if %{without filetriggers}
-%sysusers_create systemd-coredump.conf
-
-%posttrans coredump
-%restore_rpmsave systemd/coredump.conf
-%endif
-%endif
-
%if %{with journal_remote}
%pre journal-remote
%systemd_pre systemd-journal-gatewayd.service
@@ -1278,10 +1221,6 @@
%systemd_postun_with_restart systemd-journal-gatewayd.service
%systemd_postun_with_restart systemd-journal-remote.service
%systemd_postun_with_restart systemd-journal-upload.service
-
-%posttrans journal-remote
-%restore_rpmsave systemd/journal-remote.conf
-%restore_rpmsave systemd/journal-upload.conf
%endif
%if %{with networkd} || %{with resolved}
@@ -1330,10 +1269,6 @@
%ldconfig
%systemd_postun systemd-resolved.service
%endif
-
-%posttrans network
-%restore_rpmsave systemd/networkd.conf
-%restore_rpmsave systemd/resolved.conf
%endif
%if %{with homed}
@@ -1392,9 +1327,6 @@
%postun experimental
%systemd_postun systemd-homed.service
%systemd_postun systemd-oomd.service systemd-oomd.socket
-
-%posttrans experimental
-%restore_rpmsave systemd/oomd.conf
%endif
# File trigger definitions
@@ -1440,11 +1372,6 @@
%{_libdir}/libudev.so.1
%{_libdir}/libudev.so.1.7.*
-%if %{with coredump}
-%files coredump
-%include %{SOURCE208}
-%endif
-
%if %{without bootstrap}
%files lang -f systemd.lang
%include %{SOURCE210}
++++++ files.experimental ++++++
--- /var/tmp/diff_new_pack.rvU2ps/_old 2024-06-25 23:06:45.508727213 +0200
+++ /var/tmp/diff_new_pack.rvU2ps/_new 2024-06-25 23:06:45.512727360 +0200
@@ -9,6 +9,8 @@
%if %{with sd_boot}
%dir %{_unitdir}/initrd.target.wants
%endif
+# Main config files have been replaced in favor of drop-ins.
+%ghost %{_sysconfdir}/systemd/oomd.conf
%{_bindir}/oomctl
%{_bindir}/systemd-vmspawn
%if %{with sd_boot}
++++++ files.journal-remote ++++++
--- /var/tmp/diff_new_pack.rvU2ps/_old 2024-06-25 23:06:45.544728540 +0200
+++ /var/tmp/diff_new_pack.rvU2ps/_new 2024-06-25 23:06:45.548728687 +0200
@@ -4,6 +4,9 @@
%dir %{_sysconfdir}/systemd/journal-remote.conf.d
%dir %{_sysconfdir}/systemd/journal-upload.conf.d
%ghost %dir %{_localstatedir}/log/journal/remote
+# Main config files have been replaced in favor of drop-ins.
+%ghost %{_sysconfdir}/systemd/journal-remote.conf
+%ghost %{_sysconfdir}/systemd/journal-upload.conf
%{_datadir}/systemd/gatewayd
%{_datadir}/systemd/gatewayd/browse.html
%{_mandir}/man5/journal-remote.conf.5.gz
++++++ files.network ++++++
--- /var/tmp/diff_new_pack.rvU2ps/_old 2024-06-25 23:06:45.580729867 +0200
+++ /var/tmp/diff_new_pack.rvU2ps/_new 2024-06-25 23:06:45.584730014 +0200
@@ -5,6 +5,8 @@
%dir %{_sysconfdir}/systemd/network
%dir %{_sysconfdir}/systemd/networkd.conf.d
%dir %{_systemd_util_dir}/network
+# Main config files have been replaced in favor of drop-ins.
+%ghost %{_sysconfdir}/systemd/networkd.conf
%{_bindir}/networkctl
%{_datadir}/bash-completion/completions/networkctl
%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.DHCPServer.xml
++++++ files.systemd ++++++
--- /var/tmp/diff_new_pack.rvU2ps/_old 2024-06-25 23:06:45.620731341 +0200
+++ /var/tmp/diff_new_pack.rvU2ps/_new 2024-06-25 23:06:45.624731489 +0200
@@ -25,12 +25,14 @@
%dir %{_libdir}/systemd
%dir %{_localstatedir}/lib/systemd
%dir %{_localstatedir}/lib/systemd/catalog
+%dir %{_localstatedir}/lib/systemd/coredump
%dir %{_localstatedir}/lib/systemd/rpm
%dir %{_modprobedir}
%dir %{_sysconfdir}/X11/xorg.conf.d
%dir %{_sysconfdir}/binfmt.d
%dir %{_sysconfdir}/sysctl.d
%dir %{_sysconfdir}/systemd
+%dir %{_sysconfdir}/systemd/coredump.conf.d
%dir %{_sysconfdir}/systemd/journald.conf.d
%dir %{_sysconfdir}/systemd/logind.conf.d
%dir %{_sysconfdir}/systemd/system
@@ -89,9 +91,17 @@
%ghost %config(noreplace) %{_sysconfdir}/machine-info
%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal
%ghost %{_localstatedir}/lib/systemd/catalog/database
+# Main config files have been replaced in favor of drop-ins.
+%ghost %{_sysconfdir}/systemd/journald.conf
+%ghost %{_sysconfdir}/systemd/logind.conf
+%ghost %{_sysconfdir}/systemd/system.conf
+%ghost %{_sysconfdir}/systemd/user.conf
%license LICENSE.GPL2
%license LICENSE.LGPL2.1
%{_bindir}/busctl
+%if %{without bootstrap}
+%{_bindir}/coredumpctl
+%endif
%{_bindir}/hostnamectl
%{_bindir}/journalctl
%{_bindir}/localectl
@@ -128,6 +138,7 @@
%if %{without bootstrap}
%{_bindir}/userdbctl
%{_datadir}/bash-completion/completions/busctl
+%{_datadir}/bash-completion/completions/coredumpctl
%{_datadir}/bash-completion/completions/hostnamectl
%{_datadir}/bash-completion/completions/journalctl
%{_datadir}/bash-completion/completions/localectl
@@ -192,6 +203,7 @@
%{_datadir}/systemd/language-fallback-map
%if %{without bootstrap}
%{_datadir}/zsh/site-functions/_busctl
+%{_datadir}/zsh/site-functions/_coredumpctl
%{_datadir}/zsh/site-functions/_hostnamectl
%{_datadir}/zsh/site-functions/_journalctl
%{_datadir}/zsh/site-functions/_localectl
@@ -216,6 +228,7 @@
%{_libdir}/systemd/libsystemd-shared-%{systemd_major}.so
%if %{without bootstrap}
%{_mandir}/man1/busctl.1.gz
+%{_mandir}/man1/coredumpctl.1.gz
%{_mandir}/man1/hostnamectl.1.gz
%{_mandir}/man1/init.1.gz
%{_mandir}/man1/journalctl.1.gz
@@ -251,6 +264,8 @@
%{_mandir}/man1/timedatectl.1.gz
%{_mandir}/man1/userdbctl.1.gz
%{_mandir}/man5/binfmt.d.5.gz
+%{_mandir}/man5/coredump.conf.5.gz
+%{_mandir}/man5/coredump.conf.d.5.gz
%{_mandir}/man5/dnssec-trust-anchors.d.5.gz
%{_mandir}/man5/environment.d.5.gz
%{_mandir}/man5/extension-release.5.gz
@@ -340,6 +355,9 @@
%{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz
%{_mandir}/man8/systemd-confext.8.gz
%{_mandir}/man8/systemd-confext.service.8.gz
+%{_mandir}/man8/systemd-coredump.8.gz
+%{_mandir}/man8/systemd-coredump.socket.8.gz
+%{_mandir}/man8/systemd-cored...@.service.8.gz
%{_mandir}/man8/systemd-debug-generator.8.gz
%{_mandir}/man8/systemd-environment-d-generator.8.gz
%{_mandir}/man8/systemd-getty-generator.8.gz
@@ -405,8 +423,14 @@
%{_sbindir}/reboot
%{_sbindir}/shutdown
%{_sysconfdir}/xdg/systemd/user
+%if %{without bootstrap}
+%{_sysctldir}/50-coredump.conf
+%endif
%{_sysctldir}/99-sysctl.conf
%{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator
+%if %{without bootstrap}
+%{_systemd_util_dir}/coredump.conf
+%endif
%{_systemd_util_dir}/journald.conf
%{_systemd_util_dir}/logind.conf
%{_systemd_util_dir}/rpm/fixlet-systemd-post.sh
@@ -416,6 +440,9 @@
%{_systemd_util_dir}/systemd-binfmt
%{_systemd_util_dir}/systemd-boot-check-no-failures
%{_systemd_util_dir}/systemd-cgroups-agent
+%if %{without bootstrap}
+%{_systemd_util_dir}/systemd-coredump
+%endif
%{_systemd_util_dir}/systemd-executor
%{_systemd_util_dir}/systemd-hostnamed
%{_systemd_util_dir}/systemd-journald
@@ -469,6 +496,9 @@
%{_systemdgeneratordir}/systemd-run-generator
%{_systemdgeneratordir}/systemd-system-update-generator
%{_systemdusergeneratordir}/systemd-xdg-autostart-generator
+%if %{without bootstrap}
+%{_sysusersdir}/systemd-coredump.conf
+%endif
%{_sysusersdir}/systemd-journal.conf
%{_tmpfilesdir}/credstore.conf
%{_tmpfilesdir}/journal-nocow.conf
@@ -558,6 +588,9 @@
%{_unitdir}/slices.target
%{_unitdir}/smartcard.target
%{_unitdir}/sockets.target
+%if %{without bootstrap}
+%{_unitdir}/sockets.target.wants/systemd-coredump.socket
+%endif
%{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket
%{_unitdir}/sockets.target.wants/systemd-journald.socket
%{_unitdir}/sockets.target.wants/systemd-sysext.socket
@@ -601,6 +634,10 @@
%{_unitdir}/systemd-binfmt.service
%{_unitdir}/systemd-boot-check-no-failures.service
%{_unitdir}/systemd-confext.service
+%if %{without bootstrap}
+%{_unitdir}/systemd-coredump.socket
+%{_unitdir}/systemd-coredump@.service
+%endif
%{_unitdir}/systemd-exit.service
%{_unitdir}/systemd-halt.service
%{_unitdir}/systemd-hostnamed.service
++++++ files.udev ++++++
--- /var/tmp/diff_new_pack.rvU2ps/_old 2024-06-25 23:06:45.660732816 +0200
+++ /var/tmp/diff_new_pack.rvU2ps/_new 2024-06-25 23:06:45.664732964 +0200
@@ -40,6 +40,11 @@
%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation
%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf
%ghost %{_localstatedir}/lib/systemd/backlight
+# Main config files have been replaced in favor of drop-ins.
+%ghost %{_sysconfdir}/systemd/pstore.conf
+%ghost %{_sysconfdir}/systemd/sleep.conf
+%ghost %{_sysconfdir}/systemd/timesyncd.conf
+%ghost %{_sysconfdir}/udev/iocost.conf
%{_bindir}/bootctl
%if %{without bootstrap}
%{_bindir}/kernel-install
++++++ fixlet-systemd-post.sh ++++++
--- /var/tmp/diff_new_pack.rvU2ps/_old 2024-06-25 23:06:45.696734143 +0200
+++ /var/tmp/diff_new_pack.rvU2ps/_new 2024-06-25 23:06:45.700734291 +0200
@@ -276,6 +276,31 @@
fi
}
+#
+# We have stopped shipping the main config files in /etc but we don't try to
+# clean them up automatically as it can have unexepected side effects
+# (bsc#1226415). Instead we simply suggest users to convert them (if they
exist)
+# into drop-ins.
+#
+# Note: run at each package update
+#
+check_config_files () {
+ config_files=(systemd/journald.conf systemd/logind.conf
systemd/system.conf systemd/user.conf
+ systemd/pstore.conf systemd/sleep.conf
systemd/timesyncd.conf systemd/coredump.conf
+ systemd/journal-remote.conf systemd/journal-upload.conf
systemd/networkd.conf
+ systemd/resolved.conf systemd/oomd.conf udev/iocost.conf)
+
+ for f in ${config_files[*]}; do
+ [ -e /etc/$f ] || continue
+
+ cat >&2 <<EOF
+Main configuration files are deprecated in favor of drop-ins.
+Hence we suggest you to remove /etc/$f if it doesn't contain any customization
or convert it into drop-in otherwise.
+For more details, please visit https://en.opensuse.org/Systemd#Configuration.
+EOF
+ done
+}
+
r=0
fix_machine_id_perms || r=1
fix_pre_210 || r=1
