summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2021-07-23 01:10:22 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2021-07-23 01:10:22 +0200
commita56f83db1f3f42de563e2669afdc67ae708a4f78 (patch)
tree7b770ca5a05550cb9fe66ed8e8bbb3c606dbd6b2
parentAdd systemd also to gshadow and shadow lines (diff)
downloadglibc-patches-a56f83db1f3f42de563e2669afdc67ae708a4f78.tar.gz
glibc-patches-a56f83db1f3f42de563e2669afdc67ae708a4f78.tar.bz2
glibc-patches-a56f83db1f3f42de563e2669afdc67ae708a4f78.zip
Drop systemd-related config file patches, this will be done conditionally
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
-rw-r--r--9999/0050-Enable-nss-systemd-in-nsswitch.conf.patch52
-rw-r--r--9999/0051-Gentoo-nsswitch.conf-Add-nss-systemd-hook-also-to-sh.patch35
2 files changed, 0 insertions, 87 deletions
diff --git a/9999/0050-Enable-nss-systemd-in-nsswitch.conf.patch b/9999/0050-Enable-nss-systemd-in-nsswitch.conf.patch
deleted file mode 100644
index af5796a..0000000
--- a/9999/0050-Enable-nss-systemd-in-nsswitch.conf.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From eab439ef67e7749f0e0a159e373e54b5f4dbe887 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 27 Feb 2021 18:37:33 +0100
-Subject: [PATCH] Enable nss-systemd in nsswitch.conf
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-See
-https://bugs.gentoo.org/768366
-https://www.freedesktop.org/software/systemd/man/nss-systemd.html
-
-Bug: https://bugs.gentoo.org/768366
-Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
----
- nss/nsswitch.conf | 11 +++++++++--
- 1 file changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/nss/nsswitch.conf b/nss/nsswitch.conf
-index 40030d1dd7..0faf5e71fe 100644
---- a/nss/nsswitch.conf
-+++ b/nss/nsswitch.conf
-@@ -50,17 +50,24 @@
- # shadow: db files
- # group: db files
-
-+# If you encounter slowdowns of file operations and do not use
-+# systemd-generated users and groups, you can disable the corresponding
-+# lookups by replacing the group and passwd lines with, e.g.,
-+# group: files
-+# passwd: files
-+# See also https://bugs.gentoo.org/773436
-+
- # In alphabetical order. Re-order as required to optimize peformance.
- aliases: files
- ethers: files
--group: files
-+group: files [SUCCESS=merge] systemd
- gshadow: files
- hosts: files dns
- # Allow initgroups to default to the setting for group.
- # initgroups: files
- netgroup: files
- networks: files dns
--passwd: files
-+passwd: files systemd
- protocols: files
- publickey: files
- rpc: files
---
-2.26.3
-
diff --git a/9999/0051-Gentoo-nsswitch.conf-Add-nss-systemd-hook-also-to-sh.patch b/9999/0051-Gentoo-nsswitch.conf-Add-nss-systemd-hook-also-to-sh.patch
deleted file mode 100644
index 27cff54..0000000
--- a/9999/0051-Gentoo-nsswitch.conf-Add-nss-systemd-hook-also-to-sh.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c834ea3358e6a3d74ed45b96168338f31dd0f080 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Tue, 25 May 2021 22:24:20 +0200
-Subject: [PATCH] Gentoo: nsswitch.conf: Add nss-systemd hook also to shadow
- and gshadow
-
-See-also: https://github.com/systemd/systemd/pull/19545
-See-also: https://github.com/systemd/systemd/commit/f43a19ecd6e3415ec223f245204b4eaaff739af4
----
- nss/nsswitch.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nss/nsswitch.conf b/nss/nsswitch.conf
-index 0faf5e71fe..17aa6db22b 100644
---- a/nss/nsswitch.conf
-+++ b/nss/nsswitch.conf
-@@ -61,7 +61,7 @@
- aliases: files
- ethers: files
- group: files [SUCCESS=merge] systemd
--gshadow: files
-+gshadow: files systemd
- hosts: files dns
- # Allow initgroups to default to the setting for group.
- # initgroups: files
-@@ -71,5 +71,5 @@ passwd: files systemd
- protocols: files
- publickey: files
- rpc: files
--shadow: files
-+shadow: files systemd
- services: files
---
-2.26.3
-