From 3c50caeeab3dc7e0caa450fd54b21c1e325428cc Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Mon, 12 Jul 2021 09:41:38 +0000 Subject: [PATCH] Rebase to v249 Resolves: #1981276 --- ...nd-set-RemoveIPC-to-false-by-default.patch | 0 sources | 2 +- systemd.spec | 19 ++++++++----------- 3 files changed, 9 insertions(+), 12 deletions(-) rename 0003-logind-set-RemoveIPC-to-false-by-default.patch => 0001-logind-set-RemoveIPC-to-false-by-default.patch (100%) diff --git a/0003-logind-set-RemoveIPC-to-false-by-default.patch b/0001-logind-set-RemoveIPC-to-false-by-default.patch similarity index 100% rename from 0003-logind-set-RemoveIPC-to-false-by-default.patch rename to 0001-logind-set-RemoveIPC-to-false-by-default.patch diff --git a/sources b/sources index 1650fb4..6a6a3d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (systemd-248.tar.gz) = 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0 +SHA512 (systemd-249.tar.gz) = 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c diff --git a/systemd.spec b/systemd.spec index 80d573e..25fb6ab 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,8 +20,8 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd -Version: 248 -Release: 7%{?dist} +Version: 249 +Release: 1%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -77,13 +77,7 @@ GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[ # patches in this range before applying upstream pull requests. # RHEL-specific -Patch0001: 0001-rfkill-don-t-compare-values-of-different-signedness.patch -Patch0002: 0002-rfkill-fix-the-format-string-to-prevent-compilation-.patch -Patch0003: 0003-logind-set-RemoveIPC-to-false-by-default.patch -Patch0004: 0004-Revert-rfkill-fix-the-format-string-to-prevent-compi.patch -Patch0005: 0005-Revert-rfkill-don-t-compare-values-of-different-sign.patch -Patch0006: 0006-rfkill-add-some-casts-to-silence-Werror-sign-compare.patch -Patch0007: 0007-core-allow-omitting-second-part-of-LoadCredentials-a.patch +Patch0001: 0001-logind-set-RemoveIPC-to-false-by-default.patch # Downstream-only patches (9000–9999) # https://github.com/systemd/systemd/pull/17050 @@ -130,8 +124,8 @@ BuildRequires: gperf BuildRequires: gawk BuildRequires: tree BuildRequires: hostname -BuildRequires: python3-devel -BuildRequires: python3-lxml +BuildRequires: python3dist(lxml) +BuildRequires: python3dist(jinja2) BuildRequires: firewalld-filesystem BuildRequires: libseccomp-devel BuildRequires: meson >= 0.43 @@ -841,6 +835,9 @@ getent passwd systemd-oom &>/dev/null || useradd -r -l -g systemd-oom -d / -s /s %files standalone-sysusers -f .file-list-standalone-sysusers %changelog +* Mon Jul 12 2021 - 249-1 +- Rebase to v249 (#1981276) + * Thu Jun 17 2021 systemd maintenance team - 248-7 - core: allow omitting second part of LoadCredentials= argument (#1949568)