diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /sys-apps/systemd/files | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'sys-apps/systemd/files')
5 files changed, 58 insertions, 73 deletions
diff --git a/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch b/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch deleted file mode 100644 index f44b4be85d50..000000000000 --- a/sys-apps/systemd/files/gentoo-Dont-enable-audit-by-default.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Martin Pitt <martin.pitt@ubuntu.com> -Date: Sun, 28 Dec 2014 12:49:35 +0100 -Subject: Don't enable audit by default - -It causes flooding of dmesg and syslog, suppressing actually important -messages. - -Don't enable it for now, until a better solution is found: -http://lists.freedesktop.org/archives/systemd-devel/2014-December/026591.html - -Bug-Debian: https://bugs.debian.org/773528 ---- - src/journal/journald-audit.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c -index 69742fa..25ef743 100644 ---- a/src/journal/journald-audit.c -+++ b/src/journal/journald-audit.c -@@ -542,10 +542,5 @@ int server_open_audit(Server *s) { - if (r < 0) - return log_error_errno(r, "Failed to add audit fd to event loop: %m"); - -- /* We are listening now, try to enable audit */ -- r = enable_audit(s->audit_fd, true); -- if (r < 0) -- log_warning_errno(r, "Failed to issue audit enable call: %m"); -- - return 0; - } diff --git a/sys-apps/systemd/files/gentoo-generator-path-r1.patch b/sys-apps/systemd/files/gentoo-generator-path-r1.patch deleted file mode 100644 index 459be9d99edb..000000000000 --- a/sys-apps/systemd/files/gentoo-generator-path-r1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3c7918deafa34313b935851171279d8fdb5cfadb Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Tue, 25 Dec 2018 22:52:50 -0500 -Subject: [PATCH] path-lookup: look for generators in - {,/usr}/lib/systemd/system-generators - -Bug: https://bugs.gentoo.org/625402 ---- - src/shared/path-lookup.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 442fde7b2d..6814164504 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -888,6 +888,8 @@ char **generator_binary_paths(UnitFileScope scope) { - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", - "/usr/local/lib/systemd/system-generators", -+ "/usr/lib/systemd/system-generators", -+ "/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH); - - case UNIT_FILE_GLOBAL: --- -2.20.1 - diff --git a/sys-apps/systemd/files/gentoo-pam.patch b/sys-apps/systemd/files/gentoo-pam.patch new file mode 100644 index 000000000000..4d022b508ba6 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-pam.patch @@ -0,0 +1,33 @@ +From b744751e2ced66c2ec191e8bd490cb9bdffc630a Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Tue, 3 Nov 2020 10:42:51 -0500 +Subject: [PATCH] pam: include system-auth for systemd --user + +--- + src/login/systemd-user.m4 | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/login/systemd-user.m4 b/src/login/systemd-user.m4 +index f6313f79fe..bcf84b4c64 100644 +--- a/src/login/systemd-user.m4 ++++ b/src/login/systemd-user.m4 +@@ -5,7 +5,7 @@ + m4_ifdef(`ENABLE_HOMED', + -account sufficient pam_systemd_home.so + )m4_dnl +-account sufficient pam_unix.so ++account include system-auth + account required pam_permit.so + + m4_ifdef(`HAVE_SELINUX', +@@ -13,6 +13,7 @@ session required pam_selinux.so close + session required pam_selinux.so nottys open + )m4_dnl + session required pam_loginuid.so ++session include system-auth + session optional pam_keyinit.so force revoke + m4_ifdef(`ENABLE_HOMED', + -session optional pam_systemd_home.so +-- +2.29.0 + diff --git a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch new file mode 100644 index 000000000000..a9d40be4ab77 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync-r1.patch @@ -0,0 +1,25 @@ +From d9059d2ef1b0d6034267cc8ff44871d0f82f840f Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Sun, 8 Nov 2020 12:34:11 -0500 +Subject: [PATCH] systemctl: disable synchronizaion of sysv init scripts + +--- + src/systemctl/systemctl-sysv-compat.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/systemctl/systemctl-sysv-compat.c b/src/systemctl/systemctl-sysv-compat.c +index 2dca9e480f..5dcf13ba17 100644 +--- a/src/systemctl/systemctl-sysv-compat.c ++++ b/src/systemctl/systemctl-sysv-compat.c +@@ -111,7 +111,7 @@ int parse_shutdown_time_spec(const char *t, usec_t *ret) { + 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.29.0 + diff --git a/sys-apps/systemd/files/gentoo-systemd-user-pam.patch b/sys-apps/systemd/files/gentoo-systemd-user-pam.patch deleted file mode 100644 index eb2223e52f27..000000000000 --- a/sys-apps/systemd/files/gentoo-systemd-user-pam.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/src/login/systemd-user.m4 -+++ b/src/login/systemd-user.m4 -@@ -2,11 +2,7 @@ - # - # Used by systemd --user instances. - --account required pam_unix.so --m4_ifdef(`HAVE_SELINUX', --session required pam_selinux.so close --session required pam_selinux.so nottys open --)m4_dnl --session required pam_loginuid.so -+account include system-auth -+session include system-auth - session optional pam_keyinit.so force revoke - session optional pam_systemd.so |