From 1a52d97f5cd6576f6179504e27f7e4dbb5665453e7ba1c4c98bad4c29ce4ecb0 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 12 Dec 2023 07:46:24 +0000 Subject: [PATCH 1/2] - Import commit ce08cd5f66e1a661c2b9ed764ad7036decd76503 ce08cd5f66 man/standard-conf: directory paths should end with '/' 8324cbfde7 config files: update their header to reflect that they can be installed in /usr bc36846ad2 Reflect the fact that main config files can be installed in /usr e304a11f33 config files: more recommendations of `systemd-analyze cat-config` c45cecf279 meson: add build option for install path of main config files cc61b052c6 vconsole-setup: use a consistent log level when setfont fails with EX_OSERR (bsc#1212970) 4fe3653dab tmpfiles: ignore EINVAL with --graceful (bsc#1216628) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1475 --- systemd-v254.5+suse.10.gb53f364c26.tar.xz | 3 --- systemd-v254.5+suse.17.gce08cd5f66.tar.xz | 3 +++ systemd.changes | 13 +++++++++++++ systemd.spec | 17 ++++------------- 4 files changed, 20 insertions(+), 16 deletions(-) delete mode 100644 systemd-v254.5+suse.10.gb53f364c26.tar.xz create mode 100644 systemd-v254.5+suse.17.gce08cd5f66.tar.xz diff --git a/systemd-v254.5+suse.10.gb53f364c26.tar.xz b/systemd-v254.5+suse.10.gb53f364c26.tar.xz deleted file mode 100644 index a7271ec4..00000000 --- a/systemd-v254.5+suse.10.gb53f364c26.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec66792689d2f375003dbdf4328f90f633f9ac9a61e39fa5067bb976b9da75ca -size 10350532 diff --git a/systemd-v254.5+suse.17.gce08cd5f66.tar.xz b/systemd-v254.5+suse.17.gce08cd5f66.tar.xz new file mode 100644 index 00000000..ed22265e --- /dev/null +++ b/systemd-v254.5+suse.17.gce08cd5f66.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85fcae5c382ca7b6a635a103888097b96c1436c165206a342e6713aa482c84f4 +size 10351072 diff --git a/systemd.changes b/systemd.changes index d8bea7d0..8cff68c7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Dec 12 07:43:35 UTC 2023 - Franck Bui + +- Import commit ce08cd5f66e1a661c2b9ed764ad7036decd76503 + + ce08cd5f66 man/standard-conf: directory paths should end with '/' + 8324cbfde7 config files: update their header to reflect that they can be installed in /usr + bc36846ad2 Reflect the fact that main config files can be installed in /usr + e304a11f33 config files: more recommendations of `systemd-analyze cat-config` + c45cecf279 meson: add build option for install path of main config files + cc61b052c6 vconsole-setup: use a consistent log level when setfont fails with EX_OSERR (bsc#1212970) + 4fe3653dab tmpfiles: ignore EINVAL with --graceful (bsc#1216628) + ------------------------------------------------------------------- Tue Nov 21 13:57:52 UTC 2023 - Wolfgang Frisch diff --git a/systemd.spec b/systemd.spec index 676f4bb8..79fc97c9 100644 --- a/systemd.spec +++ b/systemd.spec @@ -18,7 +18,7 @@ %global flavor @BUILD_FLAVOR@%{nil} -%define archive_version +suse.10.gb53f364c26 +%define archive_version +suse.17.gce08cd5f66 %define _testsuitedir %{_systemd_util_dir}/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -715,6 +715,7 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" -Drootprefix=/usr \ -Dsplit-usr=true \ %endif + -Dconfigfiledir=/usr/lib \ -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ @@ -826,18 +827,8 @@ install -m0755 -D %{SOURCE3} %{buildroot}/%{_systemd_util_dir}/systemd-update-he install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install %endif -# For some reasons, upstream refuses to add a new build option (see pr#29244) -# for customizing the installation path of main config files. However we want to -# store them in /usr/lib so we don't encourage users to modify them while they -# still can serve as templates. -for f in %{buildroot}%{_sysconfdir}/systemd/*.conf; do - mv $f %{buildroot}%{_systemd_util_dir}/ -done -for f in %{buildroot}%{_sysconfdir}/udev/*.conf; do - # Drop-ins are currently not supported by udevd. - [ $(basename $f) = "udev.conf" ] && continue - mv $f %{buildroot}%{_prefix}/lib/udev/ -done +# Drop-ins are currently not supported by udev. +mv %{buildroot}%{_prefix}/lib/udev/udev.conf %{buildroot}%{_sysconfdir}/udev/ # Install the fixlets mkdir -p %{buildroot}%{_systemd_util_dir}/rpm From a0d495d7cbe481390f88117c1a3aac71f97f89382c4e9c400a8b7e9a6f437039 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 12 Dec 2023 08:43:35 +0000 Subject: [PATCH 2/2] - Explicitely provide 'group(systemd-journal)' from the main package (bsc#1217852) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1476 --- systemd.changes | 5 +++++ systemd.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/systemd.changes b/systemd.changes index 8cff68c7..d6e66c4a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 12 08:02:52 UTC 2023 - Franck Bui + +- Explicitely provide 'group(systemd-journal)' from the main package (bsc#1217852) + ------------------------------------------------------------------- Tue Dec 12 07:43:35 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 79fc97c9..8f7abf82 100644 --- a/systemd.spec +++ b/systemd.spec @@ -151,6 +151,7 @@ Requires(post): pam-config >= 0.79-5 Recommends: libpcre2-8-0 Recommends: libbpf0 %endif +Provides: group(systemd-journal) Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Provides: sbin_init