From 8f8ee638a2f116f31da9c4549d99e479790be8d9990d7645fbc746937a780187 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 22 Feb 2022 14:05:17 +0000 Subject: [PATCH 1/3] - Fix build if %_distconfdir is not defined (see bsc#1195679) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1253 --- files.systemd | 6 +++--- systemd.changes | 5 +++++ systemd.spec | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/files.systemd b/files.systemd index 79a3cc4..8f0f173 100644 --- a/files.systemd +++ b/files.systemd @@ -24,8 +24,8 @@ %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %endif -%dir %{_distconfdir}/X11/xinit -%dir %{_distconfdir}/X11/xinit/xinitrc.d +%dir %{xinitconfdir} +%dir %{xinitconfdir}/xinitrc.d %dir %{_environmentdir} %dir %{_journalcatalogdir} %dir %{_localstatedir}/lib/systemd @@ -205,7 +205,7 @@ %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl %endif -%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh +%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %{_environmentdir}/99-environment.conf %{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be@latin.catalog diff --git a/systemd.changes b/systemd.changes index 5f1181f..8f3f5c7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 21 09:56:26 UTC 2022 - Fabian Vogt + +- Fix build if %_distconfdir is not defined (see bsc#1195679) + ------------------------------------------------------------------- Thu Feb 17 18:30:12 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 559de80..0c24b32 100644 --- a/systemd.spec +++ b/systemd.spec @@ -29,6 +29,7 @@ %define min_kernel_version 4.5 %define suse_version +suse.82.g117bd7f14a %define _testsuitedir /usr/lib/systemd/tests +%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit # Similar to %%with but returns true/false. The 'true' value can be redefined # when a second parameter is passed. @@ -653,7 +654,7 @@ Have fun with these services at your own risk. -Dldconfig=false \ -Dpamconfdir=no \ -Dpamlibdir=%{_pam_moduledir} \ - -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ + -Dxinitrcdir=%{xinitconfdir}/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ %if %{without sysvcompat} From c397c328072c3921b134aca4780caad52ebaaf5ff6e47894cd047d9d2ac0e63e Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 22 Feb 2022 14:54:05 +0000 Subject: [PATCH 2/3] - Import commit b9b83c5d11e686178ddd545862a00b33c6fdfabb 8973cb2462 systemd-coredump: allow setting external core size to infinity (bsc#1195899 jsc#SLE-23866) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1254 --- systemd-v249.9+suse.82.g117bd7f14a.tar.xz | 3 --- systemd-v249.9+suse.84.gb9b83c5d11.tar.xz | 3 +++ systemd.changes | 7 +++++++ systemd.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 systemd-v249.9+suse.82.g117bd7f14a.tar.xz create mode 100644 systemd-v249.9+suse.84.gb9b83c5d11.tar.xz diff --git a/systemd-v249.9+suse.82.g117bd7f14a.tar.xz b/systemd-v249.9+suse.82.g117bd7f14a.tar.xz deleted file mode 100644 index 048b757..0000000 --- a/systemd-v249.9+suse.82.g117bd7f14a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:167cad3440fd7babb26317d528842f78fa37573bdaeda29845990dc0986463f0 -size 7280500 diff --git a/systemd-v249.9+suse.84.gb9b83c5d11.tar.xz b/systemd-v249.9+suse.84.gb9b83c5d11.tar.xz new file mode 100644 index 0000000..9539166 --- /dev/null +++ b/systemd-v249.9+suse.84.gb9b83c5d11.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fa72d9c4559b1777d4cff793f1fc2c43e2895c0b48bbbe2900abd5c5101fc5c +size 7279576 diff --git a/systemd.changes b/systemd.changes index 8f3f5c7..4eb500d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Feb 22 14:50:50 UTC 2022 - Franck Bui + +- Import commit b9b83c5d11e686178ddd545862a00b33c6fdfabb + + 8973cb2462 systemd-coredump: allow setting external core size to infinity (bsc#1195899 jsc#SLE-23866) + ------------------------------------------------------------------- Mon Feb 21 09:56:26 UTC 2022 - Fabian Vogt diff --git a/systemd.spec b/systemd.spec index 0c24b32..877f8b0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.82.g117bd7f14a +%define suse_version +suse.84.gb9b83c5d11 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit From 9bf64de9d26fcd93e4ec9191f3a3780b34bd24bd9bec23dc5c25b14734fd7953 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 22 Feb 2022 15:30:37 +0000 Subject: [PATCH 3/3] - Import commit 0bb1977021be2fc9ebfae10d766dff0b1a457f88 (merge of v249.10) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/b9b83c5d11e686178ddd545862a00b33c6fdfabb...0bb1977021be2fc9ebfae10d766dff0b1a457f88 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1255 --- systemd-v249.10+suse.86.g0bb1977021.tar.xz | 3 +++ systemd-v249.9+suse.84.gb9b83c5d11.tar.xz | 3 --- systemd.changes | 8 ++++++++ systemd.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 systemd-v249.10+suse.86.g0bb1977021.tar.xz delete mode 100644 systemd-v249.9+suse.84.gb9b83c5d11.tar.xz diff --git a/systemd-v249.10+suse.86.g0bb1977021.tar.xz b/systemd-v249.10+suse.86.g0bb1977021.tar.xz new file mode 100644 index 0000000..fdcaf7f --- /dev/null +++ b/systemd-v249.10+suse.86.g0bb1977021.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812 +size 7281992 diff --git a/systemd-v249.9+suse.84.gb9b83c5d11.tar.xz b/systemd-v249.9+suse.84.gb9b83c5d11.tar.xz deleted file mode 100644 index 9539166..0000000 --- a/systemd-v249.9+suse.84.gb9b83c5d11.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fa72d9c4559b1777d4cff793f1fc2c43e2895c0b48bbbe2900abd5c5101fc5c -size 7279576 diff --git a/systemd.changes b/systemd.changes index 4eb500d..36c1c1b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Feb 22 15:22:16 UTC 2022 - Franck Bui + +- Import commit 0bb1977021be2fc9ebfae10d766dff0b1a457f88 (merge of v249.10) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/b9b83c5d11e686178ddd545862a00b33c6fdfabb...0bb1977021be2fc9ebfae10d766dff0b1a457f88 + ------------------------------------------------------------------- Tue Feb 22 14:50:50 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 877f8b0..67bc126 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.84.gb9b83c5d11 +%define suse_version +suse.86.g0bb1977021 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -71,7 +71,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.9 +Version: 249.10 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later