Thu Oct 29 06:56:11 2009 UTC ()
Update OpenLDAP packages to 2.4.19, which is now the "stable release".

OpenLDAP 2.4.19 Release (2009/10/06)
	Fixed client tools with null timeouts (ITS#6282)
	Fixed slapadd to warn about missing attrs for replicas (ITS#6281)
	Fixed slapd acl cache (ITS#6287)
	Fixed slapd tools to allow -n for conversion (ITS#6258)
	Fixed slapd-ldap with null timeouts (ITS#6282)
	Fixed slapd-ldap with strong binds with relay/translucent (ITS#6296)
	Fixed slapd-ldif buffer overflow (ITS#6303)
	Fixed slapo-auditlog comments when modifying (ITS#6286)
	Fixed slapo-dynlist lock leak (ITS#6308)
	Fixed slapo-pcache cache corruption (ITS#6242)
	Fixed slapo-sssvlv sort control dereferencing (ITS#6288)
	Fixed contrib/autogroup segfaults (ITS#6279)
	Fixed contrib/nssov getgroupbymembers (ITS#6291)
	Fixed contrib/smbk5pwd rpath linking (ITS#6323)
	Build Environment
		Fixed --enable-deref support (ITS#6311)
		Fixed contrib/autogroup default libtool path (ITS#6284)
		Deleted nadf.schema (ITS#6140)

OpenLDAP 2.4.18 Release (2009/09/06)
	Fixed client tools common options (ITS#6049)
	Fixed liblber speed and other problems (ITS#6215)
	Added libldap MozNSS PEM support (ITS#6278)
	Added libldap option for SASL_USERNAME (ITS#6257)
	Fixed libldap error parsing (ITS#6197)
	Fixed libldap native getpass usage (ITS#4643)
	Fixed libldap tls_check_hostname for OpenSSL and MozNSS (ITS#6239)
	Added slapd tcp buffers support (ITS#6234)
	Fixed slapd allow mirrormode to be set to FALSE (ITS#5946)
	Fixed slapd certificate list parsing (ITS#6241)
	Fixed slapd writers blocking (ITS#6276)
	Fixed slapd dncachesize behavior to unlimited by default (ITS#6222)
	Fixed slapd incorrectly applying writetimeout when not set (ITS#6220)
	Fixed slapd with duplicate empty lines for olcDbConfig (ITS#6240)
	Fixed slapd server URL matching (ITS#5942)
	Fixed slapd subordinate needs a suffix (ITS#6216)
	Fixed slapd syncrepl decrement on possible NULL value (ITS#6256)
	Fixed slapd tools to properly close database (ITS#6214)
	Fixed slapd uninitialized SlapReply components (ITS#6101)
	Fixed slapd-meta starttls with targets (ITS#6190)
	Fixed slapd-monitor stats with glued subordinates (ITS#6243)
	Fixed slapd-ndb startup (ITS#6203)
	Fixed slapd-relay various issues (ITS#6133)
	Fixed slapd-relay response/cleanup callback mismatch (ITS#6154)
	Fixed slapd-sql with baseObject query (ITS#6172)
	Fixed slapd-sql with empty attribute (ITS#6163)
	Fixed slapo-dynlist uninitialized var (ITS#6266)
	Fixed slapo-pcache multiple enhancements (ITS#6152,ITS#5178)
	Fixed slapo-ppolicy updating operational attributes (ITS#6265)
	Fixed slapo-translucent attribute return (ITS#6254)
	Fixed slapo-translucent filter matching (ITS#6255)
	Fixed slapo-translucent to honor sizelimit (ITS#6253)
	Fixed slapo-unique filter matching (ITS#6077)
	Fixed tools off by one error (ITS#6233)
	Fixed tools resource leaks (ITS#6145)
	Added contrib/allowed (ITS#4730)
	Fixed contrib/autogroup with RE24 (ITS#6227)
	Fixed contrib/nss symbols (ITS#6273)
	Build Environment
		Tests note which backend is being tested (ITS#5810)
		Fixed test056-monitor with custom ports (ITS#6213)
	Documentation
		admin24 fix broken link (ITS#6264)
		ldap_open(3) document URI (ITS#6261)

OpenLDAP 2.4.17 Release (2009/07/13)
	Fixed liblber to use ber_strnlen (ITS#6080)
	Fixed libldap GnuTLS private key init (ITS#6053)
	Fixed libldap openssl digest initialization (ITS#6192)
	Fixed libldap tls NULL error messages (ITS#6079)
	Fixed libldap_r missing stub (ITS#6188)
	Fixed liblutil opendir/closedir on windows (ITS#6041)
	Fixed liblutil for _GNU_SOURCE (ITS#5464,ITS#5666)
	Added slapd sasl auxprop support (ITS#6147)
	Added slapd schema checking tool (ITS#6150)
	Added slapd writetimeout keyword (ITS#5836)
	Fixed slapd abandon/cancel handling for some ops (ITS#6157)
	Fixed slapd access setstyle to expand (ITS#6179)
	Fixed slapd assert with closing connections (ITS#6111)
	Fixed slapd bind race condition (ITS#6189)
	Fixed slapd cancel behavior (ITS#6137)
	Fixed slapd cert validation (ITS#6098)
	Fixed slapd connection_destroy assert (ITS#6089)
	Fixed slapd csn normalization (ITS#6195)
	Fixed slapd errno handling (ITS#6037)
	Fixed slapd global alloc handling (ITS#6054)
	Fixed slapd hung writers (ITS#5836)
	Fixed slapd ldapi issues (ITS#6056)
	Fixed slapd moduleload with static backends and modules (ITS#6016)
	Fixed slapd normalization of updated schema attributes (ITS#5540)
	Fixed slapd olcLimits handling (ITS#6159)
	Fixed slapd olcLogLevel with hex levels (ITS#6162)
	Fixed slapd pagedresults stacked control with overlays (ITS#6056)
	Fixed slapd password-hash incorrect limit on arg length (ITS#6139)
	Fixed slapd readonly restrictions (ITS#6109)
	Fixed slapd sending cancelled operations results (ITS#6103)
	Fixed slapd slapi_entry_has_children (ITS#6132)
	Fixed slapd sockets usage on windows (ITS#6039)
	Fixed slapd some abandon and cancel race conditions (ITS#6104)
	Fixed slapd tls context after changes (ITS#6135)
	Fixed slapd-bdb/hdb adjust dncachesize if too low (ITS#6176)
	Fixed slapd-bdb/hdb crashes during delete (ITS#6177)
	Fixed slapd-bdb/hdb multiple olcIndex for same attr (ITS#6196)
	Fixed slapd-hdb freeing of already freed entries (ITS#6074)
	Fixed slapd-hdb entryinfo cleanup (ITS#6088)
	Fixed slapd-hdb dncache lockups (ITS#6095)
	Fixed slapd-ldap deadlock with non-responsive TLS URIs (ITS#6167)
	Fixed slapd-relay to return failure on failure (ITS#5328)
	Fixed slapd-sql with BACKSQL_ARBITRARY_KEY defined (ITS#6100)
	Fixed slapo-collect collectinfo ordering (ITS#6076)
	Fixed slapo-collect missing equality match rule (ITS#6075)
	Fixed slapo-dds entry expiration (ITS#6169)
	Fixed slapo-perl symbols (ITS#5658)
	Fixed slapo-ppolicy to honor pwdLockout (ITS#6168)
	Fixed slapo-ppolicy to return check modules error message (ITS#6082)
	Fixed slapo-refint refint_repair handling (ITS#6056)
	Added slapo-rwm rwm-drop-unrequested-attrs config option (ITS#6057)
	Fixed slapo-rwm dn passing (ITS#6070)
	Fixed slapo-rwm entry free (ITS#6058)
	Fixed slapo-rwm entry release (ITS#6081)
	Fixed slapo-translucent entry gathering (ITS#6156)
	Fixed tools returning ldif errors (ITS#5892)
	Fixed contrib/smbk5pwd use of private functions (ITS#5535)
	Build Environment
		Added test056-monitor (ITS#5540)
		Added test057-memberof-refint (ITS#5395)
		Fixed winsock detection for windows (ITS#6102, ITS#6078)
		Removed GSSAPI configure option (ITS#6091,ITS#6092,ITS#6093,ITS#5369)
	Documentation
		admin24 relocate configuration examples (ITS#6183)
		admin24 fixed example regex (ITS#6052)
		admin24 removed temporary back-monitor note (ITS#6130)
		admin24 slapd.conf to cn=config conversion process (ITS#6060)
		man page consistency fixes (ITS#6023)
		ldapcompare(1) note -e option (ITS#6107)
		ldapdelete(1) note -e option (ITS#6107)
		ldapmodify(1) note -e option (ITS#6107)
		ldapmodrdn(1) note -e option (ITS#6107)
		ldapsearch(1) output format description (ITS#6146)
		ldapurl(1) note -e option (ITS#6107)
		ldapwhoami(1) note -e option (ITS#6107)
		ldap_result(3) Add RETURN VALUE heading (ITS#6180)
		ldap.conf(5) improve sizelimit/timelimit limits (ITS#6127)
		slapd.access(5) Fix <setstyle> to use expand (ITS#6179)
		slapd.conf(5) document default modulepath (ITS#5829)
		slapd.conf(5) pidfile/argsfile description fix (ITS#5975)
		slapd-config(5) document default modulepath (ITS#5829)
		slapd-config(5) pidfile/argsfile description fix (ITS#5975)
		slapo-constraint(5) clarify URI example (ITS#6118)
		slapo-unique(5) explicitly note rootdn requirement (ITS#6108)
		slapadd(8) note it does indexing (ITS#6160)


(ghen)
diff -r1.131 -r1.132 pkgsrc/databases/openldap/Makefile
diff -r1.23 -r1.24 pkgsrc/databases/openldap/Makefile.common
diff -r1.74 -r1.75 pkgsrc/databases/openldap/distinfo
diff -r1.6 -r1.7 pkgsrc/databases/openldap-client/PLIST
diff -r1.17 -r1.18 pkgsrc/databases/openldap-doc/Makefile
diff -r1.20 -r1.21 pkgsrc/databases/openldap-server/Makefile
diff -r1.6 -r1.7 pkgsrc/databases/openldap-server/PLIST
diff -r1.1 -r1.2 pkgsrc/databases/openldap/patches/patch-da
diff -r1.1 -r1.2 pkgsrc/databases/openldap/patches/patch-dd
cvs diff -r1.131 -r1.132 pkgsrc/databases/openldap/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap/Makefile 2009/04/27 07:15:43 1.131
+++ pkgsrc/databases/openldap/Makefile 2009/10/29 06:56:10 1.132
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.131 2009/04/27 07:15:43 ghen Exp $ 1# $NetBSD: Makefile,v 1.132 2009/10/29 06:56:10 ghen Exp $
2 2
3DISTNAME= openldap-${OPENLDAP_VERSION} 3DISTNAME= openldap-${OPENLDAP_VERSION}
4OPENLDAP_VERSION= 2.4.16 4OPENLDAP_VERSION= 2.4.19
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= # empty 6MASTER_SITES= # empty
7DISTFILES= # empty 7DISTFILES= # empty
8 8
9MAINTAINER= ghen@NetBSD.org 9MAINTAINER= ghen@NetBSD.org
10HOMEPAGE= http://www.openldap.org/ 10HOMEPAGE= http://www.openldap.org/
11COMMENT= Lightweight Directory Access Protocol meta-package 11COMMENT= Lightweight Directory Access Protocol meta-package
12 12
13META_PACKAGE= yes 13META_PACKAGE= yes
14 14
15DEPENDS+= openldap-client>=${OPENLDAP_VERSION}:../../databases/openldap-client 15DEPENDS+= openldap-client>=${OPENLDAP_VERSION}:../../databases/openldap-client
16DEPENDS+= openldap-server>=${OPENLDAP_VERSION}:../../databases/openldap-server 16DEPENDS+= openldap-server>=${OPENLDAP_VERSION}:../../databases/openldap-server
17DEPENDS+= openldap-doc>=${OPENLDAP_VERSION}:../../databases/openldap-doc 17DEPENDS+= openldap-doc>=${OPENLDAP_VERSION}:../../databases/openldap-doc
cvs diff -r1.23 -r1.24 pkgsrc/databases/openldap/Makefile.common (expand / switch to unified diff)

--- pkgsrc/databases/openldap/Makefile.common 2009/10/21 16:25:01 1.23
+++ pkgsrc/databases/openldap/Makefile.common 2009/10/29 06:56:10 1.24
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile.common,v 1.23 2009/10/21 16:25:01 tnn Exp $ 1# $NetBSD: Makefile.common,v 1.24 2009/10/29 06:56:10 ghen Exp $
2 2
3# please stick to the "stable" releases as much as possible! 3# please stick to the "stable" releases as much as possible!
4DISTNAME= openldap-2.4.16 4DISTNAME= openldap-2.4.19
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ 6MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
7MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/ 7MASTER_SITES+= http://www.openldap.org/software/download/OpenLDAP/openldap-release/
8MASTER_SITES+= http://www.PlanetMirror.com/pub/openldap/openldap-release/ 8MASTER_SITES+= http://www.PlanetMirror.com/pub/openldap/openldap-release/
9MASTER_SITES+= ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ 9MASTER_SITES+= ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/
10MASTER_SITES+= ftp://ftp.ucr.ac.cr/pub/Unix/openldap/openldap-release/ 10MASTER_SITES+= ftp://ftp.ucr.ac.cr/pub/Unix/openldap/openldap-release/
11MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ 11MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
12MASTER_SITES+= ftp://it.openldap.org/pub/OpenLDAP/openldap-release/ 12MASTER_SITES+= ftp://it.openldap.org/pub/OpenLDAP/openldap-release/
13MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ 13MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
14MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ 14MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
15MASTER_SITES+= ftp://ftp.holywar.net/pub/OpenLDAP/openldap-release/ 15MASTER_SITES+= ftp://ftp.holywar.net/pub/OpenLDAP/openldap-release/
16MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ 16MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
17MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ 17MASTER_SITES+= ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/
cvs diff -r1.74 -r1.75 pkgsrc/databases/openldap/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/openldap/distinfo 2009/08/04 22:07:18 1.74
+++ pkgsrc/databases/openldap/distinfo 2009/10/29 06:56:10 1.75
@@ -1,18 +1,5 @@ @@ -1,18 +1,5 @@
1$NetBSD: distinfo,v 1.74 2009/08/04 22:07:18 manu Exp $ 1$NetBSD: distinfo,v 1.75 2009/10/29 06:56:10 ghen Exp $
2 2
3SHA1 (openldap-2.4.16.tgz) = c84f3281d047804eb977403e66733b7dd0a998b1 3SHA1 (openldap-2.4.19.tgz) = 4a78acae0dd6d51d22ff50eef77912e59b31779a
4RMD160 (openldap-2.4.16.tgz) = 96d4a46dc95ecb8c64f9bcbcbbb89c6539eb7638 4RMD160 (openldap-2.4.19.tgz) = 89b6eb1bbf0290178a28a1447fb6240c5e8f79dc
5Size (openldap-2.4.16.tgz) = 5097314 bytes 5Size (openldap-2.4.19.tgz) = 5474200 bytes
6SHA1 (patch-aa) = 8c5c68ef53decb013114d606698cbd8a1c1b4e49 
7SHA1 (patch-ac) = 905b08c4dea8c61e044ccf66d6af22cc685a3ccc 
8SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf 
9SHA1 (patch-af) = 1ae9137e76e885e03d0f44727197a444893ec7c5 
10SHA1 (patch-ag) = bde3cb8eb9ece90e1ac13d15f8d156201c3b7026 
11SHA1 (patch-ah) = ba33845171cef760a68af1406ee2e1dcae7a5a47 
12SHA1 (patch-aj) = 4cedc384f2e81d592d66c0e1688e61cf0e69b05d 
13SHA1 (patch-am) = cf97dbc86ed1e0dc3cd7f901dd3f0e4c77490a82 
14SHA1 (patch-an) = f98c6457474247c092dd0a062e86560cc894ec4e 
15SHA1 (patch-ao) = 6276a1226689fc3be3ffacbcd8df2e4f3e51d1a0 
16SHA1 (patch-da) = c7ac86fcb4b4283fc61a3e045197bbef617c6ff4 
17SHA1 (patch-dd) = 906ece497065a9eef5991718ce1ba1299acc1b63 
18SHA1 (patch-de) = 749cdbf2d76bcf4ff192ef087f1404b608447a30 
cvs diff -r1.6 -r1.7 pkgsrc/databases/openldap-client/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/openldap-client/PLIST 2009/06/14 17:43:19 1.6
+++ pkgsrc/databases/openldap-client/PLIST 2009/10/29 06:56:11 1.7
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:43:19 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2009/10/29 06:56:11 ghen Exp $
2bin/ldapadd 2bin/ldapadd
3bin/ldapcompare 3bin/ldapcompare
4bin/ldapdelete 4bin/ldapdelete
5bin/ldapexop 5bin/ldapexop
6bin/ldapmodify 6bin/ldapmodify
7bin/ldapmodrdn 7bin/ldapmodrdn
8bin/ldappasswd 8bin/ldappasswd
9bin/ldapsearch 9bin/ldapsearch
10bin/ldapurl 10bin/ldapurl
11bin/ldapwhoami 11bin/ldapwhoami
12include/lber.h 12include/lber.h
13include/lber_types.h 13include/lber_types.h
14include/ldap.h 14include/ldap.h
@@ -235,27 +235,29 @@ man/man5/slapo-accesslog.5 @@ -235,27 +235,29 @@ man/man5/slapo-accesslog.5
235man/man5/slapo-auditlog.5 235man/man5/slapo-auditlog.5
236man/man5/slapo-chain.5 236man/man5/slapo-chain.5
237man/man5/slapo-collect.5 237man/man5/slapo-collect.5
238man/man5/slapo-constraint.5 238man/man5/slapo-constraint.5
239man/man5/slapo-dds.5 239man/man5/slapo-dds.5
240man/man5/slapo-dyngroup.5 240man/man5/slapo-dyngroup.5
241man/man5/slapo-dynlist.5 241man/man5/slapo-dynlist.5
242man/man5/slapo-memberof.5 242man/man5/slapo-memberof.5
243man/man5/slapo-pcache.5 243man/man5/slapo-pcache.5
244man/man5/slapo-ppolicy.5 244man/man5/slapo-ppolicy.5
245man/man5/slapo-refint.5 245man/man5/slapo-refint.5
246man/man5/slapo-retcode.5 246man/man5/slapo-retcode.5
247man/man5/slapo-rwm.5 247man/man5/slapo-rwm.5
 248man/man5/slapo-sssvlv.5
248man/man5/slapo-syncprov.5 249man/man5/slapo-syncprov.5
249man/man5/slapo-translucent.5 250man/man5/slapo-translucent.5
250man/man5/slapo-unique.5 251man/man5/slapo-unique.5
251man/man5/slapo-valsort.5 252man/man5/slapo-valsort.5
252man/man8/slapacl.8 253man/man8/slapacl.8
253man/man8/slapadd.8 254man/man8/slapadd.8
254man/man8/slapauth.8 255man/man8/slapauth.8
255man/man8/slapcat.8 256man/man8/slapcat.8
256man/man8/slapd.8 257man/man8/slapd.8
257man/man8/slapdn.8 258man/man8/slapdn.8
258man/man8/slapindex.8 259man/man8/slapindex.8
259man/man8/slappasswd.8 260man/man8/slappasswd.8
 261man/man8/slapschema.8
260man/man8/slaptest.8 262man/man8/slaptest.8
261share/examples/openldap/ldap.conf 263share/examples/openldap/ldap.conf
cvs diff -r1.17 -r1.18 pkgsrc/databases/openldap-doc/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-doc/Makefile 2009/04/27 07:15:44 1.17
+++ pkgsrc/databases/openldap-doc/Makefile 2009/10/29 06:56:11 1.18
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.17 2009/04/27 07:15:44 ghen Exp $ 1# $NetBSD: Makefile,v 1.18 2009/10/29 06:56:11 ghen Exp $
2 2
3DISTNAME= openldap-2.4.16 3DISTNAME= openldap-2.4.19
4PKGNAME= ${DISTNAME:S/-/-doc-/} 4PKGNAME= ${DISTNAME:S/-/-doc-/}
5CATEGORIES= databases 5CATEGORIES= databases
6MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ 6MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
7MASTER_SITES+= http://ftp.openldap.org/pub/OpenLDAP/openldap-release/ 7MASTER_SITES+= http://ftp.openldap.org/pub/OpenLDAP/openldap-release/
8MASTER_SITES+= http://www.PlanetMirror.com/pub/openldap/openldap-release/ 8MASTER_SITES+= http://www.PlanetMirror.com/pub/openldap/openldap-release/
9MASTER_SITES+= ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ 9MASTER_SITES+= ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/
10MASTER_SITES+= ftp://ftp.ucr.ac.cr/pub/Unix/openldap/openldap-release/ 10MASTER_SITES+= ftp://ftp.ucr.ac.cr/pub/Unix/openldap/openldap-release/
11MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ 11MASTER_SITES+= ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/
12MASTER_SITES+= ftp://it.openldap.org/pub/OpenLDAP/openldap-release/ 12MASTER_SITES+= ftp://it.openldap.org/pub/OpenLDAP/openldap-release/
13MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ 13MASTER_SITES+= ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/
14MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ 14MASTER_SITES+= ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/
15MASTER_SITES+= ftp://ftp.holywar.net/pub/OpenLDAP/openldap-release/ 15MASTER_SITES+= ftp://ftp.holywar.net/pub/OpenLDAP/openldap-release/
16MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ 16MASTER_SITES+= ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/
cvs diff -r1.20 -r1.21 pkgsrc/databases/openldap-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/Makefile 2009/04/27 07:15:44 1.20
+++ pkgsrc/databases/openldap-server/Makefile 2009/10/29 06:56:11 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2009/04/27 07:15:44 ghen Exp $ 1# $NetBSD: Makefile,v 1.21 2009/10/29 06:56:11 ghen Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4COMMENT= Lightweight Directory Access Protocol server suite 4COMMENT= Lightweight Directory Access Protocol server suite
5 5
6CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
7 7
8DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client 8DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client
9 9
10PKG_DESTDIR_SUPPORT= user-destdir 10PKG_DESTDIR_SUPPORT= user-destdir
11 11
12# slapd options 12# slapd options
13CONFIGURE_ARGS+= --enable-slapd 13CONFIGURE_ARGS+= --enable-slapd
14CONFIGURE_ARGS+= --enable-crypt 14CONFIGURE_ARGS+= --enable-crypt
@@ -40,34 +40,34 @@ OPENLDAP_FILEPERMS= ${REAL_ROOT_USER} ${ @@ -40,34 +40,34 @@ OPENLDAP_FILEPERMS= ${REAL_ROOT_USER} ${
40SLAPD_DIRPERMS= ${SLAPD_USER} ${LDAP_GROUP} 0700 40SLAPD_DIRPERMS= ${SLAPD_USER} ${LDAP_GROUP} 0700
41RUN_DIRPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0775 41RUN_DIRPERMS= ${REAL_ROOT_USER} ${LDAP_GROUP} 0775
42 42
43MAKE_DIRS= ${OPENLDAP_ETCDIR}/schema 43MAKE_DIRS= ${OPENLDAP_ETCDIR}/schema
44OWN_DIRS+= ${OPENLDAP_VARDIR} 44OWN_DIRS+= ${OPENLDAP_VARDIR}
45OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS} 45OWN_DIRS_PERMS= ${OPENLDAP_VARDIR}/openldap-data ${SLAPD_DIRPERMS}
46OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS} 46OWN_DIRS_PERMS+= ${OPENLDAP_VARDIR}/run ${RUN_DIRPERMS}
47 47
48CNFS= ${CNFS_SCHEMAS_cmd:sh} 48CNFS= ${CNFS_SCHEMAS_cmd:sh}
49CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||" 49CNFS_SCHEMAS_cmd= ${SED} -ne "/\.ldif$$/p;/\.schema$$/p" ${PKGDIR}/PLIST | ${SED} -e "s|share/examples/openldap/||"
50 50
51CNFS_PERMS= slapd.conf 51CNFS_PERMS= slapd.conf
52 52
53DB_CONFIG= DB_CONFIG 53DB_CONFIG= DB_CONFIG.example
54 54
55RCD_SCRIPTS= slapd 55RCD_SCRIPTS= slapd
56 56
57FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q} 57FILES_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
58FILES_SUBST+= SLAPD_USER=${SLAPD_USER} 58FILES_SUBST+= SLAPD_USER=${SLAPD_USER}
59 59
60MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER:Q} 60MESSAGE_SUBST+= SLAPD_USER=${SLAPD_USER:Q}
61MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP:Q} 61MESSAGE_SUBST+= LDAP_GROUP=${LDAP_GROUP:Q}
62MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR:Q} 62MESSAGE_SUBST+= OPENLDAP_VARDIR=${OPENLDAP_VARDIR:Q}
63MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q} 63MESSAGE_SUBST+= OPENLDAP_ETCDIR=${OPENLDAP_ETCDIR:Q}
64MESSAGE_SUBST+= CHOWN=${CHOWN} 64MESSAGE_SUBST+= CHOWN=${CHOWN}
65MESSAGE_SUBST+= CHMOD=${CHMOD} 65MESSAGE_SUBST+= CHMOD=${CHMOD}
66 66
67.include "options.mk" 67.include "options.mk"
68 68
69.include "../../databases/openldap/Makefile.common" 69.include "../../databases/openldap/Makefile.common"
70 70
71CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS} 71CONF_FILES_PERMS+= ${EGDIR}/DB_CONFIG.example ${OPENLDAP_VARDIR}/openldap-data/DB_CONFIG ${OPENLDAP_FILEPERMS}
72 72
73.include "../../mk/bsd.pkg.mk" 73.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/databases/openldap-server/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/PLIST 2009/06/14 17:43:19 1.6
+++ pkgsrc/databases/openldap-server/PLIST 2009/10/29 06:56:11 1.7
@@ -1,33 +1,33 @@ @@ -1,33 +1,33 @@
1@comment $NetBSD: PLIST,v 1.6 2009/06/14 17:43:19 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.7 2009/10/29 06:56:11 ghen Exp $
2libexec/slapd 2libexec/slapd
3sbin/slapacl 3sbin/slapacl
4sbin/slapadd 4sbin/slapadd
5sbin/slapauth 5sbin/slapauth
6sbin/slapcat 6sbin/slapcat
7sbin/slapdn 7sbin/slapdn
8sbin/slapindex 8sbin/slapindex
9sbin/slappasswd 9sbin/slappasswd
 10sbin/slapschema
10sbin/slaptest 11sbin/slaptest
11share/examples/openldap/DB_CONFIG 12share/examples/openldap/DB_CONFIG.example
12share/examples/openldap/schema/README 13share/examples/openldap/schema/README
13share/examples/openldap/schema/collective.schema 14share/examples/openldap/schema/collective.schema
14share/examples/openldap/schema/corba.schema 15share/examples/openldap/schema/corba.schema
15share/examples/openldap/schema/core.ldif 16share/examples/openldap/schema/core.ldif
16share/examples/openldap/schema/core.schema 17share/examples/openldap/schema/core.schema
17share/examples/openldap/schema/cosine.ldif 18share/examples/openldap/schema/cosine.ldif
18share/examples/openldap/schema/cosine.schema 19share/examples/openldap/schema/cosine.schema
19share/examples/openldap/schema/duaconf.schema 20share/examples/openldap/schema/duaconf.schema
20share/examples/openldap/schema/dyngroup.schema 21share/examples/openldap/schema/dyngroup.schema
21share/examples/openldap/schema/inetorgperson.ldif 22share/examples/openldap/schema/inetorgperson.ldif
22share/examples/openldap/schema/inetorgperson.schema 23share/examples/openldap/schema/inetorgperson.schema
23share/examples/openldap/schema/java.schema 24share/examples/openldap/schema/java.schema
24share/examples/openldap/schema/misc.schema 25share/examples/openldap/schema/misc.schema
25share/examples/openldap/schema/nadf.schema 
26share/examples/openldap/schema/nis.ldif 26share/examples/openldap/schema/nis.ldif
27share/examples/openldap/schema/nis.schema 27share/examples/openldap/schema/nis.schema
28share/examples/openldap/schema/openldap.ldif 28share/examples/openldap/schema/openldap.ldif
29share/examples/openldap/schema/openldap.schema 29share/examples/openldap/schema/openldap.schema
30share/examples/openldap/schema/pmi.schema 30share/examples/openldap/schema/pmi.schema
31share/examples/openldap/schema/ppolicy.schema 31share/examples/openldap/schema/ppolicy.schema
32share/examples/openldap/slapd.conf 32share/examples/openldap/slapd.conf
33share/examples/rc.d/slapd 33share/examples/rc.d/slapd
cvs diff -r1.1 -r1.2 pkgsrc/databases/openldap/patches/Attic/patch-da (expand / switch to unified diff)

--- pkgsrc/databases/openldap/patches/Attic/patch-da 2009/01/31 15:59:04 1.1
+++ pkgsrc/databases/openldap/patches/Attic/patch-da 2009/10/29 06:56:11 1.2
@@ -1,17 +1,24 @@ @@ -1,17 +1,24 @@
1$NetBSD: patch-da,v 1.1 2009/01/31 15:59:04 manu Exp $ 1$NetBSD: patch-da,v 1.2 2009/10/29 06:56:11 ghen Exp $
2--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2004-04-02 11:06:38.000000000 +0000 2
3+++ contrib/slapd-modules/smbk5pwd/Makefile 2009-01-18 18:06:11.000000000 +0000 3--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2009-09-02 00:53:30.000000000 +0200
4@@ -11,6 +11,6 @@ 4+++ contrib/slapd-modules/smbk5pwd/Makefile
 5@@ -13,8 +13,8 @@
 6 # <http://www.OpenLDAP.org/license.html>.
5  7
6 LIBTOOL=../../../libtool 8 LIBTOOL=../../../libtool
7-OPT=-g -O2 9-OPT=-g -O2
8-CC=gcc 10-CC=gcc
9+OPT=-g -O2 ${CPPFLAGS} 11+OPT=-g -O2 ${CPPFLAGS}
10+#CC=gcc 12+#CC=gcc
11  13
12 # Omit DO_KRB5 or DO_SAMBA if you don't want to support it. 14 # Omit DO_KRB5 or DO_SAMBA if you don't want to support it.
13@@ -35,3 +35,3 @@ 15 DEFS=-DDO_KRB5 -DDO_SAMBA
 16@@ -45,7 +45,7 @@ smbk5pwd.lo: smbk5pwd.c
 17
14 smbk5pwd.la: smbk5pwd.lo 18 smbk5pwd.la: smbk5pwd.lo
15 $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \ 19 $(LIBTOOL) --mode=link $(CC) $(OPT) -version-info 0:0:0 \
16- -rpath /usr/local/libexec/openldap -module -o $@ $? $(LIBS) 20- -rpath $(libdir) -module -o $@ $? $(LIBS)
17+ -rpath $(PREFIX)/lib -module -o $@ $? -ldes $(LIBS) 21+ -rpath $(libdir) -module -o $@ $? -ldes $(LIBS)
 22
 23 clean:
 24 rm -f smbk5pwd.lo smbk5pwd.la
cvs diff -r1.1 -r1.2 pkgsrc/databases/openldap/patches/Attic/patch-dd (expand / switch to unified diff)

--- pkgsrc/databases/openldap/patches/Attic/patch-dd 2009/03/16 21:08:44 1.1
+++ pkgsrc/databases/openldap/patches/Attic/patch-dd 2009/10/29 06:56:11 1.2
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1$NetBSD: patch-dd,v 1.1 2009/03/16 21:08:44 manu Exp $ 1$NetBSD: patch-dd,v 1.2 2009/10/29 06:56:11 ghen Exp $
2--- contrib/slapd-modules/nops/nops.c.orig 2009-03-16 10:28:41.000000000 +0100 2
3+++ contrib/slapd-modules/nops/nops.c 2009-03-16 10:28:11.000000000 +0100 3--- contrib/slapd-modules/nops/nops.c.orig 2009-04-28 02:51:12.000000000 +0200
4@@ -136,11 +136,15 @@ 4+++ contrib/slapd-modules/nops/nops.c
5 op->o_bd = be; 5@@ -63,10 +63,15 @@ nops_modify( Operation *op, SlapReply *r
6 } 6 int rc;
7  7
8 if ((m = op->orm_modlist) == NULL) { 8 if ((m = op->orm_modlist) == NULL) {
9+ slap_callback *cb = op->o_callback; 9+ slap_callback *cb = op->o_callback;
10+ 10+
11 op->o_bd->bd_info = (BackendInfo *)(on->on_info); 11 op->o_bd->bd_info = (BackendInfo *)(on->on_info);
12+ op->o_callback = NULL; 12+ op->o_callback = NULL;
13 send_ldap_error(op, rs, LDAP_SUCCESS, ""); 13 send_ldap_error(op, rs, LDAP_INVALID_SYNTAX,
 14 "nops() got null orm_modlist");
14- return(rs->sr_err); 15- return(rs->sr_err);
15+ op->o_callback = cb; 16+ op->o_callback = cb;
16+ 17+
17 return (rs->sr_err); 18+ return (rs->sr_err);
18 } 19 }
19  20
20 return SLAP_CB_CONTINUE; 21 op->o_bd = on->on_info->oi_origdb;