Version bump.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64

3 files changed, 93 insertions, 12 deletions

diff --git a/sys-auth/nss_ldap/ChangeLog b/sys-auth/nss_ldap/ChangeLog
index 300901edf069..a5820a445baa 100644
--- a/sys-auth/nss_ldap/ChangeLog
+++ b/sys-auth/nss_ldap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/nss_ldap
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.54 2008/02/26 13:24:58 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.55 2008/08/22 19:10:44 robbat2 Exp $
+
+*nss_ldap-261 (22 Aug 2008)
+
+  22 Aug 2008; Robin H. Johnson <robbat2@gentoo.org> +nss_ldap-261.ebuild:
+  Version bump.
 
 *nss_ldap-259 (20 Jan 2008)
 
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index df74ecf27d49..2acf982e7185 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-250-reconnect-timeouts.patch 3411 RMD160 31fba595a320903f959b566b46584d50ee84e2fd SHA1 dd93e21606017c35144c1a3f077d65635deea126 SHA256 750736f5756ad9b4ea42f0a6fafc8634126b34736fcf26e1822273a781a6b7ba
@@ -19,6 +16,7 @@ DIST nss_ldap-257.2.tar.gz 274699 RMD160 b27f4509335b7eb026e32458689c01072448093
 DIST nss_ldap-257.tar.gz 229242 RMD160 b7260a768217901c701c52a5f2446894f6dc7aef SHA1 fc57c721bcbab7eaa3ddcf4953141ab03d788fc2 SHA256 22a0e3b0ebffc5d8f252144a422ef5eaef2ad1255aa7c0953691c990a44e267b
 DIST nss_ldap-258.tar.gz 274694 RMD160 ee52775b9612f780908b3c8363ab2b18e7f4ea1c SHA1 50a5128db5a4d894fba35aeb092685605fba578d SHA256 afa3bb64cd29557e775219585655721ac220de5804d95d0c307dab86f2308346
 DIST nss_ldap-259.tar.gz 274878 RMD160 95b7fe2a4c28c4d8e86cf7d0d2e61e5e585b5a06 SHA1 0644d06be11b01e45d7a2a153e247b1203704d25 SHA256 8b65a32717f6173911aaea8e89b2c89ccb901f14f1063f5e49b5ab77d45f1790
+DIST nss_ldap-261.tar.gz 276065 RMD160 abf3f7d100f9d2ede62397538c1fd472855ec587 SHA1 85058bfca645f88a177bcde7fb3f1bea23c6e8f1 SHA256 7e9a6e8e1f07607b63f5f61fda755778fb1257e6599ac467327b6e817de5aad7
 EBUILD nss_ldap-239-r1.ebuild 1344 RMD160 072c5afe01d93c4e89dea9434e6cb4725444de70 SHA1 7ebd221362f33881debde95614d0d608f3aa8104 SHA256 bab782405e7699ed20d73e0cf19afc036659a60591b5cd2f7e74fdb2a3f42c32
 EBUILD nss_ldap-249.ebuild 1392 RMD160 6bc1684471a7aebbebba5e7f953c753659fee72d SHA1 36ccef393dfffad97ebc0a31cdfd6fc2992fab2b SHA256 1396ef5841cd22093d633b66d8b4849c913c7805d8bba7479490f77375bf43fb
 EBUILD nss_ldap-250-r1.ebuild 1654 RMD160 34c7ee9fb2fdb50ab0d6ad44b179852a10a52b86 SHA1 8afa59cb709a362ae30ac10f4f46e519948529a5 SHA256 55143af53ded71b25fa48f97367b3ed3c2222a7f988b93506cd715b735657e47
@@ -31,12 +29,6 @@ EBUILD nss_ldap-257.2.ebuild 2170 RMD160 d0e088571e5fc6839dd705d84eeb3cc2007b9e3
 EBUILD nss_ldap-257.ebuild 2138 RMD160 533377fb60031b31dc04d701e87dee1b322feab0 SHA1 1087a6d6a4b58af90ad74e8f13b8e6a4e539a965 SHA256 c5e0fd06bbdaf705c4dafdf97f6eed0dea52ed460724fdf6c47ead3ab474188f
 EBUILD nss_ldap-258.ebuild 2372 RMD160 a4869b6d13e033eb35b26dfdcf2cdb71edf35826 SHA1 169f695b92bbd02500f76c117f75007e5c6e4ab8 SHA256 91491630930b3b752c40659937dcce431b315f39253812d8443c971ed8ae00a7
 EBUILD nss_ldap-259.ebuild 2379 RMD160 3df6c70a17527bf60a545915c149f68bbd66724d SHA1 72e3c24e7ba468dc33f70cfcc1e6d1b9eff3fd02 SHA256 53cf4f8aabc230fb3a948d905ae4c51f6f65aabdf12e6042064853a4c3f3f620
-MISC ChangeLog 14667 RMD160 7526192cdbc484ab7afd6652b2c948ef19c049b0 SHA1 36e06d000311654705d64b680a82c7ed07ce851f SHA256 bf91831f41c996e34041ab1a7bb3ec966eec8371a89a438cb5e8ecb40625b1fe
+EBUILD nss_ldap-261.ebuild 2499 RMD160 139eeb95880f741e493b019eeb6a6ece367f5e2b SHA1 fd7bbf290da758f396d9c0853f4ee60d6648a054 SHA256 1cd3978bcf73de9da6175f39d6f2f272f0d6259037e7edd97e7604cb2b411d8b
+MISC ChangeLog 14790 RMD160 900f21c46961e8ca784361112efab6dcfacf4386 SHA1 567e45c0e68880057c75a3a8821977721311ed86 SHA256 1f1a2e78d54ad2826f27c81b66ff3fa805238fac0139af4d56f884ae709893ed
 MISC metadata.xml 374 RMD160 d093200b154cb3766f818bb06ab05fb29d45af0c SHA1 0e6b6cc539b9c537d3a5464884ca2ca9c1717134 SHA256 72f6eb7d9ee256d2edb0336e03b71674bf17d2828222ca8722fdb48a88304365
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHxBM9NQqtfCuFneMRAhSrAJ9rilUnFC+mWVCwccH9e/LOjLvFVgCeINxQ
-Fi6xK2wlYZkXU5CjHphBuUM=
-=jcR0
------END PGP SIGNATURE-----
diff --git a/sys-auth/nss_ldap/nss_ldap-261.ebuild b/sys-auth/nss_ldap/nss_ldap-261.ebuild
new file mode 100644
index 000000000000..c156dd92bdc5
--- /dev/null
+++ b/sys-auth/nss_ldap/nss_ldap-261.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-261.ebuild,v 1.1 2008/08/22 19:10:44 robbat2 Exp $
+
+inherit fixheadtails eutils multilib autotools
+
+IUSE="debug 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 )"
+RDEPEND="${DEPEND}
+		!<net-fs/autofs-4.1.3"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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}-252-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
+	# Upstream forgets the version number sometimes
+	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
+	sed -i \
+		-e "/^AM_INIT_AUTOMAKE/s~2..~$PV~" \
+		"${S}"/configure.in
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debugging"
+	use kerberos && myconf="${myconf} --enable-configurable-krb5-ccname-gssapi"
+	econf \
+		--with-ldap-lib=openldap \
+		--libdir=/$(get_libdir) \
+		--enable-schema-mapping \
+		--enable-paged-results \
+		--enable-rfc2307bis \
+		${myconf} || die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	dodir /$(get_libdir)
+
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	insinto /etc
+	doins 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'!"
+}