From d1cca9a9fb9abebbea9534161c87d165f1f6b559a166933a25c5b831059033f3 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 10 Sep 2021 09:54:08 +0000 Subject: [PATCH 01/10] - Adjust pam macros OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1185 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 12 ++++++------ systemd.changes | 5 +++++ systemd.spec | 12 ++++++------ 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index d28a872..e3cc72e 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 10 09:51:06 UTC 2021 - Franck Bui + +- Adjust pam macros + ------------------------------------------------------------------- Wed Sep 8 17:01:58 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 2de1c70..f07a4c5 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -621,8 +621,8 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamconfdir=%{_distconfdir}/pam.d \ - -Dpamlibdir=%{_pamdir} \ + -Dpamconfdir=%{_pam_vendordir} \ + -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ @@ -752,7 +752,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d +install -m0644 %{S:2} %{buildroot}%{_pam_vendordir} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -1379,7 +1379,7 @@ fi %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ -%{_pamdir}/pam_systemd.so +%{_pam_moduledir}/pam_systemd.so %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot @@ -1421,7 +1421,7 @@ fi %dir %{_distconfdir}/X11/xinit/xinitrc.d %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh -%{_distconfdir}/pam.d/systemd-user +%{_pam_vendordir}/systemd-user %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1869,7 +1869,7 @@ fi %{_prefix}/lib/systemd/systemd-homework %{_unitdir}/systemd-homed.service %{_unitdir}/systemd-homed-activate.service -%{_pamdir}/pam_systemd_home.so +%{_pam_moduledir}/pam_systemd_home.so %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf %{_datadir}/polkit-1/actions/org.freedesktop.home1.policy diff --git a/systemd.changes b/systemd.changes index d28a872..e3cc72e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 10 09:51:06 UTC 2021 - Franck Bui + +- Adjust pam macros + ------------------------------------------------------------------- Wed Sep 8 17:01:58 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 336ac69..a53416e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -619,8 +619,8 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamconfdir=%{_distconfdir}/pam.d \ - -Dpamlibdir=%{_pamdir} \ + -Dpamconfdir=%{_pam_vendordir} \ + -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ @@ -750,7 +750,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d +install -m0644 %{S:2} %{buildroot}%{_pam_vendordir} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -1377,7 +1377,7 @@ fi %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ -%{_pamdir}/pam_systemd.so +%{_pam_moduledir}/pam_systemd.so %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot @@ -1419,7 +1419,7 @@ fi %dir %{_distconfdir}/X11/xinit/xinitrc.d %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh -%{_distconfdir}/pam.d/systemd-user +%{_pam_vendordir}/systemd-user %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1867,7 +1867,7 @@ fi %{_prefix}/lib/systemd/systemd-homework %{_unitdir}/systemd-homed.service %{_unitdir}/systemd-homed-activate.service -%{_pamdir}/pam_systemd_home.so +%{_pam_moduledir}/pam_systemd_home.so %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf %{_datadir}/polkit-1/actions/org.freedesktop.home1.policy From c50d60c7daa8080d0e2a11402d901a20a786e62c155f9bf0bafab6c3688570c6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 10 Sep 2021 13:31:14 +0000 Subject: [PATCH 02/10] - Drop git internal files from the testsuite sub-package OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1186 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 1 + systemd.changes | 5 +++++ systemd.spec | 1 + 4 files changed, 12 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index e3cc72e..a710a70 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 10 13:30:14 UTC 2021 - Franck Bui + +- Drop git internal files from the testsuite sub-package + ------------------------------------------------------------------- Fri Sep 10 09:51:06 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index f07a4c5..95e3c7b 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -898,6 +898,7 @@ rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} cp -a test %{buildroot}%{_testsuitedir}/ +find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif %if ! 0%{?bootstrap} diff --git a/systemd.changes b/systemd.changes index e3cc72e..a710a70 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 10 13:30:14 UTC 2021 - Franck Bui + +- Drop git internal files from the testsuite sub-package + ------------------------------------------------------------------- Fri Sep 10 09:51:06 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a53416e..f4e8932 100644 --- a/systemd.spec +++ b/systemd.spec @@ -896,6 +896,7 @@ rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} cp -a test %{buildroot}%{_testsuitedir}/ +find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif %if ! 0%{?bootstrap} From 305477c6fc7d4a9b999af6c475be991d5e48916ea13f8c338920ce767cb62e6e Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 22 Sep 2021 08:45:10 +0000 Subject: [PATCH 03/10] Add a couple of missing bug references in the changelog OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1187 --- systemd-mini.changes | 11 ++++++++++- systemd.changes | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index a710a70..d31b40f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -79,6 +79,10 @@ Mon Aug 2 12:54:44 UTC 2021 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for details. + This includes the following bug fixes: + + - upstream commit 6fb61918ccdd0610b425d5b0e5417751f8f8f783 (bsc#1182870) + - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -320,6 +324,11 @@ Mon Apr 26 16:25:38 UTC 2021 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v248/NEWS for details. + This includes the following bug fixes: + + - upstream commit 4327574fc1093513badc2177f71cede2fc88c13c (bsc#1166028) + - upstream commit 3573e032f26724949e86626eace058d006b8bf70 (bsc#1186411) + - A couple runtime dependencies on libraries are now tracked manually (with Recommends:) due to the fact that some symbols of these libs are dynamically loaded with dlopen() (heck!) @@ -984,7 +993,7 @@ Mon Apr 27 14:50:36 UTC 2020 - Franck Bui ------------------------------------------------------------------- Mon Apr 27 14:33:35 UTC 2020 - Franck Bui -- Drop most of the tmpfiles that deal with generic paths (bsc#1078466) +- Drop most of the tmpfiles that deal with generic paths (bsc#1078466 bsc#1181831) They are problematic because some of them conflict with SUSE defaults. Therefore it seems better to let the revelant packages diff --git a/systemd.changes b/systemd.changes index a710a70..d31b40f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -79,6 +79,10 @@ Mon Aug 2 12:54:44 UTC 2021 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for details. + This includes the following bug fixes: + + - upstream commit 6fb61918ccdd0610b425d5b0e5417751f8f8f783 (bsc#1182870) + - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -320,6 +324,11 @@ Mon Apr 26 16:25:38 UTC 2021 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v248/NEWS for details. + This includes the following bug fixes: + + - upstream commit 4327574fc1093513badc2177f71cede2fc88c13c (bsc#1166028) + - upstream commit 3573e032f26724949e86626eace058d006b8bf70 (bsc#1186411) + - A couple runtime dependencies on libraries are now tracked manually (with Recommends:) due to the fact that some symbols of these libs are dynamically loaded with dlopen() (heck!) @@ -984,7 +993,7 @@ Mon Apr 27 14:50:36 UTC 2020 - Franck Bui ------------------------------------------------------------------- Mon Apr 27 14:33:35 UTC 2020 - Franck Bui -- Drop most of the tmpfiles that deal with generic paths (bsc#1078466) +- Drop most of the tmpfiles that deal with generic paths (bsc#1078466 bsc#1181831) They are problematic because some of them conflict with SUSE defaults. Therefore it seems better to let the revelant packages From 6bf52cd2f25ff018b2c3c859c5637e45237e694b0b3ce73ed2880cce72134e6c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 22 Sep 2021 13:29:40 +0000 Subject: [PATCH 04/10] - Update the dependencies of the testsuite package The debug tools are optional thus no more required. OTOH strip(1) is needed when building the test image and nc(1) is needed by some tests. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1188 --- systemd-mini.changes | 10 ++++++++++ systemd-mini.spec | 4 ++-- systemd.changes | 10 ++++++++++ systemd.spec | 4 ++-- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index d31b40f..79711c8 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Sep 22 13:25:26 UTC 2021 - Franck Bui + +- Update the dependencies of the testsuite package + + The debug tools are optional thus no more required. + + OTOH strip(1) is needed when building the test image and nc(1) is + needed by some tests. + ------------------------------------------------------------------- Fri Sep 10 13:30:14 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 95e3c7b..f7a97f5 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -511,13 +511,13 @@ Requires: libqrencode4 pkgconfig(libqrencode) %endif Requires: %{name} = %{version}-%{release} Requires: attr +Requires: binutils Requires: busybox-static Requires: cryptsetup -Requires: dhcp-client Requires: dosfstools Requires: libcap-progs Requires: lz4 -Requires: net-tools-deprecated +Requires: netcat Requires: qemu-kvm Requires: quota Requires: socat diff --git a/systemd.changes b/systemd.changes index d31b40f..79711c8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Sep 22 13:25:26 UTC 2021 - Franck Bui + +- Update the dependencies of the testsuite package + + The debug tools are optional thus no more required. + + OTOH strip(1) is needed when building the test image and nc(1) is + needed by some tests. + ------------------------------------------------------------------- Fri Sep 10 13:30:14 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f4e8932..24cc5cf 100644 --- a/systemd.spec +++ b/systemd.spec @@ -509,13 +509,13 @@ Requires: libqrencode4 pkgconfig(libqrencode) %endif Requires: %{name} = %{version}-%{release} Requires: attr +Requires: binutils Requires: busybox-static Requires: cryptsetup -Requires: dhcp-client Requires: dosfstools Requires: libcap-progs Requires: lz4 -Requires: net-tools-deprecated +Requires: netcat Requires: qemu-kvm Requires: quota Requires: socat From a484fde798a57c7152fb1dc058f9e4089d6e60bd3ed212cf2d1c0832b377e3cb Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 22 Sep 2021 13:45:37 +0000 Subject: [PATCH 05/10] - Import commit 7a5801342fe2f53e5c2a8578d6db132c0eca2d97 8d65ec4a66 test: wc is needed by test/units/testsuite-50.sh 1527bcc5dd test: make the installation of the debug tools optional in the image f4e6bf0b37 journalctl: never fail at flushing when the flushed flag is set (bsc#1188588) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1189 --- systemd-mini.changes | 9 +++++++++ systemd-mini.spec | 2 +- systemd-v249.4+suse.35.gec72db9ee0.tar.xz | 3 --- systemd-v249.4+suse.39.g7a5801342f.tar.xz | 3 +++ systemd.changes | 9 +++++++++ systemd.spec | 2 +- 6 files changed, 23 insertions(+), 5 deletions(-) delete mode 100644 systemd-v249.4+suse.35.gec72db9ee0.tar.xz create mode 100644 systemd-v249.4+suse.39.g7a5801342f.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 79711c8..0c7c9ea 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Sep 22 13:41:34 UTC 2021 - Franck Bui + +- Import commit 7a5801342fe2f53e5c2a8578d6db132c0eca2d97 + + 8d65ec4a66 test: wc is needed by test/units/testsuite-50.sh + 1527bcc5dd test: make the installation of the debug tools optional in the image + f4e6bf0b37 journalctl: never fail at flushing when the flushed flag is set (bsc#1188588) + ------------------------------------------------------------------- Wed Sep 22 13:25:26 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index f7a97f5..00f8acc 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.35.gec72db9ee0 +%define suse_version +suse.39.g7a5801342f %define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi diff --git a/systemd-v249.4+suse.35.gec72db9ee0.tar.xz b/systemd-v249.4+suse.35.gec72db9ee0.tar.xz deleted file mode 100644 index d8ceb7c..0000000 --- a/systemd-v249.4+suse.35.gec72db9ee0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d581f2ec411b41826c395147fe9a040b0e916de7fdeeaae0681f43be8b92bb82 -size 7266280 diff --git a/systemd-v249.4+suse.39.g7a5801342f.tar.xz b/systemd-v249.4+suse.39.g7a5801342f.tar.xz new file mode 100644 index 0000000..5000653 --- /dev/null +++ b/systemd-v249.4+suse.39.g7a5801342f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:253802820cf7090eb06e26f5dc23dfd9dfd967fc20b8c85350ea4856fe99442d +size 7266304 diff --git a/systemd.changes b/systemd.changes index 79711c8..0c7c9ea 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Sep 22 13:41:34 UTC 2021 - Franck Bui + +- Import commit 7a5801342fe2f53e5c2a8578d6db132c0eca2d97 + + 8d65ec4a66 test: wc is needed by test/units/testsuite-50.sh + 1527bcc5dd test: make the installation of the debug tools optional in the image + f4e6bf0b37 journalctl: never fail at flushing when the flushed flag is set (bsc#1188588) + ------------------------------------------------------------------- Wed Sep 22 13:25:26 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 24cc5cf..397ef81 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.35.gec72db9ee0 +%define suse_version +suse.39.g7a5801342f %define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi From 3272f46d5b49e0157c65fe2fe6dd0e0f3f9154418e554391862cb8ded407412c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 24 Sep 2021 07:42:46 +0000 Subject: [PATCH 06/10] - Drop systemd-logger This sub package was introduced in order to configure persistent journal and also to make sure that another syslog provider (such as rsyslog) couldn't be installed at the same time: each syslog provider conflicts with each others. However this mechanism didn't work since uninstalling systemd-logger wasn't magically turning off persistent logging because /var/log/journal is likely to be populated hence not removed. Moreover using a subpackage to configure the mode of journald was overkill and the usual ways (main conf file or drop-ins) should be preferred. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1190 --- systemd-mini-rpmlintrc | 2 -- systemd-mini.changes | 18 ++++++++++++++++++ systemd-mini.spec | 42 +++++++++++------------------------------- systemd-rpmlintrc | 2 -- systemd.changes | 18 ++++++++++++++++++ systemd.spec | 42 +++++++++++------------------------------- 6 files changed, 58 insertions(+), 66 deletions(-) diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index 9bc3777..c3b202a 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -20,10 +20,8 @@ addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") addFilter("nss-resolve.*shlib-policy-name-error.*") -addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") -addFilter(".*files-duplicate.*/systemd-logger.*") addFilter(".*missing-call-to-setgroups-before-setuid.*") addFilter(".*missing-call-to-chdir-with-chroot.*") addFilter(".*systemd-service-without-service.*") diff --git a/systemd-mini.changes b/systemd-mini.changes index 0c7c9ea..994e5ae 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Sep 24 07:27:58 UTC 2021 - Franck Bui + +- Drop systemd-logger + + This sub package was introduced in order to configure persistent + journal and also to make sure that another syslog provider (such as + rsyslog) couldn't be installed at the same time: each syslog + provider conflicts with each others. + + However this mechanism didn't work since uninstalling systemd-logger + wasn't magically turning off persistent logging because + /var/log/journal is likely to be populated hence not removed. + + Moreover using a subpackage to configure the mode of journald was + overkill and the usual ways (main conf file or drop-ins) should be + preferred. + ------------------------------------------------------------------- Wed Sep 22 13:41:34 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 00f8acc..64066d1 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -154,10 +154,12 @@ Conflicts: kiwi Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 -Obsoletes: systemd-analyze < 201 +Provides: systemd-logger = %{version}-%{release} +Obsoletes: systemd-logger < %{version}-%{release} Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 +Obsoletes: systemd-analyze < 201 Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user @@ -398,21 +400,9 @@ More information can be found online: http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES - %endif %if ! 0%{?bootstrap} -%package logger -Summary: Journal only logging -License: LGPL-2.1-or-later -Provides: syslog -Provides: sysvinit(syslog) -Requires(post): /usr/bin/systemctl -Conflicts: otherproviders(syslog) - -%description logger -This package marks the installation to not use syslog but only the journal. - %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later @@ -782,10 +772,6 @@ rm -f %{buildroot}%{_sysusersdir}/basic.conf # in this directory... oh well. rm -f %{buildroot}/etc/init.d/README -# Create the /var/log/journal directory to change the volatile journal -# to a persistent one -mkdir -p %{buildroot}%{_localstatedir}/log/journal/ - # This dir must be owned (and thus created) by systemd otherwise the # build system will complain. This is odd since we simply own a ghost # file in it... @@ -960,6 +946,11 @@ systemctl daemon-reexec || : # # systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : +if [ "$1" -eq 1 ]; then + # Persistent journal is the default + mkdir -p %{_localstatedir}/log/journal +fi + %journal_catalog_update %tmpfiles_create @@ -1103,13 +1094,6 @@ fi %endif %if ! 0%{?bootstrap} -%post logger -%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ -if [ "$1" -eq 1 ]; then - # tell journal to start logging on disk if directory didn't exist before - systemctl --no-block restart systemd-journal-flush.service >/dev/null || : -fi - %post -n nss-myhostname -p /sbin/ldconfig %postun -n nss-myhostname -p /sbin/ldconfig @@ -1382,6 +1366,9 @@ fi %{_pam_moduledir}/pam_systemd.so +%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ +%doc %{_localstatedir}/log/README + %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi @@ -1559,7 +1546,6 @@ fi %defattr(-,root,root,-) %dir %{_docdir}/systemd %{_docdir}/systemd/html - # /bootstrap %endif @@ -1735,12 +1721,6 @@ fi %if ! 0%{?bootstrap} %files lang -f systemd.lang -%files logger -%defattr(-,root,root) -# package without explicit setgid bit / attrs (see bsc#1172550) -%dir %{_localstatedir}/log/journal/ -%doc %{_localstatedir}/log/README - %files -n nss-myhostname %defattr(-, root, root) %{_libdir}/*nss_myhostname* diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 9bc3777..c3b202a 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -20,10 +20,8 @@ addFilter("nss-systemd.*shlib-policy-name-error.*") addFilter("nss-myhostname.*shlib-policy-name-error.*") addFilter("nss-mymachines.*shlib-policy-name-error.*") addFilter("nss-resolve.*shlib-policy-name-error.*") -addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") -addFilter(".*files-duplicate.*/systemd-logger.*") addFilter(".*missing-call-to-setgroups-before-setuid.*") addFilter(".*missing-call-to-chdir-with-chroot.*") addFilter(".*systemd-service-without-service.*") diff --git a/systemd.changes b/systemd.changes index 0c7c9ea..994e5ae 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Fri Sep 24 07:27:58 UTC 2021 - Franck Bui + +- Drop systemd-logger + + This sub package was introduced in order to configure persistent + journal and also to make sure that another syslog provider (such as + rsyslog) couldn't be installed at the same time: each syslog + provider conflicts with each others. + + However this mechanism didn't work since uninstalling systemd-logger + wasn't magically turning off persistent logging because + /var/log/journal is likely to be populated hence not removed. + + Moreover using a subpackage to configure the mode of journald was + overkill and the usual ways (main conf file or drop-ins) should be + preferred. + ------------------------------------------------------------------- Wed Sep 22 13:41:34 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 397ef81..5c0967d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -152,10 +152,12 @@ Conflicts: kiwi Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 -Obsoletes: systemd-analyze < 201 +Provides: systemd-logger = %{version}-%{release} +Obsoletes: systemd-logger < %{version}-%{release} Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 +Obsoletes: systemd-analyze < 201 Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user @@ -396,21 +398,9 @@ More information can be found online: http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES - %endif %if ! 0%{?bootstrap} -%package logger -Summary: Journal only logging -License: LGPL-2.1-or-later -Provides: syslog -Provides: sysvinit(syslog) -Requires(post): /usr/bin/systemctl -Conflicts: otherproviders(syslog) - -%description logger -This package marks the installation to not use syslog but only the journal. - %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later @@ -780,10 +770,6 @@ rm -f %{buildroot}%{_sysusersdir}/basic.conf # in this directory... oh well. rm -f %{buildroot}/etc/init.d/README -# Create the /var/log/journal directory to change the volatile journal -# to a persistent one -mkdir -p %{buildroot}%{_localstatedir}/log/journal/ - # This dir must be owned (and thus created) by systemd otherwise the # build system will complain. This is odd since we simply own a ghost # file in it... @@ -958,6 +944,11 @@ systemctl daemon-reexec || : # # systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : +if [ "$1" -eq 1 ]; then + # Persistent journal is the default + mkdir -p %{_localstatedir}/log/journal +fi + %journal_catalog_update %tmpfiles_create @@ -1101,13 +1092,6 @@ fi %endif %if ! 0%{?bootstrap} -%post logger -%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ -if [ "$1" -eq 1 ]; then - # tell journal to start logging on disk if directory didn't exist before - systemctl --no-block restart systemd-journal-flush.service >/dev/null || : -fi - %post -n nss-myhostname -p /sbin/ldconfig %postun -n nss-myhostname -p /sbin/ldconfig @@ -1380,6 +1364,9 @@ fi %{_pam_moduledir}/pam_systemd.so +%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ +%doc %{_localstatedir}/log/README + %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi @@ -1557,7 +1544,6 @@ fi %defattr(-,root,root,-) %dir %{_docdir}/systemd %{_docdir}/systemd/html - # /bootstrap %endif @@ -1733,12 +1719,6 @@ fi %if ! 0%{?bootstrap} %files lang -f systemd.lang -%files logger -%defattr(-,root,root) -# package without explicit setgid bit / attrs (see bsc#1172550) -%dir %{_localstatedir}/log/journal/ -%doc %{_localstatedir}/log/README - %files -n nss-myhostname %defattr(-, root, root) %{_libdir}/*nss_myhostname* From 97751255ede31cc83783884a2f7cd910a3076cd5101fb26970f190b98fbeefa6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 24 Sep 2021 09:29:34 +0000 Subject: [PATCH 07/10] - systemd.spec: fix a bunch of rpmlint errors/warnings OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1191 --- systemd-mini-rpmlintrc | 28 ++++------------------------ systemd-mini.changes | 5 +++++ systemd-mini.spec | 21 ++++++++++++++++----- systemd-rpmlintrc | 28 ++++------------------------ systemd.changes | 5 +++++ systemd.spec | 21 ++++++++++++++++----- 6 files changed, 50 insertions(+), 58 deletions(-) diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index c3b202a..6526f3d 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -1,30 +1,10 @@ -addFilter("invalid-pkgconfig-file") -addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*") -addFilter(".*dangling-symlink .* /dev/null.*") -addFilter(".*files-duplicate .*/reboot\.8.*") -addFilter(".*files-duplicate .*/sd_is_socket\.3.*") -addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion\.sh") -addFilter("non-conffile-in-etc /etc/rpm/macros\.systemd") +addFilter(".*filelist-forbidden-systemd-userdirs /etc/systemd/.*\.conf") addFilter(".*dbus-policy-allow-receive") -addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*") -addFilter(".*dangling-symlink /lib/udev/devices/core.*") -addFilter(".*dangling-symlink /lib/udev/devices/fd.*") -addFilter(".*incoherent-init-script-name boot\.udev.*") -addFilter(".init-script-without-%stop_on_removal-preun /etc/init\.d/boot\.udev") -addFilter(".init-script-without-%restart_on_update-postun /etc/init\.d/boot\.udev") addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") -addFilter(".*libgudev-.*shlib-fixed-dependency.*") -addFilter(".*suse-filelist-forbidden-systemd-userdirs.*") -addFilter("libudev-mini.*shlib-policy-name-error.*") -addFilter("nss-systemd.*shlib-policy-name-error.*") -addFilter("nss-myhostname.*shlib-policy-name-error.*") -addFilter("nss-mymachines.*shlib-policy-name-error.*") -addFilter("nss-resolve.*shlib-policy-name-error.*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") -addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") addFilter(".*missing-call-to-setgroups-before-setuid.*") -addFilter(".*missing-call-to-chdir-with-chroot.*") addFilter(".*systemd-service-without-service.*") -addFilter(".*shlib-policy-missing-suffix.*") -addFilter(".*suse-missing-rclink.*") addFilter("env-script-interpreter") +addFilter(".*files-duplicate /usr/lib/systemd/.*") +addFilter(".*files-duplicated-waste.*") +addFilter(".*explicit-lib-dependency .*") diff --git a/systemd-mini.changes b/systemd-mini.changes index 994e5ae..b78f954 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 24 09:28:38 UTC 2021 - Franck Bui + +- systemd.spec: fix a bunch of rpmlint errors/warnings + ------------------------------------------------------------------- Fri Sep 24 07:27:58 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 64066d1..17a8f3f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -238,7 +238,7 @@ Summary: System V init tools License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Provides: sbin_init -Conflicts: otherproviders(sbin_init) +Conflicts: sbin_init Provides: systemd-sysvinit = %{version}-%{release} Provides: sysvinit:/sbin/init @@ -892,7 +892,7 @@ find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif # Build of installation images uses a hard coded list of packages with -# a %pre that needs to be run during the build. systemd is one of them +# a %%pre that needs to be run during the build. systemd is one of them # so keep the section even if it's empty. %pre : @@ -921,7 +921,7 @@ pam-config --add --systemd || : %endif # systemd-sysusers is not available in %pre so this needs to be done -# in %post. However this shouldn't be an issue since all files the +# in %%post. However this shouldn't be an issue since all files the # main package ships are owned by root. %sysusers_create systemd.conf @@ -1211,8 +1211,6 @@ fi %service_del_postun systemd-homed.service %endif -%clean - %files %defattr(-,root,root) %license LICENSE* @@ -1437,6 +1435,14 @@ fi %{_modprobedir}/systemd.conf # Some files created at runtime. +%ghost %{_rundir}/log +%ghost %{_rundir}/systemd +%ghost %{_rundir}/systemd/ask-password +%ghost %{_rundir}/systemd/seats +%ghost %{_rundir}/systemd/sessions +%ghost %{_rundir}/systemd/users +%ghost %{_rundir}/systemd/machines +%ghost %{_rundir}/systemd/shutdown %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1789,6 +1795,11 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service +# Some files created at runtime +%ghost %{_rundir}/systemd/netif +%ghost %{_rundir}/systemd/netif/links +%ghost %{_rundir}/systemd/netif/leases +%ghost %{_rundir}/systemd/netif/lldp %endif %if %{with resolved} %{_bindir}/resolvectl diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index c3b202a..6526f3d 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -1,30 +1,10 @@ -addFilter("invalid-pkgconfig-file") -addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*") -addFilter(".*dangling-symlink .* /dev/null.*") -addFilter(".*files-duplicate .*/reboot\.8.*") -addFilter(".*files-duplicate .*/sd_is_socket\.3.*") -addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion\.sh") -addFilter("non-conffile-in-etc /etc/rpm/macros\.systemd") +addFilter(".*filelist-forbidden-systemd-userdirs /etc/systemd/.*\.conf") addFilter(".*dbus-policy-allow-receive") -addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*") -addFilter(".*dangling-symlink /lib/udev/devices/core.*") -addFilter(".*dangling-symlink /lib/udev/devices/fd.*") -addFilter(".*incoherent-init-script-name boot\.udev.*") -addFilter(".init-script-without-%stop_on_removal-preun /etc/init\.d/boot\.udev") -addFilter(".init-script-without-%restart_on_update-postun /etc/init\.d/boot\.udev") addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") -addFilter(".*libgudev-.*shlib-fixed-dependency.*") -addFilter(".*suse-filelist-forbidden-systemd-userdirs.*") -addFilter("libudev-mini.*shlib-policy-name-error.*") -addFilter("nss-systemd.*shlib-policy-name-error.*") -addFilter("nss-myhostname.*shlib-policy-name-error.*") -addFilter("nss-mymachines.*shlib-policy-name-error.*") -addFilter("nss-resolve.*shlib-policy-name-error.*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") -addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") addFilter(".*missing-call-to-setgroups-before-setuid.*") -addFilter(".*missing-call-to-chdir-with-chroot.*") addFilter(".*systemd-service-without-service.*") -addFilter(".*shlib-policy-missing-suffix.*") -addFilter(".*suse-missing-rclink.*") addFilter("env-script-interpreter") +addFilter(".*files-duplicate /usr/lib/systemd/.*") +addFilter(".*files-duplicated-waste.*") +addFilter(".*explicit-lib-dependency .*") diff --git a/systemd.changes b/systemd.changes index 994e5ae..b78f954 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 24 09:28:38 UTC 2021 - Franck Bui + +- systemd.spec: fix a bunch of rpmlint errors/warnings + ------------------------------------------------------------------- Fri Sep 24 07:27:58 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 5c0967d..4e995bd 100644 --- a/systemd.spec +++ b/systemd.spec @@ -236,7 +236,7 @@ Summary: System V init tools License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Provides: sbin_init -Conflicts: otherproviders(sbin_init) +Conflicts: sbin_init Provides: systemd-sysvinit = %{version}-%{release} Provides: sysvinit:/sbin/init @@ -890,7 +890,7 @@ find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif # Build of installation images uses a hard coded list of packages with -# a %pre that needs to be run during the build. systemd is one of them +# a %%pre that needs to be run during the build. systemd is one of them # so keep the section even if it's empty. %pre : @@ -919,7 +919,7 @@ pam-config --add --systemd || : %endif # systemd-sysusers is not available in %pre so this needs to be done -# in %post. However this shouldn't be an issue since all files the +# in %%post. However this shouldn't be an issue since all files the # main package ships are owned by root. %sysusers_create systemd.conf @@ -1209,8 +1209,6 @@ fi %service_del_postun systemd-homed.service %endif -%clean - %files %defattr(-,root,root) %license LICENSE* @@ -1435,6 +1433,14 @@ fi %{_modprobedir}/systemd.conf # Some files created at runtime. +%ghost %{_rundir}/log +%ghost %{_rundir}/systemd +%ghost %{_rundir}/systemd/ask-password +%ghost %{_rundir}/systemd/seats +%ghost %{_rundir}/systemd/sessions +%ghost %{_rundir}/systemd/users +%ghost %{_rundir}/systemd/machines +%ghost %{_rundir}/systemd/shutdown %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1787,6 +1793,11 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service +# Some files created at runtime +%ghost %{_rundir}/systemd/netif +%ghost %{_rundir}/systemd/netif/links +%ghost %{_rundir}/systemd/netif/leases +%ghost %{_rundir}/systemd/netif/lldp %endif %if %{with resolved} %{_bindir}/resolvectl From 7132b721b861d2a3be5450fbd969a4ef47120de14aec97348f7f2abd794102fa Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 24 Sep 2021 11:54:47 +0000 Subject: [PATCH 08/10] Fix systemd-mini build OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1192 --- systemd-mini.spec | 2 ++ systemd.spec | 2 ++ 2 files changed, 4 insertions(+) diff --git a/systemd-mini.spec b/systemd-mini.spec index 17a8f3f..ef4df8a 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1365,7 +1365,9 @@ fi %{_pam_moduledir}/pam_systemd.so %ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ +%if %{with sysvcompat} %doc %{_localstatedir}/log/README +%endif %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot diff --git a/systemd.spec b/systemd.spec index 4e995bd..bf33da3 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1363,7 +1363,9 @@ fi %{_pam_moduledir}/pam_systemd.so %ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ +%if %{with sysvcompat} %doc %{_localstatedir}/log/README +%endif %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot From 55eebaeb1bd1dbd66e9e36b6648481d75ec40f0b9012921824ef0cba48ee0298 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 24 Sep 2021 12:59:13 +0000 Subject: [PATCH 09/10] - Make sure the build process won't create /var/log/journal - /var/log/journal/remote is owned by systemd-journal-remote OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1193 --- systemd-mini.changes | 7 +++++++ systemd-mini.spec | 5 ++--- systemd.changes | 7 +++++++ systemd.spec | 5 ++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index b78f954..8f6e60d 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 24 12:56:31 UTC 2021 - Franck Bui + +- Make sure the build process won't create /var/log/journal + +- /var/log/journal/remote is owned by systemd-journal-remote + ------------------------------------------------------------------- Fri Sep 24 09:28:38 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index ef4df8a..e0e5dc5 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -619,6 +619,7 @@ Have fun with these services at your own risk. -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ + -Dcreate-log-dirs=false \ -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ -Dseccomp=auto \ @@ -1365,9 +1366,6 @@ fi %{_pam_moduledir}/pam_systemd.so %ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ -%if %{with sysvcompat} -%doc %{_localstatedir}/log/README -%endif %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot @@ -1776,6 +1774,7 @@ fi %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* %{_datadir}/systemd/gatewayd +%ghost %dir %{_localstatedir}/log/journal/remote %endif %if %{with networkd} || %{with resolved} diff --git a/systemd.changes b/systemd.changes index b78f954..8f6e60d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 24 12:56:31 UTC 2021 - Franck Bui + +- Make sure the build process won't create /var/log/journal + +- /var/log/journal/remote is owned by systemd-journal-remote + ------------------------------------------------------------------- Fri Sep 24 09:28:38 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index bf33da3..3971cbe 100644 --- a/systemd.spec +++ b/systemd.spec @@ -617,6 +617,7 @@ Have fun with these services at your own risk. -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ + -Dcreate-log-dirs=false \ -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ -Dseccomp=auto \ @@ -1363,9 +1364,6 @@ fi %{_pam_moduledir}/pam_systemd.so %ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ -%if %{with sysvcompat} -%doc %{_localstatedir}/log/README -%endif %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot @@ -1774,6 +1772,7 @@ fi %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* %{_datadir}/systemd/gatewayd +%ghost %dir %{_localstatedir}/log/journal/remote %endif %if %{with networkd} || %{with resolved} From 1b1777072141d0a6799407cc56000e79f9755ce2727c53c25ca930571f53f643 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Wed, 29 Sep 2021 14:09:21 +0000 Subject: [PATCH 10/10] - Work around rpmlint complaining about /var/log/journal shipped with setgid bit This setgid bit has been already reviewed in the past and wasn't a concern. However we want the mode/ownership adjusted by tmpfiles and avoid the duplication of these info in rpm. - Don't ghost own any directories created dynamically by tmpfiles Again rpmlint complains but it doesn't seem to make sense to try to track all paths (including theirs perms, ownerships...) created dynamically. And 'rpm -V' is likely to report issues later with these paths anyway. This effectively partially reverts the two previous commits. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1194 --- systemd-mini-rpmlintrc | 1 + systemd-mini.changes | 18 ++++++++++++++++++ systemd-mini.spec | 15 --------------- systemd-rpmlintrc | 1 + systemd.changes | 18 ++++++++++++++++++ systemd.spec | 15 --------------- 6 files changed, 38 insertions(+), 30 deletions(-) diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index 6526f3d..86edf48 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -8,3 +8,4 @@ addFilter("env-script-interpreter") addFilter(".*files-duplicate /usr/lib/systemd/.*") addFilter(".*files-duplicated-waste.*") addFilter(".*explicit-lib-dependency .*") +addFilter(".*tmpfile-not-in-filelist .*") diff --git a/systemd-mini.changes b/systemd-mini.changes index 8f6e60d..49998b0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Sep 29 10:04:38 UTC 2021 - Franck Bui + +- Work around rpmlint complaining about /var/log/journal shipped with setgid bit + + This setgid bit has been already reviewed in the past and wasn't a + concern. However we want the mode/ownership adjusted by tmpfiles and + avoid the duplication of these info in rpm. + +- Don't ghost own any directories created dynamically by tmpfiles + + Again rpmlint complains but it doesn't seem to make sense to try to + track all paths (including theirs perms, ownerships...) created + dynamically. And 'rpm -V' is likely to report issues later with + these paths anyway. + + This effectively partially reverts the two previous commits. + ------------------------------------------------------------------- Fri Sep 24 12:56:31 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index e0e5dc5..c7cf532 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1365,8 +1365,6 @@ fi %{_pam_moduledir}/pam_systemd.so -%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ - %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi @@ -1435,14 +1433,6 @@ fi %{_modprobedir}/systemd.conf # Some files created at runtime. -%ghost %{_rundir}/log -%ghost %{_rundir}/systemd -%ghost %{_rundir}/systemd/ask-password -%ghost %{_rundir}/systemd/seats -%ghost %{_rundir}/systemd/sessions -%ghost %{_rundir}/systemd/users -%ghost %{_rundir}/systemd/machines -%ghost %{_rundir}/systemd/shutdown %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1774,7 +1764,6 @@ fi %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* %{_datadir}/systemd/gatewayd -%ghost %dir %{_localstatedir}/log/journal/remote %endif %if %{with networkd} || %{with resolved} @@ -1797,10 +1786,6 @@ fi %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service # Some files created at runtime -%ghost %{_rundir}/systemd/netif -%ghost %{_rundir}/systemd/netif/links -%ghost %{_rundir}/systemd/netif/leases -%ghost %{_rundir}/systemd/netif/lldp %endif %if %{with resolved} %{_bindir}/resolvectl diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 6526f3d..86edf48 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -8,3 +8,4 @@ addFilter("env-script-interpreter") addFilter(".*files-duplicate /usr/lib/systemd/.*") addFilter(".*files-duplicated-waste.*") addFilter(".*explicit-lib-dependency .*") +addFilter(".*tmpfile-not-in-filelist .*") diff --git a/systemd.changes b/systemd.changes index 8f6e60d..49998b0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Sep 29 10:04:38 UTC 2021 - Franck Bui + +- Work around rpmlint complaining about /var/log/journal shipped with setgid bit + + This setgid bit has been already reviewed in the past and wasn't a + concern. However we want the mode/ownership adjusted by tmpfiles and + avoid the duplication of these info in rpm. + +- Don't ghost own any directories created dynamically by tmpfiles + + Again rpmlint complains but it doesn't seem to make sense to try to + track all paths (including theirs perms, ownerships...) created + dynamically. And 'rpm -V' is likely to report issues later with + these paths anyway. + + This effectively partially reverts the two previous commits. + ------------------------------------------------------------------- Fri Sep 24 12:56:31 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 3971cbe..bd5c592 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1363,8 +1363,6 @@ fi %{_pam_moduledir}/pam_systemd.so -%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ - %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi @@ -1433,14 +1431,6 @@ fi %{_modprobedir}/systemd.conf # Some files created at runtime. -%ghost %{_rundir}/log -%ghost %{_rundir}/systemd -%ghost %{_rundir}/systemd/ask-password -%ghost %{_rundir}/systemd/seats -%ghost %{_rundir}/systemd/sessions -%ghost %{_rundir}/systemd/users -%ghost %{_rundir}/systemd/machines -%ghost %{_rundir}/systemd/shutdown %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1772,7 +1762,6 @@ fi %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* %{_datadir}/systemd/gatewayd -%ghost %dir %{_localstatedir}/log/journal/remote %endif %if %{with networkd} || %{with resolved} @@ -1795,10 +1784,6 @@ fi %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service # Some files created at runtime -%ghost %{_rundir}/systemd/netif -%ghost %{_rundir}/systemd/netif/links -%ghost %{_rundir}/systemd/netif/leases -%ghost %{_rundir}/systemd/netif/lldp %endif %if %{with resolved} %{_bindir}/resolvectl