From ac69bf42d2af331973e0910f337e776718c7f3c3 Mon Sep 17 00:00:00 2001 From: jakob Date: Mon, 18 Oct 2004 06:44:18 +0000 Subject: [PATCH] upgrade to OpenLDAP 2.2.17 --- databases/openldap/Makefile | 21 +++++++++++++-------- databases/openldap/distinfo | 6 +++--- databases/openldap/pkg/PFRAG.shared | 11 +++++++---- databases/openldap/pkg/PLIST | 16 ++++++++++++++-- databases/openldap/pkg/PLIST-server | 11 +++++++---- 5 files changed, 44 insertions(+), 21 deletions(-) diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 3fe60bee80a..fdc520794fc 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.42 2004/07/31 21:17:21 naddy Exp $ +# $OpenBSD: Makefile,v 1.43 2004/10/18 06:44:18 jakob Exp $ COMMENT= "Open source LDAP software (client)" COMMENT-server= "Open source LDAP software (server)" -VERSION= 2.1.30 +VERSION= 2.2.17 DISTNAME= openldap-${VERSION} FULLPKGNAME= openldap-client-${VERSION} PKGNAME-server= openldap-server-${VERSION} @@ -35,13 +35,15 @@ CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= \ ${CONFIGURE_SHARED} \ --localstatedir="/var" \ - --enable-ipv6 \ + --enable-ipv6 + +# slapd options +CONFIGURE_ARGS+= \ --enable-slapd \ --enable-cleartext \ --enable-crypt \ - --enable-phonetic \ - --enable-wrappers \ - --enable-slurpd + --enable-rewrite \ + --enable-wrappers # slapd modules CONFIGURE_ARGS+= \ @@ -49,14 +51,17 @@ CONFIGURE_ARGS+= \ --enable-ldap \ --enable-ldbm \ --enable-meta \ - --enable-rewrite \ --enable-monitor \ --enable-null \ --enable-passwd \ --enable-perl \ --enable-shell -MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build +# slurpd modules +CONFIGURE_ARGS+= \ + --enable-slurpd + +MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/build REGRESS_TARGET= test diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index d7be91c3bc4..a6ad3f6caa2 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,3 +1,3 @@ -MD5 (openldap-2.1.30.tgz) = e2ae8148c4bed07d7a70edd930bdc403 -RMD160 (openldap-2.1.30.tgz) = 431aa798c6197530c17611b931f0169d7a53e831 -SHA1 (openldap-2.1.30.tgz) = c036f88abbafc16cb64c4e00ccc1c65563864755 +MD5 (openldap-2.2.17.tgz) = aa10b961d02fbe331cd53214b7746c73 +RMD160 (openldap-2.2.17.tgz) = 56c6fbebdfa52ed9fbbccfa630de7095113894fb +SHA1 (openldap-2.2.17.tgz) = 962fbb91518b0427d56d2c2c51357def06f7a3d3 diff --git a/databases/openldap/pkg/PFRAG.shared b/databases/openldap/pkg/PFRAG.shared index 2f77d50f4a2..b67a58b1bc9 100644 --- a/databases/openldap/pkg/PFRAG.shared +++ b/databases/openldap/pkg/PFRAG.shared @@ -1,4 +1,7 @@ -@comment $OpenBSD: PFRAG.shared,v 1.20 2004/08/08 16:34:32 espie Exp $ -@lib lib/liblber.so.2.130 -@lib lib/libldap.so.2.130 -@lib lib/libldap_r.so.2.130 +@comment $OpenBSD: PFRAG.shared,v 1.21 2004/10/18 06:44:18 jakob Exp $ +@lib lib/liblber-2.2.so.7.10 +@lib lib/liblber.so.7.10 +@lib lib/libldap-2.2.so.7.10 +@lib lib/libldap.so.7.10 +@lib lib/libldap_r-2.2.so.7.10 +@lib lib/libldap_r.so.7.10 diff --git a/databases/openldap/pkg/PLIST b/databases/openldap/pkg/PLIST index 33bde9c972c..1461d0a258a 100644 --- a/databases/openldap/pkg/PLIST +++ b/databases/openldap/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.9 2004/08/08 16:34:32 espie Exp $ +@comment $OpenBSD: PLIST,v 1.10 2004/10/18 06:44:18 jakob Exp $ bin/ldapadd bin/ldapcompare bin/ldapdelete @@ -14,6 +14,7 @@ include/ldap_cdefs.h include/ldap_features.h include/ldap_schema.h include/ldap_utf8.h +include/slapi-plugin.h lib/liblber.a lib/liblber.la lib/libldap.a @@ -29,8 +30,18 @@ lib/libldap_r.la @man man/man1/ldapsearch.1 @man man/man1/ldapwhoami.1 @man man/man3/ber_alloc_t.3 +@man man/man3/ber_bvarray_add.3 +@man man/man3/ber_bvarray_free.3 +@man man/man3/ber_bvdup.3 +@man man/man3/ber_bvecadd.3 +@man man/man3/ber_bvecfree.3 +@man man/man3/ber_bvfree.3 +@man man/man3/ber_bvstr.3 +@man man/man3/ber_bvstrdup.3 +@man man/man3/ber_dupbv.3 @man man/man3/ber_first_element.3 @man man/man3/ber_flush.3 +@man man/man3/ber_free.3 @man man/man3/ber_get_bitstring.3 @man man/man3/ber_get_boolean.3 @man man/man3/ber_get_enum.3 @@ -52,6 +63,7 @@ lib/libldap_r.la @man man/man3/ber_scanf.3 @man man/man3/ber_skip_tag.3 @man man/man3/ber_start_set.3 +@man man/man3/ber_str2bv.3 @man man/man3/lber-decode.3 @man man/man3/lber-encode.3 @man man/man3/lber-memory.3 @@ -170,6 +182,6 @@ lib/libldap_r.la @man man/man3/ldap_value_free_len.3 @man man/man5/ldap.conf.5 @man man/man5/ldif.5 -share/examples/openldap/ share/examples/openldap/ldap.conf +share/examples/openldap/schema/dyngroup.schema %%SHARED%% diff --git a/databases/openldap/pkg/PLIST-server b/databases/openldap/pkg/PLIST-server index 6a5359bb9bc..bf4ed0e40d4 100644 --- a/databases/openldap/pkg/PLIST-server +++ b/databases/openldap/pkg/PLIST-server @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-server,v 1.5 2004/08/08 16:34:32 espie Exp $ +@comment $OpenBSD: PLIST-server,v 1.6 2004/10/18 06:44:18 jakob Exp $ libexec/slapd libexec/slurpd @man man/man5/slapd-bdb.5 @@ -15,6 +15,10 @@ libexec/slurpd @man man/man5/slapd.access.5 @man man/man5/slapd.conf.5 @man man/man5/slapd.replog.5 +@man man/man5/slapd-monitor.5 +@man man/man5/slapd.plugin.5 +@man man/man8/slapdn.8 +@man man/man8/slaptest.8 @man man/man8/slapadd.8 @man man/man8/slapcat.8 @man man/man8/slapd.8 @@ -23,9 +27,10 @@ libexec/slurpd @man man/man8/slurpd.8 sbin/slapadd sbin/slapcat +sbin/slapdn sbin/slapindex sbin/slappasswd -share/examples/openldap/schema/ +sbin/slaptest share/examples/openldap/schema/corba.schema share/examples/openldap/schema/core.schema share/examples/openldap/schema/cosine.schema @@ -35,8 +40,6 @@ share/examples/openldap/schema/misc.schema share/examples/openldap/schema/nis.schema share/examples/openldap/schema/openldap.schema share/examples/openldap/slapd.conf -share/openldap/ -share/openldap/ucdata/ share/openldap/ucdata/case.dat share/openldap/ucdata/cmbcl.dat share/openldap/ucdata/comp.dat