[Midnightbsd-cvs] mports [17374] U trunk/net/openldap24-server/pkg-plist.client: openldap 2.4.39

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Sep 19 19:01:20 EDT 2014


Revision: 17374
          http://svnweb.midnightbsd.org/mports/?rev=17374
Author:   laffer1
Date:     2014-09-19 19:01:19 -0400 (Fri, 19 Sep 2014)
Log Message:
-----------
openldap 2.4.39

Modified Paths:
--------------
    trunk/net/openldap24-server/Makefile
    trunk/net/openldap24-server/distinfo
    trunk/net/openldap24-server/files/patch-smbk5pwd-Makefile
    trunk/net/openldap24-server/files/pkg-deinstall.in
    trunk/net/openldap24-server/files/slapd.in
    trunk/net/openldap24-server/pkg-plist
    trunk/net/openldap24-server/pkg-plist.client

Added Paths:
-----------
    trunk/net/openldap24-server/files/patch-ITS7249
    trunk/net/openldap24-server/files/patch-bdb6
    trunk/net/openldap24-server/files/patch-include__ldap_defaults.h
    trunk/net/openldap24-server/files/patch-servers__slapd__Makefile.in

Removed Paths:
-------------
    trunk/net/openldap24-server/files/manpages.client
    trunk/net/openldap24-server/files/manpages.server
    trunk/net/openldap24-server/files/patch-build::top.mk
    trunk/net/openldap24-server/files/patch-include::ldap_defaults.h
    trunk/net/openldap24-server/files/patch-servers::slapd::Makefile.in
    trunk/net/openldap24-server/files/patch-shlib-version

Property Changed:
----------------
    trunk/net/openldap24-server/files/extrapatch-Makefile.in
    trunk/net/openldap24-server/files/patch-ITS7548
    trunk/net/openldap24-server/files/patch-configure
    trunk/net/openldap24-server/files/patch-libraries__libldap__tls_o.c
    trunk/net/openldap24-server/files/patch-smbk5pwd-Makefile
    trunk/net/openldap24-server/files/pkg-deinstall.in
    trunk/net/openldap24-server/files/pkg-message.client.in
    trunk/net/openldap24-server/files/pkg-message.in
    trunk/net/openldap24-server/files/slapd.in
    trunk/net/openldap24-server/pkg-descr
    trunk/net/openldap24-server/pkg-descr.client
    trunk/net/openldap24-server/pkg-plist.client

Modified: trunk/net/openldap24-server/Makefile
===================================================================
--- trunk/net/openldap24-server/Makefile	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/Makefile	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.35
+DISTVERSION=		2.4.39
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -40,11 +40,13 @@
 
 LATEST_LINK?=		${PKGNAMEPREFIX}openldap24${PKGNAMESUFFIX}
 USE_OPENSSL=		yes
-MAKE_JOBS_SAFE=		yes
+USES=                 libtool:keepla
 USE_AUTOTOOLS=		libtool
 .if !defined(CLIENT_ONLY)
 USERS=			ldap
 GROUPS=			ldap
+LDAP_USER?=		ldap
+LDAP_GROUP?=		ldap
 .endif
 
 WANT_OPENLDAP_VER?=	24
@@ -52,16 +54,18 @@
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
-OPENLDAP_SHLIB_MAJOR=	8
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	2
+OPENLDAP_SHLIB_MAJOR=	2
+OPENLDAP_MAJOR=		${DISTVERSION:R}
 
-OPTIONS_DEFINE=	FETCH
+OPTIONS_DEFINE=		FETCH GSSAPI
 
-FETCH_DESC=	Enable fetch(3) support
+FETCH_DESC=		Enable fetch(3) support
+GSSAPI_DESC=		With GSSAPI support (implies SASL support)
 
 .if !defined(CLIENT_ONLY)
-OPTIONS_DEFINE+=	DYNACL ACI BDB DNSSRV MDB PASSWD PERL RELAY SHELL
+OPTIONS_DEFINE+=	DYNACL ACI BDB MDB DNSSRV PASSWD PERL RELAY SHELL
 OPTIONS_DEFINE+=	SOCK ODBC RLOOKUPS SLP SLAPI TCP_WRAPPERS
 OPTIONS_DEFINE+=	ACCESSLOG AUDITLOG COLLECT CONSTRAINT DDS
 OPTIONS_DEFINE+=	DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PROXYCACHE
@@ -68,13 +72,13 @@
 OPTIONS_DEFINE+=	REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
 OPTIONS_DEFINE+=	UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL
 
-OPTIONS_DEFAULT=	BDB TCP_WRAPPERS SEQMOD SYNCPROV DYNAMIC_BACKENDS
+OPTIONS_DEFAULT=	BDB MDB SYNCPROV DYNAMIC_BACKENDS
 
 DYNACL_DESC=		Run-time loadable ACL (experimental)
 ACI_DESC=		Per-object ACI (experimental)
-BDB_DESC=		With BerkeleyDB backend
+BDB_DESC=		With BerkeleyDB backend (DEPRECATED)
+MDB_DESC=		With Memory-Mapped DB backend
 DNSSRV_DESC=		With Dnssrv backend
-MDB_DESC=		With Memory-Mapped DB backend
 PASSWD_DESC=		With Passwd backend
 PERL_DESC=		With Perl backend
 RELAY_DESC=		With Relay backend
@@ -83,7 +87,7 @@
 ODBC_DESC=		With SQL backend
 RLOOKUPS_DESC=		With reverse lookups of client hostnames
 SLP_DESC=		With SLPv2 (RFC 2608) support
-SLAPI_DESC=		With Netscape SLAPI plugin API
+SLAPI_DESC=		With Netscape SLAPI plugin API (experimental)
 TCP_WRAPPERS_DESC=	With tcp wrapper support
 ACCESSLOG_DESC=		With In-Directory Access Logging overlay
 AUDITLOG_DESC=		With Audit Logging overlay
@@ -119,7 +123,7 @@
 OPENLDAP_PKGFILESUFX=
 .endif
 
-CONFIGURE_SED=		-e 's,-kthread,${PTHREAD_LIBS},g' -e 's,uuid/uuid.h,xxuuid/uuid.h,g'
+CONFIGURE_SED=		-e 's,uuid/uuid.h,xxuuid/uuid.h,g'
 
 .include <bsd.port.pre.mk>
 
@@ -130,16 +134,23 @@
 PORT_OPTIONS+=	SASL
 .endif
 .if defined(USE_OPENLDAP)
-BROKEN=			You have `USE_OPENLDAP' variable defined either in environment or in make(1) arguments. Please undefine and try again.
+BROKEN=			You have 'USE_OPENLDAP' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 .else
 USE_OPENLDAP=		yes
 WANT_OPENLDAP_VER=	24
 
+.if ${PORT_OPTIONS:MGSSAPI} && empty(PORT_OPTIONS:MSASL)
+PORT_OPTIONS+=	SASL
+.endif
+
 .if ${PORT_OPTIONS:MSASL}
 WANT_OPENLDAP_SASL=	yes
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-client-2.*
 PKGNAMESUFFIX=		-sasl-server
+.if ${PORT_OPTIONS:MGSSAPI}
+RUN_DEPENDS+=		cyrus-sasl-gssapi>0:${PORTSDIR}/security/cyrus-sasl2-gssapi
+.endif
 .else
 CONFLICTS=		${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.*
 .endif
@@ -158,6 +169,8 @@
 DATABASEDIR?=		${LOCALSTATEDIR}/openldap-data
 
 SUB_LIST+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
+			LDAP_USER=${LDAP_USER} \
+			LDAP_GROUP=${LDAP_GROUP} \
 			DATABASEDIR=${DATABASEDIR} \
 			PKGNAME=${PKGNAME}
 
@@ -174,7 +187,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=		sasl2:${PORTSDIR}/security/cyrus-sasl2
+LIB_DEPENDS+=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 CONFIGURE_ARGS+=	--with-cyrus-sasl
 .else
 CONFIGURE_ARGS+=	--without-cyrus-sasl
@@ -335,11 +348,10 @@
 .else
 
 WITH_BDB_VER?=		46
-INVALID_BDB_VER=	42
-USE_BDB=		yes
+USE_BDB=		44+
 
 # XXX Can BDB 5.x use XY instead of X as version?
-.if ${WITH_BDB_VER} >= 43 || ${WITH_BDB_VER} == 5
+.if ${WITH_BDB_VER} >= 43 || ${WITH_BDB_VER} == 5 || ${WITH_BDB_VER} == 6
 CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
 			--enable-hdb=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
@@ -357,6 +369,7 @@
 .endif
 
 CPPFLAGS+=		-I${BDB_INCLUDE_DIR}
+LDFLAGS+=		-L${BDB_LIB_DIR}
 CONFIGURE_SED+=		-e 's,ol_DB_LIB=$$,&-l${BDB_LIB_NAME:R},' \
 			-e 's,(ol_cv_lib_db=)yes$$,\1-l${BDB_LIB_NAME:R},'
 .endif
@@ -420,15 +433,8 @@
 .if ${PORT_OPTIONS:MODBC}
 CONFIGURE_ARGS+=	--enable-sql=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_SQL=${BACKEND_PLIST}
-WITH_ODBC_TYPE?=	iODBC
-.if ${WITH_ODBC_TYPE:L} == iodbc
-LIB_DEPENDS+=		iodbc.3:${PORTSDIR}/databases/libiodbc
-.elif ${WITH_ODBC_TYPE:L} == unixodbc
-LIB_DEPENDS+=		odbc.2:${PORTSDIR}/databases/unixODBC
+LIB_DEPENDS+=		libodbc.so:${PORTSDIR}/databases/unixODBC
 .else
-BROKEN=			choose either iODBC or unixODBC for WITH_ODBC_TYPE
-.endif
-.else
 PLIST_SUB+=		BACK_SQL="@comment "
 .endif
 
@@ -461,11 +467,11 @@
 
 .if ${PORT_OPTIONS:MSLP}
 CONFIGURE_ARGS+=	--enable-slp
-LIB_DEPENDS+=		slp.1:${PORTSDIR}/net/openslp
+LIB_DEPENDS+=		libslp.so:${PORTSDIR}/net/openslp
 .endif
 
 # Include tcp-wrapper support
-.if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h)
+.if ${PORT_OPTIONS:MTCP_WRAPPERS}
 CONFIGURE_ARGS+=	--enable-wrappers
 .endif
 
@@ -476,28 +482,27 @@
 CPPFLAGS+=		-DLDAP_CONNECTIONLESS
 .endif
 
-CPPFLAGS+=		${PTHREAD_CFLAGS} \
-			-I${LOCALBASE}/include
-LDFLAGS+=		-L${LOCALBASE}/lib
-#LIBS+=			${PTHREAD_LIBS}
+CPPFLAGS+=		-I${LOCALBASE}/include
+LIBS+=			-L${LOCALBASE}/lib
 
-CONFIGURE_ENV+=		LIBS="${LIBS}"
-
 .if defined(CLIENT_ONLY)
-.include "${FILESDIR}/manpages.client"
 .else
 SUB_LIST+=		RC_DIR=${PREFIX} \
 			LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			DATABASEDIR=${DATABASEDIR}
-.include "${FILESDIR}/manpages.server"
 .endif
 
 PLIST_SUB+=		${SUB_LIST}
 PLIST_SUB+=		SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR}
+PLIST_SUB+=		OPENLDAP_MAJOR=${OPENLDAP_MAJOR}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \
 		${SED_MODULES} ${WRKSRC}/servers/slapd/slapd.conf
+	@${REINPLACE_CMD} -e 's,^OPT =.*,OPT = ${CFLAGS},g' \
+		-e 's,^CC =.*,CC = ${CC},g' \
+		${SED_MODULES} ${WRKSRC}/contrib/slapd-modules/*/Makefile \
+		${WRKSRC}/contrib/slapd-modules/*/*/Makefile
 .if defined(CONFIGURE_SED)
 	@${REINPLACE_CMD} -E ${CONFIGURE_SED} \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -511,18 +516,18 @@
 
 .if !defined(CLIENT_ONLY)
 test: build
-	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
+	@(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
 
 post-build:
 	@${DO_NADA}
 .if ${PORT_OPTIONS:MSMBPWD}
-	@cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd; ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} DEFS="-DDO_SAMBA" all
+	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} DEFS="-DDO_SAMBA" all)
 .endif
 .if ${PORT_OPTIONS:MSHA2}
-	@cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2; ${SETENV} ${MAKE_ENV} \
-		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all
+	@(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && ${SETENV} ${MAKE_ENV} \
+		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
 .endif
 .endif
 
@@ -533,21 +538,25 @@
 .if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI}
 	@${MKDIR} ${PREFIX}/libexec/openldap
 .endif
+.if !defined(CLIENT_ONLY)
+	@${MKDIR} ${DATABASEDIR}
+.endif
 
 post-install:
 .if defined(CLIENT_ONLY)
-.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
 	@for dir in drafts rfc; do \
-		${MKDIR} ${DOCSDIR}/$${dir}; \
+		${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
 		${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \
 	done
-.endif
+	@for library in lber ldap ldap_r; do \
+		${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
+	done
 .else
 	@${MKDIR} ${LDAP_RUN_DIR}
 	@for schema in ${SCHEMATA}; do \
-		${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema" \
+		${ECHO_CMD} "@unexec if cmp -s %D/etc/openldap/schema/$${schema}.schema " \
 			"%D/etc/openldap/schema/$${schema}.schema.default; then" \
 			"rm -f %D/etc/openldap/schema/$${schema}.schema; fi"; \
 		${ECHO_CMD} "etc/openldap/schema/$${schema}.schema.default"; \
@@ -555,6 +564,9 @@
 	done >>${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap/schema 2>/dev/null || true" >>${TMPPLIST}
 	@${ECHO_CMD} "@unexec ${RMDIR} %D/etc/openldap 2>/dev/null || true" >>${TMPPLIST}
+.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS}
+	@${STRIP_CMD} ${PREFIX}/libexec/openldap/*.so.${OPENLDAP_SHLIB_MAJOR}
+.endif
 .if ${PORT_OPTIONS:MSMBPWD}
 	@${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \
 		${PREFIX}/libexec/openldap/

Modified: trunk/net/openldap24-server/distinfo
===================================================================
--- trunk/net/openldap24-server/distinfo	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/distinfo	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.35.tgz) = 16100374c147df0d82a5c52ca60da5eca1a5ea8b5a187467d40a78e3691e9eeb
-SIZE (openldap-2.4.35.tgz) = 5486240
+SHA256 (openldap-2.4.39.tgz) = 8267c87347103fef56b783b24877c0feda1063d3cb85d070e503d076584bf8a7
+SIZE (openldap-2.4.39.tgz) = 5509060

Index: trunk/net/openldap24-server/files/extrapatch-Makefile.in
===================================================================
--- trunk/net/openldap24-server/files/extrapatch-Makefile.in	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/extrapatch-Makefile.in	2014-09-19 23:01:19 UTC (rev 17374)

Property changes on: trunk/net/openldap24-server/files/extrapatch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: trunk/net/openldap24-server/files/manpages.client
===================================================================
--- trunk/net/openldap24-server/files/manpages.client	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/manpages.client	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,201 +0,0 @@
-# $FreeBSD$
-
-MAN1+=	ldapcompare.1 \
-	ldapdelete.1 \
-	ldapexop.1 \
-	ldapmodify.1 \
-	ldapmodrdn.1 \
-	ldappasswd.1 \
-	ldapsearch.1 \
-	ldapurl.1 \
-	ldapwhoami.1
-MLINKS+= \
-	ldapmodify.1 ldapadd.1
-
-MAN3+=	lber-decode.3 \
-	lber-encode.3 \
-	lber-memory.3 \
-	lber-sockbuf.3 \
-	lber-types.3 \
-	ldap.3 \
-	ldap_abandon.3 \
-	ldap_add.3 \
-	ldap_bind.3 \
-	ldap_compare.3 \
-	ldap_controls.3 \
-	ldap_delete.3 \
-	ldap_dup.3 \
-	ldap_get_option.3 \
-	ldap_error.3 \
-	ldap_extended_operation.3 \
-	ldap_first_attribute.3 \
-	ldap_first_entry.3 \
-	ldap_first_message.3 \
-	ldap_first_reference.3 \
-	ldap_get_dn.3 \
-	ldap_get_values.3 \
-	ldap_memory.3 \
-	ldap_modify.3 \
-	ldap_modrdn.3 \
-	ldap_open.3 \
-	ldap_parse_reference.3 \
-	ldap_parse_result.3 \
-	ldap_parse_sort_control.3 \
-	ldap_parse_vlv_control.3 \
-	ldap_rename.3 \
-	ldap_result.3 \
-	ldap_schema.3 \
-	ldap_search.3 \
-	ldap_sort.3 \
-	ldap_sync.3 \
-	ldap_tls.3 \
-	ldap_url.3
-MLINKS+= \
-	lber-decode.3 ber_get_next.3 \
-	lber-decode.3 ber_skip_tag.3 \
-	lber-decode.3 ber_peek_tag.3 \
-	lber-decode.3 ber_scanf.3 \
-	lber-decode.3 ber_get_int.3 \
-	lber-decode.3 ber_get_stringa.3 \
-	lber-decode.3 ber_get_stringb.3 \
-	lber-decode.3 ber_get_null.3 \
-	lber-decode.3 ber_get_enum.3 \
-	lber-decode.3 ber_get_boolean.3 \
-	lber-decode.3 ber_get_bitstring.3 \
-	lber-decode.3 ber_first_element.3 \
-	lber-decode.3 ber_next_element.3 \
-	lber-encode.3 ber_alloc_t.3 \
-	lber-encode.3 ber_flush.3 \
-	lber-encode.3 ber_printf.3 \
-	lber-encode.3 ber_put_int.3 \
-	lber-encode.3 ber_put_ostring.3 \
-	lber-encode.3 ber_put_string.3 \
-	lber-encode.3 ber_put_null.3 \
-	lber-encode.3 ber_put_enum.3 \
-	lber-encode.3 ber_start_set.3 \
-	lber-encode.3 ber_put_seq.3 \
-	lber-encode.3 ber_put_set.3 \
-	lber-types.3 ber_bvarray_add.3 \
-	lber-types.3 ber_bvarray_free.3 \
-	lber-types.3 ber_bvdup.3 \
-	lber-types.3 ber_bvecadd.3 \
-	lber-types.3 ber_bvecfree.3 \
-	lber-types.3 ber_bvfree.3 \
-	lber-types.3 ber_bvstr.3 \
-	lber-types.3 ber_bvstrdup.3 \
-	lber-types.3 ber_dupbv.3 \
-	lber-types.3 ber_free.3 \
-	lber-types.3 ber_str2bv.3 \
-	ldap_abandon.3 ldap_abandon_ext.3 \
-	ldap_add.3 ldap_add_s.3 \
-	ldap_add.3 ldap_add_ext.3 \
-	ldap_add.3 ldap_add_ext_s.3 \
-	ldap_bind.3 ldap_bind_s.3 \
-	ldap_bind.3 ldap_simple_bind.3 \
-	ldap_bind.3 ldap_simple_bind_s.3 \
-	ldap_bind.3 ldap_sasl_bind.3 \
-	ldap_bind.3 ldap_sasl_bind_s.3 \
-	ldap_bind.3 ldap_unbind.3 \
-	ldap_bind.3 ldap_unbind_ext.3 \
-	ldap_bind.3 ldap_unbind_s.3 \
-	ldap_bind.3 ldap_unbind_ext_s.3 \
-	ldap_bind.3 ldap_set_rebind_proc.3 \
-	ldap_compare.3 ldap_compare_s.3 \
-	ldap_compare.3 ldap_compare_ext.3 \
-	ldap_compare.3 ldap_compare_ext_s.3 \
-	ldap_controls.3 ldap_control_create.3 \
-	ldap_controls.3 ldap_control_find.3 \
-	ldap_controls.3 ldap_control_dup.3 \
-	ldap_controls.3 ldap_controls_dup.3 \
-	ldap_controls.3 ldap_control_free.3 \
-	ldap_controls.3 ldap_controls_free.3 \
-	ldap_delete.3 ldap_delete_s.3 \
-	ldap_delete.3 ldap_delete_ext.3 \
-	ldap_delete.3 ldap_delete_ext_s.3 \
-	ldap_dup.3 ldap_destroy.3 \
-	ldap_error.3 ldap_perror.3 \
-	ldap_error.3 ld_errno.3 \
-	ldap_error.3 ldap_result2error.3 \
-	ldap_error.3 ldap_errlist.3 \
-	ldap_error.3 ldap_err2string.3 \
-	ldap_extended_operation.3 ldap_extended_operation_s.3 \
-	ldap_first_attribute.3 ldap_next_attribute.3 \
-	ldap_first_entry.3 ldap_next_entry.3 \
-	ldap_first_entry.3 ldap_count_entries.3 \
-	ldap_first_message.3 ldap_next_message.3 \
-	ldap_first_message.3 ldap_count_messages.3 \
-	ldap_first_reference.3 ldap_next_reference.3 \
-	ldap_first_reference.3 ldap_count_references.3 \
-	ldap_get_dn.3 ldap_explode_dn.3 \
-	ldap_get_dn.3 ldap_explode_rdn.3 \
-	ldap_get_dn.3 ldap_dn2ufn.3 \
-	ldap_get_dn.3 ldap_str2dn.3 \
-	ldap_get_dn.3 ldap_dn2str.3 \
-	ldap_get_dn.3 ldap_dn2dcedn.3 \
-	ldap_get_dn.3 ldap_dcedn2dn.3 \
-	ldap_get_dn.3 ldap_dn2ad_canonical.3 \
-	ldap_get_dn.3 ldap_dnfree.3 \
-	ldap_get_option.3 ldap_set_option.3 \
-	ldap_get_values.3 ldap_get_values_len.3 \
-	ldap_get_values.3 ldap_value_free.3 \
-	ldap_get_values.3 ldap_value_free_len.3 \
-	ldap_get_values.3 ldap_count_values.3 \
-	ldap_get_values.3 ldap_count_values_len.3 \
-	ldap_memory.3 ldap_memfree.3 \
-	ldap_memory.3 ldap_memvfree.3 \
-	ldap_memory.3 ldap_memalloc.3 \
-	ldap_memory.3 ldap_memcalloc.3 \
-	ldap_memory.3 ldap_memrealloc.3 \
-	ldap_memory.3 ldap_strdup.3 \
-	ldap_modify.3 ldap_modify_s.3 \
-	ldap_modify.3 ldap_modify_ext.3 \
-	ldap_modify.3 ldap_modify_ext_s.3 \
-	ldap_modify.3 ldap_mods_free.3 \
-	ldap_modrdn.3 ldap_modrdn_s.3 \
-	ldap_modrdn.3 ldap_modrdn2.3 \
-	ldap_modrdn.3 ldap_modrdn2_s.3 \
-	ldap_open.3 ldap_init.3 \
-	ldap_open.3 ldap_initialize.3 \
-	ldap_open.3 ldap_init_fd.3 \
-	ldap_open.3 ldap_set_urllist_proc.3 \
-	ldap_parse_result.3 ldap_parse_sasl_bind_result.3 \
-	ldap_parse_result.3 ldap_parse_extended_result.3 \
-	ldap_rename.3 ldap_rename_s.3 \
-	ldap_result.3 ldap_msgfree.3 \
-	ldap_result.3 ldap_msgtype.3 \
-	ldap_result.3 ldap_msgid.3 \
-	ldap_schema.3 ldap_str2syntax.3 \
-	ldap_schema.3 ldap_syntax2str.3 \
-	ldap_schema.3 ldap_syntax2name.3 \
-	ldap_schema.3 ldap_syntax_free.3 \
-	ldap_schema.3 ldap_str2matchingrule.3 \
-	ldap_schema.3 ldap_matchingrule2str.3 \
-	ldap_schema.3 ldap_matchingrule2name.3 \
-	ldap_schema.3 ldap_matchingrule_free.3 \
-	ldap_schema.3 ldap_str2attributetype.3 \
-	ldap_schema.3 ldap_attributetype2str.3 \
-	ldap_schema.3 ldap_attributetype2name.3 \
-	ldap_schema.3 ldap_attributetype_free.3 \
-	ldap_schema.3 ldap_str2objectclass.3 \
-	ldap_schema.3 ldap_objectclass2str.3 \
-	ldap_schema.3 ldap_objectclass2name.3 \
-	ldap_schema.3 ldap_objectclass_free.3 \
-	ldap_schema.3 ldap_scherr2str.3 \
-	ldap_search.3 ldap_search_s.3 \
-	ldap_search.3 ldap_search_st.3 \
-	ldap_search.3 ldap_search_ext.3 \
-	ldap_search.3 ldap_search_ext_s.3 \
-	ldap_sort.3 ldap_sort_entries.3 \
-	ldap_sort.3 ldap_sort_values.3 \
-	ldap_sort.3 ldap_sort_strcasecmp.3 \
-	ldap_tls.3 ldap_start_tls.3 \
-	ldap_tls.3 ldap_start_tls_s.3 \
-	ldap_tls.3 ldap_tls_inplace.3 \
-	ldap_tls.3 ldap_install_tls.3 \
-	ldap_url.3 ldap_is_ldap_url.3 \
-	ldap_url.3 ldap_url_parse.3 \
-	ldap_url.3 ldap_free_urldesc.3
-
-MAN5+=	ldap.conf.5 \
-	ldif.5 \
-

Deleted: trunk/net/openldap24-server/files/manpages.server
===================================================================
--- trunk/net/openldap24-server/files/manpages.server	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/manpages.server	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,58 +0,0 @@
-# $FreeBSD$
-
-MAN5+=	slapd-bdb.5 \
-	slapd-config.5 \
-	slapd-dnssrv.5 \
-	slapd-ldap.5 \
-	slapd-ldbm.5 \
-	slapd-ldif.5 \
-	slapd-mdb.5 \
-	slapd-meta.5 \
-	slapd-monitor.5 \
-	slapd-ndb.5 \
-	slapd-null.5 \
-	slapd-passwd.5 \
-	slapd-perl.5 \
-	slapd-relay.5 \
-	slapd-shell.5 \
-	slapd-sock.5 \
-	slapd-sql.5 \
-	slapd.access.5 \
-	slapd.backends.5 \
-	slapd.conf.5 \
-	slapd.overlays.5 \
-	slapd.plugin.5 \
-	slapo-accesslog.5 \
-	slapo-auditlog.5 \
-	slapo-chain.5 \
-	slapo-collect.5 \
-	slapo-constraint.5 \
-	slapo-dds.5 \
-	slapo-dyngroup.5 \
-	slapo-dynlist.5 \
-	slapo-memberof.5 \
-	slapo-pbind.5 \
-	slapo-pcache.5 \
-	slapo-ppolicy.5 \
-	slapo-refint.5 \
-	slapo-retcode.5 \
-	slapo-rwm.5 \
-	slapo-syncprov.5 \
-	slapo-sssvlv.5 \
-	slapo-translucent.5 \
-	slapo-unique.5 \
-	slapo-valsort.5 
-MLINKS+= \
-	slapd-bdb.5 slapd-hdb.5 \
-	slapd-sock.5 slapo-sock.5
-
-MAN8+=	slapacl.8 \
-	slapadd.8 \
-	slapauth.8 \
-	slapcat.8 \
-	slapd.8 \
-	slapdn.8 \
-	slapindex.8 \
-	slappasswd.8 \
-	slapschema.8 \
-	slaptest.8

Added: trunk/net/openldap24-server/files/patch-ITS7249
===================================================================
--- trunk/net/openldap24-server/files/patch-ITS7249	                        (rev 0)
+++ trunk/net/openldap24-server/files/patch-ITS7249	2014-09-19 23:01:19 UTC (rev 17374)
@@ -0,0 +1,56 @@
+--- servers/slapd/overlays/memberof.c.orig	2013-11-14 19:31:27.000000000 -0800
++++ servers/slapd/overlays/memberof.c	2013-12-12 16:44:13.000000000 -0800
+@@ -190,7 +190,16 @@
+ 	BerVarray memberof;
+ 	memberof_is_t what;
+ } memberof_cbinfo_t;
+-	
++
++static void
++memberof_set_backend(Operation *op_target, Operation *op, slap_overinst *on)
++{
++	BackendInfo *bi = op->o_bd->bd_info;
++
++	if (bi->bi_type == memberof.on_bi.bi_type)
++		op_target->o_bd->bd_info = (BackendInfo *)on->on_info;
++}
++
+ static int
+ memberof_isGroupOrMember_cb( Operation *op, SlapReply *rs )
+ {
+@@ -285,7 +294,7 @@
+ 		op2.ors_filterstr = mo->mo_groupFilterstr;
+ 		op2.ors_filter = &mo->mo_groupFilter;
+ 
+-		op2.o_bd->bd_info = (BackendInfo *)on->on_info;
++		memberof_set_backend(&op2, op, on);
+ 		(void)op->o_bd->be_search( &op2, &rs2 );
+ 		op2.o_bd->bd_info = bi;
+ 
+@@ -307,7 +316,7 @@
+ 		op2.ors_filterstr = mo->mo_memberFilterstr;
+ 		op2.ors_filter = &mo->mo_memberFilter;
+ 
+-		op2.o_bd->bd_info = (BackendInfo *)on->on_info;
++		memberof_set_backend(&op2, op, on);
+ 		(void)op->o_bd->be_search( &op2, &rs2 );
+ 		op2.o_bd->bd_info = bi;
+ 
+@@ -409,7 +418,7 @@
+ 
+ 		oex.oe_key = (void *)&memberof;
+ 		LDAP_SLIST_INSERT_HEAD(&op2.o_extra, &oex, oe_next);
+-		op2.o_bd->bd_info = (BackendInfo *)on->on_info;
++		memberof_set_backend(&op2, op, on);
+ 		(void)op->o_bd->be_modify( &op2, &rs2 );
+ 		op2.o_bd->bd_info = bi;
+ 		LDAP_SLIST_REMOVE(&op2.o_extra, &oex, OpExtra, oe_next);
+@@ -451,7 +460,7 @@
+ 
+ 		oex.oe_key = (void *)&memberof;
+ 		LDAP_SLIST_INSERT_HEAD(&op2.o_extra, &oex, oe_next);
+-		op2.o_bd->bd_info = (BackendInfo *)on->on_info;
++		memberof_set_backend(&op2, op, on);
+ 		(void)op->o_bd->be_modify( &op2, &rs2 );
+ 		op2.o_bd->bd_info = bi;
+ 		LDAP_SLIST_REMOVE(&op2.o_extra, &oex, OpExtra, oe_next);

Index: trunk/net/openldap24-server/files/patch-ITS7548
===================================================================
--- trunk/net/openldap24-server/files/patch-ITS7548	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/patch-ITS7548	2014-09-19 23:01:19 UTC (rev 17374)

Property changes on: trunk/net/openldap24-server/files/patch-ITS7548
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/net/openldap24-server/files/patch-bdb6
===================================================================
--- trunk/net/openldap24-server/files/patch-bdb6	                        (rev 0)
+++ trunk/net/openldap24-server/files/patch-bdb6	2014-09-19 23:01:19 UTC (rev 17374)
@@ -0,0 +1,18 @@
+--- build/openldap.m4.orig	2013-11-15 12:31:27.000000000 +0900
++++ build/openldap.m4	2014-01-10 15:21:33.000000000 +0900
+@@ -357,7 +357,14 @@
+ AC_DEFUN([OL_BERKELEY_DB_LINK],
+ [ol_cv_lib_db=no
+ 
+-if test $ol_cv_bdb_major = 5 ; then
++if test $ol_cv_bdb_major = 6 ; then
++	OL_BERKELEY_DB_TRY(ol_cv_db_db_6_dot_m,[-ldb-6.$ol_cv_bdb_minor])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db6m,[-ldb6$ol_cv_bdb_minor])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db_6m,[-ldb-6$ol_cv_bdb_minor])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db_6_m,[-ldb-6-$ol_cv_bdb_minor])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db_6,[-ldb-6])
++	OL_BERKELEY_DB_TRY(ol_cv_db_db6,[-ldb6])
++elif test $ol_cv_bdb_major = 5 ; then
+ 	OL_BERKELEY_DB_TRY(ol_cv_db_db_5_dot_m,[-ldb-5.$ol_cv_bdb_minor])
+ 	OL_BERKELEY_DB_TRY(ol_cv_db_db5m,[-ldb5$ol_cv_bdb_minor])
+ 	OL_BERKELEY_DB_TRY(ol_cv_db_db_5m,[-ldb-5$ol_cv_bdb_minor])

Deleted: trunk/net/openldap24-server/files/patch-build::top.mk
===================================================================
--- trunk/net/openldap24-server/files/patch-build::top.mk	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/patch-build::top.mk	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,11 +0,0 @@
---- build/top.mk.orig	Mon Apr 12 20:21:07 2004
-+++ build/top.mk	Wed May  5 12:49:13 2004
-@@ -196,6 +196,8 @@
- SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
- SLURPD_LIBS = @SLURPD_LIBS@
- 
-+SLAPI_LIBS = @SLAPI_LIBS@
-+
- # Our Defaults
- CC = $(AC_CC)
- DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)

Index: trunk/net/openldap24-server/files/patch-configure
===================================================================
--- trunk/net/openldap24-server/files/patch-configure	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/patch-configure	2014-09-19 23:01:19 UTC (rev 17374)

Property changes on: trunk/net/openldap24-server/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Deleted: trunk/net/openldap24-server/files/patch-include::ldap_defaults.h
===================================================================
--- trunk/net/openldap24-server/files/patch-include::ldap_defaults.h	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/patch-include::ldap_defaults.h	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,11 +0,0 @@
---- include/ldap_defaults.h.orig	Tue Sep 28 20:18:40 2004
-+++ include/ldap_defaults.h	Tue Sep 28 20:20:01 2004
-@@ -39,7 +39,7 @@
- #define LDAP_ENV_PREFIX "LDAP"
- 
- /* default ldapi:// socket */
--#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
-+#define LDAPI_SOCK "/var/run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
- 
- /*
-  * SLAPD DEFINITIONS

Added: trunk/net/openldap24-server/files/patch-include__ldap_defaults.h
===================================================================
--- trunk/net/openldap24-server/files/patch-include__ldap_defaults.h	                        (rev 0)
+++ trunk/net/openldap24-server/files/patch-include__ldap_defaults.h	2014-09-19 23:01:19 UTC (rev 17374)
@@ -0,0 +1,11 @@
+--- include/ldap_defaults.h.orig	Tue Sep 28 20:18:40 2004
++++ include/ldap_defaults.h	Tue Sep 28 20:20:01 2004
+@@ -39,7 +39,7 @@
+ #define LDAP_ENV_PREFIX "LDAP"
+ 
+ /* default ldapi:// socket */
+-#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"
++#define LDAPI_SOCK "/var/run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"
+ 
+ /*
+  * SLAPD DEFINITIONS

Index: trunk/net/openldap24-server/files/patch-libraries__libldap__tls_o.c
===================================================================
--- trunk/net/openldap24-server/files/patch-libraries__libldap__tls_o.c	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/patch-libraries__libldap__tls_o.c	2014-09-19 23:01:19 UTC (rev 17374)

Property changes on: trunk/net/openldap24-server/files/patch-libraries__libldap__tls_o.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/net/openldap24-server/files/patch-servers::slapd::Makefile.in
===================================================================
--- trunk/net/openldap24-server/files/patch-servers::slapd::Makefile.in	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/patch-servers::slapd::Makefile.in	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,44 +0,0 @@
---- servers/slapd/Makefile.in.orig	2008-02-11 15:26:43.000000000 -0800
-+++ servers/slapd/Makefile.in	2008-07-19 20:10:16.023473779 -0700
-@@ -374,7 +374,6 @@
- 
- install-slapd: FORCE
- 	-$(MKDIR) $(DESTDIR)$(libexecdir)
--	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
- 	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
- 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
- 	@for i in $(SUBDIRS); do \
-@@ -405,16 +404,18 @@
- 	touch all-cffiles
- 
- install-schema: FORCE
--	@if test -d $(DESTDIR)$(schemadir) ; then \
--		echo "MOVING EXISTING SCHEMA DIR to $(DESTDIR)$(schemadir).$$$$" ; \
--		mv $(DESTDIR)$(schemadir) $(DESTDIR)$(schemadir).$$$$ ; \
--	fi
--	$(MKDIR) $(DESTDIR)$(schemadir)
-+	@-$(MKDIR) $(DESTDIR)$(schemadir)
- 	@SD=$(DESTDIR)$(schemadir) ; \
--	files=`cd $(srcdir)/schema ; echo README *.ldif *.schema` ; \
-+	files=`cd $(srcdir)/schema ; echo README *.ldif` ; \
- 	for i in $$files ; do \
- 		echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \
- 		$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \
-+	done ; \
-+	files=`cd $(srcdir)/schema ; echo *.schema` ; \
-+	for i in $$files ; do \
-+		echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \
-+		$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \
-+		$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i.default ; \
- 	done
- 
- install-conf: FORCE
-@@ -432,8 +433,6 @@
- 	@-$(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
- 
- install-tools: FORCE

Added: trunk/net/openldap24-server/files/patch-servers__slapd__Makefile.in
===================================================================
--- trunk/net/openldap24-server/files/patch-servers__slapd__Makefile.in	                        (rev 0)
+++ trunk/net/openldap24-server/files/patch-servers__slapd__Makefile.in	2014-09-19 23:01:19 UTC (rev 17374)
@@ -0,0 +1,44 @@
+--- servers/slapd/Makefile.in.orig	2008-02-11 15:26:43.000000000 -0800
++++ servers/slapd/Makefile.in	2008-07-19 20:10:16.023473779 -0700
+@@ -371,7 +371,6 @@
+ 
+ install-slapd: FORCE
+ 	-$(MKDIR) $(DESTDIR)$(libexecdir)
+-	-$(MKDIR) $(DESTDIR)$(localstatedir)/run
+ 	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
+ 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
+ 	@for i in $(SUBDIRS); do \
+@@ -406,16 +405,18 @@
+ 	touch all-cffiles
+ 
+ install-schema: FORCE
+-	@if test -d $(DESTDIR)$(schemadir) ; then \
+-		echo "MOVING EXISTING SCHEMA DIR to $(DESTDIR)$(schemadir).$$$$" ; \
+-		mv $(DESTDIR)$(schemadir) $(DESTDIR)$(schemadir).$$$$ ; \
+-	fi
+-	$(MKDIR) $(DESTDIR)$(schemadir)
++	@-$(MKDIR) $(DESTDIR)$(schemadir)
+ 	@SD=$(DESTDIR)$(schemadir) ; \
+-	files=`cd $(srcdir)/schema ; echo README *.ldif *.schema` ; \
++	files=`cd $(srcdir)/schema ; echo README *.ldif` ; \
+ 	for i in $$files ; do \
+ 		echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \
+ 		$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \
++	done ; \
++	files=`cd $(srcdir)/schema ; echo *.schema` ; \
++	for i in $$files ; do \
++		echo $(INSTALL) $(INSTALLFLAGS) -m 444 schema/$$i $$SD/$$i ; \
++		[ -f $$SD/$$i ] || $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i ; \
++		$(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i.default ; \
+ 	done
+ 
+ install-conf: FORCE
+@@ -441,8 +442,6 @@
+ 	@-$(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
+ 
+ install-tools: FORCE

Deleted: trunk/net/openldap24-server/files/patch-shlib-version
===================================================================
--- trunk/net/openldap24-server/files/patch-shlib-version	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/patch-shlib-version	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,15 +0,0 @@
-# I have checked all headers and don't think the shared library
-# bump is a needed one.  We patch it back to prevent large
-# rebuild need.
---- build/version.var.orig	2013-03-28 08:41:51.000000000 -0700
-+++ build/version.var	2013-04-04 11:54:45.040564564 -0700
-@@ -17,7 +17,7 @@
- ol_minor=4
- ol_patch=35
- ol_api_inc=20435
--ol_api_current=11
-+ol_api_current=8
- ol_api_revision=1
--ol_api_age=9
-+ol_api_age=8
- ol_release_date="2013/03/31"

Modified: trunk/net/openldap24-server/files/patch-smbk5pwd-Makefile
===================================================================
--- trunk/net/openldap24-server/files/patch-smbk5pwd-Makefile	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/patch-smbk5pwd-Makefile	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,12 +1,6 @@
 --- contrib/slapd-modules/smbk5pwd/Makefile.orig	2013-03-03 13:17:30.000000000 -0800
 +++ contrib/slapd-modules/smbk5pwd/Makefile	2013-03-14 10:54:56.917578861 -0700
-@@ -24,13 +24,12 @@
- HEIMDAL_INC = -I/usr/heimdal/include
- HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
- 
--LIBTOOL = $(LDAP_BUILD)/libtool
- CC = gcc
- OPT = -g -O2 -Wall
+@@ -30,7 +30,7 @@
  # 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)


Property changes on: trunk/net/openldap24-server/files/patch-smbk5pwd-Makefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/openldap24-server/files/pkg-deinstall.in
===================================================================
--- trunk/net/openldap24-server/files/pkg-deinstall.in	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/pkg-deinstall.in	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/net/openldap24-server/files/pkg-deinstall.in 340719 2014-01-22 15:52:06Z mat $
 #
 
 ECHO_CMD=echo


Property changes on: trunk/net/openldap24-server/files/pkg-deinstall.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/net/openldap24-server/files/pkg-message.client.in
===================================================================
--- trunk/net/openldap24-server/files/pkg-message.client.in	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/pkg-message.client.in	2014-09-19 23:01:19 UTC (rev 17374)

Property changes on: trunk/net/openldap24-server/files/pkg-message.client.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/net/openldap24-server/files/pkg-message.in
===================================================================
--- trunk/net/openldap24-server/files/pkg-message.in	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/pkg-message.in	2014-09-19 23:01:19 UTC (rev 17374)

Property changes on: trunk/net/openldap24-server/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/net/openldap24-server/files/slapd.in
===================================================================
--- trunk/net/openldap24-server/files/slapd.in	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/files/slapd.in	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,11 +1,11 @@
 #!/bin/sh
 #
-# $FreeBSD$
+# $FreeBSD: head/net/openldap24-server/files/slapd.in 348655 2014-03-19 22:44:50Z delphij $
 #
 
 # PROVIDE: slapd
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: securelevel
+# REQUIRE: FILESYSTEMS ldconfig
+# BEFORE: SERVERS
 # KEYWORD: shutdown
 
 #
@@ -47,7 +47,7 @@
   warn "slapd_args is deprecated, use slapd_flags"
   : ${slapd_flags="$slapd_args"}
 fi
-: ${slapd_owner="ldap:ldap"}
+: ${slapd_owner="%%LDAP_USER%%:%%LDAP_GROUP%%"}
 : ${slapd_sockets_mode="666"}
 : ${slapd_cn_config="NO"}
 
@@ -83,7 +83,7 @@
     for DBDIR in ${DATABASEDIR}; do
        if [ ! -d "${DBDIR}" ]; then
           mkdir -p "${DBDIR}"
-          cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG"
+          [ -f "%%PREFIX%%/etc/openldap/DB_CONFIG.example" ] && cp "%%PREFIX%%/etc/openldap/DB_CONFIG.example" "${DBDIR}/DB_CONFIG"
        fi
        chown -RL "$slapd_owner" "${DBDIR}"
        chmod 700 "${DBDIR}"


Property changes on: trunk/net/openldap24-server/files/slapd.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/openldap24-server/pkg-descr
===================================================================
--- trunk/net/openldap24-server/pkg-descr	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/pkg-descr	2014-09-19 23:01:19 UTC (rev 17374)

Property changes on: trunk/net/openldap24-server/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/net/openldap24-server/pkg-descr.client
===================================================================
--- trunk/net/openldap24-server/pkg-descr.client	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/pkg-descr.client	2014-09-19 23:01:19 UTC (rev 17374)

Property changes on: trunk/net/openldap24-server/pkg-descr.client
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/net/openldap24-server/pkg-plist
===================================================================
--- trunk/net/openldap24-server/pkg-plist	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/pkg-plist	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,4 +1,3 @@
- at comment $FreeBSD$
 @unexec %%RC_DIR%%/etc/rc.d/slapd stop 2>&1 >/dev/null || true
 etc/openldap/slapd.ldif.default
 etc/openldap/slapd.ldif
@@ -19,67 +18,67 @@
 etc/openldap/schema/corba.ldif
 etc/openldap/schema/collective.ldif
 etc/openldap/schema/README
-etc/openldap/DB_CONFIG.example
+%%BACK_BDB%%etc/openldap/DB_CONFIG.example
+%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%SLAPI%%lib/libslapi.a
 %%SLAPI%%lib/libslapi.la
 %%SLAPI%%lib/libslapi.so
-%%SLAPI%%lib/libslapi-2.4.so
-%%SLAPI%%lib/libslapi-2.4.so.%%SHLIB_MAJOR%%
 %%MODULES%%@exec mkdir -p %D/libexec/openldap
-%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so
-%%BACK_BDB%%libexec/openldap/back_bdb-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_BDB%%libexec/openldap/back_bdb.la
 %%BACK_BDB%%libexec/openldap/back_bdb.so
-%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so
-%%BACK_HDB%%libexec/openldap/back_hdb-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_HDB%%libexec/openldap/back_hdb.la
 %%BACK_HDB%%libexec/openldap/back_hdb.so
-%%BACKEND%%libexec/openldap/back_ldap-2.4.so
-%%BACKEND%%libexec/openldap/back_ldap-2.4.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACKEND%%libexec/openldap/back_ldap.la
 %%BACKEND%%libexec/openldap/back_ldap.so
-%%BACKEND%%libexec/openldap/back_meta-2.4.so
-%%BACKEND%%libexec/openldap/back_meta-2.4.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACKEND%%libexec/openldap/back_meta.la
 %%BACKEND%%libexec/openldap/back_meta.so
-%%BACKEND%%libexec/openldap/back_monitor-2.4.so
-%%BACKEND%%libexec/openldap/back_monitor-2.4.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACKEND%%libexec/openldap/back_monitor.la
 %%BACKEND%%libexec/openldap/back_monitor.so
-%%BACKEND%%libexec/openldap/back_null-2.4.so
-%%BACKEND%%libexec/openldap/back_null-2.4.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACKEND%%libexec/openldap/back_null.la
 %%BACKEND%%libexec/openldap/back_null.so
-%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so
-%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la
 %%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so
-%%BACK_MDB%%libexec/openldap/back_mdb-2.4.so
-%%BACK_MDB%%libexec/openldap/back_mdb-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_MDB%%libexec/openldap/back_mdb.la
 %%BACK_MDB%%libexec/openldap/back_mdb.so
-%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so
-%%BACK_PASSWD%%libexec/openldap/back_passwd-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_PASSWD%%libexec/openldap/back_passwd.la
 %%BACK_PASSWD%%libexec/openldap/back_passwd.so
-%%BACK_PERL%%libexec/openldap/back_perl-2.4.so
-%%BACK_PERL%%libexec/openldap/back_perl-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_PERL%%libexec/openldap/back_perl.la
 %%BACK_PERL%%libexec/openldap/back_perl.so
-%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so
-%%BACK_RELAY%%libexec/openldap/back_relay-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_RELAY%%libexec/openldap/back_relay.la
 %%BACK_RELAY%%libexec/openldap/back_relay.so
-%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so
-%%BACK_SHELL%%libexec/openldap/back_shell-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_SHELL%%libexec/openldap/back_shell.la
 %%BACK_SHELL%%libexec/openldap/back_shell.so
-%%BACK_SOCK%%libexec/openldap/back_sock-2.4.so
-%%BACK_SOCK%%libexec/openldap/back_sock-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_SOCK%%libexec/openldap/back_sock.la
 %%BACK_SOCK%%libexec/openldap/back_sock.so
-%%BACK_SQL%%libexec/openldap/back_sql-2.4.so
-%%BACK_SQL%%libexec/openldap/back_sql-2.4.so.%%SHLIB_MAJOR%%
+%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
 %%SHA2%%libexec/openldap/pw-sha2.la
@@ -99,7 +98,67 @@
 sbin/slappasswd
 sbin/slapschema
 sbin/slaptest
+man/man5/slapd-bdb.5.gz
+man/man5/slapd-config.5.gz
+man/man5/slapd-dnssrv.5.gz
+man/man5/slapd-hdb.5.gz
+man/man5/slapd-ldap.5.gz
+man/man5/slapd-ldbm.5.gz
+man/man5/slapd-ldif.5.gz
+man/man5/slapd-mdb.5.gz
+man/man5/slapd-meta.5.gz
+man/man5/slapd-monitor.5.gz
+man/man5/slapd-ndb.5.gz
+man/man5/slapd-null.5.gz
+man/man5/slapd-passwd.5.gz
+man/man5/slapd-perl.5.gz
+man/man5/slapd-relay.5.gz
+man/man5/slapd-shell.5.gz
+man/man5/slapd-sock.5.gz
+man/man5/slapd-sql.5.gz
+man/man5/slapd.access.5.gz
+man/man5/slapd.backends.5.gz
+man/man5/slapd.conf.5.gz
+man/man5/slapd.overlays.5.gz
+man/man5/slapd.plugin.5.gz
+man/man5/slapo-accesslog.5.gz
+man/man5/slapo-auditlog.5.gz
+man/man5/slapo-chain.5.gz
+man/man5/slapo-collect.5.gz
+man/man5/slapo-constraint.5.gz
+man/man5/slapo-dds.5.gz
+man/man5/slapo-dyngroup.5.gz
+man/man5/slapo-dynlist.5.gz
+man/man5/slapo-memberof.5.gz
+man/man5/slapo-pbind.5.gz
+man/man5/slapo-pcache.5.gz
+man/man5/slapo-ppolicy.5.gz
+man/man5/slapo-refint.5.gz
+man/man5/slapo-retcode.5.gz
+man/man5/slapo-rwm.5.gz
+man/man5/slapo-sock.5.gz
+man/man5/slapo-sssvlv.5.gz
+man/man5/slapo-syncprov.5.gz
+man/man5/slapo-translucent.5.gz
+man/man5/slapo-unique.5.gz
+man/man5/slapo-valsort.5.gz
+man/man8/slapacl.8.gz
+man/man8/slapadd.8.gz
+man/man8/slapauth.8.gz
+man/man8/slapcat.8.gz
+man/man8/slapd.8.gz
+man/man8/slapdn.8.gz
+man/man8/slapindex.8.gz
+man/man8/slappasswd.8.gz
+man/man8/slapschema.8.gz
+man/man8/slaptest.8.gz
 @cwd /
- at exec mkdir -p %%LDAP_RUN_DIR%%
+ at owner %%LDAP_USER%%
+ at group %%LDAP_USER%%
+ at exec install -d -o %%LDAP_USER%% -g %%LDAP_GROUP%% %%LDAP_RUN_DIR%%
 @dirrmtry %%LDAP_RUN_DIR%%
+ at exec install -d -o %%LDAP_USER%% -g %%LDAP_GROUP%% %%DATABASEDIR%%
+ at dirrmtry %%DATABASEDIR%%
+ at owner root
+ at group wheel
 @cwd %%PREFIX%%

Modified: trunk/net/openldap24-server/pkg-plist.client
===================================================================
--- trunk/net/openldap24-server/pkg-plist.client	2014-09-19 22:55:29 UTC (rev 17373)
+++ trunk/net/openldap24-server/pkg-plist.client	2014-09-19 23:01:19 UTC (rev 17374)
@@ -1,4 +1,3 @@
- at comment $FreeBSD$
 bin/ldapadd
 bin/ldapcompare
 bin/ldapdelete
@@ -22,18 +21,212 @@
 include/ldap_utf8.h
 include/ldif.h
 include/slapi-plugin.h
-lib/liblber-2.4.so
-lib/liblber-2.4.so.%%SHLIB_MAJOR%%
+lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 lib/liblber.a
 lib/liblber.la
 lib/liblber.so
-lib/libldap-2.4.so
-lib/libldap-2.4.so.%%SHLIB_MAJOR%%
+lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 lib/libldap.a
 lib/libldap.la
 lib/libldap.so
-lib/libldap_r-2.4.so
-lib/libldap_r-2.4.so.%%SHLIB_MAJOR%%
+lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
 lib/libldap_r.a
 lib/libldap_r.la
 lib/libldap_r.so
+man/man1/ldapadd.1.gz
+man/man1/ldapcompare.1.gz
+man/man1/ldapdelete.1.gz
+man/man1/ldapexop.1.gz
+man/man1/ldapmodify.1.gz
+man/man1/ldapmodrdn.1.gz
+man/man1/ldappasswd.1.gz
+man/man1/ldapsearch.1.gz
+man/man1/ldapurl.1.gz
+man/man1/ldapwhoami.1.gz
+man/man3/ber_alloc_t.3.gz
+man/man3/ber_bvarray_add.3.gz
+man/man3/ber_bvarray_free.3.gz
+man/man3/ber_bvdup.3.gz
+man/man3/ber_bvecadd.3.gz
+man/man3/ber_bvecfree.3.gz
+man/man3/ber_bvfree.3.gz
+man/man3/ber_bvstr.3.gz
+man/man3/ber_bvstrdup.3.gz
+man/man3/ber_dupbv.3.gz
+man/man3/ber_first_element.3.gz
+man/man3/ber_flush.3.gz
+man/man3/ber_free.3.gz
+man/man3/ber_get_bitstring.3.gz
+man/man3/ber_get_boolean.3.gz
+man/man3/ber_get_enum.3.gz
+man/man3/ber_get_int.3.gz
+man/man3/ber_get_next.3.gz
+man/man3/ber_get_null.3.gz
+man/man3/ber_get_stringa.3.gz
+man/man3/ber_get_stringb.3.gz
+man/man3/ber_next_element.3.gz
+man/man3/ber_peek_tag.3.gz
+man/man3/ber_printf.3.gz
+man/man3/ber_put_enum.3.gz
+man/man3/ber_put_int.3.gz
+man/man3/ber_put_null.3.gz
+man/man3/ber_put_ostring.3.gz
+man/man3/ber_put_seq.3.gz
+man/man3/ber_put_set.3.gz
+man/man3/ber_put_string.3.gz
+man/man3/ber_scanf.3.gz
+man/man3/ber_skip_tag.3.gz
+man/man3/ber_start_set.3.gz
+man/man3/ber_str2bv.3.gz
+man/man3/lber-decode.3.gz
+man/man3/lber-encode.3.gz
+man/man3/lber-memory.3.gz
+man/man3/lber-sockbuf.3.gz
+man/man3/lber-types.3.gz
+man/man3/ld_errno.3.gz
+man/man3/ldap.3.gz
+man/man3/ldap_abandon.3.gz
+man/man3/ldap_abandon_ext.3.gz
+man/man3/ldap_add.3.gz
+man/man3/ldap_add_ext.3.gz
+man/man3/ldap_add_ext_s.3.gz
+man/man3/ldap_add_s.3.gz
+man/man3/ldap_attributetype2name.3.gz
+man/man3/ldap_attributetype2str.3.gz
+man/man3/ldap_attributetype_free.3.gz
+man/man3/ldap_bind.3.gz
+man/man3/ldap_bind_s.3.gz
+man/man3/ldap_compare.3.gz
+man/man3/ldap_compare_ext.3.gz
+man/man3/ldap_compare_ext_s.3.gz
+man/man3/ldap_compare_s.3.gz
+man/man3/ldap_control_create.3.gz
+man/man3/ldap_control_dup.3.gz
+man/man3/ldap_control_find.3.gz
+man/man3/ldap_control_free.3.gz
+man/man3/ldap_controls.3.gz
+man/man3/ldap_controls_dup.3.gz
+man/man3/ldap_controls_free.3.gz
+man/man3/ldap_count_entries.3.gz
+man/man3/ldap_count_messages.3.gz
+man/man3/ldap_count_references.3.gz
+man/man3/ldap_count_values.3.gz
+man/man3/ldap_count_values_len.3.gz
+man/man3/ldap_dcedn2dn.3.gz
+man/man3/ldap_delete.3.gz
+man/man3/ldap_delete_ext.3.gz
+man/man3/ldap_delete_ext_s.3.gz
+man/man3/ldap_delete_s.3.gz
+man/man3/ldap_destroy.3.gz
+man/man3/ldap_dn2ad_canonical.3.gz
+man/man3/ldap_dn2dcedn.3.gz
+man/man3/ldap_dn2str.3.gz
+man/man3/ldap_dn2ufn.3.gz
+man/man3/ldap_dnfree.3.gz
+man/man3/ldap_dup.3.gz
+man/man3/ldap_err2string.3.gz
+man/man3/ldap_errlist.3.gz
+man/man3/ldap_error.3.gz
+man/man3/ldap_explode_dn.3.gz
+man/man3/ldap_explode_rdn.3.gz
+man/man3/ldap_extended_operation.3.gz
+man/man3/ldap_extended_operation_s.3.gz
+man/man3/ldap_first_attribute.3.gz
+man/man3/ldap_first_entry.3.gz
+man/man3/ldap_first_message.3.gz
+man/man3/ldap_first_reference.3.gz
+man/man3/ldap_free_urldesc.3.gz
+man/man3/ldap_get_dn.3.gz
+man/man3/ldap_get_option.3.gz
+man/man3/ldap_get_values.3.gz
+man/man3/ldap_get_values_len.3.gz
+man/man3/ldap_init.3.gz
+man/man3/ldap_init_fd.3.gz
+man/man3/ldap_initialize.3.gz
+man/man3/ldap_install_tls.3.gz
+man/man3/ldap_is_ldap_url.3.gz
+man/man3/ldap_matchingrule2name.3.gz
+man/man3/ldap_matchingrule2str.3.gz
+man/man3/ldap_matchingrule_free.3.gz
+man/man3/ldap_memalloc.3.gz
+man/man3/ldap_memcalloc.3.gz
+man/man3/ldap_memfree.3.gz
+man/man3/ldap_memory.3.gz
+man/man3/ldap_memrealloc.3.gz
+man/man3/ldap_memvfree.3.gz
+man/man3/ldap_modify.3.gz
+man/man3/ldap_modify_ext.3.gz
+man/man3/ldap_modify_ext_s.3.gz
+man/man3/ldap_modify_s.3.gz
+man/man3/ldap_modrdn.3.gz
+man/man3/ldap_modrdn2.3.gz
+man/man3/ldap_modrdn2_s.3.gz
+man/man3/ldap_modrdn_s.3.gz
+man/man3/ldap_mods_free.3.gz
+man/man3/ldap_msgfree.3.gz
+man/man3/ldap_msgid.3.gz
+man/man3/ldap_msgtype.3.gz
+man/man3/ldap_next_attribute.3.gz
+man/man3/ldap_next_entry.3.gz
+man/man3/ldap_next_message.3.gz
+man/man3/ldap_next_reference.3.gz
+man/man3/ldap_objectclass2name.3.gz
+man/man3/ldap_objectclass2str.3.gz
+man/man3/ldap_objectclass_free.3.gz
+man/man3/ldap_open.3.gz
+man/man3/ldap_parse_extended_result.3.gz
+man/man3/ldap_parse_reference.3.gz
+man/man3/ldap_parse_result.3.gz
+man/man3/ldap_parse_sasl_bind_result.3.gz
+man/man3/ldap_parse_sort_control.3.gz
+man/man3/ldap_parse_vlv_control.3.gz
+man/man3/ldap_perror.3.gz
+man/man3/ldap_rename.3.gz
+man/man3/ldap_rename_s.3.gz
+man/man3/ldap_result.3.gz
+man/man3/ldap_result2error.3.gz
+man/man3/ldap_sasl_bind.3.gz
+man/man3/ldap_sasl_bind_s.3.gz
+man/man3/ldap_schema.3.gz
+man/man3/ldap_scherr2str.3.gz
+man/man3/ldap_search.3.gz
+man/man3/ldap_search_ext.3.gz
+man/man3/ldap_search_ext_s.3.gz
+man/man3/ldap_search_s.3.gz
+man/man3/ldap_search_st.3.gz
+man/man3/ldap_set_option.3.gz
+man/man3/ldap_set_rebind_proc.3.gz
+man/man3/ldap_set_urllist_proc.3.gz
+man/man3/ldap_simple_bind.3.gz
+man/man3/ldap_simple_bind_s.3.gz
+man/man3/ldap_sort.3.gz
+man/man3/ldap_sort_entries.3.gz
+man/man3/ldap_sort_strcasecmp.3.gz
+man/man3/ldap_sort_values.3.gz
+man/man3/ldap_start_tls.3.gz
+man/man3/ldap_start_tls_s.3.gz
+man/man3/ldap_str2attributetype.3.gz
+man/man3/ldap_str2dn.3.gz
+man/man3/ldap_str2matchingrule.3.gz
+man/man3/ldap_str2objectclass.3.gz
+man/man3/ldap_str2syntax.3.gz
+man/man3/ldap_strdup.3.gz
+man/man3/ldap_sync.3.gz
+man/man3/ldap_syntax2name.3.gz
+man/man3/ldap_syntax2str.3.gz
+man/man3/ldap_syntax_free.3.gz
+man/man3/ldap_tls.3.gz
+man/man3/ldap_tls_inplace.3.gz
+man/man3/ldap_unbind.3.gz
+man/man3/ldap_unbind_ext.3.gz
+man/man3/ldap_unbind_ext_s.3.gz
+man/man3/ldap_unbind_s.3.gz
+man/man3/ldap_url.3.gz
+man/man3/ldap_url_parse.3.gz
+man/man3/ldap_value_free.3.gz
+man/man3/ldap_value_free_len.3.gz
+man/man5/ldap.conf.5.gz
+man/man5/ldif.5.gz


Property changes on: trunk/net/openldap24-server/pkg-plist.client
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list