Bug #121099, version bump.

(Portage version: 2.1_pre4-r1)

5 files changed, 163 insertions, 12 deletions

diff --git a/sys-auth/nss_ldap/ChangeLog b/sys-auth/nss_ldap/ChangeLog
index fa0807e53ddb..70ae65ac633f 100644
--- a/sys-auth/nss_ldap/ChangeLog
+++ b/sys-auth/nss_ldap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/nss_ldap
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.14 2005/12/30 19:25:12 flameeyes Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.15 2006/02/25 10:53:14 robbat2 Exp $
+
+*nss_ldap-249 (25 Feb 2006)
+
+  25 Feb 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/nss_ldap-249-sasl-compile.patch, +nss_ldap-249.ebuild:
+  Bug #121099, version bump.
 
   30 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> nss_ldap-239-r1.ebuild:
   Made multilib-aware.
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 54c819d4c839..97ef397ac36e 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -1,47 +1,120 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7f3135a48eb48a78e28b52109bdfa406 ChangeLog 8534
+RMD160 07f78d8471dbe31b0b9df4ea296397048fa72b90 ChangeLog 8534
+SHA256 fd59bbe68df78ce1676d85e1e62073f674e8c8f47b81a7bb4ecaa62ccbccd9b5 ChangeLog 8534
 MD5 a4302c4120b75a23e43cc824423169c8 files/db4_1.85.diff 1569
+RMD160 ae1c388fc3b7d35ae455c26f87f20eabef281268 files/db4_1.85.diff 1569
+SHA256 d61f848810c0e8d6fa5878f59a657ec60ab901d8ac25102f903209ad0778caed files/db4_1.85.diff 1569
 MD5 a2d9a9c16028097d3f2ade6550440711 files/digest-nss_ldap-174-r2 64
+RMD160 1dd571244a55d61357b64fc4a274d7a95e2383be files/digest-nss_ldap-174-r2 64
+SHA256 519111ce5dc4955248b24df52c6744adcc92407859e502a1dd705a7015d407fb files/digest-nss_ldap-174-r2 64
 MD5 d8021fe04d76482091c816f28edad140 files/digest-nss_ldap-202 64
+RMD160 9ec4d8ab14c6219146d48c9a87714aaa97220d62 files/digest-nss_ldap-202 64
+SHA256 3bf9364d332339a1466c259985f5fe455d7678fe81cceae0984e23fce9a354aa files/digest-nss_ldap-202 64
 MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207 64
+RMD160 8882d21c873b671e4ea07e7ae6cd001f81a499d3 files/digest-nss_ldap-207 64
+SHA256 8b01573263bfb157c34c752be880bd2775096fb27ab11e8bd1761105f91fc507 files/digest-nss_ldap-207 64
 MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207-r1 64
+RMD160 8882d21c873b671e4ea07e7ae6cd001f81a499d3 files/digest-nss_ldap-207-r1 64
+SHA256 8b01573263bfb157c34c752be880bd2775096fb27ab11e8bd1761105f91fc507 files/digest-nss_ldap-207-r1 64
 MD5 c1919ec630e0278d0e09787a14d497a9 files/digest-nss_ldap-210 64
+RMD160 c6d8784991049132c695729361a9cba7d52001a5 files/digest-nss_ldap-210 64
+SHA256 a85176099efbbfa1a14a47f5026eadc99851d861c342ae8a1fbe7d869db0b2ad files/digest-nss_ldap-210 64
 MD5 4dc20eb7ee3f4a562d6ad00a0609cfbc files/digest-nss_ldap-211 64
+RMD160 cae9d44dd4c90d4bf5d98a538ebcf970b82cb161 files/digest-nss_ldap-211 64
+SHA256 fcbc2258576b84641da59cd0dd52b57628736dc1bee4fdefecf575428371092d files/digest-nss_ldap-211 64
 MD5 b2dc517b69cad6d24fce3d19a7879dcf files/digest-nss_ldap-215 64
+RMD160 3a6e2a29fb6ab32b6b00b367728a5be88b5bdae9 files/digest-nss_ldap-215 64
+SHA256 3c3a58623382d7385eaa210fafa41a0d0bfee195ecd8b0401cc889422e98dfae files/digest-nss_ldap-215 64
 MD5 b2dc517b69cad6d24fce3d19a7879dcf files/digest-nss_ldap-215-r1 64
+RMD160 3a6e2a29fb6ab32b6b00b367728a5be88b5bdae9 files/digest-nss_ldap-215-r1 64
+SHA256 3c3a58623382d7385eaa210fafa41a0d0bfee195ecd8b0401cc889422e98dfae files/digest-nss_ldap-215-r1 64
 MD5 2fdb02aab9086996c9129865cff0f0de files/digest-nss_ldap-220 64
+RMD160 1eb15a460893de433afdd84b9431274735ce3e1f files/digest-nss_ldap-220 64
+SHA256 f6f9fbefaeade8010ce32e029ca8b951ab02995421a4b8e9dfd723467b892426 files/digest-nss_ldap-220 64
 MD5 94ff5d327f98e3aceb7fa140493e8dd5 files/digest-nss_ldap-226 64
+RMD160 0834d9d341e2e8c87d5532fb0b0a8f73d8a604fc files/digest-nss_ldap-226 64
+SHA256 feacf484098328f11cb076e12d24e5663b7b60b4aa6fdf7e7d87860c1e13e611 files/digest-nss_ldap-226 64
 MD5 94ff5d327f98e3aceb7fa140493e8dd5 files/digest-nss_ldap-226-r1 64
+RMD160 0834d9d341e2e8c87d5532fb0b0a8f73d8a604fc files/digest-nss_ldap-226-r1 64
+SHA256 feacf484098328f11cb076e12d24e5663b7b60b4aa6fdf7e7d87860c1e13e611 files/digest-nss_ldap-226-r1 64
 MD5 7d2b7694b9c68b4538679a6973c23d49 files/digest-nss_ldap-234 64
+RMD160 b1ef96b7f81009f3e4fa42173b0452c2d734e749 files/digest-nss_ldap-234 64
+SHA256 e9d93e0fce20a7a96c0a15465216d7c4283235ff660959bc2c117c84c4afe75b files/digest-nss_ldap-234 64
 MD5 f4606a6bf13f616f9fda25ac76493653 files/digest-nss_ldap-238 64
+RMD160 01ac1073ec545bd0d17fd1639fba378698e95265 files/digest-nss_ldap-238 64
+SHA256 67925ebdb46379b0a8a6c08e4bed1a4610e07b3d2cb873af1f62378c60d721d9 files/digest-nss_ldap-238 64
 MD5 2c0782010f3906c38562b1d459f16bea files/digest-nss_ldap-239 64
+RMD160 5456a213940d9dbb89d7fe92e71b9a8a03e7c6dd files/digest-nss_ldap-239 64
+SHA256 9397a0c5886313134d47d2bd29d4e5bd8203b0f73fe321310f35f084a4af7e2e files/digest-nss_ldap-239 64
 MD5 2c0782010f3906c38562b1d459f16bea files/digest-nss_ldap-239-r1 64
+RMD160 5456a213940d9dbb89d7fe92e71b9a8a03e7c6dd files/digest-nss_ldap-239-r1 64
+SHA256 9397a0c5886313134d47d2bd29d4e5bd8203b0f73fe321310f35f084a4af7e2e files/digest-nss_ldap-239-r1 64
+MD5 ac4a10de300d763f3b7ca6baa465fda1 files/digest-nss_ldap-249 238
+RMD160 8e8592b6656f73268c681f36fb17dbcbd5a51d51 files/digest-nss_ldap-249 238
+SHA256 9eac77f088564033acecca13bf17a1b258551aaf8b90c92ee6299590cd531761 files/digest-nss_ldap-249 238
 MD5 2af7b597298bb9269f739cbb8a25224d files/nss_ldap-220-db4.2-patch.diff 1707
+RMD160 66bd9183dcda11a699b0e5886bdf44df810f3bfd files/nss_ldap-220-db4.2-patch.diff 1707
+SHA256 6e4cc826eb9b43c132dbcaadb57ceb3233a283a1f2c6b7e26e0170b5d8ee8344 files/nss_ldap-220-db4.2-patch.diff 1707
 MD5 1923bbb463805e6cad70e98e567297f5 files/nss_ldap-238-whitespace-fix.diff 2043
+RMD160 8f291ca511c137a9c7012e8dddc30622ad9a0380 files/nss_ldap-238-whitespace-fix.diff 2043
+SHA256 b0dd410fcf400cb639e553dcee67716f8e2506e09b60f1cf7e68f96e5b833513 files/nss_ldap-238-whitespace-fix.diff 2043
 MD5 a85a2ad9e438c3ac6f0fb7087621ed35 files/nss_ldap-239-tls-security-bug.patch 1022
+RMD160 9b48ef4eee157b4b3bfa8a531bbe0000ca564295 files/nss_ldap-239-tls-security-bug.patch 1022
+SHA256 4915f034328c69dc1323cfec3a8d2e2e4eeb2a57590b0aeafa06f0cb3fafe5b4 files/nss_ldap-239-tls-security-bug.patch 1022
+MD5 28418d13af929c2bc04bb96248ddceda files/nss_ldap-249-sasl-compile.patch 282
+RMD160 dcca3b25794db3d5db82ec6b9ed423af829f2de0 files/nss_ldap-249-sasl-compile.patch 282
+SHA256 3da93087461fb970d5da9fe6b169f5493ca83ae2149cb03be9e8486bfcf437d6 files/nss_ldap-249-sasl-compile.patch 282
 MD5 1fe060c70b1c673346b696dbe194260a files/nsswitch.ldap.diff 575
+RMD160 6c429261de3f99eccfb6f613e0d8a499fa798245 files/nsswitch.ldap.diff 575
+SHA256 f3bf121d1fa4e3c0119d36ddd2445bcbbd955e2b7fe2f0fe65ebaa6d2808c43e files/nsswitch.ldap.diff 575
 MD5 5ba8c9c9be079ebcbc93c08f838665bd metadata.xml 255
+RMD160 2a5b1ef0df8360b2a563653844baae48e44c6e79 metadata.xml 255
+SHA256 c3d87e158edbe4189c6e38c4c891285af2e68b0fbef16d59cb6326e287da0cb6 metadata.xml 255
 MD5 9dcfa229ed6ea2efa18f34f9ecfff661 nss_ldap-174-r2.ebuild 996
+RMD160 252b041d336fc97f9913f734c1a2ddd64c925c7f nss_ldap-174-r2.ebuild 996
+SHA256 fc34dda4fab3ff0dcc915c3736912a85389ae684e8103df2fb2ae421eb227c21 nss_ldap-174-r2.ebuild 996
 MD5 2facb9b8b2db2a53cdcb1ffca8254a4a nss_ldap-202.ebuild 1006
+RMD160 6eba8b0de8aa46bc8945caf45a6d22cfdc7ca60e nss_ldap-202.ebuild 1006
+SHA256 f4dfcfc6e7662a8a370d3763117c82960e73e24554e120e41d696c2d05b62aea nss_ldap-202.ebuild 1006
 MD5 18518c2e3dd5a043a1ca052a2d0bee3b nss_ldap-207-r1.ebuild 986
+RMD160 7f0ca02120ed412cd4b09df1cdac792efeac48cd nss_ldap-207-r1.ebuild 986
+SHA256 b1c941887c01f8e4cd808d88364d1d5757e901d3fe1c898c2d6b8237931f83e7 nss_ldap-207-r1.ebuild 986
 MD5 9eb6230d204098fe102143fc52733514 nss_ldap-207.ebuild 1046
+RMD160 00dd504af404be8273f6ee020b2f41742864a548 nss_ldap-207.ebuild 1046
+SHA256 9128c2f16cb21727eb705bd427bf3978ebbb95cbcbec571e375478b3f240d801 nss_ldap-207.ebuild 1046
 MD5 c0754505ff6a26ef50a332da9d807e87 nss_ldap-210.ebuild 1444
+RMD160 677ebc4699ce795c6fe3144cc75aa8d7f4f53b81 nss_ldap-210.ebuild 1444
+SHA256 52f332900ad36167d2919e1c2b122b46ef20db00bd70293f2aeafa4dc8496fb6 nss_ldap-210.ebuild 1444
 MD5 09e944c3a06eb51d27c2da98a79a809f nss_ldap-211.ebuild 1444
+RMD160 f20bcbab7bf2cc867cc57d0bbc350f91e122a9b9 nss_ldap-211.ebuild 1444
+SHA256 b8884e081604d086e0d482dc23ac7945024bc2893b627e3de3381587b4ee3338 nss_ldap-211.ebuild 1444
 MD5 ac7a4a33fe022b39fa720f3400311732 nss_ldap-215-r1.ebuild 1491
+RMD160 cb6131ca2490acbf8f7f7af5f6c82edea473a628 nss_ldap-215-r1.ebuild 1491
+SHA256 4170c3788314e3edf15a3f56a7752bf8335cc1e8b86c20aab00bee02ae4f5b51 nss_ldap-215-r1.ebuild 1491
 MD5 974d7abe6772fa6246b7a3082cb33cfe nss_ldap-215.ebuild 1303
+RMD160 3724675399d9a4fb5dfe6330cbc6818936175a74 nss_ldap-215.ebuild 1303
+SHA256 c788821d19944a51b185695b62f174ed73fbc19a5b40943328fdf50771c0c86f nss_ldap-215.ebuild 1303
 MD5 874a6850a3d761baf871bd22c7079c30 nss_ldap-220.ebuild 1574
+RMD160 0aee5288fd2538398b83af3c546e0e62986202ea nss_ldap-220.ebuild 1574
+SHA256 47ebf39153c68087383d77a55442e2e93e33a323fc91b06707f0b567628c2b6c nss_ldap-220.ebuild 1574
 MD5 07a252aaae3ce562ca68164b2aa7a74e nss_ldap-226-r1.ebuild 1359
+RMD160 c8696ec25cef01c3774ea21ac36ad1e034910910 nss_ldap-226-r1.ebuild 1359
+SHA256 e0a6bbcbb5a546480d42fec693f265a603c52b63ef67c25cfb2a21347ec30e94 nss_ldap-226-r1.ebuild 1359
 MD5 9b63a0c29f8a6fe291d120b4918f6438 nss_ldap-226.ebuild 1277
+RMD160 1c9460ae1711e3c4039d2db887cb3366bc3f2b74 nss_ldap-226.ebuild 1277
+SHA256 701762706d6f1709e1f94026000950e8b5f7e720e1f2d4e33fa0ab9aa74dbb3a nss_ldap-226.ebuild 1277
 MD5 e1bddbfa5c678467d44c7b523b3a04d1 nss_ldap-234.ebuild 1282
+RMD160 aef58a7aed8eb47691e61873dc56cf9c23290a59 nss_ldap-234.ebuild 1282
+SHA256 2ceb6282198f2b6ae7dbdb8cf504b4a1576ccf1b912bb0841430dd113db5ba2e nss_ldap-234.ebuild 1282
 MD5 7682813fbef665128d41d35fdaada068 nss_ldap-238.ebuild 1320
+RMD160 c2d61845d90d14f532df7475e94dac5ccd743713 nss_ldap-238.ebuild 1320
+SHA256 99bdbf99cec50ea002e56e1475525393d4874463803376bbac0817ee9576fb08 nss_ldap-238.ebuild 1320
 MD5 681dd60add223bfd315e424fd2f14791 nss_ldap-239-r1.ebuild 1390
+RMD160 4477eb58ac4ea37febf79a5b4e2af4a72f735e36 nss_ldap-239-r1.ebuild 1390
+SHA256 67a54d7c6460c897bbc9268e1fd80d66403447eb16b658845232460a8ac96a5c nss_ldap-239-r1.ebuild 1390
 MD5 5c58ca9482b42b82c7bfe7b4e009698b nss_ldap-239.ebuild 1273
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDtYmpAiZjviIA2XgRAjxXAJ9yQv7UZGyZ22eYxKCG17bYg5YevQCgyrrV
-YkyZ1WkrQJ8C0j0AsiTQf1s=
-=U881
------END PGP SIGNATURE-----
+RMD160 bcf3ec954f710cc4d9c5249044606603690d2ed4 nss_ldap-239.ebuild 1273
+SHA256 5014a005190b92a912d6c8d2628f6f5f8b2de3488425ce37050bf77744840d4e nss_ldap-239.ebuild 1273
+MD5 5caa1f1e6ee6c7116c2d078ed2244ffa nss_ldap-249.ebuild 1446
+RMD160 41cce1c7aa24fe022df89e98aa43bb420e986429 nss_ldap-249.ebuild 1446
+SHA256 e67594c398720eea009b1ca7dd848e2a8f5880513e7afa43ddd1c465f1320b19 nss_ldap-249.ebuild 1446
diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-249 b/sys-auth/nss_ldap/files/digest-nss_ldap-249
new file mode 100644
index 000000000000..35136d71d19e
--- /dev/null
+++ b/sys-auth/nss_ldap/files/digest-nss_ldap-249
@@ -0,0 +1,3 @@
+MD5 1ce2d14601f94013c8ab15cb0eebc9e7 nss_ldap-249.tar.gz 262800
+RMD160 d411ab872932707bb38829fa388cf2090ffa4855 nss_ldap-249.tar.gz 262800
+SHA256 2733473e2305e48227b4762ba7c14fb0cc6eb717ee2c3165915fb07ece6733e1 nss_ldap-249.tar.gz 262800
diff --git a/sys-auth/nss_ldap/files/nss_ldap-249-sasl-compile.patch b/sys-auth/nss_ldap/files/nss_ldap-249-sasl-compile.patch
new file mode 100644
index 000000000000..1e92c9bb6fe5
--- /dev/null
+++ b/sys-auth/nss_ldap/files/nss_ldap-249-sasl-compile.patch
@@ -0,0 +1,11 @@
+--- ldap-nss.c~	2006-02-25 02:43:33.503639826 -0800
++++ ldap-nss.c	2006-02-25 02:50:51.943806612 -0800
+@@ -72,6 +72,8 @@
+ #include <sasl/sasl.h>
+ #elif defined(HAVE_SASL_H)
+ #include <sasl.h>
++#elif defined(HAVE_SASL_SASL_H)
++#include <sasl/sasl.h>
+ #endif
+ 
+ #ifndef HAVE_SNPRINTF
diff --git a/sys-auth/nss_ldap/nss_ldap-249.ebuild b/sys-auth/nss_ldap/nss_ldap-249.ebuild
new file mode 100644
index 000000000000..076daa6a7d85
--- /dev/null
+++ b/sys-auth/nss_ldap/nss_ldap-249.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-249.ebuild,v 1.1 2006/02/25 10:53:14 robbat2 Exp $
+
+inherit fixheadtails eutils gnuconfig multilib
+
+IUSE="debug"
+
+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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND=">=net-nds/openldap-2.1.30-r5"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/nsswitch.ldap.diff
+	epatch ${FILESDIR}/${PN}-239-tls-security-bug.patch
+	epatch ${FILESDIR}/${PN}-249-sasl-compile.patch
+	# fix head/tail stuff
+	ht_fix_file ${S}/Makefile.am ${S}/Makefile.in ${S}/depcomp
+	# update config.{guess,sub}
+	gnuconfig_update
+}
+
+src_compile() {
+	local myconf=""
+	use debug && myconf="${myconf} --enable-debugging"
+
+	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)
+
+	make 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/*
+}