Import of pkgsrc-2013Q2

databases/openldap/DESCR

@@ -0,0 +1,7 @@
+OpenLDAP is an open source implementation of the Lightweight Directory Access
+Protocol.  This package includes:
+
+* slapd - stand-alone LDAP daemon (server)
+* libraries implementing the LDAP protocol
+* utilities, tools, and sample clients
+* administration guide

databases/openldap/Makefile

@@ -0,0 +1,21 @@
+# $NetBSD: Makefile,v 1.142 2013/04/13 12:21:31 adam Exp $
+
+.include "../../databases/openldap/Makefile.version"
+
+DISTNAME=	openldap-${OPENLDAP_VERSION}
+CATEGORIES=	databases
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+
+MAINTAINER=	adam@NetBSD.org
+HOMEPAGE=	http://www.openldap.org/
+COMMENT=	Lightweight Directory Access Protocol meta-package
+LICENSE=	modified-bsd
+
+META_PACKAGE=		yes
+
+DEPENDS+=	openldap-client>=${PKGVERSION_NOREV}:../../databases/openldap-client
+DEPENDS+=	openldap-server>=${PKGVERSION_NOREV}:../../databases/openldap-server
+DEPENDS+=	openldap-doc>=${PKGVERSION_NOREV}:../../databases/openldap-doc
+
+.include "../../mk/bsd.pkg.mk"

databases/openldap/Makefile.common

@@ -0,0 +1,127 @@
+# $NetBSD: Makefile.common,v 1.36 2013/05/10 06:51:26 riastradh Exp $
+#
+# used by databases/openldap-client/Makefile
+# used by databases/openldap-cloak/Makefile
+# used by databases/openldap-nops/Makefile
+# used by databases/openldap-server/Makefile
+# used by databases/openldap-smbk5pwd/Makefile
+
+.include "../../databases/openldap/Makefile.version"
+
+DISTNAME=	openldap-${OPENLDAP_VERSION}
+CATEGORIES=	databases
+MASTER_SITES=	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
+		http://www.openldap.org/software/download/OpenLDAP/openldap-release/ \
+		ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/openldap-release/ \
+		ftp://ftp.ntua.gr/mirror/OpenLDAP/openldap-release/ \
+		ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/openldap-release/ \
+		ftp://ftp.u-aizu.ac.jp/pub/net/openldap/openldap-release/ \
+		ftp://ftp.nl.uu.net/pub/unix/db/openldap/openldap-release/ \
+		ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/openldap-release/ \
+		ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/openldap-release/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	adam@NetBSD.org
+HOMEPAGE=	http://www.openldap.org/
+LICENSE=	modified-bsd
+
+CONFLICTS+=		ldapsdk-[0-9]*
+
+DISTINFO_FILE=		${.CURDIR}/../../databases/openldap/distinfo
+PATCHDIR=		${.CURDIR}/../../databases/openldap/patches
+FILESDIR=		${.CURDIR}/../../databases/openldap/files
+
+USE_LIBTOOL=		yes
+USE_TOOLS+=		soelim
+GNU_CONFIGURE=		yes
+
+MAKE_ENV+=		LIBMODE=${LIBMODE}
+
+.include "../../mk/bsd.prefs.mk"
+
+OPENLDAP_ETCDIR?=	${PKG_SYSCONFDIR}/openldap
+OPENLDAP_MODULEDIR=	${PREFIX}/lib/openldap
+OPENLDAP_VARDIR?=	${VARBASE}/openldap
+
+SLAPD_USER?=		slapd
+LDAP_GROUP?=		ldap
+
+PKG_GROUPS_VARS+=	LDAP_GROUP
+PKG_USERS_VARS+=	SLAPD_USER
+
+# the internal avl_* prototypes conflict with those in <sys/avl.h> which
+# is included by another system header file on Solaris, so subst them.
+.if ${OPSYS} == "SunOS"
+SUBST_CLASSES+=		conflict
+SUBST_STAGE.conflict=	post-patch
+SUBST_FILES.conflict=	${WRKSRC}/*/*.h
+SUBST_FILES.conflict+=	${WRKSRC}/*/*/*.c ${WRKSRC}/*/*/*/*.c
+SUBST_SED.conflict+=	-e 's,avl_free,openldap_avl_free,g'
+SUBST_SED.conflict+=	-e 's,avl_insert,openldap_avl_insert,g'
+SUBST_SED.conflict+=	-e 's,avl_delete,openldap_avl_delete,g'
+SUBST_SED.conflict+=	-e 's,avl_find,openldap_avl_find,g'
+SUBST_SED.conflict+=	-e 's,avl_find2,openldap_avl_find2,g'
+SUBST_MESSAGE.conflict=	Fixing conflicting function prototypes.
+.endif
+
+CPPFLAGS.Darwin+=	-DBIND_8_COMPAT
+CPPFLAGS.Linux+=	-D_GNU_SOURCE
+
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--localstatedir=${OPENLDAP_VARDIR}
+CONFIGURE_ARGS+=	--enable-dynamic
+CONFIGURE_ARGS+=	--with-tls=openssl
+
+.if !empty(USE_CROSS_COMPILE:M[yY][eE][sS]) && ${OPSYS} == "NetBSD"
+# Probably true for more than just NetBSD.
+CONFIGURE_ARGS+=	--with-yielding_select=yes
+CONFIGURE_ENV+=		ac_cv_func_memcmp_working=yes
+.endif
+
+EGDIR=			${PREFIX}/share/examples/openldap
+
+CONF_FILES=		# empty
+CONF_FILES_PERMS=	# empty
+.for file in ${CNFS}
+CONF_FILES+=		${EGDIR}/${file} ${OPENLDAP_ETCDIR}/${file}
+.endfor
+.for file in ${CNFS_PERMS}
+CONF_FILES_PERMS+=	${EGDIR}/${file} ${OPENLDAP_ETCDIR}/${file} ${OPENLDAP_FILEPERMS}
+.endfor
+
+DB_CONFIG?=		# empty
+
+PTHREAD_OPTS+=		require
+
+CONFIGURE_ARGS+=	--without-fetch
+
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+.if ${PTHREAD_TYPE} == "native"
+CONFIGURE_ARGS+=	--with-threads
+.elif ${PTHREAD_TYPE} == "pth"
+CONFIGURE_ARGS+=	--with-threads=pth
+
+# Don't use a larger FD_SETSIZE than GNU Pth can handle (value taken from
+# pth.h header).
+PTH_FDSETSIZE_cmd=							\
+	if ${TEST} -f ${BUILDLINK_PREFIX.pth:Q}/include/pth.h; then	\
+		${AWK} '/if FD_SETSIZE >/ { print $$4 }'		\
+			${BUILDLINK_PREFIX.pth}/include/pth.h;		\
+	else								\
+		${ECHO} 0;						\
+	fi
+CPPFLAGS+=	-DOPENLDAP_FD_SETSIZE=${PTH_FDSETSIZE_cmd:sh:Q}
+.endif
+
+MAKE_FLAGS+=		moduledir=${OPENLDAP_MODULEDIR}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} sysconfdir=${EGDIR}
+
+# Set the correct file modes for the example config files.
+post-install:
+.for file in ${CNFS} ${CNFS_PERMS} ${DB_CONFIG}
+	${CHMOD} ${SHAREMODE} ${DESTDIR}${EGDIR}/${file:Q}
+	${RM} -f ${DESTDIR}${EGDIR}/${file:Q}.default
+.endfor

databases/openldap/Makefile.version

@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.version,v 1.4 2013/04/13 12:21:31 adam Exp $
+# used by databases/openldap/Makefile
+# used by databases/openldap/Makefile.common
+# used by databases/openldap-docs/Makefile
+
+OPENLDAP_VERSION=	2.4.35

databases/openldap/distinfo

@@ -0,0 +1,20 @@
+$NetBSD: distinfo,v 1.90 2013/04/13 12:21:31 adam Exp $
+
+SHA1 (openldap-2.4.35.tgz) = db02243150b050baac6a8ea4145ad73a1f6d2266
+RMD160 (openldap-2.4.35.tgz) = f5b21929ee3a317ee51e953f26e278daaa391e44
+Size (openldap-2.4.35.tgz) = 5486240 bytes
+SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
+SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
+SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
+SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896
+SHA1 (patch-ah) = 7b5a9d042df36f17bcb503372e301a0c6554af68
+SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
+SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
+SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
+SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
+SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 36c416f21982235270ca9f0e4b54f677c4deb1ea
+SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 22a39eda3e9375e35cec4be57d92a8eafca130a5
+SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
+SHA1 (patch-da) = 880b25a9266ee057f7269c5be46ef3c3fecf16b4
+SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
+SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198

databases/openldap/files/slapd.sh

@@ -0,0 +1,19 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: slapd.sh,v 1.8 2006/05/31 18:17:49 ghen Exp $
+#
+# OpenLDAP standalone LDAP daemon
+#
+# PROVIDE: slapd
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="slapd"
+rcvar=${name}
+command="@PREFIX@/libexec/${name}"
+required_files="@OPENLDAP_ETCDIR@/${name}.conf"
+command_args="-u @SLAPD_USER@"
+
+load_rc_config $name
+run_rc_command "$1"

databases/openldap/patches/patch-ac

@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.12 2012/03/13 19:57:11 adam Exp $
+
+--- libraries/libldap_r/thr_posix.c.orig	2006-05-13 11:47:50.000000000 +0200
++++ libraries/libldap_r/thr_posix.c
+@@ -19,6 +19,7 @@
+ #if defined( HAVE_PTHREADS )
+ 
+ #include <ac/errno.h>
++#include <ac/unistd.h>
+ 
+ #ifdef REPLACE_BROKEN_YIELD
+ #ifndef HAVE_NANOSLEEP
+@@ -146,9 +147,11 @@ ldap_pvt_thread_create( ldap_pvt_thread_
+ #endif
+ 
+ #ifdef LDAP_PVT_THREAD_SET_STACK_SIZE
++#if defined(_POSIX_THREAD_ATTR_STACKSIZE)
+ 	/* this should be tunable */
+ 	pthread_attr_setstacksize( &attr, LDAP_PVT_THREAD_STACK_SIZE );
+ #endif
++#endif
+ 
+ #if HAVE_PTHREADS > 5
+ 	detach = detach ? PTHREAD_CREATE_DETACHED : PTHREAD_CREATE_JOINABLE;

databases/openldap/patches/patch-ad

@@ -0,0 +1,156 @@
+$NetBSD: patch-ad,v 1.7 2006/05/18 05:14:11 taca Exp $
+
+--- libraries/liblutil/sha1.c.orig	2006-01-04 07:16:11.000000000 +0900
++++ libraries/liblutil/sha1.c
+@@ -50,10 +50,16 @@
+ #define SHA1HANDSOFF		/* Copies data before messing with it. */
+ #define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+ 
++#if defined(__sparcv9) && \
++    ((__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 3))
++# define SPARC64_GCC_BUG
++#endif
++
+ /*
+  * blk0() and blk() perform the initial expand.
+  * I got the idea of expanding during the round function from SSLeay
+  */
++#ifndef SPARC64_GCC_BUG
+ #if BYTE_ORDER == LITTLE_ENDIAN
+ # define blk0(i) (block[i] = (rol(block[i],24)&0xFF00FF00) \
+     |(rol(block[i],8)&0x00FF00FF))
+@@ -62,6 +68,16 @@
+ #endif
+ #define blk(i) (block[i&15] = rol(block[(i+13)&15]^block[(i+8)&15] \
+     ^block[(i+2)&15]^block[i&15],1))
++#else
++#if BYTE_ORDER == LITTLE_ENDIAN
++# define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
++    |(rol(block->l[i],8)&0x00FF00FF))
++#else
++# define blk0(i) block->l[i]
++#endif
++#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
++    ^block->l[(i+2)&15]^block->l[i&15],1))
++#endif	/* !SPARC64_GCC_BUG */
+ 
+ /*
+  * (R0+R1), R2, R3, R4 are the different operations (rounds) used in SHA1
+@@ -72,6 +88,68 @@
+ #define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+ #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+ 
++#ifdef SPARC64_GCC_BUG
++typedef union {
++    u_char c[64];
++    uint32 l[16];
++} CHAR64LONG16;
++
++void do_R01(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16
++*);
++void do_R2(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 
++*);
++void do_R3(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 
++*);
++void do_R4(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 
++*);
++
++#define nR0(v,w,x,y,z,i) R0(*v,*w,*x,*y,*z,i)
++#define nR1(v,w,x,y,z,i) R1(*v,*w,*x,*y,*z,i)
++#define nR2(v,w,x,y,z,i) R2(*v,*w,*x,*y,*z,i)
++#define nR3(v,w,x,y,z,i) R3(*v,*w,*x,*y,*z,i)
++#define nR4(v,w,x,y,z,i) R4(*v,*w,*x,*y,*z,i)
++
++void
++do_R01(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block)
++{
++    nR0(a,b,c,d,e, 0); nR0(e,a,b,c,d, 1); nR0(d,e,a,b,c, 2); nR0(c,d,e,a,b, 3);
++    nR0(b,c,d,e,a, 4); nR0(a,b,c,d,e, 5); nR0(e,a,b,c,d, 6); nR0(d,e,a,b,c, 7);
++    nR0(c,d,e,a,b, 8); nR0(b,c,d,e,a, 9); nR0(a,b,c,d,e,10); nR0(e,a,b,c,d,11);
++    nR0(d,e,a,b,c,12); nR0(c,d,e,a,b,13); nR0(b,c,d,e,a,14); nR0(a,b,c,d,e,15);
++    nR1(e,a,b,c,d,16); nR1(d,e,a,b,c,17); nR1(c,d,e,a,b,18); nR1(b,c,d,e,a,19);
++}
++
++void
++do_R2(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block)
++{
++    nR2(a,b,c,d,e,20); nR2(e,a,b,c,d,21); nR2(d,e,a,b,c,22); nR2(c,d,e,a,b,23);
++    nR2(b,c,d,e,a,24); nR2(a,b,c,d,e,25); nR2(e,a,b,c,d,26); nR2(d,e,a,b,c,27);
++    nR2(c,d,e,a,b,28); nR2(b,c,d,e,a,29); nR2(a,b,c,d,e,30); nR2(e,a,b,c,d,31);
++    nR2(d,e,a,b,c,32); nR2(c,d,e,a,b,33); nR2(b,c,d,e,a,34); nR2(a,b,c,d,e,35);
++    nR2(e,a,b,c,d,36); nR2(d,e,a,b,c,37); nR2(c,d,e,a,b,38); nR2(b,c,d,e,a,39);
++}
++
++void
++do_R3(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block)
++{
++    nR3(a,b,c,d,e,40); nR3(e,a,b,c,d,41); nR3(d,e,a,b,c,42); nR3(c,d,e,a,b,43);
++    nR3(b,c,d,e,a,44); nR3(a,b,c,d,e,45); nR3(e,a,b,c,d,46); nR3(d,e,a,b,c,47);
++    nR3(c,d,e,a,b,48); nR3(b,c,d,e,a,49); nR3(a,b,c,d,e,50); nR3(e,a,b,c,d,51);
++    nR3(d,e,a,b,c,52); nR3(c,d,e,a,b,53); nR3(b,c,d,e,a,54); nR3(a,b,c,d,e,55);
++    nR3(e,a,b,c,d,56); nR3(d,e,a,b,c,57); nR3(c,d,e,a,b,58); nR3(b,c,d,e,a,59);
++}
++
++void
++do_R4(uint32 *a, uint32 *b, uint32 *c, uint32 *d, uint32 *e, CHAR64LONG16 *block)
++{
++    nR4(a,b,c,d,e,60); nR4(e,a,b,c,d,61); nR4(d,e,a,b,c,62); nR4(c,d,e,a,b,63);
++    nR4(b,c,d,e,a,64); nR4(a,b,c,d,e,65); nR4(e,a,b,c,d,66); nR4(d,e,a,b,c,67);
++    nR4(c,d,e,a,b,68); nR4(b,c,d,e,a,69); nR4(a,b,c,d,e,70); nR4(e,a,b,c,d,71);
++    nR4(d,e,a,b,c,72); nR4(c,d,e,a,b,73); nR4(b,c,d,e,a,74); nR4(a,b,c,d,e,75);
++    nR4(e,a,b,c,d,76); nR4(d,e,a,b,c,77); nR4(c,d,e,a,b,78); nR4(b,c,d,e,a,79);
++}
++#endif	/* SPARC64_GCC_BUG */
++
+ 
+ /*
+  * Hash a single 512-bit block. This is the core of the algorithm.
+@@ -80,13 +158,26 @@ void
+ lutil_SHA1Transform( uint32 *state, const unsigned char *buffer )
+ {
+     uint32 a, b, c, d, e;
++#ifdef SPARC64_GCC_BUG
++    CHAR64LONG16 *block;
++#endif
+ 
++#ifndef SPARC64_GCC_BUG
+ #ifdef SHA1HANDSOFF
+     uint32 block[16];
+     (void)AC_MEMCPY(block, buffer, 64);
+ #else
+     uint32 *block = (u_int32 *) buffer;
+ #endif
++#else
++#ifdef SHA1HANDSOFF
++    CHAR64LONG16 workspace;
++    block = &workspace;
++    (void)AC_MEMCPY(block, buffer, 64);
++#else
++    block = (CHAR64LONG16 *) (void *) buffer;
++#endif
++#endif	/* !SPARC64_GCC_BUG */
+ 
+     /* Copy context->state[] to working vars */
+     a = state[0];
+@@ -95,6 +186,7 @@ lutil_SHA1Transform( uint32 *state, cons
+     d = state[3];
+     e = state[4];
+ 
++#ifndef SPARC64_GCC_BUG
+     /* 4 rounds of 20 operations each. Loop unrolled. */
+     R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+     R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+@@ -116,6 +208,13 @@ lutil_SHA1Transform( uint32 *state, cons
+     R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+     R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+     R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
++#else
++    do_R01(&a, &b, &c, &d, &e, block);
++    do_R2(&a, &b, &c, &d, &e, block);
++    do_R3(&a, &b, &c, &d, &e, block);
++    do_R4(&a, &b, &c, &d, &e, block);
++#endif	/* !SPARC64_GCC_BUG */
++
+ 
+     /* Add the working vars back into context.state[] */
+     state[0] += a;

databases/openldap/patches/patch-af

@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.6 2012/03/13 19:57:11 adam Exp $
+
+--- libraries/libldap/Makefile.in.orig	2005-05-06 12:10:22.000000000 -0400
++++ libraries/libldap/Makefile.in
+@@ -68,7 +68,7 @@ CFFILES=ldap.conf
+ 
+ install-local: $(CFFILES) FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libdir)
+-	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
++	$(LTINSTALL) $(INSTALLFLAGS) -m $(LIBMODE) $(LIBRARY) $(DESTDIR)$(libdir)
+ 	$(LTFINISH) $(DESTDIR)$(libdir)
+ 	-$(MKDIR) $(DESTDIR)$(sysconfdir)
+ 	@for i in $(CFFILES); do \

databases/openldap/patches/patch-ag

@@ -0,0 +1,26 @@
+$NetBSD: patch-ag,v 1.7 2012/03/13 19:57:11 adam Exp $
+
+--- servers/slapd/Makefile.in.orig	2007-02-14 16:59:43.000000000 +0100
++++ servers/slapd/Makefile.in
+@@ -76,6 +76,10 @@ XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_
+ XXLIBS = $(SLAPD_LIBS) $(SECURITY_LIBS) $(LUTIL_LIBS)
+ XXXLIBS = $(LTHREAD_LIBS) $(SLAPI_LIBS)
+ 
++AC_CFLAGS += $(DL_CFLAGS)
++AC_LDFLAGS += $(DL_LDFLAGS)
++AC_LIBS += $(DL_LIBS)
++
+ BUILD_OPT = "--enable-slapd"
+ BUILD_SRV = @BUILD_SLAPD@
+ 
+@@ -441,9 +445,7 @@ install-db-config: FORCE
+ 	@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
+ 	@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
+ 	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+-		$(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
+-	$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
+-		$(DESTDIR)$(sysconfdir)/DB_CONFIG.example
++		$(DESTDIR)$(sysconfdir)/DB_CONFIG
+ 
+ install-tools: FORCE
+ 	-$(MKDIR) $(DESTDIR)$(sbindir)

databases/openldap/patches/patch-ah

@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.10 2012/10/13 11:47:19 adam Exp $
+
+--- libraries/libldap/init.c.orig	2012-10-10 12:18:49.000000000 +0000
++++ libraries/libldap/init.c
+@@ -643,7 +643,11 @@ void ldap_int_initialize( struct ldapopt
+ #if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
+ 	LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
+ 	{
+-		char	*name = ldap_int_hostname;
++		char	*name;
++#if defined(LDAP_R_COMPILE)
++		ldap_pvt_thread_initialize();
++#endif
++		name = ldap_int_hostname;
+ 
+ 		ldap_int_hostname = ldap_pvt_get_fqdn( name );
+ 

databases/openldap/patches/patch-aj

@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.4 2012/03/13 19:57:11 adam Exp $
+
+--- libraries/libldap_r/Makefile.in.orig	2008-02-12 00:26:41.000000000 +0100
++++ libraries/libldap_r/Makefile.in
+@@ -62,6 +62,10 @@ XXXLIBS = $(LTHREAD_LIBS)
+ NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+ UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
+ 
++AC_CFLAGS += $(PTHREAD_CFLAGS)
++AC_LDFLAGS += $(PTHREAD_LDFLAGS)
++LINK_LIBS += $(LTHREAD_LIBS)
++
+ .links : Makefile
+ 	@for i in $(XXSRCS); do \
+ 		$(RM) $$i ; \

databases/openldap/patches/patch-am

@@ -0,0 +1,94 @@
+$NetBSD: patch-am,v 1.7 2012/03/13 19:57:11 adam Exp $
+
+--- libraries/libldap/cyrus.c.orig	2012-02-29 17:37:09.000000000 +0000
++++ libraries/libldap/cyrus.c
+@@ -680,7 +680,7 @@ ldap_int_sasl_external(
+ 	LDAP *ld,
+ 	LDAPConn *conn,
+ 	const char * authid,
+-	ber_len_t ssf )
++	ber_uint_t ssf )
+ {
+ 	int sc;
+ 	sasl_conn_t *ctx;
+@@ -824,6 +824,7 @@ int ldap_pvt_sasl_secprops(
+ 	char **props;
+ 	unsigned sflags = 0;
+ 	int got_sflags = 0;
++	int tmp_ssf;
+ 	sasl_ssf_t max_ssf = 0;
+ 	int got_max_ssf = 0;
+ 	sasl_ssf_t min_ssf = 0;
+@@ -854,9 +855,9 @@ int ldap_pvt_sasl_secprops(
+ 				if ( next == &props[i][sprops[j].key.bv_len] || next[0] != '\0' ) continue;
+ 				switch( sprops[j].ival ) {
+ 				case GOT_MINSSF:
+-					min_ssf = v; got_min_ssf++; break;
++					min_ssf = (v >= 0 ? (sasl_ssf_t)v : 0); got_min_ssf++; break;
+ 				case GOT_MAXSSF:
+-					max_ssf = v; got_max_ssf++; break;
++					max_ssf = (v >= 0 ? (sasl_ssf_t)v : 0); got_max_ssf++; break;
+ 				case GOT_MAXBUF:
+ 					maxbufsize = v; got_maxbufsize++; break;
+ 				}
+@@ -960,7 +961,7 @@ ldap_int_sasl_get_option( LDAP *ld, int 
+ 				return -1;
+ 			}
+ 
+-			*(ber_len_t *)arg = *ssf;
++			*(sasl_ssf_t *)arg = *ssf;
+ 		} break;
+ 
+ 		case LDAP_OPT_X_SASL_SSF_EXTERNAL:
+@@ -968,13 +969,13 @@ ldap_int_sasl_get_option( LDAP *ld, int 
+ 			return -1;
+ 
+ 		case LDAP_OPT_X_SASL_SSF_MIN:
+-			*(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.min_ssf;
++			*(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.min_ssf;
+ 			break;
+ 		case LDAP_OPT_X_SASL_SSF_MAX:
+-			*(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.max_ssf;
++			*(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.max_ssf;
+ 			break;
+ 		case LDAP_OPT_X_SASL_MAXBUFSIZE:
+-			*(ber_len_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
++			*(sasl_ssf_t *)arg = ld->ld_options.ldo_sasl_secprops.maxbufsize;
+ 			break;
+ 		case LDAP_OPT_X_SASL_NOCANON:
+ 			*(int *)arg = (int) LDAP_BOOL_GET(&ld->ld_options, LDAP_BOOL_SASL_NOCANON );
+@@ -1074,7 +1075,7 @@ ldap_int_sasl_set_option( LDAP *ld, int 
+ #else
+ 		memset(&extprops, 0L, sizeof(extprops));
+ 
+-		extprops.ssf = * (ber_len_t *) arg;
++		extprops.ssf = * (sasl_ssf_t *) arg;
+ 
+ 		sc = sasl_setprop( ctx, SASL_SSF_EXTERNAL,
+ 			(void *) &extprops );
+@@ -1086,13 +1087,13 @@ ldap_int_sasl_set_option( LDAP *ld, int 
+ 		} break;
+ 
+ 	case LDAP_OPT_X_SASL_SSF_MIN:
+-		ld->ld_options.ldo_sasl_secprops.min_ssf = *(ber_len_t *)arg;
++		ld->ld_options.ldo_sasl_secprops.min_ssf = *(sasl_ssf_t *)arg;
+ 		break;
+ 	case LDAP_OPT_X_SASL_SSF_MAX:
+-		ld->ld_options.ldo_sasl_secprops.max_ssf = *(ber_len_t *)arg;
++		ld->ld_options.ldo_sasl_secprops.max_ssf = *(sasl_ssf_t *)arg;
+ 		break;
+ 	case LDAP_OPT_X_SASL_MAXBUFSIZE:
+-		ld->ld_options.ldo_sasl_secprops.maxbufsize = *(ber_len_t *)arg;
++		ld->ld_options.ldo_sasl_secprops.maxbufsize = *(sasl_ssf_t *)arg;
+ 		break;
+ 	case LDAP_OPT_X_SASL_NOCANON:
+ 		if ( arg == LDAP_OPT_OFF ) {
+@@ -1220,7 +1221,7 @@ ldap_int_sasl_external(
+ 	LDAP *ld,
+ 	LDAPConn *conn,
+ 	const char * authid,
+-	ber_len_t ssf )
++	ber_uint_t ssf )
+ { return LDAP_SUCCESS; }
+ 
+ #endif /* HAVE_CYRUS_SASL */

databases/openldap/patches/patch-an

@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.5 2012/08/06 13:33:38 adam Exp $
+
+--- libraries/libldap/ldap-int.h.orig	2005-10-11 21:10:47.000000000 -0400
++++ libraries/libldap/ldap-int.h
+@@ -743,7 +743,7 @@ LDAP_F (int) ldap_int_sasl_close LDAP_P(
+ 
+ LDAP_F (int) ldap_int_sasl_external LDAP_P((
+ 	LDAP *ld, LDAPConn *conn,
+-	const char* authid, ber_len_t ssf ));
++	const char* authid, ber_uint_t ssf ));
+ 
+ LDAP_F (int) ldap_int_sasl_get_option LDAP_P(( LDAP *ld,
+ 	int option, void *arg ));

databases/openldap/patches/patch-ao

@@ -0,0 +1,16 @@
+$NetBSD: patch-ao,v 1.2 2012/03/13 19:57:11 adam Exp $
+
+SQL_NO_DATA is called SQL_NO_DATA_FOUND in ODBC versions >= 3.0,
+as provided by databases/iodbc and databases/unixodbc.
+
+--- servers/slapd/back-sql/delete.c.orig	2005-08-09 23:04:06.000000000 +0200
++++ servers/slapd/back-sql/delete.c
+@@ -209,7 +209,7 @@ backsql_delete( Operation *op, SlapReply
+ 
+ 	rc = SQLExecute( sth );
+ 	switch ( rc ) {
+-	case SQL_NO_DATA:
++	case SQL_NO_DATA_FOUND:
+ 		/* apparently there were no "auxiliary" objectClasses
+ 		 * for this entry... */
+ 	case SQL_SUCCESS:

databases/openldap/patches/patch-contrib_slapd-modules_cloak_Makefile

@@ -0,0 +1,19 @@
+$NetBSD: patch-contrib_slapd-modules_cloak_Makefile,v 1.1 2013/03/16 12:49:54 adam Exp $
+
+--- contrib/slapd-modules/cloak/Makefile.orig	2013-03-16 12:37:06.000000000 +0000
++++ contrib/slapd-modules/cloak/Makefile
+@@ -3,12 +3,10 @@
+ LDAP_SRC = ../../..
+ LDAP_BUILD = ../../..
+ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
+-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+-	$(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_LIB = -lldap_r -llber
+ 
+ LIBTOOL = $(LDAP_BUILD)/libtool
+-CC = gcc
+-OPT = -g -O2 -Wall
++OPT = ${CFLAGS} ${CPPFLAGS}
+ DEFS = -DSLAPD_OVER_CLOAK=SLAPD_MOD_DYNAMIC
+ INCS = $(LDAP_INC)
+ LIBS = $(LDAP_LIB)

databases/openldap/patches/patch-contrib_slapd-modules_nops_Makefile

@@ -0,0 +1,19 @@
+$NetBSD: patch-contrib_slapd-modules_nops_Makefile,v 1.1 2013/03/16 12:49:54 adam Exp $
+
+--- contrib/slapd-modules/nops/Makefile.orig	2013-03-16 12:40:41.000000000 +0000
++++ contrib/slapd-modules/nops/Makefile
+@@ -3,12 +3,10 @@
+ LDAP_SRC = ../../..
+ LDAP_BUILD = ../../..
+ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
+-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+-	$(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_LIB = -lldap_r -llber
+ 
+ LIBTOOL = $(LDAP_BUILD)/libtool
+-CC = gcc
+-OPT = -g -O2 -Wall
++OPT = ${CFLAGS} ${CPPFLAGS}
+ DEFS = -DSLAPD_OVER_NOPS=SLAPD_MOD_DYNAMIC
+ INCS = $(LDAP_INC)
+ LIBS = $(LDAP_LIB)

databases/openldap/patches/patch-contrib_slapd-modules_nops_slapo-nops.5

@@ -0,0 +1,13 @@
+$NetBSD: patch-contrib_slapd-modules_nops_slapo-nops.5,v 1.1 2012/01/24 20:36:40 joerg Exp $
+
+--- contrib/slapd-modules/nops/slapo-nops.5.orig	2012-01-23 22:24:40.000000000 +0000
++++ contrib/slapd-modules/nops/slapo-nops.5
+@@ -29,4 +29,7 @@ default slapd configuration file
+ .BR slapd.conf (5).
+ .SH ACKNOWLEDGEMENTS
+ This module was written in 2008 by Emmanuel Dreyfus.
+-.so ../Project
++.B "OpenLDAP Software"
++is developed and maintained by The OpenLDAP Project <http://www.openldap.org/>.
++.B "OpenLDAP Software"
++is derived from University of Michigan LDAP 3.3 Release.

databases/openldap/patches/patch-da

@@ -0,0 +1,30 @@
+$NetBSD: patch-da,v 1.7 2013/03/16 12:49:54 adam Exp $
+
+--- contrib/slapd-modules/smbk5pwd/Makefile.orig	2013-03-03 21:17:30.000000000 +0000
++++ contrib/slapd-modules/smbk5pwd/Makefile
+@@ -15,8 +15,7 @@
+ LDAP_SRC = ../../..
+ LDAP_BUILD = ../../..
+ LDAP_INC = -I$(LDAP_BUILD)/include -I$(LDAP_SRC)/include -I$(LDAP_SRC)/servers/slapd
+-LDAP_LIB = $(LDAP_BUILD)/libraries/libldap_r/libldap_r.la \
+-	$(LDAP_BUILD)/libraries/liblber/liblber.la
++LDAP_LIB = -lldap_r -llber
+ 
+ SSL_INC = 
+ SSL_LIB = -lcrypto
+@@ -25,12 +24,10 @@ HEIMDAL_INC = -I/usr/heimdal/include
+ HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
+ 
+ LIBTOOL = $(LDAP_BUILD)/libtool
+-CC = gcc
+-OPT = -g -O2 -Wall
++OPT = ${CFLAGS} ${CPPFLAGS}
+ # Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
+-DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
+-INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
+-LIBS = $(LDAP_LIB) $(HEIMDAL_LIB) $(SSL_LIB)
++INCS = $(LDAP_INC) $(SSL_INC)
++LIBS = $(LDAP_LIB) $(SSL_LIB) ${EXTRA_LIBS}
+ 
+ PROGRAMS = smbk5pwd.la
+ LTVER = 0:0:0

databases/openldap/patches/patch-dd

@@ -0,0 +1,21 @@
+$NetBSD: patch-dd,v 1.3 2012/03/13 19:57:11 adam Exp $
+
+--- contrib/slapd-modules/nops/nops.c.orig	2009-04-28 02:51:12.000000000 +0200
++++ contrib/slapd-modules/nops/nops.c
+@@ -69,10 +69,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_INVALID_SYNTAX,
+ 				"nops() got null orm_modlist");
+-		return(rs->sr_err);
++		op->o_callback = cb;
++
++		return (rs->sr_err);
+ 	}
+ 
+ 	op->o_bd = on->on_info->oi_origdb;

databases/openldap/patches/patch-de

@@ -0,0 +1,20 @@
+$NetBSD: patch-de,v 1.3 2012/08/06 13:33:38 adam Exp $
+
+--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig	2012-07-31 16:39:26.000000000 +0000
++++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c
+@@ -69,8 +69,15 @@ static ObjectClass *oc_krb5KDCEntry;
+ #include <gcrypt.h>
+ typedef unsigned char DES_cblock[8];
+ #elif HAVE_OPENSSL
++#ifdef __NetBSD__
++#include <des.h>
++#include <md4.h>
++typedef des_key_schedule DES_key_schedule;
++typedef des_cblock DES_cblock;
++#else
+ #include <openssl/des.h>
+ #include <openssl/md4.h>
++#endif
+ #else
+ #error Unsupported crypto backend.
+ #endif