Bug #222693: Avoid delays due to slapd looking itself up in nss_ldap during startup.

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

3 files changed, 126 insertions, 15 deletions

diff --git a/sys-auth/nss_ldap/ChangeLog b/sys-auth/nss_ldap/ChangeLog
index ecd642c35b77..a44b4a92bd35 100644
--- a/sys-auth/nss_ldap/ChangeLog
+++ b/sys-auth/nss_ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/nss_ldap
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.66 2010/11/01 20:08:41 halcy0n Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.67 2012/02/12 21:51:38 robbat2 Exp $
+
+*nss_ldap-265-r1 (12 Feb 2012)
+
+  12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +nss_ldap-265-r1.ebuild:
+  Bug #222693: Avoid delays due to slapd looking itself up in nss_ldap during
+  startup.
 
   01 Nov 2010; Mark Loeser <halcy0n@gentoo.org> nss_ldap-264-r1.ebuild:
   Stable for ppc64; bug #305935
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 07933b4141c8..5f0ad6bfc277 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX nss_ldap-239-tls-security-bug.patch 1022 RMD160 9b48ef4eee157b4b3bfa8a531bbe0000ca564295 SHA1 1e091948682c1f332c618c7d594b4cf3e8f82140 SHA256 4915f034328c69dc1323cfec3a8d2e2e4eeb2a57590b0aeafa06f0cb3fafe5b4
 AUX nss_ldap-249-sasl-compile.patch 282 RMD160 dcca3b25794db3d5db82ec6b9ed423af829f2de0 SHA1 abb3e6e027a564e981a3a7208e94cc61f89ee301 SHA256 3da93087461fb970d5da9fe6b169f5493ca83ae2149cb03be9e8486bfcf437d6
 AUX nss_ldap-252-reconnect-timeouts.patch 3169 RMD160 f442c89e3065db02aef6fd60235e20db9baadb16 SHA1 d8f3acd6b118d34223e93991431acf05fcacdc08 SHA256 9867267fb7ae1e08f3aa872f3682b12855465bf5bfc9407d75935e54678ab90f
@@ -23,15 +20,7 @@ EBUILD nss_ldap-261.ebuild 2499 RMD160 139eeb95880f741e493b019eeb6a6ece367f5e2b
 EBUILD nss_ldap-262.ebuild 2499 RMD160 a3bb810de2c68961ab6120d2870104687b36e61a SHA1 8dda9cd9d3635ea89d2fb07bf08cc6c5fe0308d8 SHA256 36846bd0eeccab737c054f2f94f4e8fdb14b545993bd70c910425e0bb6f15c29
 EBUILD nss_ldap-264-r1.ebuild 2732 RMD160 36eee7e93b66a5c6c28ab64c862dfc0aaa9ab8d5 SHA1 d899c281db2dd73f3cf74fe09d3efdfeee2ea830 SHA256 ee3d43ad22bd71718fa710c55c3c0cb5ef976ceb08c95618a3fd7bcc72672caf
 EBUILD nss_ldap-264.ebuild 2670 RMD160 9afdfddec613d88d821bd91dbef797155adb0745 SHA1 0d81c9a25a0461ae41f331987a603719d7277a49 SHA256 ca86d085fe02f4d5fd723ac6d7b1c9f8ee87296e6e695d2d3437c9fbfdca81ef
+EBUILD nss_ldap-265-r1.ebuild 3075 RMD160 a41b6bba1d8699af1e22bec86d91b3b2fcfa68e2 SHA1 896637e01b313a08708439b03c5d29a8a40ad9c1 SHA256 14a4d086ea6ea6e7245df44585a1f3580afb132b5c2238e2bd4c478f27db8d0b
 EBUILD nss_ldap-265.ebuild 2814 RMD160 b77501195a800b8ddf111336687b8d6a72378aad SHA1 af655e947972ee3bf6a0f7b4ed984f9b9859108d SHA256 ed202b2c56cd1f1951c189d821e2ea3fa39b037ccdcbf2d80c4fae4b1ef76f03
-MISC ChangeLog 16684 RMD160 2998c0fcb5764e66522a77b568f32375222963bb SHA1 1dfa0b4fafe6fdc77f9f4dcdfdc800e98cea931b SHA256 4a9b408f30a3acf985fd9eb4bd922b83f5d9a9e7cb05e67bcaa702822071ecbe
+MISC ChangeLog 16884 RMD160 af9f6715948a48090dc7ea5e20d4549802d5f228 SHA1 6b5df9411867bcca367ed91cd37005989c5c9c4e SHA256 001904d17cff409a11a69586b692d280787e130f51c0d01da4b5712542370e13
 MISC metadata.xml 353 RMD160 df513805bbb563ee1ace11dccd7980c0aa3b371a SHA1 771aee7c604f8d7c3167fb224068fbad9ba16681 SHA256 15eaadcd2984ab57a485030b49064540994a63df14ec3b6ce0dc18f65044fb00
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iJwEAQEIAAYFAk59skMACgkQfXuS5UK5QB1wrgP/YeQqkM1Gz8KixzFlDxAZtBbR
-vLnevratNWfqhhnuIvCcMgMB2j3KjeD3aStyukcAeOLJXDhIrunUjaDEVG1MRcdp
-+IJRrHy7A/x6jX7kRJ3NcJvlLGrLsLZww8glAaQO3T5sZefrGNMr+nuCzDJb6IlS
-l6O3y1lkrSkaltg2Gy4=
-=bzC1
------END PGP SIGNATURE-----
diff --git a/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild b/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
new file mode 100644
index 000000000000..9cfc722f56ab
--- /dev/null
+++ b/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-265-r1.ebuild,v 1.1 2012/02/12 21:51:38 robbat2 Exp $
+
+EAPI=2
+inherit fixheadtails eutils multilib autotools
+
+IUSE="debug ssl sasl kerberos"
+
+DESCRIPTION="NSS LDAP Module"
+HOMEPAGE="http://www.padl.com/OSS/nss_ldap.html"
+SRC_URI="http://www.padl.com/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=net-nds/openldap-2.1.30-r5
+		sasl? ( dev-libs/cyrus-sasl )
+		kerberos? ( virtual/krb5 )
+		ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+		!<net-fs/autofs-4.1.3"
+
+src_prepare() {
+	epatch "${FILESDIR}"/nsswitch.ldap.diff
+
+	# Applied by upstream
+	#epatch "${FILESDIR}"/${PN}-239-tls-security-bug.patch
+
+	epatch "${FILESDIR}"/${PN}-249-sasl-compile.patch
+
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-265-reconnect-timeouts.patch
+
+	# Applied by upstream
+	#EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-254-nss_getgrent_skipmembers.patch
+
+	EPATCH_OPTS="-p1 -d ${S}" epatch "${FILESDIR}"/${PN}-257-nss_max_group_depth.patch
+
+	sed -i.orig \
+		-e '/^ @(#)\$Id: ldap.conf,v/s,^,#,' \
+		"${S}"/ldap.conf || die "failed to clean up initial version marker"
+
+	# fix head/tail stuff
+	ht_fix_file "${S}"/Makefile.am "${S}"/Makefile.in "${S}"/depcomp
+
+	# fix build borkage
+	for i in Makefile.{in,am}; do
+	  sed -i.orig \
+	    -e '/^install-exec-local: nss_ldap.so/s,nss_ldap.so,,g' \
+	    "${S}"/$i
+	done
+
+	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
+
+	# Bug #214750, no automagic deps
+	epatch "${FILESDIR}"/${PN}-264-disable-automagic.patch
+
+	# Upstream forgets the version number sometimes
+	#sed -i \
+	#	-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
+	#	"${S}"/configure.in
+
+	# Include an SONAME
+	epatch "${FILESDIR}"/${PN}-254-soname.patch
+
+	sed -i \
+		-e 's, vers_string , ./vers_string ,g' \
+		"${S}"/Makefile.am
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debugging"
+	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
+	# --enable-schema-mapping \
+	econf \
+		--with-ldap-lib=openldap \
+		--libdir=/$(get_libdir) \
+		--enable-paged-results \
+		--enable-rfc2307bis \
+		$(use_enable ssl) \
+		$(use_enable sasl) \
+		$(use_enable kerberos krb) \
+		${myconf} || die "configure failed"
+}
+
+src_install() {
+	dodir /$(get_libdir)
+
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc
+	doins ldap.conf
+
+	# Append two blank lines and some skip entries
+	echo >>"${D}"/etc/ldap.conf
+	echo >>"${D}"/etc/ldap.conf
+	sed -i "${D}"/etc/ldap.conf \
+		-e '$inss_initgroups_ignoreusers ldap,openldap,mysql,syslog,root,postgres' \
+		|| die "failed to sed /etc/ldap.conf"
+
+
+	dodoc ldap.conf ANNOUNCE NEWS ChangeLog AUTHORS \
+		COPYING CVSVersionInfo.txt README nsswitch.ldap certutil
+	docinto docs; dodoc doc/*
+
+
+}
+
+pkg_postinst() {
+	elog "If you use a ldaps:// string in the 'uri' setting of"
+	elog "your /etc/ldap.conf, you must set 'ssl on'!"
+}