summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Thode <prometheanfire@gentoo.org>2015-06-17 21:39:23 +0000
committerMatt Thode <prometheanfire@gentoo.org>2015-06-17 21:39:23 +0000
commit57f4dd3434d7e50e98822306d78978069c0deeda (patch)
tree197259bd669772eaabd19410bfc3858fc50b2495 /sys-auth
parentVersion bump. (diff)
downloadhistorical-57f4dd3434d7e50e98822306d78978069c0deeda.tar.gz
historical-57f4dd3434d7e50e98822306d78978069c0deeda.tar.bz2
historical-57f4dd3434d7e50e98822306d78978069c0deeda.zip
adding s6 suport for bug 550594
Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x33ED3FD25AFC78BA
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/nss-pam-ldapd/ChangeLog7
-rw-r--r--sys-auth/nss-pam-ldapd/Manifest34
-rw-r--r--sys-auth/nss-pam-ldapd/files/nslcd-init-r229
-rw-r--r--sys-auth/nss-pam-ldapd/files/nslcd-init-s60
-rw-r--r--sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild121
-rw-r--r--sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild12
6 files changed, 62 insertions, 141 deletions
diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index d18a84e7cee8..52ababb59199 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-auth/nss-pam-ldapd
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.24 2015/06/15 18:27:15 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.25 2015/06/17 21:39:14 prometheanfire Exp $
+
+ 17 Jun 2015; Matthew Thode <prometheanfire@gentoo.org> +files/nslcd-init-r2,
+ +files/nslcd-init-s6, -nss-pam-ldapd-0.9.5-r1.ebuild,
+ nss-pam-ldapd-0.9.6.ebuild:
+ adding s6 suport for bug 550594
*nss-pam-ldapd-0.9.6 (15 Jun 2015)
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index d5afac7c0565..f38811aabc6e 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -3,32 +3,32 @@ Hash: SHA256
AUX nslcd-init 867 SHA256 a8cac89f3bbecde9b4267269a19bbd9cba56b452928346c4027052dc46624d5e SHA512 5fdb4dfb678a8733156bd9f99cace12104917cce96b476eccaa3621019c319a2cbb5e0f7789a883e0107bcaad98b9272ffcbfefe33a75173a79bbbb1202c02a8 WHIRLPOOL 795e2ab94174731b2b20ff27cb308fe2eddf9a5eb457f36c7a4a2c2d3d505f014fe71f99379bff3983d9f1253335227f63f36f984e316896f52d3f0539f03715
AUX nslcd-init-r1 856 SHA256 d10fd2a3b46af6d9172d4caa9544b66c86783f147c37cc217e52b8d343813090 SHA512 31962bf39ffb3e61cf9b203425ec6fcb7635cfe82add485efd48db212b24c3ed0b77953b524add1c2a07574890bf933f265e7f2a94c63fe7c4203f3ebcc0a20d WHIRLPOOL a5c3243b811a26ee09a9f2d735fd87ad3004afec85837b5eebfa8e3c0673d58c93fbb192bad3bfb45b8866620742c491cf5a6b9da49806ff06c3539858f6cdf3
+AUX nslcd-init-r2 645 SHA256 1d5ada9f212779075b6fdcb0aeee6b8d92753f2afcf57263939d98d1de3c7f51 SHA512 2013d4c5e3dbf3c6e033dac561a8f264938c6a91bbbdf98c42f8d6ad55d821673faf07c9a29354d8a95be40eed5546d57e8b4767e81c1a818e39e57401e3c53f WHIRLPOOL 8c169eed1dae9c6bb37ffea03aca65bf8b167b669aa8ca48f335de26bc92f0580651f85220d33c92149a29132f7ff2f3fdc6e64c41b9452ea1d22708815db7f6
+AUX nslcd-init-s6 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 SHA512 cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e WHIRLPOOL 19fa61d75522a4669b44e39c1d2e1726c530232130d407f89afee0964997f7a73e83be698b288febcf88e3e03c4f0757ea8964e59b63d93708b138cc42a66eb3
AUX nslcd-tmpfiles.conf 32 SHA256 670cad7afe9938464a1e2edd6bbb588e138318795ed6895493c64fa7e666164a SHA512 ccffd327cfa015ec746f4e1506c02beb514763625b0e5818455491b911d9328b19f17620926c15aaf18f5cd9268ea71f5ef35ce7a427aefab950579d5629ee5d WHIRLPOOL fdae80405339264b9c9a491b80d5e68990f2a8c5a42ab2b8b2fc60ea00ee4a5a47ca1b74a256caacb376292302b6e44a888e2d201d9ad2b698e65974ec52aba5
AUX nslcd.rc 815 SHA256 7e68c0387282d045016c371c3888946955e7c74281f3d92f677c1f80d39833d9 SHA512 fca3a13f259293adf5fac1f1b574019752103ea83aef261a3a83be81eba59e779399179a82c57e2d504663c455efd2cdd3662ffe12bc2bfdc323f425c58d0906 WHIRLPOOL 2b3ced109aebafff42981b18b142dfed90bc2f1c10f228098f38ab2a1f03402fb79d986cf7a1b309e7649fc91d10c184f3fe5f9caf39933d12bc716de5c6c819
AUX nslcd.service 324 SHA256 9a194c0cc0f43fac5de3ac974cf8efef1911e233c05d7cdef22a9922161d940a SHA512 8055407704c445b4b90046cc4f6b68544d8955bf65fc6b4a2fdf986548a353c2292de70edcf7cb2356619cb122cd3341a82156b6f71eec914471406447cb26a7 WHIRLPOOL bfe549b354ebe56aeb8442a081fdecd7326391d789bb733933606dac8a118a66f169561ea07e389206f971dc93b6d665ae9f8d374a6e36160db218c1b5c0f973
AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 SHA256 d47afa040e8c282bf7f294583ae2c11a66c12cc702082c138eebaf972afcfa68 SHA512 c8cccb044a641f673f12db9717bda4c0c4d91bd1933342595d8f3f540449459c5cf14263133487195b223670d450873f608e3ce5b6f1ca775ca7fe0180a9f962 WHIRLPOOL 916c2b506e9133864c4063bc6ab420b6c6a7759b8b7adc6f6964b9b33bbcd5966b89135bf37eb3a511646806a11073210a68be9ea379fb214539f4a41934cc22
DIST nss-pam-ldapd-0.8.14.tar.gz 508949 SHA256 a29ceb9b7eda386ca38f16115ffec61425462cca6b5e560c44c3d51edc03a63f SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9 WHIRLPOOL 5d30088d73e464bf380dd5e7d34f8c5200680712693c97ee1f1df1880b4680236d9168ac7ec08b161ae463236c0feddc2171442a956c872113caa6e2b07a6bb8
-DIST nss-pam-ldapd-0.9.5.tar.gz 750988 SHA256 49080058d85f60213c1b661a899ffe44e30770b5034e5a6ce48486a8d92bee6c SHA512 78df39c7db10b8787ad4e3b4ccc4c764f390db85c1ef3da1de5344cca668fc54945537425e1c89c7899c66c6246652475386009b8fcd3f4d3144b790b1fc4015 WHIRLPOOL c6bbae2c174df83fd27ba90ec3c7a9cbbb20ef1e1b048c8b730735897d356bd2087289c8e5e669f3681f615cc466c540ddc78893edcf487f796e3a5396a30ccf
DIST nss-pam-ldapd-0.9.6.tar.gz 754681 SHA256 101d5a7fa10549cc77be48d07f2b8141f59182f10f2cc0fea93efd13c3a5a6f2 SHA512 213bc55554290042623ef4cce071045bab569a824aef7d960e3aa9c2f64f0c4928c5c28a4b5d9225fd35ea5026bb11f710d9c620f790e9d82c73d89b272e972a WHIRLPOOL 8902d48a6e889e697f7ddf9bd7d481493a0e2e302223317647f24fd3cd10b176cf66287553b8eafc2b996d0c073055afeb42b4f29d93e8f05f3967bb0aeaee16
EBUILD nss-pam-ldapd-0.8.14-r2.ebuild 2144 SHA256 f36b6e4138dc6346f8440fc530f2be42dd4856243faec07058079f9d55f7b562 SHA512 ca6749205a478d4d7f526c46164fa8ce0c22b8ad8d18af6e3c0dfc9f41ca37f1bfeb29e428bc3836a94aae4a810a954851842aa527f424a7aa4bf4fad3307756 WHIRLPOOL 0755f53e9f56e745c37753d62747ac8efc01404e778648b353076d1ee43815411f6db60b404faa600602299f819decdad9b7d364442b76e9cc43f91c1d162ed4
-EBUILD nss-pam-ldapd-0.9.5-r1.ebuild 3121 SHA256 786ecef074556bcf3dfbca459f5cacde6c5d8dc30cec2d634b964b8ddc769dda SHA512 a1dcb24faead16545afb073d97753c030cb0e8401238a0d36907fcffdda73052e4b2eee8aef1cd6203ba414bdbd25a8b09a2b0c0d278472539b08ddcba2bfb09 WHIRLPOOL 6469669f168a15c8fefb0cac2b3cefde8ff1147f79f771a111dfec25604c1deade7665cf2695ebbcb7f829c399abdf302c9c6717f645265cdf6e813eeb631520
-EBUILD nss-pam-ldapd-0.9.6.ebuild 3112 SHA256 acd4855af7c46613900863d024bb753649591f23239298e5b3db9dc5aa6ea36c SHA512 8f8ddaf4c2b5cb451c14617e45187992908e2c18a9cd3dd2b22f6867d9fd6d53a5c7ea90d75e87900a64ec0059eb483078cf649617683bbc3eae2aab9b058025 WHIRLPOOL 1a509a239f8a4f42ca27b1305cbad81dc77aa22fcda3dd84f4d5acdb676b19854b98c46fd707adee559b2c0ec7456b4ab7872a9a69aa5a7dfbcf216bd8118be8
-MISC ChangeLog 6114 SHA256 dde425227ef41a84e6dad2c97c7e45509656dae51e92c00bbb4fbbeb0d386e83 SHA512 68d0f535c038401ea91af26decaebda7989f561c134ae00aced88a3829d901662f7f63468a91ad5d91e17368ed572c870064d3dc9c4a980169d38cef512aff25 WHIRLPOOL 79942a37020eba544b992e8510d110c33dbfc611a7cee7323e3876434edb0f8b69bf5cd05c640f15a93095218a40e7695bca68c9297a8ec3ec9982f57c826a62
+EBUILD nss-pam-ldapd-0.9.6.ebuild 3466 SHA256 2658337821d4dfa75455125af511338d7e33a6ec95618b8ceb5630a518b0adc7 SHA512 9a27d50fd4e053adcd13ebec43ce0f3e7aaab68ff99eb57fba33f6ea4a6e6dc5dc2c1adbc65d6f92474ac8ea58c54d314a79b0301173d77dc309fa5b527a86da WHIRLPOOL 322ef9520a988f82117faacfaa245bf3a77784afeba6b0d02ea9ff6d78d9233d32c54e3d886aa45e100b2d3d79a9e36cbb9316cb2be1558178c237d23779eb9b
+MISC ChangeLog 6320 SHA256 e596e817666fd5f55b84af4c3f2f912ac30e7d83b9675ceeaeb12ca37950a46e SHA512 aa565c289f28c6467dcefde33b174793064cfee4e9bef3b71fb5bb1bd450f24c8a46c20f71da2cfc5a8d3f606c1cf0a8d1455cf6cb333e1470084142e32aa004 WHIRLPOOL a2785d0fdc469c6e12ea800ee4bd0fccd3fbb7b29e0792916f3211acbfc3fc0b8ace63696938d655fe3c211e0931c697c5dd5691916192916fbf803c9dcb935d
MISC metadata.xml 1036 SHA256 81bb1d41ad1502e088be7041ee4ab827d770bf21c5eb4617553d45fa27356218 SHA512 532558a294e12659b86691c324fe9d4e90530aa56d985a450057363e3c966bb1a18d354be536106b83c24b7bff54c4a8d3852ba8be7a1e5e270921c7828507bf WHIRLPOOL 7a73016266565c39cf732006384ea266ce00f8119786cebd7fb39e40408b07bad864601a96d747f7488c92acb39e1c96e3f170dc4d708d8dc5b61f12fc8a26b2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJVfxkLAAoJEHy/RO9cNQiD7UUQAJDRH6yJPECrJ2Cyw44UPNh5
-rYQWfOPU+Wu7n1Jfn4oupxwdsJffyTo7JMg2QyBWF8gRGwDv2514A/xLn6YZdRXM
-SD1VRABSxAPSyc4d0YbLcwgYZ6o8mAzenv2BLY+T+NQ2fQqONnIFCPm/X2GCzHAV
-XsYt6NJ6hoqmA3oCZYj6ZyBZcsJjFl3o0vbJcwsiusbYWKG2Fvmw9cHpjyRcQj91
-6IaymVO2jQKL1EEQxAO0CwwU0ElvktqMnwy+kun7Cx2/vdkQ0Sq6KVx0Cz1AHYh0
-Emz4bkytiRp+U+8irD0Z8opE9nyWVpmJ4Ab5S5uhtIQAq+YJ6l5ZZh50JIgzSy5M
-PPxOc6UedsG/Dy6UYgV6sg0Q6fCjtRMGdNfR3Xu5u1zBl65dHPrrA7byhn335bVL
-4FvoRZR6nN4nIQbxBeMIXGGPykbqX4Ij8eaUUoIpBA/ys3nmYbr89GZU4Pn77r/p
-niPN/FxxLPBMSKr+Y0fUtMBnBwNQGvIzmIpMbBOMQnmUPGJBYhNsWeMz0G450oN7
-zhvvWq8P3HYasAilR+2dC4GeVOZ2YasDKAUiw01Uemf6EaLVsIuhM+nUw0wRAaOA
-03PvQ+TomYBWUDszuM2BngrO2CcvngZ2jSubKs1QMHeCQjCzbYHfF6Y1PYfejAES
-AQKy35zsto4dlzH6u7wF
-=70c5
+iQIcBAEBCAAGBQJVgek9AAoJEGSje+quGaToTHcP/A/B9MPah8m0iO24+kez32tB
+MzfrSWdlZ9F7QSCKRSJ1muKn1/4USnzMt4yGjmS1gzxvm4epe53Za4zFeguSDeZK
+GnMme6flDIIntcTc8v+p4OsUB+mWGMl7OBF2CBeZZGCrtr7nyenizP94IlFr/aPH
+UtVm7SY3WPgXQdqDQ6ndQo4yJJU5XRRG++Psij2YT91kT5r69Uh6JeK160DND6AG
+eYF1h1i3yO5VsHRdOyesD6pse3Ipbk/kC1tua5hy54XzfGkZbiCx4BwFghhh+GuL
+jqT5aek1lWCKZI3teczy1PkdAVB0i+TZ2dvnde2wQ8ieGACm6MioiJJf8LYPwjnS
+DAeC1tni/YCrnLd843kSxnusjt6d+eNuVHWrP7r1KbU4SfKaH3zD6H/hhM/e32jW
+h3+Evvd2DBY1K/plKsVz+irN2pIhne8KLxH7jtfN0+JjMgHuP5kHs7ConmeK0Hb5
+m5QuHObXDJzkIo0nsFnnIORsEMx5+ZLIY4WtjLuTONrf7Rle3+rkGIDKiwnSdbrO
+H/FsWtVR2WKvyDXRDUvlpojwWijEHYexR/dBiP0psmWUZbyJA3zgT8KGKOqYztdG
+jogbVBxzwNb8gqVlHJ4lbsyFSrcStLLgdnKvV9kI3pMFx70RoE4YQUCU3ev6l0OZ
+YWEmgKIGYc2g70LaTUoP
+=Lg9U
-----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r2 b/sys-auth/nss-pam-ldapd/files/nslcd-init-r2
new file mode 100644
index 000000000000..533e8ee2eddb
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nslcd-init-r2
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/files/nslcd-init-r2,v 1.1 2015/06/17 21:39:13 prometheanfire Exp $
+
+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-s6 b/sys-auth/nss-pam-ldapd/files/nslcd-init-s6
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nslcd-init-s6
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
deleted file mode 100644
index 0044c38e0582..000000000000
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5-r1.ebuild,v 1.2 2015/05/15 18:12:17 prometheanfire Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd
-
-DESCRIPTION="NSS module for name lookups using LDAP"
-HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
-SRC_URI="http://arthurdejong.org/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-IUSE="debug kerberos +pam sasl test +utils"
-
-COMMON_DEP="
- net-nds/openldap[${MULTILIB_USEDEP}]
- sasl? ( dev-libs/cyrus-sasl[${MULTILIB_USEDEP}] )
- kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
- pam? ( virtual/pam[${MULTILIB_USEDEP}] )
- utils? ( ${PYTHON_DEPS} )
- !sys-auth/nss_ldap
- !sys-auth/pam_ldap"
-RDEPEND="${COMMON_DEP}"
-DEPEND="${COMMON_DEP}
- test? (
- ${PYTHON_DEPS}
- dev-python/pylint[${PYTHON_USEDEP}]
- )
- sys-devel/automake"
-
-REQUIRED_USE="
- utils? ( ${PYTHON_REQUIRED_USE} )
- test? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- enewgroup nslcd
- enewuser nslcd -1 -1 -1 nslcd
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.9.4-disable-py3-only-linters.patch
- epatch_user
- use utils && python_setup
-}
-
-multilib_src_configure() {
- local -a myconf
-
- myconf=(
- --disable-utils
- --enable-warnings
- --with-ldap-lib=openldap
- --with-ldap-conf-file=/etc/nslcd.conf
- --with-nslcd-pidfile=/run/nslcd/nslcd.pid
- --with-nslcd-socket=/run/nslcd/socket
- $(usex x86-fbsd '--with-nss-flavour=' '--with-nss-flavour=' 'freebsd' 'glibc')
- $(use_enable debug)
- $(use_enable kerberos)
- $(use_enable pam)
- $(use_enable sasl)
- )
-
- # nss libraries always go in /lib on Gentoo
- if multilib_is_native_abi ; then
- myconf+=("--with-pam-seclib-dir=${EPREFIX}/$(get_libdir)/security")
- myconf+=("--libdir=${EPREFIX}/$(get_libdir)")
- else
- myconf+=("--with-pam-seclib-dir=/$(get_libdir)/security")
- myconf+=("--libdir=/$(get_libdir)")
- fi
-
- ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-multilib_src_install_all() {
- local script
-
- newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
-
- insinto /usr/share/nss-pam-ldapd
- doins "${WORKDIR}/${P}/nslcd.conf"
-
- fperms o-r /etc/nslcd.conf
-
- if use utils; then
- python_moduleinto nslcd
- python_foreach_impl && python_domodule utils/*.py
-
- for script in chsh getent; do
- python_foreach_impl python_newscript utils/${script}.py ${script}.ldap
- done
- fi
-
- systemd_newtmpfilesd "${FILESDIR}"/nslcd-tmpfiles.conf nslcd.conf
- systemd_dounit "${FILESDIR}"/nslcd.service
-}
-
-multilib_src_test() {
- python_foreach_impl emake check
-}
-
-pkg_postinst() {
- echo
- elog "For this to work you must configure /etc/nslcd.conf"
- elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
- echo
- elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
- elog "start it like this:"
- elog " # /etc/init.d/nslcd start"
- echo
- elog "You can add it to the default runlevel like so:"
- elog " # rc-update add nslcd default"
- elog
- elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
- elog " is now named /etc/nslcd.conf"
- echo
-}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild
index 103dd3282704..00a96f868a64 100644
--- a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild,v 1.1 2015/06/15 18:27:15 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.6.ebuild,v 1.2 2015/06/17 21:39:14 prometheanfire Exp $
EAPI=5
PYTHON_COMPAT=(python2_7)
-inherit eutils prefix user python-r1 multilib multilib-minimal systemd
+inherit eutils prefix user python-r1 multilib multilib-minimal systemd s6
DESCRIPTION="NSS module for name lookups using LDAP"
HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
@@ -80,6 +80,9 @@ multilib_src_install_all() {
local script
newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
+ newinitd "${FILESDIR}"/nslcd-init-r2 nslcd
+ newinitd "${FILESDIR}"/nslcd-init-s6 nslcd-s6
+ s6_install_service nslcd "${FILESDIR}"/run-s6
insinto /usr/share/nss-pam-ldapd
doins "${WORKDIR}/${P}/nslcd.conf"
@@ -115,6 +118,11 @@ pkg_postinst() {
elog "You can add it to the default runlevel like so:"
elog " # rc-update add nslcd default"
elog
+ elog "If you have >=sys-apps/openrc-0.16.3, you can also use s6"
+ elog "to supervise this service."
+ elog "To do this, emerge sys-apps/s6 then add nslcd-s6"
+ elog "default runlevel instead of nslcd."
+ elog
elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
elog " is now named /etc/nslcd.conf"
echo