diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-04-12 03:41:30 +0100 |
commit | 623ee73d661e5ed8475cb264511f683407d87365 (patch) | |
tree | 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-auth/nss-pam-ldapd/files | |
parent | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff) |
gentoo Easter resync : 12.04.2020
Diffstat (limited to 'sys-auth/nss-pam-ldapd/files')
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/nslcd-2.service | 14 | ||||
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/nslcd-init-r1 | 36 | ||||
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/nslcd-init-r2 | 28 | ||||
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/nslcd.init (renamed from sys-auth/nss-pam-ldapd/files/nslcd-init-r3) | 2 | ||||
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/nslcd.s6 (renamed from sys-auth/nss-pam-ldapd/files/nslcd-run-s6) | 0 | ||||
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/nslcd.service | 2 | ||||
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch | 25 | ||||
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/pynslcd.init (renamed from sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2) | 2 | ||||
-rw-r--r-- | sys-auth/nss-pam-ldapd/files/pynslcd.initd | 28 |
9 files changed, 3 insertions, 134 deletions
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-2.service b/sys-auth/nss-pam-ldapd/files/nslcd-2.service deleted file mode 100644 index b6b167aaed92..000000000000 --- a/sys-auth/nss-pam-ldapd/files/nslcd-2.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=NSS and PAM LDAP client daemon -After=network-online.target -Wants=network-online.target nss-lookup.target syslog.service -Before=nss-user-lookup.target - -[Service] -Type=forking -PIDFile=/run/nslcd/nslcd.pid -ExecStart=/usr/sbin/nslcd - -[Install] -WantedBy=multi-user.target -RequiredBy=nss-user-lookup.target diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r1 b/sys-auth/nss-pam-ldapd/files/nslcd-init-r1 deleted file mode 100644 index 776a7b3009e0..000000000000 --- a/sys-auth/nss-pam-ldapd/files/nslcd-init-r1 +++ /dev/null @@ -1,36 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="checkconfig" -cfg="/etc/nslcd.conf" - -depend() { - need net - use dns logger -} - -checkconfig() { - if [ ! -f "$cfg" ] ; then - eerror "Please create $cfg" - eerror "Example config: /usr/share/nss-ldapd/nslcd.conf" - return 1 - fi - return 0 -} - -start() { - checkpath -q -d /run/nslcd -o nslcd:nslcd - checkconfig || return $? - - ebegin "Starting nslcd" - start-stop-daemon --start --pidfile /var/run/nslcd/nslcd.pid \ - --exec /usr/sbin/nslcd - eend $? "Failed to start nslcd" -} - -stop() { - ebegin "Stopping nslcd" - start-stop-daemon --stop --pidfile /var/run/nslcd/nslcd.pid - eend $? "Failed to stop nslcd" -} diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r2 b/sys-auth/nss-pam-ldapd/files/nslcd-init-r2 deleted file mode 100644 index 55ef9a53774f..000000000000 --- a/sys-auth/nss-pam-ldapd/files/nslcd-init-r2 +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command=/usr/sbin/nslcd -pidfile=/var/run/nslcd/nslcd.pid -extra_commands="checkconfig" -cfg="/etc/nslcd.conf" - -depend() { - need net - use dns logger -} - -checkconfig() { - if [ ! -f "$cfg" ] ; then - eerror "Please create $cfg" - eerror "Example config: /usr/share/nss-ldapd/nslcd.conf" - return 1 - fi - return 0 -} - -start_pre() { - checkpath -q -d /run/nslcd -o nslcd:nslcd - checkconfig - return $? -} diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r3 b/sys-auth/nss-pam-ldapd/files/nslcd.init index 513ad9af3fe1..959fb601f606 100644 --- a/sys-auth/nss-pam-ldapd/files/nslcd-init-r3 +++ b/sys-auth/nss-pam-ldapd/files/nslcd.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/sbin/nslcd diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-run-s6 b/sys-auth/nss-pam-ldapd/files/nslcd.s6 index 264da009ba11..264da009ba11 100644 --- a/sys-auth/nss-pam-ldapd/files/nslcd-run-s6 +++ b/sys-auth/nss-pam-ldapd/files/nslcd.s6 diff --git a/sys-auth/nss-pam-ldapd/files/nslcd.service b/sys-auth/nss-pam-ldapd/files/nslcd.service index 030cc2c90eb1..b6b167aaed92 100644 --- a/sys-auth/nss-pam-ldapd/files/nslcd.service +++ b/sys-auth/nss-pam-ldapd/files/nslcd.service @@ -6,7 +6,7 @@ Before=nss-user-lookup.target [Service] Type=forking -PIDFile=/var/run/nslcd/nslcd.pid +PIDFile=/run/nslcd/nslcd.pid ExecStart=/usr/sbin/nslcd [Install] diff --git a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch b/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch deleted file mode 100644 index 11c86eff2e24..000000000000 --- a/sys-auth/nss-pam-ldapd/files/nss-pam-ldapd-0.9.8-pynslcd-module-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/pynslcd/pynslcd.py b/pynslcd/pynslcd.py -index d367a8c..9a52120 100755 ---- a/pynslcd.py -+++ b/pynslcd.py -@@ -30,13 +30,13 @@ import threading - import daemon - import ldap - --from tio import TIOStream --import cfg --import common --import constants --import invalidator --import mypidfile --import search -+from pynslcd.tio import TIOStream -+import pynslcd.cfg as cfg -+import pynslcd.common as common -+import pynslcd.constants as constants -+import pynslcd.invalidator as invalidator -+import pynslcd.mypidfile as mypidfile -+import pynslcd.search as search - - - # the name of the program diff --git a/sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 b/sys-auth/nss-pam-ldapd/files/pynslcd.init index 21762ae5fd2b..3165b02843fc 100644 --- a/sys-auth/nss-pam-ldapd/files/pynslcd.initd-r2 +++ b/sys-auth/nss-pam-ldapd/files/pynslcd.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 command=/usr/sbin/pynslcd diff --git a/sys-auth/nss-pam-ldapd/files/pynslcd.initd b/sys-auth/nss-pam-ldapd/files/pynslcd.initd deleted file mode 100644 index 7b6540810aed..000000000000 --- a/sys-auth/nss-pam-ldapd/files/pynslcd.initd +++ /dev/null @@ -1,28 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command=/usr/sbin/pynslcd -pidfile=/var/run/nslcd/nslcd.pid -extra_commands="checkconfig" -cfg="/etc/nslcd.conf" - -depend() { - need net - use dns logger -} - -checkconfig() { - if [ ! -f "$cfg" ] ; then - eerror "Please create $cfg" - eerror "Example config: /usr/share/nss-ldapd/nslcd.conf" - return 1 - fi - return 0 -} - -start_pre() { - checkpath -q -d /run/nslcd -o nslcd:nslcd - checkconfig - return $? -} |