diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-21 17:32:00 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-21 17:32:00 +0100 |
commit | 61f10f985e19dfe20a4d9552902625edd5b6eabb (patch) | |
tree | 50db31971b38c4e0358253ef5005058a46fc773e /sys-apps/systemd/files | |
parent | 34dea8e38f88007799629d0a56b12dec480b1d21 (diff) |
gentoo resync : 21.06.2021
Diffstat (limited to 'sys-apps/systemd/files')
-rw-r--r-- | sys-apps/systemd/files/247-cgroup-test.patch | 35 | ||||
-rw-r--r-- | sys-apps/systemd/files/248-rfkill.patch | 35 | ||||
-rw-r--r-- | sys-apps/systemd/files/gentoo-pam-r1.patch | 33 | ||||
-rw-r--r-- | sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch | 25 | ||||
-rw-r--r-- | sys-apps/systemd/files/systemd-user.pam | 5 |
5 files changed, 5 insertions, 128 deletions
diff --git a/sys-apps/systemd/files/247-cgroup-test.patch b/sys-apps/systemd/files/247-cgroup-test.patch deleted file mode 100644 index bfa4422a6211..000000000000 --- a/sys-apps/systemd/files/247-cgroup-test.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ddfc6ad061ad47caeeff901d27cbc59af85e0db3 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Tue, 9 Mar 2021 17:57:37 -0500 -Subject: [PATCH] cg_unified_cached: return ENOMEDIUM if we cannot find a known - hierarchy - -When the test suite is being run in a foreign environment, -/sys/fs/cgroup might not be set up in a way that we recognize. -Returning ENOMEDIUM causes the tests to be skipped in this case. - -Bug: https://bugs.gentoo.org/771819 ---- - src/basic/cgroup-util.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c -index 527043a2b39..0b252eb28fb 100644 ---- a/src/basic/cgroup-util.c -+++ b/src/basic/cgroup-util.c -@@ -2052,8 +2052,14 @@ int cg_unified_cached(bool flush) { - unified_cache = CGROUP_UNIFIED_SYSTEMD; - unified_systemd_v232 = false; - } else { -- if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) -+ if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0) { -+ if (errno == ENOENT) { -+ /* Some other software may have set up /sys/fs/cgroup in a configuration we do not recognize. */ -+ log_debug_errno(errno, "Unsupported cgroupsv1 setup detected: name=systemd hierarchy not found."); -+ return -ENOMEDIUM; -+ } - return log_debug_errno(errno, "statfs(\"/sys/fs/cgroup/systemd\" failed: %m"); -+ } - - if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) { - log_debug("Found cgroup2 on /sys/fs/cgroup/systemd, unified hierarchy for systemd controller (v232 variant)"); diff --git a/sys-apps/systemd/files/248-rfkill.patch b/sys-apps/systemd/files/248-rfkill.patch deleted file mode 100644 index 122508704355..000000000000 --- a/sys-apps/systemd/files/248-rfkill.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ab1aa6368a883bce88e3162fee2bea14aacedf23 Mon Sep 17 00:00:00 2001 -From: Luca Boccassi <luca.boccassi@microsoft.com> -Date: Tue, 13 Apr 2021 13:17:53 +0100 -Subject: [PATCH] rfkill: add some casts to silence -Werror=sign-compare - ---- - src/rfkill/rfkill.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c -index e2d1a1be5fa..bff1a2886be 100644 ---- a/src/rfkill/rfkill.c -+++ b/src/rfkill/rfkill.c -@@ -177,7 +177,7 @@ static int load_state(Context *c, const struct rfkill_event *event) { - ssize_t l = write(c->rfkill_fd, &we, sizeof we); - if (l < 0) - return log_error_errno(errno, "Failed to restore rfkill state for %i: %m", event->idx); -- if (l < RFKILL_EVENT_SIZE_V1) -+ if ((size_t)l < RFKILL_EVENT_SIZE_V1) /* l cannot be < 0 here. Cast to fix -Werror=sign-compare */ - return log_error_errno(SYNTHETIC_ERRNO(EIO), - "Couldn't write rfkill event structure, too short (wrote %zd of %zu bytes).", - l, sizeof we); -@@ -335,9 +335,9 @@ static int run(int argc, char *argv[]) { - break; - } - -- if (l < RFKILL_EVENT_SIZE_V1) -- return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short read of struct rfkill_event: (%zd < %d)", -- l, RFKILL_EVENT_SIZE_V1); -+ if ((size_t)l < RFKILL_EVENT_SIZE_V1) /* l cannot be < 0 here. Cast to fix -Werror=sign-compare */ -+ return log_error_errno(SYNTHETIC_ERRNO(EIO), "Short read of struct rfkill_event: (%zd < %zu)", -+ l, (size_t) RFKILL_EVENT_SIZE_V1); /* Casting necessary to make compiling with different kernel versions happy */ - log_debug("Reading struct rfkill_event: got %zd bytes.", l); - - /* The event structure has more fields. We only care about the first few, so it's OK if we diff --git a/sys-apps/systemd/files/gentoo-pam-r1.patch b/sys-apps/systemd/files/gentoo-pam-r1.patch deleted file mode 100644 index 8816bae19e07..000000000000 --- a/sys-apps/systemd/files/gentoo-pam-r1.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e404e655eab9042bfc81ff5638dd54f4a5452ce0 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Wed, 19 May 2021 15:34:41 -0400 -Subject: [PATCH] pam: include system-auth for systemd --user - ---- - src/login/systemd-user.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/login/systemd-user.in b/src/login/systemd-user.in -index 343aec4a01..a18d7d43cf 100644 ---- a/src/login/systemd-user.in -+++ b/src/login/systemd-user.in -@@ -5,7 +5,7 @@ - {% if ENABLE_HOMED %} - -account sufficient pam_systemd_home.so - {% endif %} --account sufficient pam_unix.so -+account include system-auth - account required pam_permit.so - - {% if HAVE_SELINUX %} -@@ -13,6 +13,7 @@ session required pam_selinux.so close - session required pam_selinux.so nottys open - {% endif %} - session required pam_loginuid.so -+session include system-auth - session optional pam_keyinit.so force revoke - {% if ENABLE_HOMED %} - -session optional pam_systemd_home.so --- -2.31.1 - diff --git a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch deleted file mode 100644 index d92d2d43a0c2..000000000000 --- a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7ccd5724afc6fa83ec6cd93dbaf4faf3671c88fc Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Mon, 27 Apr 2020 10:22:03 -0400 -Subject: [PATCH] systemctl: disable synchronizaion of sysv init scripts - ---- - src/systemctl/systemctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index d319d5d375..bb8419800c 100644 ---- a/src/systemctl/systemctl.c -+++ b/src/systemctl/systemctl.c -@@ -6622,7 +6622,7 @@ static int import_environment(int argc, char *argv[], void *userdata) { - static int enable_sysv_units(const char *verb, char **args) { - int r = 0; - --#if HAVE_SYSV_COMPAT -+#if 0 - _cleanup_(lookup_paths_free) LookupPaths paths = {}; - unsigned f = 0; - --- -2.26.2 - diff --git a/sys-apps/systemd/files/systemd-user.pam b/sys-apps/systemd/files/systemd-user.pam new file mode 100644 index 000000000000..38ae3211f8d4 --- /dev/null +++ b/sys-apps/systemd/files/systemd-user.pam @@ -0,0 +1,5 @@ +account include system-auth + +session required pam_loginuid.so +session include system-auth +session optional pam_systemd.so |