From fd6fe43968aa84c77b7e846ce90ca65f14c9ded49ae56799117d75688fc52970 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 28 Feb 2023 08:09:56 +0000 Subject: [PATCH 1/3] Accepting request 1068086 from home:zhonglidong:branches:Base:System - Fix return non-zero value when disabling SysVinit service(bsc#1208432) OBS-URL: https://build.opensuse.org/request/show/1068086 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1349 --- systemd-sysv-install | 4 ++-- systemd.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/systemd-sysv-install b/systemd-sysv-install index cffe4c8f..d7900159 100644 --- a/systemd-sysv-install +++ b/systemd-sysv-install @@ -93,10 +93,10 @@ enable_initscript() { disable_initscript() { for symlink in rc*.d/[SK]*; do - [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ] && { + if [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ]; then info "rm $(pwd)/$symlink" rm $symlink - } + fi done } diff --git a/systemd.changes b/systemd.changes index 804dcfce..bffdd096 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 28 02:58:20 UTC 2023 - Lidong Zhong + +- Fix return non-zero value when disabling SysVinit service(bsc#1208432) + ------------------------------------------------------------------- Mon Feb 27 08:43:27 UTC 2023 - Franck Bui From 041bd1170de724686a2ad4713a81ce54df6837bf89e8648b680b7be84535ab3a Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 28 Feb 2023 15:53:20 +0000 Subject: [PATCH 2/3] Accepting request 1067366 from home:gmbr3:Active - Correct BR from python3-jinja2 to python3-Jinja2, fixes dependency resolving on older distros OBS-URL: https://build.opensuse.org/request/show/1067366 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1350 --- systemd.changes | 6 ++++++ systemd.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index bffdd096..af813ebc 100644 --- a/systemd.changes +++ b/systemd.changes @@ -16,6 +16,12 @@ Mon Feb 27 08:43:27 UTC 2023 - Franck Bui - aaa_base has stop providing /etc/sysctl.conf, cope with this change so the compat symlink we provide is not dangling during the build. +------------------------------------------------------------------- +Thu Feb 23 11:52:48 UTC 2023 - Callum Farmer + +- Correct BR from python3-jinja2 to python3-Jinja2, fixes + dependency resolving on older distros + ------------------------------------------------------------------- Fri Feb 17 11:06:41 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 6d1c9c40..8f25c54e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -108,7 +108,7 @@ BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 BuildRequires: meson >= 0.53.2 BuildRequires: pam-devel -BuildRequires: python3-jinja2 +BuildRequires: python3-Jinja2 # regenerate_initrd_post macro is expanded during build, hence this BR. Also # this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 From 32cbf3c6e6f1a7987dfde84edafc4865a112fb93e7cd3d98c5ea93c1eec73b0b Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 6 Mar 2023 08:50:22 +0000 Subject: [PATCH 3/3] - Import commit d447802feee7752cd1756f8fa86ce2a6314ba24f (merge of v252.7) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/8e0a8094b8bbc442d262795b85ac57a37264c5fe...d447802feee7752cd1756f8fa86ce2a6314ba24f OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1351 --- systemd-v252.6+suse.48.g8e0a8094b8.tar.xz | 3 --- systemd-v252.7+suse.50.gd447802fee.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 6 +++--- 4 files changed, 14 insertions(+), 6 deletions(-) delete mode 100644 systemd-v252.6+suse.48.g8e0a8094b8.tar.xz create mode 100644 systemd-v252.7+suse.50.gd447802fee.tar.xz diff --git a/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz b/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz deleted file mode 100644 index a2f346c8..00000000 --- a/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58501d3c453cc1c3363dd0263190d9514b34b4392f1ecaa32e9f7a2c715fa8d9 -size 8090264 diff --git a/systemd-v252.7+suse.50.gd447802fee.tar.xz b/systemd-v252.7+suse.50.gd447802fee.tar.xz new file mode 100644 index 00000000..0a07938e --- /dev/null +++ b/systemd-v252.7+suse.50.gd447802fee.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd9f697fdbb194da090ef87f472c1c6d05d16cfa49b3b668648ea6d3c8f177d2 +size 8089304 diff --git a/systemd.changes b/systemd.changes index af813ebc..897181a9 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 6 08:40:35 UTC 2023 - Franck Bui + +- Import commit d447802feee7752cd1756f8fa86ce2a6314ba24f (merge of v252.7) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/8e0a8094b8bbc442d262795b85ac57a37264c5fe...d447802feee7752cd1756f8fa86ce2a6314ba24f + ------------------------------------------------------------------- Tue Feb 28 02:58:20 UTC 2023 - Lidong Zhong diff --git a/systemd.spec b/systemd.spec index 8f25c54e..75d654a5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.48.g8e0a8094b8 +%define archive_version +suse.50.gd447802fee %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -72,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 252.6 +Version: 252.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -596,7 +596,7 @@ BuildRequires: pkgconfig(openssl) %description experimental This package contains optional extra services that are considered as previews and are provided so users can do early experiments with the new features or -technologies without waiting for them to be fully supported by either upstream +technologies without waiting for them to be fully supported by both upstream and openSUSE. Please note that all services should be considered in development phase and as