summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--databases/openldap-client/PLIST4
-rw-r--r--databases/openldap-doc/Makefile4
-rw-r--r--databases/openldap-server/Makefile6
-rw-r--r--databases/openldap-server/PLIST6
-rw-r--r--databases/openldap/Makefile4
-rw-r--r--databases/openldap/Makefile.common4
-rw-r--r--databases/openldap/distinfo21
-rw-r--r--databases/openldap/patches/patch-da21
-rw-r--r--databases/openldap/patches/patch-dd21
9 files changed, 44 insertions, 47 deletions
diff --git a/databases/openldap-client/PLIST b/databases/openldap-client/PLIST
index 09673fccdf6..eefdd17496e 100644
--- a/databases/openldap-client/PLIST
+++ b/databases/openldap-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:43:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/10/29 06:56:11 ghen Exp $
bin/ldapadd
bin/ldapcompare
bin/ldapdelete
@@ -245,6 +245,7 @@ man/man5/slapo-ppolicy.5
man/man5/slapo-refint.5
man/man5/slapo-retcode.5
man/man5/slapo-rwm.5
+man/man5/slapo-sssvlv.5
man/man5/slapo-syncprov.5
man/man5/slapo-translucent.5
man/man5/slapo-unique.5
@@ -257,5 +258,6 @@ man/man8/slapd.8
man/man8/slapdn.8
man/man8/slapindex.8
man/man8/slappasswd.8
+man/man8/slapschema.8
man/man8/slaptest.8
share/examples/openldap/ldap.conf
diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile
index e931c63ed55..a474246e417 100644
--- a/databases/openldap-doc/Makefile
+++ b/databases/openldap-doc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2009/04/27 07:15:44 ghen Exp $
+# $NetBSD: Makefile,v 1.18 2009/10/29 06:56:11 ghen Exp $
-DISTNAME= openldap-2.4.16
+DISTNAME= openldap-2.4.19
PKGNAME= ${DISTNAME:S/-/-doc-/}
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile
index 5a3442a0a7d..11f2191194b 100644
--- a/databases/openldap-server/Makefile
+++ b/databases/openldap-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/04/27 07:15:44 ghen Exp $
+# $NetBSD: Makefile,v 1.21 2009/10/29 06:56:11 ghen Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
COMMENT= Lightweight Directory Access Protocol server suite
@@ -50,7 +50,7 @@ CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED
CNFS_PERMS= slapd.conf
-DB_CONFIG= DB_CONFIG
+DB_CONFIG= DB_CONFIG.example
RCD_SCRIPTS= slapd
@@ -68,6 +68,6 @@ MESSAGE_SUBST+= CHMOD=${CHMOD}
.include "../../databases/openldap/Makefile.common"
-CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
+CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG.example ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/openldap-server/PLIST b/databases/openldap-server/PLIST
index ab0ed43e28b..db47223d5e4 100644
--- a/databases/openldap-server/PLIST
+++ b/databases/openldap-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:43:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2009/10/29 06:56:11 ghen Exp $
libexec/slapd
sbin/slapacl
sbin/slapadd
@@ -7,8 +7,9 @@ sbin/slapcat
sbin/slapdn
sbin/slapindex
sbin/slappasswd
+sbin/slapschema
sbin/slaptest
-share/examples/openldap/DB_CONFIG
+share/examples/openldap/DB_CONFIG.example
share/examples/openldap/schema/README
share/examples/openldap/schema/collective.schema
share/examples/openldap/schema/corba.schema
@@ -22,7 +23,6 @@ share/examples/openldap/schema/inetorgperson.ldif
share/examples/openldap/schema/inetorgperson.schema
share/examples/openldap/schema/java.schema
share/examples/openldap/schema/misc.schema
-share/examples/openldap/schema/nadf.schema
share/examples/openldap/schema/nis.ldif
share/examples/openldap/schema/nis.schema
share/examples/openldap/schema/openldap.ldif
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 740ed87ea01..b8ef533b00d 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.131 2009/04/27 07:15:43 ghen Exp $
+# $NetBSD: Makefile,v 1.132 2009/10/29 06:56:10 ghen Exp $
DISTNAME= openldap-${OPENLDAP_VERSION}
-OPENLDAP_VERSION= 2.4.16
+OPENLDAP_VERSION= 2.4.19
CATEGORIES= databases
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 381a1a8fedb..7f3fb8f1dbe 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.23 2009/10/21 16:25:01 tnn Exp $
+# $NetBSD: Makefile.common,v 1.24 2009/10/29 06:56:10 ghen Exp $
# please stick to the "stable" releases as much as possible!
-DISTNAME= openldap-2.4.16
+DISTNAME= openldap-2.4.19
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index e563fb2ba45..e9c7319594d 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,18 +1,5 @@
-$NetBSD: distinfo,v 1.74 2009/08/04 22:07:18 manu Exp $
+$NetBSD: distinfo,v 1.75 2009/10/29 06:56:10 ghen Exp $
-SHA1 (openldap-2.4.16.tgz) = c84f3281d047804eb977403e66733b7dd0a998b1
-RMD160 (openldap-2.4.16.tgz) = 96d4a46dc95ecb8c64f9bcbcbbb89c6539eb7638
-Size (openldap-2.4.16.tgz) = 5097314 bytes
-SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49
-SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc
-SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
-SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5
-SHA1 (patch-ag) = bde3cb8eb9ece90e1ac13d15f8d156201c3b7026
-SHA1 (patch-ah) = ba33845171cef760a68af1406ee2e1dcae7a5a47
-SHA1 (patch-aj) = 4cedc384f2e81d592d66c0e1688e61cf0e69b05d
-SHA1 (patch-am) = cf97dbc86ed1e0dc3cd7f901dd3f0e4c77490a82
-SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e
-SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0
-SHA1 (patch-da) = c7ac86fcb4b4283fc61a3e045197bbef617c6ff4
-SHA1 (patch-dd) = 906ece497065a9eef5991718ce1ba1299acc1b63
-SHA1 (patch-de) = 749cdbf2d76bcf4ff192ef087f1404b608447a30
+SHA1 (openldap-2.4.19.tgz) = 4a78acae0dd6d51d22ff50eef77912e59b31779a
+RMD160 (openldap-2.4.19.tgz) = 89b6eb1bbf0290178a28a1447fb6240c5e8f79dc
+Size (openldap-2.4.19.tgz) = 5474200 bytes
diff --git a/databases/openldap/patches/patch-da b/databases/openldap/patches/patch-da
index a27cdc3e218..ac4edc62612 100644
--- a/databases/openldap/patches/patch-da
+++ b/databases/openldap/patches/patch-da
@@ -1,7 +1,9 @@
-$NetBSD: patch-da,v 1.1 2009/01/31 15:59:04 manu Exp $
---- contrib/slapd-modules/smbk5pwd/Makefile.orig 2004-04-02 11:06:38.000000000 +0000
-+++ contrib/slapd-modules/smbk5pwd/Makefile 2009-01-18 18:06:11.000000000 +0000
-@@ -11,6 +11,6 @@
+$NetBSD: patch-da,v 1.2 2009/10/29 06:56:11 ghen Exp $
+
+--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2009-09-02 00:53:30.000000000 +0200
++++ contrib/slapd-modules/smbk5pwd/Makefile
+@@ -13,8 +13,8 @@
+ # <http://www.OpenLDAP.org/license.html>.
LIBTOOL=../../../libtool
-OPT=-g -O2
@@ -10,8 +12,13 @@ $NetBSD: patch-da,v 1.1 2009/01/31 15:59:04 manu Exp $
+#CC=gcc
# Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
-@@ -35,3 +35,3 @@
+ DEFS=-DDO_KRB5 -DDO_SAMBA
+@@ -45,7 +45,7 @@ smbk5pwd.lo: smbk5pwd.c
+
smbk5pwd.la: smbk5pwd.lo
$(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
-- -rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS)
-+ -rpath $(PREFIX)/lib -module -o $@ $? -ldes $(LIBS)
+- -rpath $(libdir) -module -o $@ $? $(LIBS)
++ -rpath $(libdir) -module -o $@ $? -ldes $(LIBS)
+
+ clean:
+ rm -f smbk5pwd.lo smbk5pwd.la
diff --git a/databases/openldap/patches/patch-dd b/databases/openldap/patches/patch-dd
index b414e4d057f..47cac5a0ec2 100644
--- a/databases/openldap/patches/patch-dd
+++ b/databases/openldap/patches/patch-dd
@@ -1,20 +1,21 @@
-$NetBSD: patch-dd,v 1.1 2009/03/16 21:08:44 manu Exp $
---- contrib/slapd-modules/nops/nops.c.orig 2009-03-16 10:28:41.000000000 +0100
-+++ contrib/slapd-modules/nops/nops.c 2009-03-16 10:28:11.000000000 +0100
-@@ -136,11 +136,15 @@
- op->o_bd = be;
- }
-
+$NetBSD: patch-dd,v 1.2 2009/10/29 06:56:11 ghen Exp $
+
+--- contrib/slapd-modules/nops/nops.c.orig 2009-04-28 02:51:12.000000000 +0200
++++ contrib/slapd-modules/nops/nops.c
+@@ -63,10 +63,15 @@ nops_modify( Operation *op, SlapReply *r
+ int rc;
+
if ((m = op->orm_modlist) == NULL) {
+ slap_callback *cb = op->o_callback;
+
op->o_bd->bd_info = (BackendInfo *)(on->on_info);
+ op->o_callback = NULL;
- send_ldap_error(op, rs, LDAP_SUCCESS, "");
+ send_ldap_error(op, rs, LDAP_INVALID_SYNTAX,
+ "nops() got null orm_modlist");
- return(rs->sr_err);
+ op->o_callback = cb;
+
- return (rs->sr_err);
++ return (rs->sr_err);
}
- return SLAP_CB_CONTINUE;
+ op->o_bd = on->on_info->oi_origdb;
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-07 07:42:44 +0000