Version bump.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xE3F69979BB4B8928DA78E3D17CBF44EF

3 files changed, 140 insertions, 15 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index 81644ac63304..636eb8dbd8ce 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.19 2015/03/11 22:32:36 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.20 2015/03/30 19:01:38 chutzpah Exp $
+
+*nss-pam-ldapd-0.9.5 (30 Mar 2015)
+
+  30 Mar 2015; Patrick McLean <chutzpah@gentoo.org> +nss-pam-ldapd-0.9.5.ebuild:
+  Version bump.
 
   11 Mar 2015; Patrick McLean <chutzpah@gentoo.org>
   nss-pam-ldapd-0.9.4-r2.ebuild:
diff --git a/sys-auth/nss-pam-ldapd/Manifest b/sys-auth/nss-pam-ldapd/Manifest
index fce081fed6af..3123bda405dd 100644
--- a/sys-auth/nss-pam-ldapd/Manifest
+++ b/sys-auth/nss-pam-ldapd/Manifest
@@ -8,28 +8,30 @@ AUX nss-pam-ldapd-0.9.4-disable-py3-only-linters.patch 403 SHA256 d47afa040e8c28
 DIST nss-pam-ldapd-0.8.13.tar.gz 487295 SHA256 b792ae98c98402ac25db49d54c4c53b860d45c9a7a7e24587e03a5fda7ee5d22 SHA512 fbc1baac3957cfe1a0f5a29563ba37e045b45931867815d2a5ac2e11b9c985df0723a1086fa4cb5251b9a20c87e91028bf93ee0deb9128ed525863076a301f01 WHIRLPOOL 18c93663a12af9d0f1ae25476693a1772ee9d74b6894af7b7a87e609c353d4e39dc71b0b5bf336bed1aba6693c745048a5dffa35c7be66b1d8a5a4a3d7084d4b
 DIST nss-pam-ldapd-0.8.14.tar.gz 508949 SHA256 a29ceb9b7eda386ca38f16115ffec61425462cca6b5e560c44c3d51edc03a63f SHA512 70abb1836b5b3304e583fd3b71f11fee7586e181b26f4630779ec1d90b856da6e4fcc76327c51b20a158aa36708dd12ceb5f543a33c826881f2ad3e092f542c9 WHIRLPOOL 5d30088d73e464bf380dd5e7d34f8c5200680712693c97ee1f1df1880b4680236d9168ac7ec08b161ae463236c0feddc2171442a956c872113caa6e2b07a6bb8
 DIST nss-pam-ldapd-0.9.4.tar.gz 746269 SHA256 fd2e3e0935acfd3d2b13682962f51d28d5855472e690d787e36a476fa40c88e6 SHA512 ca336d034f3a9e135cb805b4a7cfcca38db22260268f6e0da8f72e1357b4f4da186b9abca4b3a36ec046172fae92666bccd966a49e19b1e2810442b7d439ac34 WHIRLPOOL ef5937b6e4aa90fd1a1c498688af627bad47c61ba0b6c33956f3d74029ae0866a72816777b7d3371e5bc6e84ad5acd2138d7ef2338a24e84b64430180dd69eb0
+DIST nss-pam-ldapd-0.9.5.tar.gz 750988 SHA256 49080058d85f60213c1b661a899ffe44e30770b5034e5a6ce48486a8d92bee6c SHA512 78df39c7db10b8787ad4e3b4ccc4c764f390db85c1ef3da1de5344cca668fc54945537425e1c89c7899c66c6246652475386009b8fcd3f4d3144b790b1fc4015 WHIRLPOOL c6bbae2c174df83fd27ba90ec3c7a9cbbb20ef1e1b048c8b730735897d356bd2087289c8e5e669f3681f615cc466c540ddc78893edcf487f796e3a5396a30ccf
 EBUILD nss-pam-ldapd-0.8.13.ebuild 2135 SHA256 8cce84f8a1229937b393d175edfa5d2446b7010b82a25cb9d742f730e44e7db7 SHA512 34022b794f2090a2b18dcac92913af133275330fc53071616eb616c2062ccd2538f9f6b36ecd586a00cb54b00ccb26bc7717b3247da06690e9638540b5006299 WHIRLPOOL 04062e9a7a11305cc250020b29498b74b1f14b729c24494a9f3d44cc1409bfdc7b45bbd756428ac9171e1fee8c3a7a9c66415ea890e3cbb0acaff6cabbec4679
 EBUILD nss-pam-ldapd-0.8.14-r1.ebuild 2070 SHA256 15e1322d9b5de5796a7f0d294089df31c6345fd1106759c68456fa2cffaf8e17 SHA512 bf0bd6b0dba89fdaf777c5afcb7969f23e8e47f4c5d0a4631beae5c627e267c97b020c75ce46bbba896711fb179a0984682ed74698400459edfb963b141d1fd7 WHIRLPOOL c6f988bf8d87bb2fcb509c78e75f205501137e8c1d007ce50cd1ac0e4ccaf970ce457b211f9e9b096e8036c76d452d436cfa9f0e33d3fccca8e021c8854cb585
 EBUILD nss-pam-ldapd-0.8.14.ebuild 2135 SHA256 51a090cdd09c1a0b01249d3c89302fae5b4dffba98371c3d09cccef8ba166ccc SHA512 81a579a39e15a279d5b06216f63e38cfa2908a6b9f4cda3da93d9120212095a1722bcea8e85559f1142fcf4263d7ebe558993e0c026d11d29390f2810cf8c5ad WHIRLPOOL 1e5fd88790faa5fa03d9a8eaa59ed1c1f53051389cfcd2fcc259d51578b9edd743610866b85f7b7dfd20ad38ae68af78ad1cf06d3107d18cca7ee0f8f416e76a
 EBUILD nss-pam-ldapd-0.9.4-r1.ebuild 2448 SHA256 629cec8f9b64a2e09d4c2fa9705609a2f7636b4213c770ff09f221bff9d9f4d2 SHA512 36fa4abbbb52b725bb73fb9babb9527699047f430398b9973b48e00ae7b75bfc8e7962ecade59249122bb8dd4fb4d6e8064d81ff61070a91ea1969c305a47e7a WHIRLPOOL 77cb7ea18f24aac843ee93d861ac168245ccc99b5aeeb3c6d3801d49a678689dd7f2111708321bf6af25b162d277bdbbf9b667d336d2d3cf936e68363d274465
 EBUILD nss-pam-ldapd-0.9.4-r2.ebuild 2970 SHA256 ecfef9f45f9be787c9fee3d759b58a88aa61a8bf57eccb2e4759b3e2502e1a48 SHA512 b63f55710d7760e03afe10c36f5f41dd9c49f5767ba80f0eb2ddaeb2181892bab2cebe094e039562b165e8a8fc5b22c3b5295597b1682ff8b4e35149226f3527 WHIRLPOOL bf3354017552f7f8ed05d136c1492291d2d7f212ce632c1208df41b93f34e7604595ef4a8596c914e8d880d0e29cb972a157a954cb975a72e770e1cb3b194f19
 EBUILD nss-pam-ldapd-0.9.4.ebuild 2128 SHA256 6dfb282bf3fee3219b214b5d978aa8c60ebf9931092b0cf55a22d054f2cffec0 SHA512 f16e57892f85c22d73a8cf226f8b54d69bacc8de38fa062e9e15559b80644f40c17ca89ad8976709477057cd7ed88236893d4313673b65d71f1d349b321812fc WHIRLPOOL 00ed56a4e3f870117c38f116a85c39313b6497fcd69a7441214c0a796233ebaf33fce26be3f068e046b16669ce2e5987503ea5685b6246f97471620b6a5f6ac3
-MISC ChangeLog 5065 SHA256 44c49717b9e492e9e27144c36d21d9af9342b783ce3153e3b54ee7fc7bc57301 SHA512 9e5b63d41bafba80ffb47c91a20feeed0b35918ff26aa5838cb0c23a33c1daa6093a9cabac64b86e81fca5f2b3439ecbf6db79505a5b8f6dbfd6e4f881049df3 WHIRLPOOL 365eaf11def7253801df53611309df1a067ad4fe6f4000c8ee1e9993197f38eae13afdea63c6d3af65a1f227ead0a63f7f35aa9d51f29dfb374ee80d3f90b24a
+EBUILD nss-pam-ldapd-0.9.5.ebuild 2974 SHA256 3a05742e141b31fd5670d6ed1ec886c249ebead77c35dcf6101f91b48748bd97 SHA512 d5737c247b9808d81412c746a40bf670a0abab1b98d42c116465f464cb6033a282e6004f141ed31b3cfc0c8f8f7e14582c826b47838add6b1e324cf3a62f72d7 WHIRLPOOL fdf5d7c01ad889a0ffc94d9bf05e2b0bb44e9887fe2f0448b9b3586604ee8f5eb73447f32e68dc5e911236a15329e19106445b9fe8a523ed0dca6d8affb3715d
+MISC ChangeLog 5199 SHA256 da0029d77f773a29ba2b27f0813a57d25c84977a0673fe7350c1e6bd46a1bdc1 SHA512 75cc5ce79b51a905b4a8db63bbca6343ad59da8f43491a1fd08c3ad8cdb997822e2f3e6193fe8662cee3bd31e3112e697ef2d5c03175e6fd6262472550678860 WHIRLPOOL 50b6543b31bad1410079af0e268be5f69cfd21d3d32a3c7c4e4ef83e7326113594d764a270c67bfec333c61724670b29348d3083daa20472f5db45630d41425e
 MISC metadata.xml 1016 SHA256 7b3b00bd69c58ac7c42366da38f9863d6679f8c35ff5bfa94cabc47b22957a13 SHA512 5a4d523e2cc7857c125e950c9d2d3bf84a82429497d180faec4fbf2bc1b29318a457649eb7714f5fa8deb7d6f617c0ac1bf3e2a89ff7ef90a9f4ed642f87e1b8 WHIRLPOOL e67dc2216841a07c8874f667fc27a8df1e7d22e3493d49f8884f54a43ad0f48c0a663b0661c272a603f57e68851efaec94ea8c9964e25bf19d4738ed35782787
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVAdQ/AAoJEHy/RO9cNQiDlkYP/RDHoCozYJJUt6GJh3car+BF
-OEivCX+du8hef/d5pgBDDfgA3W/ovrIFvQUY3TKjbDa/7YdDWjXzAjI71cxnvGJs
-lAGxvx3NdYU5YZNAfM/0i2kt8yyVEswiuIVKeAkcPV5v9+tSpXT+SxqAGhHSd7GU
-cKUTBxfvVs81tYYQ1WKGDZ89wH3nV/QxUaZ382R0/OT5JNwfUhb1qON9TwH8ZA/s
-NYMA5wkiAbg/Re+6Dhdy9UjbRj7iBgEikObVq3pXHkuLL87lUBa+VcwmsOB/A93h
-5QaDc5Hma348w1ra7zg7zqH71Rvh8YD2Ux6Lp2RyJgOFFdSOVVbZL3SxgBP8RzZd
-RSCP0O759XEpyUC0BBeu0yV4TNzu7Nti1a6YrawadWH4mE64QrtW9kx5dbFfdf45
-XjnMES5J/+6Wh7f5k6tobCCGfPjOt5v59GoP3P1e0dex0eujtaxQ5CZp8ItKj0ia
-IrWYE25dE5r4NRPbFnMbVXkP8fFTT7x3SnvwVJdOEZH31ubqMCgjOlMnYFMSm02n
-SBt6vEqEW4ab2fOGNqQFqO8UMKejeQBNqnqBt7uEisWBDWJeRM56LWGmyvudRk3Y
-4jNQhp5XX55FsuCJqJXM3MJvJ769cI8ziX2xQkcmCRuvYoDFedrOZTb0gz7h5y1g
-DLx241H+qLzkMBS4G93/
-=qsR4
+iQIcBAEBCAAGBQJVGZ2fAAoJEHy/RO9cNQiDEyIQAJwn/8K2Ec4k7gBlm4347IDS
+uQRgzH1XyfbPPvnJzvNDHYARGLNjgIFgtsGJ0+8mrmhtqhrvqAEUHf1sj9NecKUP
+m396u9mM0sO8Q4HcuOPZ6/bNTu56BSXZlrm8+O264hCBZh75XVIXz5HP8DCjG4xA
+srIvsxgYgwbk4wg3t0SsKGSd3Ow6EX0+JqneZkBcgkxqx0sKq0kjr2g/Wvws6WnL
+z6jpUEc9ikpR2LEdzU3KvOIZ/wUYkHUTFZz7pk5heb7F/lDsCvNV5yCuG/ooAEk7
+2BeD3YN6vglFtIFnFuaEcqt+70y2kR/AtsG+tsggzhoR21SpunJ7BHKXN0GYwMkf
+dtvYzZkY2IjJEV0BP8QUehsZdGxJHjPOjS1SlnOo5yKz8IUvmnbG4E7PIA/6Pqfa
+GumWLozBnD5bw37cqFkNvAuZ+CbhQ7cge9sPpG8lmXBuSH28N88q13VMSSDAvURm
+SzlOKdeqFoEIVn8o76wKmjzKBR2M5zMInLXaVqXh/r+a3bOUoxFzYg6HzT38vtsk
+dprmvP4+z17geGoMzL+1ou+CYIYC3JgBJCVPzQjoRxLsH8hZ6HJ6DX6j6rIXRwsi
+mfMRUy8yTteqT4D3My3IkSRMVxpF251k42mbn1CC/u1UaPZoIpqB3jbWCwd7LTNx
+e7ilSSaJN2ShQp53xITA
+=fN6M
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5.ebuild
new file mode 100644
index 000000000000..4a1b956d280a
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.5.ebuild
@@ -0,0 +1,118 @@
+# 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.ebuild,v 1.1 2015/03/30 19:01:38 chutzpah Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=(python2_7)
+inherit eutils prefix user python-r1 multilib multilib-minimal
+
+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 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
+}
+
+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
+}