Version bump. Bugfixes only, fixes nss_srv_domain per upstream bug, and gentoo bug #165638 for kerberos building.

Package-Manager: portage-2.1.3.16

5 files changed, 167 insertions, 5 deletions

diff --git a/sys-auth/nss_ldap/ChangeLog b/sys-auth/nss_ldap/ChangeLog
index 19e7221dc855..0a3050e10737 100644
--- a/sys-auth/nss_ldap/ChangeLog
+++ b/sys-auth/nss_ldap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/nss_ldap
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.44 2007/11/07 17:51:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/ChangeLog,v 1.45 2007/11/08 03:17:53 robbat2 Exp $
+
+*nss_ldap-258 (08 Nov 2007)
+
+  08 Nov 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/nss_ldap-257.2-gssapi-headers.patch, +nss_ldap-258.ebuild:
+  Version bump. Bugfixes only, fixes nss_srv_domain per upstream bug, and
+  gentoo bug #165638 for kerberos building.
 
   07 Nov 2007; Raúl Porcel <armin76@gentoo.org> nss_ldap-257.2.ebuild:
   Add ~ia64 wrt #198261
diff --git a/sys-auth/nss_ldap/Manifest b/sys-auth/nss_ldap/Manifest
index 83b04596e7fb..614ea516a311 100644
--- a/sys-auth/nss_ldap/Manifest
+++ b/sys-auth/nss_ldap/Manifest
@@ -22,6 +22,10 @@ AUX nss_ldap-257-nss_max_group_depth.patch 3551 RMD160 8d23cd290f23808f14e1e5308
 MD5 b375c2157a5e264f1cfdcbe8b463b88b files/nss_ldap-257-nss_max_group_depth.patch 3551
 RMD160 8d23cd290f23808f14e1e5308280de00fb9cb9f0 files/nss_ldap-257-nss_max_group_depth.patch 3551
 SHA256 66286a3d097b2ac425bd7f6078701a8f5b357ee535284d3faa4e0783b974fa37 files/nss_ldap-257-nss_max_group_depth.patch 3551
+AUX nss_ldap-257.2-gssapi-headers.patch 2343 RMD160 b99b79b7cf9a423aceb350bfcc7d692b5bfa4ead SHA1 b7a3577b4db4f1c87c55935c2f6493bc704c82c2 SHA256 1b920cfc6b5d62408fee019cdf8491a8cbc9884344775d9fb57cd8a419d32fd5
+MD5 5bef1c5b5e9f7f93ab1920d684b14d4b files/nss_ldap-257.2-gssapi-headers.patch 2343
+RMD160 b99b79b7cf9a423aceb350bfcc7d692b5bfa4ead files/nss_ldap-257.2-gssapi-headers.patch 2343
+SHA256 1b920cfc6b5d62408fee019cdf8491a8cbc9884344775d9fb57cd8a419d32fd5 files/nss_ldap-257.2-gssapi-headers.patch 2343
 AUX nsswitch.ldap.diff 575 RMD160 6c429261de3f99eccfb6f613e0d8a499fa798245 SHA1 a2aada398f1db0eb162633d39992646ce513a3b6 SHA256 f3bf121d1fa4e3c0119d36ddd2445bcbbd955e2b7fe2f0fe65ebaa6d2808c43e
 MD5 1fe060c70b1c673346b696dbe194260a files/nsswitch.ldap.diff 575
 RMD160 6c429261de3f99eccfb6f613e0d8a499fa798245 files/nsswitch.ldap.diff 575
@@ -34,6 +38,7 @@ DIST nss_ldap-253.tar.gz 228278 RMD160 a129985fe6b27a481efa94e07e994cbcdbb6867c
 DIST nss_ldap-254.tar.gz 228504 RMD160 db8e57be27f0fddca0f285380eb3bd9d7e2a11f9 SHA1 4ef320b99edc0f8fc2e9c3ebf13842490c772c98 SHA256 3bc77bd173b1cbeda8d19a923f3d62ae4ce02c57d5af68b71254fb3896c03730
 DIST nss_ldap-257.2.tar.gz 274699 RMD160 b27f4509335b7eb026e32458689c01072448093f SHA1 e479a52028836d2494a68e3183673cfd1c202c54 SHA256 7850f40208d1d3dd946e0c9388e7420ef07f69855fd2721fd2784f3cdb5b82fb
 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
 EBUILD nss_ldap-239-r1.ebuild 1344 RMD160 072c5afe01d93c4e89dea9434e6cb4725444de70 SHA1 7ebd221362f33881debde95614d0d608f3aa8104 SHA256 bab782405e7699ed20d73e0cf19afc036659a60591b5cd2f7e74fdb2a3f42c32
 MD5 e3994581a5a52fd5acb8d62efb415b3b nss_ldap-239-r1.ebuild 1344
 RMD160 072c5afe01d93c4e89dea9434e6cb4725444de70 nss_ldap-239-r1.ebuild 1344
@@ -74,10 +79,14 @@ EBUILD nss_ldap-257.ebuild 2138 RMD160 533377fb60031b31dc04d701e87dee1b322feab0
 MD5 75a602b05cb2ace4a2bed8d15b4ba0d0 nss_ldap-257.ebuild 2138
 RMD160 533377fb60031b31dc04d701e87dee1b322feab0 nss_ldap-257.ebuild 2138
 SHA256 c5e0fd06bbdaf705c4dafdf97f6eed0dea52ed460724fdf6c47ead3ab474188f nss_ldap-257.ebuild 2138
-MISC ChangeLog 13451 RMD160 8a9925b25a2f7251dada314648c74057c3ff280c SHA1 06d2976c7f55d4950d771d64b92c3410e67c5741 SHA256 10a836baf02660bbde2fad71ff5bea38fa86da0fdb0b87e60ef9e339eef64e62
-MD5 1ea33fda000de4e3cab3a6039e745923 ChangeLog 13451
-RMD160 8a9925b25a2f7251dada314648c74057c3ff280c ChangeLog 13451
-SHA256 10a836baf02660bbde2fad71ff5bea38fa86da0fdb0b87e60ef9e339eef64e62 ChangeLog 13451
+EBUILD nss_ldap-258.ebuild 2240 RMD160 32fbcb534817467a3d04483bdb5ce572df1ce878 SHA1 74dc1e15884b52655983c29f2d7027eb9a58ae1f SHA256 644d5187b54452ef5147a88524885ada557d7fff82df569ed85b72294c073151
+MD5 6d1d3559435fe0e55e504a5405bfa4c8 nss_ldap-258.ebuild 2240
+RMD160 32fbcb534817467a3d04483bdb5ce572df1ce878 nss_ldap-258.ebuild 2240
+SHA256 644d5187b54452ef5147a88524885ada557d7fff82df569ed85b72294c073151 nss_ldap-258.ebuild 2240
+MISC ChangeLog 13720 RMD160 d005d872a9c47a059559eb2df6970b78199f31f9 SHA1 eefd115ccbebcd564770b19534225b1a22f05027 SHA256 ba8e85c6441d6518198b0b95e1c45c6e7db0bdaad635efed9241fe3ae3a563ad
+MD5 efea565e321ed48751cca19a76a97a13 ChangeLog 13720
+RMD160 d005d872a9c47a059559eb2df6970b78199f31f9 ChangeLog 13720
+SHA256 ba8e85c6441d6518198b0b95e1c45c6e7db0bdaad635efed9241fe3ae3a563ad ChangeLog 13720
 MISC metadata.xml 374 RMD160 d093200b154cb3766f818bb06ab05fb29d45af0c SHA1 0e6b6cc539b9c537d3a5464884ca2ca9c1717134 SHA256 72f6eb7d9ee256d2edb0336e03b71674bf17d2828222ca8722fdb48a88304365
 MD5 641473a13d5ae20a9b73223b84af5c0d metadata.xml 374
 RMD160 d093200b154cb3766f818bb06ab05fb29d45af0c metadata.xml 374
@@ -112,3 +121,6 @@ SHA256 933836f317037365b7fb89a65e09616ce94983e82ae8a400831126d5dc3b8f0c files/di
 MD5 19817af7a2822f521287be1f67a370d4 files/digest-nss_ldap-257.2 244
 RMD160 9ef8371fec5ec45f50d742bc74597471e2604ef9 files/digest-nss_ldap-257.2 244
 SHA256 ac72acab66b0186959c7b67436191d4d51ecc0e057761fb5e596be47bf1045c9 files/digest-nss_ldap-257.2 244
+MD5 3181cb57157e0e24a136d90478dca852 files/digest-nss_ldap-258 238
+RMD160 3516b44aae998aee0db17af5a22c0dca199d45b7 files/digest-nss_ldap-258 238
+SHA256 de3a13c05fcbb7f2ff75380bc85da94a12a1f949e84ce231a06b0a06de47c543 files/digest-nss_ldap-258 238
diff --git a/sys-auth/nss_ldap/files/digest-nss_ldap-258 b/sys-auth/nss_ldap/files/digest-nss_ldap-258
new file mode 100644
index 000000000000..c4fcb07b1c83
--- /dev/null
+++ b/sys-auth/nss_ldap/files/digest-nss_ldap-258
@@ -0,0 +1,3 @@
+MD5 baecf49a2e1ca1e29b33b7b9059f688a nss_ldap-258.tar.gz 274694
+RMD160 ee52775b9612f780908b3c8363ab2b18e7f4ea1c nss_ldap-258.tar.gz 274694
+SHA256 afa3bb64cd29557e775219585655721ac220de5804d95d0c307dab86f2308346 nss_ldap-258.tar.gz 274694
diff --git a/sys-auth/nss_ldap/files/nss_ldap-257.2-gssapi-headers.patch b/sys-auth/nss_ldap/files/nss_ldap-257.2-gssapi-headers.patch
new file mode 100644
index 000000000000..cec5517e741c
--- /dev/null
+++ b/sys-auth/nss_ldap/files/nss_ldap-257.2-gssapi-headers.patch
@@ -0,0 +1,65 @@
+http://bugs.gentoo.org/show_bug.cgi?id=165638
+http://bugzilla.padl.com/show_bug.cgi?id=308
+
+Make nss_ldap compile with gssapi/gssapi.h even if there is no
+gssapi/gssapi_krb5.h present. This seems to be needed to compile against
+heimdal. Extended header checks and modified preprocessor logic a bit.
+
+2007-02-07 Martin von Gagern <Martin.vGagern@gmx.net>
+
+diff -ruN nss_ldap-257.2.orig/config.h.in nss_ldap-257.2/config.h.in
+--- nss_ldap-257.2.orig/config.h.in	2007-10-24 14:22:55.000000000 +0200
++++ nss_ldap-257.2/config.h.in	2007-10-24 14:25:15.000000000 +0200
+@@ -87,6 +87,9 @@
+ /* Define to 1 if you have the <gssapi/gssapi_krb5.h> header file. */
+ #undef HAVE_GSSAPI_GSSAPI_KRB5_H
+ 
++/* Define to 1 if you have the <gssapi/gssapi.h> header file. */
++#undef HAVE_GSSAPI_GSSAPI_H
++
+ /* Define to 1 if you have the <gssapi.h> header file. */
+ #undef HAVE_GSSAPI_H
+ 
+diff -ruN nss_ldap-257.2.orig/configure nss_ldap-257.2/configure
+--- nss_ldap-257.2.orig/configure	2007-10-24 14:22:55.000000000 +0200
++++ nss_ldap-257.2/configure	2007-10-24 14:25:49.000000000 +0200
+@@ -8409,7 +8409,7 @@
+ 
+ 
+ 
+-for ac_header in gssapi/gssapi_krb5.h gssapi.h
++for ac_header in gssapi/gssapi_krb5.h gssapi/gssapi.h gssapi.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+diff -ruN nss_ldap-257.2.orig/configure.in nss_ldap-257.2/configure.in
+--- nss_ldap-257.2.orig/configure.in	2007-10-24 14:22:55.000000000 +0200
++++ nss_ldap-257.2/configure.in	2007-10-24 14:26:26.000000000 +0200
+@@ -182,7 +182,7 @@
+ AC_CHECK_HEADERS(strings.h)
+ AC_CHECK_HEADERS(gssldap.h)
+ AC_CHECK_HEADERS(gsssasl.h)
+-AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi.h)
++AC_CHECK_HEADERS(gssapi/gssapi_krb5.h gssapi/gssapi.h gssapi.h)
+ AC_CHECK_HEADERS(krb5.h)
+ 
+ AC_CHECK_LIB(resolv, main)
+diff -ruN nss_ldap-257.2.orig/ldap-nss.c nss_ldap-257.2/ldap-nss.c
+--- nss_ldap-257.2.orig/ldap-nss.c	2007-10-24 14:22:55.000000000 +0200
++++ nss_ldap-257.2/ldap-nss.c	2007-10-24 14:27:32.000000000 +0200
+@@ -82,10 +82,14 @@
+ #endif
+ #ifdef HAVE_GSSAPI_H
+ #include <gssapi.h>
+-#elif defined(HAVE_GSSAPI_GSSAPI_KRB5_H)
++#else
++#ifdef HAVE_GSSAPI_GSSAPI_H
+ #include <gssapi/gssapi.h>
++#endif
++#ifdef HAVE_GSSAPI_GSSAPI_KRB5_H
+ #include <gssapi/gssapi_krb5.h>
+ #endif
++#endif
+ #ifdef CONFIGURE_KRB5_CCNAME
+ #include <krb5.h>
+ #endif
diff --git a/sys-auth/nss_ldap/nss_ldap-258.ebuild b/sys-auth/nss_ldap/nss_ldap-258.ebuild
new file mode 100644
index 000000000000..9683df3dd161
--- /dev/null
+++ b/sys-auth/nss_ldap/nss_ldap-258.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss_ldap/nss_ldap-258.ebuild,v 1.1 2007/11/08 03:17:53 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 ~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
+	epatch "${FILESDIR}"/${PN}-257.2-gssapi-headers.patch
+	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/*
+}