[Midnightbsd-cvs] mports [18428] trunk/net/openldap24-server: 2.4.40 openldap
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Mar 28 17:16:42 EDT 2015
Revision: 18428
http://svnweb.midnightbsd.org/mports/?rev=18428
Author: laffer1
Date: 2015-03-28 17:16:41 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
2.4.40 openldap
Modified Paths:
--------------
trunk/net/openldap24-server/Makefile
trunk/net/openldap24-server/distinfo
trunk/net/openldap24-server/files/patch-servers__slapd__Makefile.in
trunk/net/openldap24-server/pkg-plist
trunk/net/openldap24-server/pkg-plist.client
Added Paths:
-----------
trunk/net/openldap24-server/files/patch-ITS8027
trunk/net/openldap24-server/files/patch-ITS8046
trunk/net/openldap24-server/files/patch-des
trunk/net/openldap24-server/files/patch-libraries__libldap__Makefile.in
trunk/net/openldap24-server/files/patch-servers__slapd__slapd.conf
Removed Paths:
-------------
trunk/net/openldap24-server/files/patch-ITS7249
Modified: trunk/net/openldap24-server/Makefile
===================================================================
--- trunk/net/openldap24-server/Makefile 2015-03-28 21:13:06 UTC (rev 18427)
+++ trunk/net/openldap24-server/Makefile 2015-03-28 21:16:41 UTC (rev 18428)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= openldap
-DISTVERSION= 2.4.39
+DISTVERSION= 2.4.40
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -38,10 +38,8 @@
LICENSE= openldap2.8
-LATEST_LINK?= ${PKGNAMEPREFIX}openldap24${PKGNAMESUFFIX}
USE_OPENSSL= yes
USES= libtool:keepla
-USES= libtool
.if !defined(CLIENT_ONLY)
USERS= ldap
GROUPS= ldap
@@ -55,8 +53,9 @@
.endif
PORTREVISION_CLIENT= 1
-PORTREVISION_SERVER= 2
+PORTREVISION_SERVER= 0
OPENLDAP_SHLIB_MAJOR= 2
+OPENLDAP_SHLIB_MINOR= 10.3
OPENLDAP_MAJOR= ${DISTVERSION:R}
OPTIONS_DEFINE= FETCH GSSAPI
@@ -71,8 +70,9 @@
OPTIONS_DEFINE+= DEREF DYNGROUP DYNLIST MEMBEROF PPOLICY PROXYCACHE
OPTIONS_DEFINE+= REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT
OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL
+OPTIONS_DEFINE+= LMPASSWD
-OPTIONS_DEFAULT= BDB MDB SYNCPROV DYNAMIC_BACKENDS
+OPTIONS_DEFAULT= MDB SYNCPROV DYNAMIC_BACKENDS
DYNACL_DESC= Run-time loadable ACL (experimental)
ACI_DESC= Per-object ACI (experimental)
@@ -112,6 +112,7 @@
VALSORT_DESC= With Value Sorting overlay
SMBPWD_DESC= With Samba Password hashes overlay
SHA2_DESC= With SHA2 Password hashes overlay
+LMPASSWD_DESC= With LM hash password support (DEPRECATED)
DYNAMIC_BACKENDS_DESC= Build dynamic backends
.endif
@@ -125,7 +126,7 @@
CONFIGURE_SED= -e 's,uuid/uuid.h,xxuuid/uuid.h,g'
-.include <bsd.port.pre.mk>
+.include <bsd.mport.options.mk>
.if defined(CLIENT_ONLY)
PORTDOCS= CHANGES drafts rfc
@@ -216,7 +217,7 @@
EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in
.if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI}
-USE_AUTOTOOLS+= libltdl
+LIB_DEPENDS+= libltdl.so:${PORTSDIR}/devel/libltdl
CONFIGURE_ARGS+= --enable-modules
PLIST_SUB+= MODULES=""
.else
@@ -239,7 +240,6 @@
CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \
--enable-crypt \
- --enable-lmpasswd \
--enable-ldap=${BACKEND_ENABLE} \
--enable-meta=${BACKEND_ENABLE} \
--enable-rewrite \
@@ -280,6 +280,10 @@
CONFIGURE_ARGS+= --enable-dynlist=${OVERLAY_ENABLE}
.endif
+.if ${PORT_OPTIONS:MLMPASSWD}
+CONFIGURE_ARGS+= --enable-lmpasswd
+.endif
+
.if ${PORT_OPTIONS:MMEMBEROF}
CONFIGURE_ARGS+= --enable-memberof=${OVERLAY_ENABLE}
.endif
@@ -347,26 +351,13 @@
BACK_HDB="@comment "
.else
-WITH_BDB_VER?= 46
-USE_BDB= 44+
+USE_BDB= 48+
+INVALID_BDB_VER= 6
-# XXX Can BDB 5.x use XY instead of X as version?
-.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} \
BACK_HDB=${BACKEND_PLIST}
-.elif ${WITH_BDB_VER} >= 4
-CONFIGURE_ARGS+= --disable-bdb \
- --enable-hdb=${BACKEND_ENABLE}
-PLIST_SUB+= BACK_BDB="@comment " \
- BACK_HDB=${BACKEND_PLIST}
-.elif ${WITH_BDB_VER} == 3
-CONFIGURE_ARGS+= --disable-bdb \
- --disable-hdb
-PLIST_SUB+= BACK_BDB="@comment " \
- BACK_HDB="@comment "
-.endif
CPPFLAGS+= -I${BDB_INCLUDE_DIR}
LDFLAGS+= -L${BDB_LIB_DIR}
@@ -418,7 +409,7 @@
.endif
.if ${PORT_OPTIONS:MPERL}
-USE_PERL5= yes
+USES+= perl5
CONFIGURE_ARGS+= --enable-perl=${BACKEND_ENABLE}
CONFIGURE_ENV+= PERLBIN="${PERL}"
PLIST_SUB+= BACK_PERL=${BACKEND_PLIST}
@@ -494,6 +485,7 @@
PLIST_SUB+= ${SUB_LIST}
PLIST_SUB+= SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR}
+PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR}
PLIST_SUB+= OPENLDAP_MAJOR=${OPENLDAP_MAJOR}
post-patch:
@@ -522,65 +514,50 @@
post-build:
@${DO_NADA}
.if ${PORT_OPTIONS:MSMBPWD}
- @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${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" prefix="${PREFIX}" all)
.endif
.if ${PORT_OPTIONS:MSHA2}
- @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
+ @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} prefix="${PREFIX}" all)
.endif
.endif
-pre-su-install:
- @if [ -f ${PKGINSTALL} ]; then \
- ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL; \
- fi
-.if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI}
- @${MKDIR} ${PREFIX}/libexec/openldap
-.endif
+pre-install:
.if !defined(CLIENT_ONLY)
- @${MKDIR} ${DATABASEDIR}
+ @${MKDIR} ${STAGEDIR}${DATABASEDIR}
.endif
post-install:
.if defined(CLIENT_ONLY)
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR}
@for dir in drafts rfc; do \
${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \
- ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${DOCSDIR}/$${dir}; \
+ ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \
done
@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 " \
- "%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"; \
- ${ECHO_CMD} "@exec [ -f %B/$${schema}.schema ] || ${CP} %B/%f %B/$${schema}.schema"; \
- 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
+ @${MKDIR} ${STAGEDIR}${LDAP_RUN_DIR}
.if ${PORT_OPTIONS:MSMBPWD}
- @${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \
- ${PREFIX}/libexec/openldap/
- @${INSTALL_PROGRAM} ${WRKSRC}/contrib/slapd-modules/smbk5pwd/.libs/smbk5pwd.so.0 \
- ${PREFIX}/libexec/openldap/
- @${LN} -s smbk5pwd.so.0 ${PREFIX}/libexec/openldap/smbk5pwd.so
+ @(cd ${WRKSRC}/contrib/slapd-modules/smbk5pwd && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} prefix="${PREFIX}" install)
+ ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/smbk5pwd.a
.endif
.if ${PORT_OPTIONS:MSHA2}
- @${INSTALL_DATA} ${WRKSRC}/contrib/slapd-modules/passwd/sha2/pw-sha2.la \
- ${PREFIX}/libexec/openldap/
- @${INSTALL_PROGRAM} ${WRKSRC}/contrib/slapd-modules/passwd/sha2/.libs/pw-sha2.so.0 \
- ${PREFIX}/libexec/openldap/
- @${LN} -s pw-sha2.so.0 ${PREFIX}/libexec/openldap/pw-sha2.so
+ @(cd ${WRKSRC}/contrib/slapd-modules/passwd/sha2 && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
+ ${MAKE_ARGS} prefix="${PREFIX}" install)
+ ${RM} ${STAGEDIR}${PREFIX}/libexec/openldap/pw-sha2.a
.endif
+.if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSMBPWD} || ${PORT_OPTIONS:MSHA2}
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/openldap/*.so
.endif
+.endif # defined(CLIENT_ONLY)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: trunk/net/openldap24-server/distinfo
===================================================================
--- trunk/net/openldap24-server/distinfo 2015-03-28 21:13:06 UTC (rev 18427)
+++ trunk/net/openldap24-server/distinfo 2015-03-28 21:16:41 UTC (rev 18428)
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.39.tgz) = 8267c87347103fef56b783b24877c0feda1063d3cb85d070e503d076584bf8a7
-SIZE (openldap-2.4.39.tgz) = 5509060
+SHA256 (openldap-2.4.40.tgz) = d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb
+SIZE (openldap-2.4.40.tgz) = 5641865
Deleted: trunk/net/openldap24-server/files/patch-ITS7249
===================================================================
--- trunk/net/openldap24-server/files/patch-ITS7249 2015-03-28 21:13:06 UTC (rev 18427)
+++ trunk/net/openldap24-server/files/patch-ITS7249 2015-03-28 21:16:41 UTC (rev 18428)
@@ -1,56 +0,0 @@
---- 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);
Added: trunk/net/openldap24-server/files/patch-ITS8027
===================================================================
--- trunk/net/openldap24-server/files/patch-ITS8027 (rev 0)
+++ trunk/net/openldap24-server/files/patch-ITS8027 2015-03-28 21:16:41 UTC (rev 18428)
@@ -0,0 +1,26 @@
+From c32e74763f77675b9e144126e375977ed6dc562c Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc at openldap.org>
+Date: Mon, 19 Jan 2015 22:25:53 +0000
+Subject: [PATCH] ITS#8027 require non-empty AttributeList
+
+---
+ servers/slapd/overlays/deref.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git servers/slapd/overlays/deref.c servers/slapd/overlays/deref.c
+index 9420e3e..05aa890 100644
+--- servers/slapd/overlays/deref.c
++++ servers/slapd/overlays/deref.c
+@@ -183,7 +183,8 @@ deref_parseCtrl (
+ ber_len_t cnt = sizeof(struct berval);
+ ber_len_t off = 0;
+
+- if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR )
++ if ( ber_scanf( ber, "{m{M}}", &derefAttr, &attributes, &cnt, off ) == LBER_ERROR
++ || !cnt )
+ {
+ rs->sr_text = "Dereference control: derefSpec decoding error";
+ rs->sr_err = LDAP_PROTOCOL_ERROR;
+--
+1.7.10.4
+
Property changes on: trunk/net/openldap24-server/files/patch-ITS8027
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/openldap24-server/files/patch-ITS8046
===================================================================
--- trunk/net/openldap24-server/files/patch-ITS8046 (rev 0)
+++ trunk/net/openldap24-server/files/patch-ITS8046 2015-03-28 21:16:41 UTC (rev 18428)
@@ -0,0 +1,34 @@
+From 2f1a2dd329b91afe561cd06b872d09630d4edb6a Mon Sep 17 00:00:00 2001
+From: Howard Chu <hyc at openldap.org>
+Date: Wed, 4 Feb 2015 02:03:55 +0000
+Subject: [PATCH] ITS#8046 fix vrFilter_free
+
+---
+ servers/slapd/filter.c | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git servers/slapd/filter.c servers/slapd/filter.c
+index b859f73..22c81c8 100644
+--- servers/slapd/filter.c
++++ servers/slapd/filter.c
+@@ -1158,14 +1158,10 @@ get_vrFilter( Operation *op, BerElement *ber,
+ void
+ vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
+ {
+- ValuesReturnFilter *p, *next;
++ ValuesReturnFilter *next;
+
+- if ( vrf == NULL ) {
+- return;
+- }
+-
+- for ( p = vrf; p != NULL; p = next ) {
+- next = p->vrf_next;
++ for ( ; vrf != NULL; vrf = next ) {
++ next = vrf->vrf_next;
+
+ switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
+ case LDAP_FILTER_PRESENT:
+--
+1.7.10.4
+
Property changes on: trunk/net/openldap24-server/files/patch-ITS8046
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/openldap24-server/files/patch-des
===================================================================
--- trunk/net/openldap24-server/files/patch-des (rev 0)
+++ trunk/net/openldap24-server/files/patch-des 2015-03-28 21:16:41 UTC (rev 18428)
@@ -0,0 +1,204 @@
+--- libraries/liblutil/passwd.c.orig 2014-09-19 03:48:49.000000000 +0200
++++ libraries/liblutil/passwd.c 2014-11-05 19:57:10.807555025 +0100
+@@ -38,11 +38,11 @@
+ # include <openssl/des.h>
+
+
+-typedef des_cblock des_key;
+-typedef des_cblock des_data_block;
+-typedef des_key_schedule des_context;
+-#define des_failed(encrypted) 0
+-#define des_finish(key, schedule)
++typedef DES_cblock DES_key;
++typedef DES_cblock DES_data_block;
++typedef DES_key_schedule DES_context;
++#define DES_failed(encrypted) 0
++#define DES_finish(key, schedule)
+
+ #elif defined(HAVE_MOZNSS)
+ /*
+@@ -53,9 +53,9 @@
+ */
+ #define PROTYPES_H 1
+ # include <nss/pk11pub.h>
+-typedef PK11SymKey *des_key;
+-typedef unsigned char des_data_block[8];
+-typedef PK11Context *des_context[1];
++typedef PK11SymKey *DES_key;
++typedef unsigned char DES_data_block[8];
++typedef PK11Context *DES_context[1];
+ #define DES_ENCRYPT CKA_ENCRYPT
+
+ #endif
+@@ -664,10 +664,10 @@
+ * abstract away setting the parity.
+ */
+ static void
+-des_set_key_and_parity( des_key *key, unsigned char *keyData)
++DES_set_key_and_parity( DES_key *key, unsigned char *keyData)
+ {
+ memcpy(key, keyData, 8);
+- des_set_odd_parity( key );
++ DES_set_odd_parity( key );
+ }
+
+
+@@ -677,7 +677,7 @@
+ * implement MozNSS wrappers for the openSSL calls
+ */
+ static void
+-des_set_key_and_parity( des_key *key, unsigned char *keyData)
++DES_set_key_and_parity( DES_key *key, unsigned char *keyData)
+ {
+ SECItem keyDataItem;
+ PK11SlotInfo *slot;
+@@ -699,7 +699,7 @@
+ }
+
+ static void
+-des_set_key_unchecked( des_key *key, des_context ctxt )
++DES_set_key_unchecked( DES_key *key, DES_context ctxt )
+ {
+ ctxt[0] = NULL;
+
+@@ -712,37 +712,37 @@
+ }
+
+ static void
+-des_ecb_encrypt( des_data_block *plain, des_data_block *encrypted,
+- des_context ctxt, int op)
++DES_ecb_encrypt( DES_data_block *plain, DES_data_block *encrypted,
++ DES_context ctxt, int op)
+ {
+ SECStatus rv;
+ int size;
+
+ if (ctxt[0] == NULL) {
+ /* need to fail here... */
+- memset(encrypted, 0, sizeof(des_data_block));
++ memset(encrypted, 0, sizeof(DES_data_block));
+ return;
+ }
+ rv = PK11_CipherOp(ctxt[0], (unsigned char *)&encrypted[0],
+- &size, sizeof(des_data_block),
+- (unsigned char *)&plain[0], sizeof(des_data_block));
++ &size, sizeof(DES_data_block),
++ (unsigned char *)&plain[0], sizeof(DES_data_block));
+ if (rv != SECSuccess) {
+ /* signal failure */
+- memset(encrypted, 0, sizeof(des_data_block));
++ memset(encrypted, 0, sizeof(DES_data_block));
+ return;
+ }
+ return;
+ }
+
+ static int
+-des_failed(des_data_block *encrypted)
++DES_failed(DES_data_block *encrypted)
+ {
+- static const des_data_block zero = { 0 };
++ static const DES_data_block zero = { 0 };
+ return memcmp(encrypted, zero, sizeof(zero)) == 0;
+ }
+
+ static void
+-des_finish(des_key *key, des_context ctxt)
++DES_finish(DES_key *key, DES_context ctxt)
+ {
+ if (*key) {
+ PK11_FreeSymKey(*key);
+@@ -817,7 +817,7 @@
+
+ static void lmPasswd_to_key(
+ const char *lmPasswd,
+- des_key *key)
++ DES_key *key)
+ {
+ const unsigned char *lpw = (const unsigned char *) lmPasswd;
+ unsigned char k[8];
+@@ -832,7 +832,7 @@
+ k[6] = ((lpw[5] & 0x3F) << 2) | (lpw[6] >> 6);
+ k[7] = ((lpw[6] & 0x7F) << 1);
+
+- des_set_key_and_parity( key, k );
++ DES_set_key_and_parity( key, k );
+ }
+
+ static int chk_lanman(
+@@ -843,10 +843,10 @@
+ {
+ ber_len_t i;
+ char UcasePassword[15];
+- des_key key;
+- des_context schedule;
+- des_data_block StdText = "KGS!@#$%";
+- des_data_block PasswordHash1, PasswordHash2;
++ DES_key key;
++ DES_context schedule;
++ DES_data_block StdText = "KGS!@#$%";
++ DES_data_block PasswordHash1, PasswordHash2;
+ char PasswordHash[33], storedPasswordHash[33];
+
+ for( i=0; i<cred->bv_len; i++) {
+@@ -864,21 +864,21 @@
+ ldap_pvt_str2upper( UcasePassword );
+
+ lmPasswd_to_key( UcasePassword, &key );
+- des_set_key_unchecked( &key, schedule );
+- des_ecb_encrypt( &StdText, &PasswordHash1, schedule , DES_ENCRYPT );
++ DES_set_key_unchecked( &key, &schedule );
++ DES_ecb_encrypt( &StdText, &PasswordHash1, &schedule , DES_ENCRYPT );
+
+- if (des_failed(&PasswordHash1)) {
++ if (DES_failed(&PasswordHash1)) {
+ return LUTIL_PASSWD_ERR;
+ }
+
+ lmPasswd_to_key( &UcasePassword[7], &key );
+- des_set_key_unchecked( &key, schedule );
+- des_ecb_encrypt( &StdText, &PasswordHash2, schedule , DES_ENCRYPT );
+- if (des_failed(&PasswordHash2)) {
++ DES_set_key_unchecked( &key, &schedule );
++ DES_ecb_encrypt( &StdText, &PasswordHash2, &schedule , DES_ENCRYPT );
++ if (DES_failed(&PasswordHash2)) {
+ return LUTIL_PASSWD_ERR;
+ }
+
+- des_finish( &key, schedule );
++ DES_finish( &key, schedule );
+
+ sprintf( PasswordHash, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+ PasswordHash1[0],PasswordHash1[1],PasswordHash1[2],PasswordHash1[3],
+@@ -1139,10 +1139,10 @@
+
+ ber_len_t i;
+ char UcasePassword[15];
+- des_key key;
+- des_context schedule;
+- des_data_block StdText = "KGS!@#$%";
+- des_data_block PasswordHash1, PasswordHash2;
++ DES_key key;
++ DES_context schedule;
++ DES_data_block StdText = "KGS!@#$%";
++ DES_data_block PasswordHash1, PasswordHash2;
+ char PasswordHash[33];
+
+ for( i=0; i<passwd->bv_len; i++) {
+@@ -1160,12 +1160,12 @@
+ ldap_pvt_str2upper( UcasePassword );
+
+ lmPasswd_to_key( UcasePassword, &key );
+- des_set_key_unchecked( &key, schedule );
+- des_ecb_encrypt( &StdText, &PasswordHash1, schedule , DES_ENCRYPT );
++ DES_set_key_unchecked( &key, &schedule );
++ DES_ecb_encrypt( &StdText, &PasswordHash1, &schedule , DES_ENCRYPT );
+
+ lmPasswd_to_key( &UcasePassword[7], &key );
+- des_set_key_unchecked( &key, schedule );
+- des_ecb_encrypt( &StdText, &PasswordHash2, schedule , DES_ENCRYPT );
++ DES_set_key_unchecked( &key, &schedule );
++ DES_ecb_encrypt( &StdText, &PasswordHash2, &schedule , DES_ENCRYPT );
+
+ sprintf( PasswordHash, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+ PasswordHash1[0],PasswordHash1[1],PasswordHash1[2],PasswordHash1[3],
Property changes on: trunk/net/openldap24-server/files/patch-des
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/net/openldap24-server/files/patch-libraries__libldap__Makefile.in
===================================================================
--- trunk/net/openldap24-server/files/patch-libraries__libldap__Makefile.in (rev 0)
+++ trunk/net/openldap24-server/files/patch-libraries__libldap__Makefile.in 2015-03-28 21:16:41 UTC (rev 18428)
@@ -0,0 +1,17 @@
+--- ./libraries/libldap/Makefile.in.orig 2014-08-27 09:41:52.000000000 +0200
++++ ./libraries/libldap/Makefile.in 2014-08-27 09:43:35.000000000 +0200
+@@ -72,13 +72,6 @@
+ $(LTFINISH) $(DESTDIR)$(libdir)
+ -$(MKDIR) $(DESTDIR)$(sysconfdir)
+ @for i in $(CFFILES); do \
+- if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
+- echo "installing $$i in $(sysconfdir)"; \
+- echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i"; \
+- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i; \
+- else \
+- echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
+- fi; \
+- $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.default; \
++ $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.sample; \
+ done
+
Property changes on: trunk/net/openldap24-server/files/patch-libraries__libldap__Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/net/openldap24-server/files/patch-servers__slapd__Makefile.in
===================================================================
--- trunk/net/openldap24-server/files/patch-servers__slapd__Makefile.in 2015-03-28 21:13:06 UTC (rev 18427)
+++ trunk/net/openldap24-server/files/patch-servers__slapd__Makefile.in 2015-03-28 21:16:41 UTC (rev 18428)
@@ -1,6 +1,6 @@
---- 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 @@
+--- servers/slapd/Makefile.in.orig 2014-01-25 13:36:15 UTC
++++ servers/slapd/Makefile.in
+@@ -377,7 +377,6 @@
install-slapd: FORCE
-$(MKDIR) $(DESTDIR)$(libexecdir)
@@ -8,7 +8,7 @@
$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
@for i in $(SUBDIRS); do \
-@@ -406,16 +405,18 @@
+@@ -412,43 +411,28 @@
touch all-cffiles
install-schema: FORCE
@@ -28,12 +28,31 @@
+ 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 ; \
++ $(INSTALL) $(INSTALLFLAGS) -m 444 $(srcdir)/schema/$$i $$SD/$$i.sample ; \
done
install-conf: FORCE
-@@ -441,8 +442,6 @@
+ @-$(MKDIR) $(DESTDIR)$(sysconfdir)
+- $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default
+- if test ! -f $(DESTDIR)$(sysconfdir)/slapd.conf; then \
+- echo "installing slapd.conf in $(sysconfdir)"; \
+- echo "$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf"; \
+- $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf; \
+- else \
+- echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \
+- fi
+- $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif.default
+- if test ! -f $(DESTDIR)$(sysconfdir)/slapd.ldif; then \
+- echo "installing slapd.ldif in $(sysconfdir)"; \
+- echo "$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif"; \
+- $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif; \
+- else \
+- echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.ldif" ; \
+- fi
++ $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.sample
++ $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.ldif.tmp $(DESTDIR)$(sysconfdir)/slapd.ldif.sample
+
+ install-db-config: FORCE
@-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
@-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
$(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
Added: trunk/net/openldap24-server/files/patch-servers__slapd__slapd.conf
===================================================================
--- trunk/net/openldap24-server/files/patch-servers__slapd__slapd.conf (rev 0)
+++ trunk/net/openldap24-server/files/patch-servers__slapd__slapd.conf 2015-03-28 21:16:41 UTC (rev 18428)
@@ -0,0 +1,26 @@
+--- servers/slapd/slapd.conf.orig 2014-09-18 18:48:49.000000000 -0700
++++ servers/slapd/slapd.conf 2014-11-02 11:35:49.000000000 -0800
+@@ -15,8 +15,7 @@
+
+ # Load dynamic backend modules:
+ # modulepath %MODULEDIR%
+-# moduleload back_bdb.la
+-# moduleload back_hdb.la
++# moduleload back_mdb.la
+ # moduleload back_ldap.la
+
+ # Sample security restrictions
+@@ -47,10 +46,11 @@
+ # rootdn can always read and write EVERYTHING!
+
+ #######################################################################
+-# BDB database definitions
++# backend database definitions
+ #######################################################################
+
+-database bdb
++database mdb
++maxsize 1073741824
+ suffix "dc=my-domain,dc=com"
+ rootdn "cn=Manager,dc=my-domain,dc=com"
+ # Cleartext passwords, especially for the rootdn, should
Property changes on: trunk/net/openldap24-server/files/patch-servers__slapd__slapd.conf
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/net/openldap24-server/pkg-plist
===================================================================
--- trunk/net/openldap24-server/pkg-plist 2015-03-28 21:13:06 UTC (rev 18427)
+++ trunk/net/openldap24-server/pkg-plist 2015-03-28 21:16:41 UTC (rev 18428)
@@ -1,103 +1,105 @@
@unexec %%RC_DIR%%/etc/rc.d/slapd stop 2>&1 >/dev/null || true
-etc/openldap/slapd.ldif.default
-etc/openldap/slapd.ldif
- at unexec if cmp -s %D/etc/openldap/slapd.conf %D/etc/openldap/slapd.conf.default; then rm -f %D/etc/openldap/slapd.conf; fi
-etc/openldap/slapd.conf.default
- at exec [ -f %B/slapd.conf ] || cp %B/%f %B/slapd.conf
-etc/openldap/schema/ppolicy.ldif
-etc/openldap/schema/pmi.ldif
-etc/openldap/schema/openldap.ldif
-etc/openldap/schema/nis.ldif
-etc/openldap/schema/misc.ldif
-etc/openldap/schema/java.ldif
-etc/openldap/schema/inetorgperson.ldif
-etc/openldap/schema/dyngroup.ldif
-etc/openldap/schema/duaconf.ldif
-etc/openldap/schema/cosine.ldif
-etc/openldap/schema/core.ldif
-etc/openldap/schema/corba.ldif
-etc/openldap/schema/collective.ldif
-etc/openldap/schema/README
-%%BACK_BDB%%etc/openldap/DB_CONFIG.example
+%%ETCDIR%%/schema/README
+%%ETCDIR%%/schema/collective.ldif
+ at sample %%ETCDIR%%/schema/collective.schema.sample
+%%ETCDIR%%/schema/corba.ldif
+ at sample %%ETCDIR%%/schema/corba.schema.sample
+%%ETCDIR%%/schema/core.ldif
+ at sample %%ETCDIR%%/schema/core.schema.sample
+%%ETCDIR%%/schema/cosine.ldif
+ at sample %%ETCDIR%%/schema/cosine.schema.sample
+%%ETCDIR%%/schema/duaconf.ldif
+ at sample %%ETCDIR%%/schema/duaconf.schema.sample
+%%ETCDIR%%/schema/dyngroup.ldif
+ at sample %%ETCDIR%%/schema/dyngroup.schema.sample
+%%ETCDIR%%/schema/inetorgperson.ldif
+ at sample %%ETCDIR%%/schema/inetorgperson.schema.sample
+%%ETCDIR%%/schema/java.ldif
+ at sample %%ETCDIR%%/schema/java.schema.sample
+%%ETCDIR%%/schema/misc.ldif
+ at sample %%ETCDIR%%/schema/misc.schema.sample
+%%ETCDIR%%/schema/nis.ldif
+ at sample %%ETCDIR%%/schema/nis.schema.sample
+%%ETCDIR%%/schema/openldap.ldif
+ at sample %%ETCDIR%%/schema/openldap.schema.sample
+%%ETCDIR%%/schema/pmi.ldif
+ at sample %%ETCDIR%%/schema/pmi.schema.sample
+%%ETCDIR%%/schema/ppolicy.ldif
+ at sample %%ETCDIR%%/schema/ppolicy.schema.sample
+ at sample %%ETCDIR%%/slapd.conf.sample
+ at sample %%ETCDIR%%/slapd.ldif.sample
+%%BACK_BDB%%%%ETCDIR%%/DB_CONFIG.example
%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
+%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%SLAPI%%lib/libslapi.a
%%SLAPI%%lib/libslapi.la
%%SLAPI%%lib/libslapi.so
%%MODULES%%@exec mkdir -p %D/libexec/openldap
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_BDB%%libexec/openldap/back_bdb.la
%%BACK_BDB%%libexec/openldap/back_bdb.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_HDB%%libexec/openldap/back_hdb.la
%%BACK_HDB%%libexec/openldap/back_hdb.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACKEND%%libexec/openldap/back_ldap.la
%%BACKEND%%libexec/openldap/back_ldap.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACKEND%%libexec/openldap/back_meta.la
%%BACKEND%%libexec/openldap/back_meta.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACKEND%%libexec/openldap/back_monitor.la
%%BACKEND%%libexec/openldap/back_monitor.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACKEND%%libexec/openldap/back_null.la
%%BACKEND%%libexec/openldap/back_null.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la
%%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_MDB%%libexec/openldap/back_mdb.la
%%BACK_MDB%%libexec/openldap/back_mdb.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_PASSWD%%libexec/openldap/back_passwd.la
%%BACK_PASSWD%%libexec/openldap/back_passwd.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_PERL%%libexec/openldap/back_perl.la
%%BACK_PERL%%libexec/openldap/back_perl.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_RELAY%%libexec/openldap/back_relay.la
%%BACK_RELAY%%libexec/openldap/back_relay.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_SHELL%%libexec/openldap/back_shell.la
%%BACK_SHELL%%libexec/openldap/back_shell.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_SOCK%%libexec/openldap/back_sock.la
%%BACK_SOCK%%libexec/openldap/back_sock.so
%%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-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
%%BACK_SQL%%libexec/openldap/back_sql.la
%%BACK_SQL%%libexec/openldap/back_sql.so
%%SHA2%%libexec/openldap/pw-sha2.la
%%SHA2%%libexec/openldap/pw-sha2.so
%%SHA2%%libexec/openldap/pw-sha2.so.0
+%%SHA2%%libexec/openldap/pw-sha2.so.0.0.0
%%SMBPWD%%libexec/openldap/smbk5pwd.la
%%SMBPWD%%libexec/openldap/smbk5pwd.so
%%SMBPWD%%libexec/openldap/smbk5pwd.so.0
+%%SMBPWD%%libexec/openldap/smbk5pwd.so.0.0.0
libexec/slapd
-%%MODULES%%@dirrmtry libexec/openldap
-sbin/slapacl
-sbin/slapadd
-sbin/slapauth
-sbin/slapcat
-sbin/slapdn
-sbin/slapindex
-sbin/slappasswd
-sbin/slapschema
-sbin/slaptest
man/man5/slapd-bdb.5.gz
man/man5/slapd-config.5.gz
man/man5/slapd-dnssrv.5.gz
@@ -152,13 +154,16 @@
man/man8/slappasswd.8.gz
man/man8/slapschema.8.gz
man/man8/slaptest.8.gz
- at cwd /
- at owner %%LDAP_USER%%
- at group %%LDAP_USER%%
- at exec install -d -o %%LDAP_USER%% -g %%LDAP_GROUP%% %%LDAP_RUN_DIR%%
- at dirrmtry %%LDAP_RUN_DIR%%
- at exec install -d -o %%LDAP_USER%% -g %%LDAP_GROUP%% %%DATABASEDIR%%
- at dirrmtry %%DATABASEDIR%%
- at owner root
- at group wheel
- at cwd %%PREFIX%%
+sbin/slapacl
+sbin/slapadd
+sbin/slapauth
+sbin/slapcat
+sbin/slapdn
+sbin/slapindex
+sbin/slappasswd
+sbin/slapschema
+sbin/slaptest
+ at dir %%ETCDIR%%/schema
+%%MODULES%%@dir libexec/openldap
+ at dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%LDAP_RUN_DIR%%
+ at dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%DATABASEDIR%%
Modified: trunk/net/openldap24-server/pkg-plist.client
===================================================================
--- trunk/net/openldap24-server/pkg-plist.client 2015-03-28 21:13:06 UTC (rev 18427)
+++ trunk/net/openldap24-server/pkg-plist.client 2015-03-28 21:16:41 UTC (rev 18428)
@@ -8,10 +8,7 @@
bin/ldapsearch
bin/ldapurl
bin/ldapwhoami
- at unexec if cmp -s %D/etc/openldap/ldap.conf %D/etc/openldap/ldap.conf.default; then rm -f %D/etc/openldap/ldap.conf; fi
-etc/openldap/ldap.conf.default
- at exec [ -f %B/ldap.conf ] || cp %B/%f %B/ldap.conf
- at dirrmtry etc/openldap
+ at sample %%ETCDIR%%/ldap.conf.sample
include/lber.h
include/lber_types.h
include/ldap.h
@@ -22,17 +19,17 @@
include/ldif.h
include/slapi-plugin.h
lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
+lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
lib/liblber.a
lib/liblber.la
lib/liblber.so
lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
+lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
lib/libldap.a
lib/libldap.la
lib/libldap.so
lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
-lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
+lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
lib/libldap_r.a
lib/libldap_r.la
lib/libldap_r.so
@@ -230,3 +227,4 @@
man/man3/ldap_value_free_len.3.gz
man/man5/ldap.conf.5.gz
man/man5/ldif.5.gz
+ at dir %%ETCDIR%%
More information about the Midnightbsd-cvs
mailing list