diff options
| -rw-r--r-- | net-libs/nss_ldap/ChangeLog | 8 | ||||
| -rw-r--r-- | net-libs/nss_ldap/Manifest | 2 | ||||
| -rw-r--r-- | net-libs/nss_ldap/files/digest-nss_ldap-220 | 1 | ||||
| -rw-r--r-- | net-libs/nss_ldap/files/nss_ldap-220-db4.2-patch.diff | 50 | ||||
| -rw-r--r-- | net-libs/nss_ldap/nss_ldap-220.ebuild | 64 |
5 files changed, 124 insertions, 1 deletions
diff --git a/net-libs/nss_ldap/ChangeLog b/net-libs/nss_ldap/ChangeLog index 3037ff29c812..e0b925a9b637 100644 --- a/net-libs/nss_ldap/ChangeLog +++ b/net-libs/nss_ldap/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/nss_ldap # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.27 2004/06/24 23:16:38 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/ChangeLog,v 1.28 2004/08/24 19:05:38 robbat2 Exp $ + +*nss_ldap-220 (24 Aug 2004) + + 24 Aug 2004; Robin H. Johnson <robbat2@gentoo.org> + +files/nss_ldap-220-db4.2-patch.diff, +nss_ldap-220.ebuild: + Combine #61511 with my own work for the new version. 08 Jun 2004; Nick Hadaway <raker@gentoo.org> nss_ldap-215-r1.ebuild, files/nsswitch.ldap.diff : diff --git a/net-libs/nss_ldap/Manifest b/net-libs/nss_ldap/Manifest index ae6e90e8cb4b..60df792bf491 100644 --- a/net-libs/nss_ldap/Manifest +++ b/net-libs/nss_ldap/Manifest @@ -3,6 +3,7 @@ MD5 77d50c921dbb570ea7ecb2e2f168ff92 nss_ldap-207-r1.ebuild 985 MD5 c4a1cf09317b8ae055f62a9932b0080b nss_ldap-215.ebuild 1302 MD5 0c59d4006a7b59eb7e9d1ec5b1d193f9 nss_ldap-210.ebuild 1443 MD5 8f9e8b5ee2eeaf7af4ff947d1387c813 nss_ldap-209.1.ebuild 1453 +MD5 55ec3ce22273283fbf7ac14a87bad991 nss_ldap-220.ebuild 1491 MD5 55ec3ce22273283fbf7ac14a87bad991 nss_ldap-215-r1.ebuild 1491 MD5 ec8f48de4368a8db1de491803031ed1f nss_ldap-211.ebuild 1444 MD5 f4481085e0aa4565ac7953d70575302d nss_ldap-207.ebuild 1045 @@ -17,6 +18,7 @@ MD5 8d358c3dda5ce728c6fd5f8f4bc448d2 files/digest-nss_ldap-207 64 MD5 c1919ec630e0278d0e09787a14d497a9 files/digest-nss_ldap-210 64 MD5 4dc20eb7ee3f4a562d6ad00a0609cfbc files/digest-nss_ldap-211 64 MD5 b2dc517b69cad6d24fce3d19a7879dcf files/digest-nss_ldap-215 64 +MD5 2fdb02aab9086996c9129865cff0f0de files/digest-nss_ldap-220 64 MD5 66e79b5d5f9f5105ad2988280f27475d files/digest-nss_ldap-209.1 66 MD5 a4302c4120b75a23e43cc824423169c8 files/db4_1.85.diff 1569 MD5 1fe060c70b1c673346b696dbe194260a files/nsswitch.ldap.diff 575 diff --git a/net-libs/nss_ldap/files/digest-nss_ldap-220 b/net-libs/nss_ldap/files/digest-nss_ldap-220 new file mode 100644 index 000000000000..c97e065818ed --- /dev/null +++ b/net-libs/nss_ldap/files/digest-nss_ldap-220 @@ -0,0 +1 @@ +MD5 d401485fcabf4ea40d244c2c9a19247e nss_ldap-220.tar.gz 204826 diff --git a/net-libs/nss_ldap/files/nss_ldap-220-db4.2-patch.diff b/net-libs/nss_ldap/files/nss_ldap-220-db4.2-patch.diff new file mode 100644 index 000000000000..ea3309ecf1a8 --- /dev/null +++ b/net-libs/nss_ldap/files/nss_ldap-220-db4.2-patch.diff @@ -0,0 +1,50 @@ +diff -urN nss_ldap-215/configure.in nss_ldap-215-modified/configure.in +--- nss_ldap-215/configure.in 2004-01-07 07:02:15.000000000 -0600 ++++ nss_ldap-215-modified/configure.in 2004-03-18 19:47:13.111404704 -0600 +@@ -133,6 +133,9 @@ + AC_CHECK_HEADERS(db1/db.h) + AC_CHECK_HEADERS(db_185.h) + AC_CHECK_HEADERS(db3/db_185.h) ++AC_CHECK_HEADERS(db4/db_185.h) ++AC_CHECK_HEADERS(db4.1/db_185.h) ++AC_CHECK_HEADERS(db4.2/db_185.h) + AC_CHECK_HEADERS(alignof.h) + AC_CHECK_HEADERS(rpc/rpcent.h) + AC_CHECK_HEADERS(sys/byteorder.h) +diff -urN nss_ldap-215/ldap-nss.c nss_ldap-215-modified/ldap-nss.c +--- nss_ldap-215/ldap-nss.c 2004-01-07 07:02:15.000000000 -0600 ++++ nss_ldap-215-modified/ldap-nss.c 2004-03-18 19:48:19.139366928 -0600 +@@ -72,7 +72,13 @@ + #include <sasl.h> + #endif + #ifdef AT_OC_MAP +-#ifdef HAVE_DB3_DB_185_H ++#ifdef HAVE_DB4_2_DB_185_H ++#include <db4.2/db_185.h> ++#elif defined(HAVE_DB4_1_DB_185_H) ++#include <db4.1/db_185.h> ++#elif defined(HAVE_DB4_DB_185_H) ++#include <db4/db_185.h> ++#elif defined(HAVE_DB3_DB_185_H) + #include <db3/db_185.h> + #elif defined(HAVE_DB_185_H) + #include <db_185.h> +diff -urN nss_ldap-215/util.c nss_ldap-215-modified/util.c +--- nss_ldap-215/util.c 2004-01-07 07:02:15.000000000 -0600 ++++ nss_ldap-215-modified/util.c 2004-03-18 19:49:16.347669944 -0600 +@@ -84,7 +84,14 @@ + * right API! + */ + #if defined(RFC2307BIS) || defined(AT_OC_MAP) +-#ifdef HAVE_DB3_DB_185_H ++#define DN2UID_CACHE ++#ifdef HAVE_DB4_2_DB_185_H ++#include <db4.2/db_185.h> ++#elif defined(HAVE_DB4_1_DB_185_H) ++#include <db4.1/db_185.h> ++#elif defined(HAVE_DB4_DB_185_H) ++#include <db4/db_185.h> ++#elif defined(HAVE_DB3_DB_185_H) + #include <db3/db_185.h> + #define DN2UID_CACHE + #elif defined(HAVE_DB_185_H) diff --git a/net-libs/nss_ldap/nss_ldap-220.ebuild b/net-libs/nss_ldap/nss_ldap-220.ebuild new file mode 100644 index 000000000000..29ead9e2f572 --- /dev/null +++ b/net-libs/nss_ldap/nss_ldap-220.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/nss_ldap/nss_ldap-220.ebuild,v 1.1 2004/08/24 19:05:38 robbat2 Exp $ + +inherit fixheadtails eutils gnuconfig + +IUSE="berkdb 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="~x86 ~sparc ~amd64 ~ppc ~hppa" + +DEPEND=">=net-nds/openldap-1.2.11 + berkdb? ( >=sys-libs/db-3 )" + +src_unpack() { + unpack ${A} + # bug #34717 + EPATCH_OPTS="-d${S} -p1" epatch ${FILESDIR}/${PN}-220-db4.2-patch.diff + cd ${S} + epatch ${FILESDIR}/nsswitch.ldap.diff + + aclocal || die "aclocal failed" + autoheader || die "autoheader failed" + automake || die "automake failed" + autoconf || die "autoconf failed" + + # 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 berkdb && myconf="${myconf} --enable-rfc2307bis" + use debug && myconf="${myconf} --enable-debugging" + + econf \ + --with-ldap-lib=openldap \ + --libdir=/lib \ + --enable-schema-mapping \ + --enable-paged-results \ + ${myconf} || die "configure failed" + + emake || die "make failed" +} + +src_install() { + dodir /lib + + 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/* +} |