From 83523197eea477f98cd655c517a8f68ba73de5de Mon Sep 17 00:00:00 2001 From: Anita Zhang Date: Wed, 21 Jun 2023 15:59:07 +0100 Subject: [PATCH 01/20] fix typos in standalone package provides --- systemd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd.spec b/systemd.spec index 2c6b59f..4929bd3 100644 --- a/systemd.spec +++ b/systemd.spec @@ -491,7 +491,7 @@ useful to test systemd internals. %package standalone-repart Summary: Standalone systemd-repart binary for use on systems without systemd -Provides: %{name}-tmpfiles = %{version}-%{release} +Provides: %{name}-repart = %{version}-%{release} RemovePathPostfixes: .standalone %description standalone-repart @@ -521,7 +521,7 @@ package and is meant for use on systems without systemd. %package standalone-shutdown Summary: Standalone systemd-shutdown binary for use on systems without systemd -Provides: %{name}-sysusers = %{version}-%{release} +Provides: %{name}-shutdown = %{version}-%{release} RemovePathPostfixes: .standalone %description standalone-shutdown From e349dc83aae2e63e5e4e1419edbb9a272514e32a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 4 Jun 2023 23:42:45 -0400 Subject: [PATCH 02/20] Avoid qrencode dependency in RHEL builds Based on c9s: https://gitlab.com/redhat/centos-stream/rpms/systemd/-/commit/c7784e658433844e056b6cab5bf3186f093b9f79 (cherry picked from commit 4980b39c441babc2c858e76acb6b8064a57370b7) [skip changelog] --- systemd.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index 4929bd3..ded0b01 100644 --- a/systemd.spec +++ b/systemd.spec @@ -140,7 +140,9 @@ BuildRequires: kmod-devel BuildRequires: elfutils-devel BuildRequires: openssl-devel BuildRequires: gnutls-devel +%if %{undefined rhel} BuildRequires: qrencode-devel +%endif BuildRequires: libmicrohttpd-devel BuildRequires: libxkbcommon-devel BuildRequires: iptables-devel @@ -235,7 +237,9 @@ Recommends: libidn2.so.0(IDN2_0.0.0)%{?elf_bits} Recommends: libpcre2-8.so.0%{?elf_suffix} Recommends: libpwquality.so.1%{?elf_suffix} Recommends: libpwquality.so.1(LIBPWQUALITY_1.0)%{?elf_bits} +%if %{undefined rhel} Recommends: libqrencode.so.4%{?elf_suffix} +%endif Recommends: libbpf.so.0%{?elf_suffix} Recommends: libbpf.so.0(LIBBPF_0.4.0)%{?elf_bits} @@ -588,7 +592,7 @@ CONFIGURE_OPTS=( -Dlibcryptsetup=%[%{with bootstrap}?"false":"true"] -Delfutils=true -Dpwquality=true - -Dqrencode=true + -Dqrencode=%[%{defined rhel}?"false":"true"] -Dgnutls=true -Dmicrohttpd=true -Dlibidn2=true From 70ec24e92e47ac871ae89149dd5e0acb1734714d Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Mon, 5 Jun 2023 12:49:57 -0400 Subject: [PATCH 03/20] Avoid pillow and pyflakes in RHEL builds These test dependencies are unwanted in RHEL. (cherry picked from commit 5982ae9504c8f2697a839c6ce2a82287a60c1043) [skip changelog] --- systemd.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index ded0b01..308a2e4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -164,9 +164,11 @@ BuildRequires: python3-devel BuildRequires: python3dist(jinja2) BuildRequires: python3dist(lxml) BuildRequires: python3dist(pefile) +%if %{undefined rhel} BuildRequires: python3dist(pillow) -BuildRequires: python3dist(pytest) BuildRequires: python3dist(pytest-flakes) +%endif +BuildRequires: python3dist(pytest) BuildRequires: python3dist(zstd) # gzip and lzma are provided by the stdlib BuildRequires: firewalld-filesystem From c000d72768d0efba1e8244082917d0f8d86e4a81 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Thu, 23 Jun 2022 01:13:02 +0000 Subject: [PATCH 04/20] Move gnutls, zlib, bzip2, lz4, xz, and zstd to bconds (cherry picked from commit 379f9bfba1876f6e91d2acdc439cbd57e433675a) [skip changelog] --- systemd.spec | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/systemd.spec b/systemd.spec index 308a2e4..9d8e50c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -15,6 +15,13 @@ %global elf_suffix ()%{elf_bits} %endif +%bcond bzip2 1 +%bcond gnutls 1 +%bcond lz4 1 +%bcond xz 1 +%bcond zlib 1 +%bcond zstd 1 + # Bootstrap may be needed to break circular dependencies with cryptsetup, # e.g. when re-building cryptsetup on a json-c SONAME-bump. %bcond_with bootstrap @@ -128,18 +135,28 @@ BuildRequires: /usr/bin/getfacl BuildRequires: libacl-devel BuildRequires: gobject-introspection-devel BuildRequires: libblkid-devel +%if %{with xz} BuildRequires: xz-devel BuildRequires: xz +%endif +%if %{with lz4} BuildRequires: lz4-devel BuildRequires: lz4 +%endif +%if %{with bzip2} BuildRequires: bzip2-devel +%endif +%if %{with zstd} BuildRequires: libzstd-devel +%endif BuildRequires: libidn2-devel BuildRequires: libcurl-devel BuildRequires: kmod-devel BuildRequires: elfutils-devel BuildRequires: openssl-devel +%if %{with gnutls} BuildRequires: gnutls-devel +%endif %if %{undefined rhel} BuildRequires: qrencode-devel %endif @@ -577,11 +594,11 @@ CONFIGURE_OPTS=( -Dbpf-framework=%[0%{?have_bpf}?"true":"false"] -Dapparmor=false -Dpolkit=true - -Dxz=true - -Dzlib=true - -Dbzip2=true - -Dlz4=true - -Dzstd=true + -Dxz=%[%{with xz}?"true":"false"] + -Dzlib=%[%{with zlib}?"true":"false"] + -Dbzip2=%[%{with bzip2}?"true":"false"] + -Dlz4=%[%{with lz4}?"true":"false"] + -Dzstd=%[%{with zstd}?"true":"false"] -Dpam=true -Dacl=true -Dsmack=true @@ -595,7 +612,7 @@ CONFIGURE_OPTS=( -Delfutils=true -Dpwquality=true -Dqrencode=%[%{defined rhel}?"false":"true"] - -Dgnutls=true + -Dgnutls=%[%{with gnutls}?"true":"false"] -Dmicrohttpd=true -Dlibidn2=true -Dlibiptc=false From 266fe575b1346d195fc5257fddbd62e2478dd085 Mon Sep 17 00:00:00 2001 From: Stewart Smith Date: Sun, 16 Jul 2023 16:12:46 -0700 Subject: [PATCH 05/20] Convert existing bcond_with[out] to plain bcond (cherry picked from commit 5c840a72b50cdba5280a3afc1ad6363da9ad8188) [skip changelog] --- systemd.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/systemd.spec b/systemd.spec index 9d8e50c..4837836 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,13 +24,13 @@ # Bootstrap may be needed to break circular dependencies with cryptsetup, # e.g. when re-building cryptsetup on a json-c SONAME-bump. -%bcond_with bootstrap -%bcond_without tests -%bcond_without lto +%bcond bootstrap 0 +%bcond tests 1 +%bcond lto 1 # Support for quick builds with rpmbuild --build-in-place. # See README.build-in-place. -%bcond_with inplace +%bcond inplace 0 Name: systemd Url: https://systemd.io From c340a3a7dc76f51291bd65fdad23969f75351b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 17 Jul 2023 14:42:12 +0200 Subject: [PATCH 06/20] Fix scriptlets for various services and remote-cryptsetup.target ... (rhbz#2217997) systemd-homed.service and systemd-portabled.service are in systemd-udev but the scriptlet was attached to main subpackage, so it wouldn't work because the unit file wasn't installed yet when it was invoked. systemd-pstore.service and remote-cryptsetup.target were forgotten, so they wouldn't get enabled on installation. (cherry picked from commit 219083fc04c8a67e5360e5eade2342c4f7f3aae6) --- systemd.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/systemd.spec b/systemd.spec index 4837836..3f58f34 100644 --- a/systemd.spec +++ b/systemd.spec @@ -925,7 +925,7 @@ if [ $1 -eq 1 ]; then systemd-tmpfiles --create &>/dev/null || : fi -%systemd_postun_with_restart systemd-timedated.service systemd-portabled.service systemd-homed.service systemd-hostnamed.service systemd-journald.service systemd-localed.service systemd-userdbd.service systemd-oomd.service +%systemd_postun_with_restart systemd-timedated.service systemd-hostnamed.service systemd-journald.service systemd-localed.service systemd-userdbd.service systemd-oomd.service # FIXME: systemd-logind.service is excluded (https://github.com/systemd/systemd/pull/17558) # FIXME: user@*.service needs to be restarted, but using systemctl --user daemon-reexec @@ -957,8 +957,7 @@ systemctl --no-reload preset systemd-oomd.service &>/dev/null || : # a different package version. systemctl --no-reload preset systemd-journald-audit.socket &>/dev/null || : - -%global udev_services systemd-udev{d,-settle,-trigger}.service systemd-udevd-{control,kernel}.socket systemd-timesyncd.service %{?have_gnu_efi:systemd-boot-update.service} +%global udev_services systemd-udev{d,-settle,-trigger}.service systemd-udevd-{control,kernel}.socket systemd-homed.service systemd-timesyncd.service %{?have_gnu_efi:systemd-boot-update.service} systemd-portabled.service systemd-pstore.service remote-cryptsetup.target %post udev # Move old stuff around in /var/lib From 4e346786e12743c84157944cd3df8f942bdaaf04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 17 Jul 2023 18:20:56 +0200 Subject: [PATCH 07/20] Version 253.7 ... (rhbz#2215304, rhbz#2210770, rhbz#2213398) --- sources | 2 +- systemd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index b97b829..ca33640 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.5.tar.gz) = 39709b485cd9287e26ac8e973fa1692b280bec3b96e1da6667e4a4f2ac2228aa072b22802720a254698d32c82f5306d7feb32229e4b6d54cc0e2b1e2caa4cc2e +SHA512 (systemd-253.7.tar.gz) = 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1 diff --git a/systemd.spec b/systemd.spec index 3f58f34..57bf9af 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.5 +Version: 253.7 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') From ade2a0f960eee737107bd624f8640db1a0e1d4ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 8 Sep 2023 08:47:31 +0200 Subject: [PATCH 08/20] Version 253.9 - A bunch of various small fixes all over the place --- sources | 2 +- systemd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index ca33640..34480c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.7.tar.gz) = 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1 +SHA512 (systemd-253.9.tar.gz) = 69ef361ea8aae8da0ce909461379219a1a9034940df32f04c5bb9185cbb829ea54b3438cc06eb76ad58d9edf06d16a891ca6a1c901e7ebfc62087a9cd0997df8 diff --git a/systemd.spec b/systemd.spec index 57bf9af..e904e5c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.7 +Version: 253.9 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') From f5c48b10e57649abf4e890cca1891e2437271c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 7 Sep 2023 12:17:02 +0200 Subject: [PATCH 09/20] Make inter-subpackage dependencies archful Prompted by the discussion in https://github.com/rpminspect/rpminspect/issues/1231. (cherry picked from commit 14701a7bc8e3f75116e63e035c4204a6188b359f) --- systemd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd.spec b/systemd.spec index e904e5c..81297a3 100644 --- a/systemd.spec +++ b/systemd.spec @@ -216,9 +216,9 @@ Requires(post): grep # systemd-machine-id-setup requires libssl Requires(post): openssl-libs Requires: dbus >= 1.9.18 -Requires: %{name}-pam = %{version}-%{release} +Requires: %{name}-pam%{_isa} = %{version}-%{release} Requires(meta): (%{name}-rpm-macros = %{version}-%{release} if rpm-build) -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{_isa} = %{version}-%{release} %{?fedora:Recommends: %{name}-networkd = %{version}-%{release}} %{?fedora:Recommends: %{name}-resolved = %{version}-%{release}} Recommends: diffutils From b6a48db9fadd5e3ff87681bc7ec2475b08515189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 11 Sep 2023 16:58:03 +0200 Subject: [PATCH 10/20] README.build-in-place: fix example command (cherry picked from commit 8365e8181dd91d648e9718a2709e4bb8f90bc31b) [skip changelog] --- README.build-in-place.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.build-in-place.md b/README.build-in-place.md index 057c103..8c444c5 100644 --- a/README.build-in-place.md +++ b/README.build-in-place.md @@ -7,7 +7,7 @@ and his [talk during ASG2019](https://www.youtube.com/watch?v=fVM1kJrymRM). git clone https://github.com/systemd/systemd fedpkg clone systemd fedora-systemd cd systemd -rpmbuild -bb --build-in-place --noprep --define "_sourcedir $PWD/../fedora-systemd" --define "_rpmdir $PWD/rpms" --with inplace ../systemd.spec +rpmbuild -bb --build-in-place --noprep --define "_sourcedir $PWD/../fedora-systemd" --define "_rpmdir $PWD/rpms" --with inplace ../fedora-systemd/systemd.spec sudo dnf upgrade --setopt install_weak_deps=False rpms/*/*.rpm ``` From 5b4edb1ebce6ab595f07917cce1da89278ed53ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 11 Sep 2023 17:16:11 +0200 Subject: [PATCH 11/20] Move file manipulation to %build Without this, in-place builds are broken: they don't execute %prep, so %install fails. (cherry picked from commit 32656b2b877cd089c38a8df4118f7d3120a56f67) [skip changelog] --- systemd.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemd.spec b/systemd.spec index 81297a3..2087b16 100644 --- a/systemd.spec +++ b/systemd.spec @@ -559,8 +559,6 @@ package and is meant for use in exitrds. # Let's disable the service. sed -r -i '/^enable systemd-boot-update.service/d' presets/90-systemd.preset -sed -r 's|/system/|/user/|g' %{SOURCE16} >10-timeout-abort.conf.user - %generate_buildrequires %if 0%{?have_gnu_efi} if grep -q gnu-efi meson_options.txt; then @@ -708,6 +706,8 @@ if ! diff -u %{SOURCE1} ${new_triggers}; then sleep 5 fi +sed -r 's|/system/|/user/|g' %{SOURCE16} >10-timeout-abort.conf.user + %install %meson_install From fe59dd499ae6d64f9e352fd8d937e0c07da732f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 18 Sep 2023 14:30:40 +0200 Subject: [PATCH 12/20] Version 253.10 ... (rhbz#2239247) --- sources | 2 +- systemd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 34480c5..1b210cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.9.tar.gz) = 69ef361ea8aae8da0ce909461379219a1a9034940df32f04c5bb9185cbb829ea54b3438cc06eb76ad58d9edf06d16a891ca6a1c901e7ebfc62087a9cd0997df8 +SHA512 (systemd-253.10.tar.gz) = dab45496586a9a78ba46a3c03c02e6bd97a8b832e28f96fdf052ecf1906c8c1bdc55967fc243ca837d0371e81730a92bb230e59a43e2ab6bc1b62fbd42a051d4 diff --git a/systemd.spec b/systemd.spec index 2087b16..12f1307 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.9 +Version: 253.10 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') From 729aadeb341b1554b3ce996cfa4f9d3ee21622df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 26 Oct 2023 00:11:43 +0200 Subject: [PATCH 13/20] Version 253.12 - Just some documentation patches, a hwdb update, and fix for udev on systemd with too much hardware devices, and some fixes for networkd. - Fixes rhbz#2242759 by virtue of rebuild. --- sources | 2 +- systemd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 1b210cd..6f0481d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.10.tar.gz) = dab45496586a9a78ba46a3c03c02e6bd97a8b832e28f96fdf052ecf1906c8c1bdc55967fc243ca837d0371e81730a92bb230e59a43e2ab6bc1b62fbd42a051d4 +SHA512 (systemd-253.12.tar.gz) = dd099160932258f7baf541e52ce7181565096f93f9311e4d3f6383c2035ab3d39765a7de03fb99b83e16a79db301558577fb14859ef24f3da548e8806ef95ea2 diff --git a/systemd.spec b/systemd.spec index 12f1307..5902a85 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.10 +Version: 253.12 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') From 605c30c25fb9bf05b13779566704597b8a7d5938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 27 Nov 2023 14:29:21 +0100 Subject: [PATCH 14/20] Version 253.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - No major bugs resolved, just a bunch of small fixes all over (documentation, udev, nspawn, cryptsetup…). Includes an update to the hardware database. --- sources | 2 +- systemd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 6f0481d..303632f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.12.tar.gz) = dd099160932258f7baf541e52ce7181565096f93f9311e4d3f6383c2035ab3d39765a7de03fb99b83e16a79db301558577fb14859ef24f3da548e8806ef95ea2 +SHA512 (systemd-253.13.tar.gz) = 7f603884ee8f49729332ca1e681eed03ee4936f66f96ae8b4e13fcaca2d0d3b8fb8850551f8eb0ca248ce841a8430983680d29399ce911900d3b9bfcbb67faaa diff --git a/systemd.spec b/systemd.spec index 5902a85..f9a1730 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.12 +Version: 253.13 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') From 89e67de2ab4dee4e6007af25a4f9fe3ebaf707e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Dec 2023 13:26:32 +0100 Subject: [PATCH 15/20] gitignore: also exclude noarch/ [skip changelog] --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 6cf7897..5df577e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /systemd-*/ /.build-*.log /x86_64/ +/noarch/ /systemd-*src.rpm /systemd-*.tar.xz /systemd-*.tar.gz From 179024332bc7407897adb9cfc36028686e5a2294 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 6 Dec 2023 13:34:38 +0100 Subject: [PATCH 16/20] Version 253.14 - A bunch of small bugfixes: sd-journal, battery alarm detection, portablectl, new system call definitions for seccomp, systemd-networkd, log messages, D-Bus interfaces, systemd itself, udevadm, udev rules, systemd-homed, systemd-stdio-bridge, systemd pam modules, systemd-resolved. - An update to the hardware database --- sources | 2 +- systemd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 303632f..c7e85bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.13.tar.gz) = 7f603884ee8f49729332ca1e681eed03ee4936f66f96ae8b4e13fcaca2d0d3b8fb8850551f8eb0ca248ce841a8430983680d29399ce911900d3b9bfcbb67faaa +SHA512 (systemd-253.14.tar.gz) = dfb43101dc5b7be8ad2317f78c39dda4266b67d9d7309a207f7b642e176f8ff665496ee1068104b6c527beb9473aa15e71b945f6da4c9fb79a1cc85a8d04913a diff --git a/systemd.spec b/systemd.spec index f9a1730..9f7bcee 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.13 +Version: 253.14 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') From 1ea4754b055277e0c84fca8bc1e518c96f7a85d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 22 Jan 2024 16:55:00 +0100 Subject: [PATCH 17/20] Version 253.15 - A bunch of fixes for various components: systemd, systemctl, hostnamectl, bootctl, systemd-networkd, systemd-network-generator, systemd-analyze, systemd-dissect, man pages. - Also has a patch for CVE-2023-7008 (rhbz#2222260) --- sources | 2 +- systemd.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index c7e85bf..27ea900 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.14.tar.gz) = dfb43101dc5b7be8ad2317f78c39dda4266b67d9d7309a207f7b642e176f8ff665496ee1068104b6c527beb9473aa15e71b945f6da4c9fb79a1cc85a8d04913a +SHA512 (systemd-253.15.tar.gz) = 68a6599d7a485ab6548deefd1ae94e70ff28322f7cfc052c07265d00fddb120fa3e62474b159138b0f003e9e4e573036a0f0cbfbd9abf28c530fbf108b655ca8 diff --git a/systemd.spec b/systemd.spec index 9f7bcee..d970105 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.14 +Version: 253.15 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') From 911e319b500782f4cd5d0a5055d179a85f989c91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jan 2024 10:12:34 +0100 Subject: [PATCH 18/20] Add missing %postun scriptlets for systemd-{resolved,networkd} ... (rhbz#2255718) I'm not sure what happened here. But I think both services should be fine with a restart and there is no reason not to do this. --- systemd.spec | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/systemd.spec b/systemd.spec index d970105..7b139be 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1033,6 +1033,24 @@ fi %preun networkd %systemd_preun systemd-networkd.service systemd-networkd-wait-online.service +%postun networkd +%systemd_postun_with_restart systemd-networkd.service +%systemd_postun systemd-networkd-wait-online.service + +%post resolved +[ $1 -eq 1 ] || exit 0 +# Initial installation + +touch %{_localstatedir}/lib/rpm-state/systemd-resolved.initial-installation + +# Related to https://bugzilla.redhat.com/show_bug.cgi?id=1943263 +if ls /usr/lib/systemd/libsystemd-shared-24[0-8].so &>/dev/null; then + echo "Skipping presets for systemd-resolved.service, seems we are upgrading from old systemd." + exit 0 +fi + +%systemd_post systemd-resolved.service + %preun resolved if [ $1 -eq 0 ] ; then systemctl disable --quiet \ @@ -1048,19 +1066,8 @@ if [ $1 -eq 0 ] ; then fi fi -%post resolved -[ $1 -eq 1 ] || exit 0 -# Initial installation - -touch %{_localstatedir}/lib/rpm-state/systemd-resolved.initial-installation - -# Related to https://bugzilla.redhat.com/show_bug.cgi?id=1943263 -if ls /usr/lib/systemd/libsystemd-shared-24[0-8].so &>/dev/null; then - echo "Skipping presets for systemd-resolved.service, seems we are upgrading from old systemd." - exit 0 -fi - -%systemd_post systemd-resolved.service +%postun resolved +%systemd_postun_with_restart systemd-resolved.service %posttrans resolved [ -e %{_localstatedir}/lib/rpm-state/systemd-resolved.initial-installation ] || exit 0 From 9f99daab635e8d218087a5555e3406f436f144ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 11 Mar 2024 21:42:51 +0100 Subject: [PATCH 19/20] Version 253.17 --- ...upload-drop-RestartSteps-and-Restart.patch | 27 +++++++++++++++++++ sources | 2 +- systemd.spec | 5 +++- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch diff --git a/0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch b/0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch new file mode 100644 index 0000000..c7c34fe --- /dev/null +++ b/0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch @@ -0,0 +1,27 @@ +From e4f1fb16aeda475a0cb27535abf0bfa24e9fb0d8 Mon Sep 17 00:00:00 2001 +From: Luca Boccassi +Date: Thu, 29 Feb 2024 14:40:33 +0000 +Subject: [PATCH] systemd-journal-upload: drop RestartSteps= and + RestartMaxDelaySec= + +They are not available in this release, and were backported by mistake together with +Restart=on-failure. + +Follow-up for 3ac88345598003c6f5b53c0dc5cf3e4f80e371bc +--- + units/systemd-journal-upload.service.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in +index 7e64870e9d..18365a86a3 100644 +--- a/units/systemd-journal-upload.service.in ++++ b/units/systemd-journal-upload.service.in +@@ -27,8 +27,6 @@ ProtectKernelLogs=yes + ProtectKernelModules=yes + ProtectKernelTunables=yes + Restart=on-failure +-RestartSteps=10 +-RestartMaxDelaySec=60 + RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 + RestrictNamespaces=yes + RestrictRealtime=yes diff --git a/sources b/sources index 27ea900..c8c03ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.15.tar.gz) = 68a6599d7a485ab6548deefd1ae94e70ff28322f7cfc052c07265d00fddb120fa3e62474b159138b0f003e9e4e573036a0f0cbfbd9abf28c530fbf108b655ca8 +SHA512 (systemd-253.17.tar.gz) = 3acc9ba17db26ce701a8b11984a25f269109d08bcec589dabe6cf46033c59aac151e8baaa561b3c8300bf8d5bc3e0769e84971be3fe893a7f003e618141800a6 diff --git a/systemd.spec b/systemd.spec index 7b139be..efb2fcd 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.15 +Version: 253.17 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -102,6 +102,9 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # https://bugzilla.redhat.com/show_bug.cgi?id=2164404 Patch0001: https://github.com/systemd/systemd/pull/26494.patch +# Fixup patch from v253-stable branch that went in after the tag +Patch0002: 0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch + # Those are downstream-only patches, but we don't want them in packit builds: # https://bugzilla.redhat.com/show_bug.cgi?id=1738828 From ee58c1a6668177efa90f124f839b8f28b7058260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 11 May 2024 15:46:15 +0200 Subject: [PATCH 20/20] Version 253.18 - Various small fixes, too many too list. --- ...upload-drop-RestartSteps-and-Restart.patch | 27 ------------------- sources | 2 +- systemd.spec | 6 +---- 3 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch diff --git a/0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch b/0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch deleted file mode 100644 index c7c34fe..0000000 --- a/0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e4f1fb16aeda475a0cb27535abf0bfa24e9fb0d8 Mon Sep 17 00:00:00 2001 -From: Luca Boccassi -Date: Thu, 29 Feb 2024 14:40:33 +0000 -Subject: [PATCH] systemd-journal-upload: drop RestartSteps= and - RestartMaxDelaySec= - -They are not available in this release, and were backported by mistake together with -Restart=on-failure. - -Follow-up for 3ac88345598003c6f5b53c0dc5cf3e4f80e371bc ---- - units/systemd-journal-upload.service.in | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/units/systemd-journal-upload.service.in b/units/systemd-journal-upload.service.in -index 7e64870e9d..18365a86a3 100644 ---- a/units/systemd-journal-upload.service.in -+++ b/units/systemd-journal-upload.service.in -@@ -27,8 +27,6 @@ ProtectKernelLogs=yes - ProtectKernelModules=yes - ProtectKernelTunables=yes - Restart=on-failure --RestartSteps=10 --RestartMaxDelaySec=60 - RestrictAddressFamilies=AF_UNIX AF_INET AF_INET6 - RestrictNamespaces=yes - RestrictRealtime=yes diff --git a/sources b/sources index c8c03ca..d53b087 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-253.17.tar.gz) = 3acc9ba17db26ce701a8b11984a25f269109d08bcec589dabe6cf46033c59aac151e8baaa561b3c8300bf8d5bc3e0769e84971be3fe893a7f003e618141800a6 +SHA512 (systemd-253.18.tar.gz) = 70b2387f51c633067824a21714a3c47066dff619a686b73b51f73abd560f4da6f2e93ab5e4b3e6501297164a84b1ac7435d410e1b3c9d4e744cfe39c4d4333ae diff --git a/systemd.spec b/systemd.spec index efb2fcd..b196896 100644 --- a/systemd.spec +++ b/systemd.spec @@ -35,7 +35,7 @@ Name: systemd Url: https://systemd.io %if %{without inplace} -Version: 253.17 +Version: 253.18 %else # determine the build information from local checkout Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/') @@ -102,10 +102,6 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # https://bugzilla.redhat.com/show_bug.cgi?id=2164404 Patch0001: https://github.com/systemd/systemd/pull/26494.patch -# Fixup patch from v253-stable branch that went in after the tag -Patch0002: 0001-systemd-journal-upload-drop-RestartSteps-and-Restart.patch - - # Those are downstream-only patches, but we don't want them in packit builds: # https://bugzilla.redhat.com/show_bug.cgi?id=1738828 Patch0490: use-bfq-scheduler.patch