From f610b8e29efa47635093e222638cfadd3f1ec3fd Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 14 May 2021 13:54:19 +0200 Subject: [PATCH] systemd-248-4 Resolves: #1959836 --- ...nd-set-RemoveIPC-to-false-by-default.patch | 54 +++++++++++++++++++ systemd.spec | 8 ++- 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 0003-logind-set-RemoveIPC-to-false-by-default.patch diff --git a/0003-logind-set-RemoveIPC-to-false-by-default.patch b/0003-logind-set-RemoveIPC-to-false-by-default.patch new file mode 100644 index 0000000..bc767e4 --- /dev/null +++ b/0003-logind-set-RemoveIPC-to-false-by-default.patch @@ -0,0 +1,54 @@ +From 6897f6efe6d7cee90a817bb31f25e0b4dbb0e370 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Wed, 1 Aug 2018 10:58:28 +0200 +Subject: [PATCH] logind: set RemoveIPC to false by default + +RHEL-only + +Resolves: #1959836 + +(cherry picked from commit 0b3833d6c3b751c6dfb40eeb2ef852984c58f546) +--- + man/logind.conf.xml | 2 +- + src/login/logind-core.c | 2 +- + src/login/logind.conf.in | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/man/logind.conf.xml b/man/logind.conf.xml +index be62b6b572..bec7ff44af 100644 +--- a/man/logind.conf.xml ++++ b/man/logind.conf.xml +@@ -346,7 +346,7 @@ + user fully logs out. Takes a boolean argument. If enabled, the user may not consume IPC resources after the + last of the user's sessions terminated. This covers System V semaphores, shared memory and message queues, as + well as POSIX shared memory and message queues. Note that IPC objects of the root user and other system users +- are excluded from the effect of this setting. Defaults to yes. ++ are excluded from the effect of this setting. Defaults to no. + + + +diff --git a/src/login/logind-core.c b/src/login/logind-core.c +index 2ecf2120fd..9ad411c575 100644 +--- a/src/login/logind-core.c ++++ b/src/login/logind-core.c +@@ -34,7 +34,7 @@ void manager_reset_config(Manager *m) { + + m->n_autovts = 6; + m->reserve_vt = 6; +- m->remove_ipc = true; ++ m->remove_ipc = false; + m->inhibit_delay_max = 5 * USEC_PER_SEC; + m->user_stop_delay = 10 * USEC_PER_SEC; + +diff --git a/src/login/logind.conf.in b/src/login/logind.conf.in +index 76f529c176..b936b6e62d 100644 +--- a/src/login/logind.conf.in ++++ b/src/login/logind.conf.in +@@ -39,6 +39,6 @@ + #IdleActionSec=30min + #RuntimeDirectorySize=10% + #RuntimeDirectoryInodes=400k +-#RemoveIPC=yes ++#RemoveIPC=no + #InhibitorsMax=8192 + #SessionsMax=8192 diff --git a/systemd.spec b/systemd.spec index a4c22f4..a632b8b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 248 -Release: 3%{?dist} +Release: 4%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: System and Service Manager @@ -77,6 +77,9 @@ 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 # Downstream-only patches (9000–9999) # https://github.com/systemd/systemd/pull/17050 @@ -902,6 +905,9 @@ getent passwd systemd-resolve &>/dev/null || useradd -r -u 193 -l -g systemd-res %files standalone-sysusers -f .file-list-standalone-sysusers %changelog +* Fri May 14 2021 systemd maintenance team - 248-4 +- logind: set RemoveIPC to false by default (#1959836) + * Fri May 14 2021 systemd maintenance team - 248-3 - rfkill: don't compare values of different signedness (#1931710) - rfkill: fix the format string to prevent compilation error (#1931710)