diff options
Diffstat (limited to 'sys-auth/nss_ldap')
| -rw-r--r-- | sys-auth/nss_ldap/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-auth/nss_ldap/files/digest-nss_ldap-258 | 3 | ||||
| -rw-r--r-- | sys-auth/nss_ldap/files/nss_ldap-257.2-gssapi-headers.patch | 65 | ||||
| -rw-r--r-- | sys-auth/nss_ldap/nss_ldap-258.ebuild | 75 |
4 files changed, 151 insertions, 1 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/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/* +} |