- Merge systemd-coredump back into the main package (bsc#1091684)

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1530

files.coredump

@@ -1,23 +0,0 @@
-#
-# Please keep the list sorted (with `LC_ALL=C sort`).
-#
-%dir %{_localstatedir}/lib/systemd/coredump
-%dir %{_sysconfdir}/systemd/coredump.conf.d
-%{_bindir}/coredumpctl
-%if %{without bootstrap}
-%{_datadir}/bash-completion/completions/coredumpctl
-%{_datadir}/zsh/site-functions/_coredumpctl
-%{_mandir}/man1/coredumpctl.1.gz
-%{_mandir}/man5/coredump.conf.5.gz
-%{_mandir}/man5/coredump.conf.d.5.gz
-%{_mandir}/man8/systemd-coredump.8.gz
-%{_mandir}/man8/systemd-coredump.socket.8.gz
-%{_mandir}/man8/systemd-coredump@.service.8.gz
-%endif
-%{_sysctldir}/50-coredump.conf
-%{_systemd_util_dir}/coredump.conf
-%{_systemd_util_dir}/systemd-coredump
-%{_sysusersdir}/systemd-coredump.conf
-%{_unitdir}/sockets.target.wants/systemd-coredump.socket
-%{_unitdir}/systemd-coredump.socket
-%{_unitdir}/systemd-coredump@.service

files.systemd

@@ -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
@@ -92,6 +94,9 @@
 %license LICENSE.GPL2
 %license LICENSE.LGPL2.1
 %{_bindir}/busctl
+%if %{without bootstrap}
+%{_bindir}/coredumpctl
+%endif
 %{_bindir}/hostnamectl
 %{_bindir}/journalctl
 %{_bindir}/localectl
@@ -128,6 +133,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 +198,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 +223,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 +259,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 +350,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-coredump@.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 +418,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 +435,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 +491,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 +583,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 +629,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

systemd.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 18 10:19:19 UTC 2024 - Franck Bui <fbui@suse.com>
+
+- Merge systemd-coredump back into the main package (bsc#1091684)
+
 -------------------------------------------------------------------
 Tue Jun 18 10:12:01 UTC 2024 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -56,7 +56,6 @@
 %else
 %global mini %nil
 %bcond_without  apparmor
-%bcond_without  coredump
 %bcond_without  homed
 %bcond_without  importd
 %bcond_without  journal_remote
@@ -185,6 +184,8 @@ Obsoletes:      nss-systemd < %{version}-%{release}
 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 +217,6 @@ Source204:      files.devel
 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 +422,6 @@ Requires:       this-is-only-for-build-envs
 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
@@ -671,9 +657,6 @@ Requires:       systemd-container
 %if %{with sd_boot}
 Requires:       systemd-boot
 %endif
-%if %{with coredump}
-Requires:       systemd-coredump
-%endif
 %if %{with experimental}
 Requires:       systemd-experimental
 %endif
@@ -843,7 +826,7 @@ for the C APIs.
         -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} \
@@ -1150,6 +1133,7 @@ journalctl --update-catalog || :
 %systemd_postun_with_restart systemd-userdbd.service
 
 %posttrans
+%restore_rpmsave systemd/coredump.conf
 %restore_rpmsave systemd/journald.conf
 %restore_rpmsave systemd/logind.conf
 %restore_rpmsave systemd/system.conf
@@ -1239,16 +1223,6 @@ fi
 %{_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
@@ -1435,11 +1409,6 @@ fi
 %{_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}