Index: head/net/openldap24-server/Makefile =================================================================== --- head/net/openldap24-server/Makefile (revision 442533) +++ head/net/openldap24-server/Makefile (revision 442534) @@ -1,596 +1,596 @@ # Created by: Xin LI # $FreeBSD$ PORTNAME= openldap -DISTVERSION= 2.4.44 +DISTVERSION= 2.4.45 PORTREVISION= ${OPENLDAP_PORTREVISION} CATEGORIES= net databases MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \ ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \ ftp://ftp.ntua.gr/mirror/OpenLDAP/%SUBDIR%/ \ ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/%SUBDIR%/ \ ftp://ftp.u-aizu.ac.jp/pub/net/openldap/%SUBDIR%/ \ ftp://ftp.nl.uu.net/pub/unix/db/openldap/%SUBDIR%/ \ ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/%SUBDIR%/ \ http://www.openldap.org/software/download/OpenLDAP/%SUBDIR%/ MASTER_SITE_SUBDIR= openldap-release .if defined(CLIENT_ONLY) .if ${CLIENT_ONLY} == sasl PKGNAMESUFFIX= -sasl-client COMMENT= Open source LDAP client implementation with SASL2 support CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.* \ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.[0-3].* .else PKGNAMESUFFIX= -client COMMENT= Open source LDAP client implementation CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-client-2.[0-3].* \ ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* .endif .else PKGNAMESUFFIX?= -server .endif EXTRACT_SUFX= .tgz MAINTAINER= delphij@FreeBSD.org COMMENT?= Open source LDAP server implementation LICENSE= OPENLDAP LICENSE_NAME= OpenLDAP Public License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept GNU_CONFIGURE= yes # :keepla because port uses lt_dlopen USES= cpe libtool:keepla ssl .if !defined(CLIENT_ONLY) USERS= ldap GROUPS= ldap LDAP_USER?= ldap LDAP_GROUP?= ldap .endif WANT_OPENLDAP_VER?= 24 .if ${WANT_OPENLDAP_VER} != 24 BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif PORTREVISION_CLIENT= 0 PORTREVISION_SERVER= 0 OPENLDAP_SHLIB_MAJOR= 2 -OPENLDAP_SHLIB_MINOR= 10.7 +OPENLDAP_SHLIB_MINOR= 10.8 OPENLDAP_MAJOR= ${DISTVERSION:R} OPTIONS_DEFINE= DEBUG FETCH GSSAPI FETCH_DESC= Enable fetch(3) support GSSAPI_DESC= With GSSAPI support (implies SASL support) .if !defined(CLIENT_ONLY) 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 OPTIONS_DEFINE+= REFINT RETCODE RWM SEQMOD SSSVLV SYNCPROV TRANSLUCENT OPTIONS_DEFINE+= UNIQUE VALSORT SMBPWD SHA2 DYNAMIC_BACKENDS SASL OPTIONS_DEFINE+= LMPASSWD OPTIONS_DEFINE+= OUTLOOK OPTIONS_DEFAULT= MDB SYNCPROV DYNAMIC_BACKENDS DYNACL_DESC= Run-time loadable ACL (experimental) ACI_DESC= Per-object ACI (experimental) BDB_DESC= With BerkeleyDB backend (DEPRECATED) MDB_DESC= With Memory-Mapped DB backend DNSSRV_DESC= With Dnssrv backend PASSWD_DESC= With Passwd backend PERL_DESC= With Perl backend RELAY_DESC= With Relay backend SHELL_DESC= With Shell backend (disables threading) SOCK_DESC= With Sock backend 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 (experimental) TCP_WRAPPERS_DESC= With tcp wrapper support ACCESSLOG_DESC= With In-Directory Access Logging overlay AUDITLOG_DESC= With Audit Logging overlay COLLECT_DESC= With Collect overy Services overlay CONSTRAINT_DESC= With Attribute Constraint overlay DDS_DESC= With Dynamic Directory Services overlay DEREF_DESC= With Dereference overlay DYNGROUP_DESC= With Dynamic Group overlay DYNLIST_DESC= With Dynamic List overlay MEMBEROF_DESC= With Reverse Group Membership overlay PPOLICY_DESC= With Password Policy overlay PROXYCACHE_DESC= With Proxy Cache overlay REFINT_DESC= With Referential Integrity overlay RETCODE_DESC= With Return Code testing overlay RWM_DESC= With Rewrite/Remap overlay SASL_DESC= With (Cyrus) SASL2 support SEQMOD_DESC= With Sequential Modify overlay SSSVLV_DESC= With ServerSideSort/VLV overlay SYNCPROV_DESC= With Syncrepl Provider overlay TRANSLUCENT_DESC= With Translucent Proxy overlay UNIQUE_DESC= With attribute Uniqueness overlay 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 OUTLOOK_DESC= Force caseIgnoreOrderingMatch on name attribute (experimental) .endif .if defined(CLIENT_ONLY) OPENLDAP_PORTREVISION= ${PORTREVISION_CLIENT} OPENLDAP_PKGFILESUFX= .client .else OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER} OPENLDAP_PKGFILESUFX= .endif CONFIGURE_SED= -e 's,uuid/uuid.h,xxuuid/uuid.h,g' .include .if defined(CLIENT_ONLY) PORTDOCS= CHANGES drafts rfc .if ${CLIENT_ONLY} == sasl 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 .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:security/cyrus-sasl2-gssapi .endif .else CONFLICTS= ${PKGNAMEPREFIX}${PORTNAME}-sasl-client-2.* .endif .endif DESCR= ${PKGDIR}/pkg-descr${OPENLDAP_PKGFILESUFX} PLIST= ${PKGDIR}/pkg-plist${OPENLDAP_PKGFILESUFX} SCHEMATA= collective corba core cosine duaconf dyngroup \ inetorgperson java misc \ nis openldap pmi ppolicy LDAP_RUN_DIR?= /var/run/openldap LOCALSTATEDIR?= /var/db DATABASEDIR?= ${LOCALSTATEDIR}/openldap-data SUB_LIST+= LDAP_RUN_DIR=${LDAP_RUN_DIR} \ LDAP_USER=${LDAP_USER} \ LDAP_GROUP=${LDAP_GROUP} \ DATABASEDIR=${DATABASEDIR} \ PKGNAME=${PKGNAME} CONFIGURE_ARGS= --with-threads=posix \ --with-tls=openssl \ --disable-dependency-tracking \ --enable-dynamic # XXX FreeBSD does not implement O_DSYNC and fdatasync at this time. CFLAGS+= -DMDB_DSYNC=O_SYNC -Dfdatasync=fsync .if ${PORT_OPTIONS:MSASL} LIB_DEPENDS+= libsasl2.so:security/cyrus-sasl2 CONFIGURE_ARGS+= --with-cyrus-sasl .else CONFIGURE_ARGS+= --without-cyrus-sasl .endif .if defined(CLIENT_ONLY) # client specific configuration CONFIGURE_ARGS+= --disable-slapd \ --disable-monitor \ --disable-bdb \ --disable-relay \ --disable-syncprov SUB_FILES+= pkg-message.client PKGMESSAGE= ${WRKSRC}/pkg-message.client USE_LDCONFIG= yes .else # server specific configuration USE_LDCONFIG= ${PREFIX}/libexec/openldap SUB_FILES+= pkg-message pkg-deinstall USE_RC_SUBR= slapd EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in .if ${PORT_OPTIONS:MMODULES} || ${PORT_OPTIONS:MDYNAMIC_BACKENDS} || ${PORT_OPTIONS:MSLAPI} LIB_DEPENDS+= libltdl.so:devel/libltdl CONFIGURE_ARGS+= --enable-modules PLIST_SUB+= MODULES="" .else PLIST_SUB+= MODULES="@comment " .endif SED_MODULES= -e 's/\(moduleload[ ]*back_[a-z]*\)\.la/\1/' .if ${PORT_OPTIONS:MDYNAMIC_BACKENDS} BACKEND_ENABLE= "mod" BACKEND_PLIST= "" SED_MODULES+= -e 's/\# *\(modulepath\)/\1/' \ -e 's/\# *\(moduleload[ ]*back_bdb\)/\1/' .else BACKEND_ENABLE= "yes" BACKEND_PLIST= "@comment " .endif OVERLAY_ENABLE= yes CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ --enable-crypt \ --enable-ldap=${BACKEND_ENABLE} \ --enable-meta=${BACKEND_ENABLE} \ --enable-rewrite \ --enable-null=${BACKEND_ENABLE} \ --enable-monitor=${BACKEND_ENABLE} PLIST_SUB+= BACKEND=${BACKEND_PLIST} .if ${PORT_OPTIONS:MACCESSLOG} CONFIGURE_ARGS+= --enable-accesslog=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MAUDITLOG} CONFIGURE_ARGS+= --enable-auditlog=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MCOLLECT} CONFIGURE_ARGS+= --enable-collect=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MCONSTRAINT} CONFIGURE_ARGS+= --enable-constraint=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MDDS} CONFIGURE_ARGS+= --enable-dds=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-debug=yes .endif MAKE_ENV+= STRIP=${STRIP} .if ${PORT_OPTIONS:MDEREF} CONFIGURE_ARGS+= --enable-deref=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MDYNGROUP} CONFIGURE_ARGS+= --enable-dyngroup=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MDYNLIST} 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 .if ${PORT_OPTIONS:MPPOLICY} CONFIGURE_ARGS+= --enable-ppolicy=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MPROXYCACHE} CONFIGURE_ARGS+= --enable-proxycache=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MREFINT} CONFIGURE_ARGS+= --enable-refint=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MRETCODE} CONFIGURE_ARGS+= --enable-retcode=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MRWM} CONFIGURE_ARGS+= --enable-rwm=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MSEQMOD} CONFIGURE_ARGS+= --enable-seqmod=${OVERLAY_ENABLE} .else CONFIGURE_ARGS+= --disable-seqmod .endif .if ${PORT_OPTIONS:MSSSVLV} CONFIGURE_ARGS+= --enable-sssvlv=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MSYNCPROV} CONFIGURE_ARGS+= --enable-syncprov=${OVERLAY_ENABLE} .else CONFIGURE_ARGS+= --disable-syncprov .endif .if ${PORT_OPTIONS:MTRANSLUCENT} CONFIGURE_ARGS+= --enable-translucent=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MUNIQUE} CONFIGURE_ARGS+= --enable-unique=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MVALSORT} CONFIGURE_ARGS+= --enable-valsort=${OVERLAY_ENABLE} .endif .if ${PORT_OPTIONS:MACI} CONFIGURE_ARGS+= --enable-aci .endif .if ${PORT_OPTIONS:MDYNACL} CONFIGURE_ARGS+= --enable-dynacl .endif .if !${PORT_OPTIONS:MBDB} CONFIGURE_ARGS+= --disable-bdb \ --disable-hdb PLIST_SUB+= BACK_BDB="@comment " \ BACK_HDB="@comment " .else USES+= bdb INVALID_BDB_VER= 6 CONFIGURE_ARGS+= --enable-bdb=${BACKEND_ENABLE} \ --enable-hdb=${BACKEND_ENABLE} PLIST_SUB+= BACK_BDB=${BACKEND_PLIST} \ BACK_HDB=${BACKEND_PLIST} 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 .if ${PORT_OPTIONS:MDNSSRV} CONFIGURE_ARGS+= --enable-dnssrv=${BACKEND_ENABLE} PLIST_SUB+= BACK_DNSSRV=${BACKEND_PLIST} .else PLIST_SUB+= BACK_DNSSRV="@comment " .endif .if ${PORT_OPTIONS:MMDB} CONFIGURE_ARGS+= --enable-mdb=${BACKEND_ENABLE} PLIST_SUB+= BACK_MDB=${BACKEND_PLIST} .else PLIST_SUB+= BACK_MDB="@comment " .endif .if ${PORT_OPTIONS:MPASSWD} CONFIGURE_ARGS+= --enable-passwd=${BACKEND_ENABLE} PLIST_SUB+= BACK_PASSWD=${BACKEND_PLIST} .else PLIST_SUB+= BACK_PASSWD="@comment " .endif .if ${PORT_OPTIONS:MRELAY} CONFIGURE_ARGS+= --enable-relay=${BACKEND_ENABLE} PLIST_SUB+= BACK_RELAY=${BACKEND_PLIST} .else PLIST_SUB+= BACK_RELAY="@comment " .endif .if ${PORT_OPTIONS:MSHELL} CONFIGURE_ARGS+= --without-threads --enable-shell=${BACKEND_ENABLE} PLIST_SUB+= BACK_SHELL=${BACKEND_PLIST} .else PLIST_SUB+= BACK_SHELL="@comment " WANT_OPENLDAP_THREADS= yes .endif .if ${PORT_OPTIONS:MSOCK} CONFIGURE_ARGS+= --enable-sock=${BACKEND_ENABLE} PLIST_SUB+= BACK_SOCK=${BACKEND_PLIST} .else PLIST_SUB+= BACK_SOCK="@comment " .endif .if ${PORT_OPTIONS:MPERL} USES+= perl5 CONFIGURE_ARGS+= --enable-perl=${BACKEND_ENABLE} CONFIGURE_ENV+= PERLBIN="${PERL}" PLIST_SUB+= BACK_PERL=${BACKEND_PLIST} .else PLIST_SUB+= BACK_PERL="@comment " .endif .if ${PORT_OPTIONS:MSASL} CONFIGURE_ARGS+= --enable-spasswd .endif .if ${PORT_OPTIONS:MODBC} CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE} PLIST_SUB+= BACK_SQL=${BACKEND_PLIST} LIB_DEPENDS+= libodbc.so:databases/unixODBC LDFLAGS+= -L${LOCALBASE}/lib .else PLIST_SUB+= BACK_SQL="@comment " .endif .if ${PORT_OPTIONS:MSMBPWD} PLIST_SUB+= SMBPWD="" .else PLIST_SUB+= SMBPWD="@comment " .endif .if ${PORT_OPTIONS:MSHA2} PLIST_SUB+= SHA2="" .else PLIST_SUB+= SHA2="@comment " .endif .if ${PORT_OPTIONS:MRLOOKUPS} CONFIGURE_ARGS+= --enable-rlookups PLIST_SUB+= RLOOKUPS="" .else PLIST_SUB+= RLOOKUPS="@comment " .endif .if ${PORT_OPTIONS:MSLAPI} CONFIGURE_ARGS+= --enable-slapi PLIST_SUB+= SLAPI="" USE_LDCONFIG= yes .else PLIST_SUB+= SLAPI="@comment " .endif .if ${PORT_OPTIONS:MSLP} CONFIGURE_ARGS+= --enable-slp LIB_DEPENDS+= libslp.so:net/openslp .endif # Include tcp-wrapper support .if ${PORT_OPTIONS:MTCP_WRAPPERS} CONFIGURE_ARGS+= --enable-wrappers .endif # Force using caseIgnoreOrderingMatch on 'name' attribute. # This may be a violation of RFC 4519 2.18 definition. # See http://www.openldap.org/lists/openldap-technical/201211/msg00175.html .if ${PORT_OPTIONS:MOUTLOOK} EXTRA_PATCHES+= ${FILESDIR}/extrapatch-outlook-servers__slapd__schema_prep.c .endif # end of client/server specific configuration .endif .if defined(WITH_CLDAP) CPPFLAGS+= -DLDAP_CONNECTIONLESS .endif CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib .if defined(CLIENT_ONLY) .else SUB_LIST+= RC_DIR=${PREFIX} \ LDAP_RUN_DIR=${LDAP_RUN_DIR} \ DATABASEDIR=${DATABASEDIR} .endif PLIST_SUB+= ${SUB_LIST} PLIST_SUB+= SHLIB_MAJOR=${OPENLDAP_SHLIB_MAJOR} PLIST_SUB+= SHLIB_MINOR=${OPENLDAP_SHLIB_MINOR} PLIST_SUB+= OPENLDAP_MAJOR=${OPENLDAP_MAJOR} .include .if ${SSL_DEFAULT:Mopenssl-devel} BROKEN= Does not build with openssl-devel .endif .if !${PORT_OPTIONS:MFETCH} CONFIGURE_ARGS+= --without-fetch .else . if defined(OPENSSL_INSTALLED) && ${OPENSSL_INSTALLED} != "" || ${SSL_DEFAULT} != base BROKEN= using OpenSSL from ports and OPTION FETCH together is not supported . endif .endif 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} .endif pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind\(84\)\{0,1\}-base-8\.' 2>/dev/null`" ]; then \ ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ ${FALSE}; \ fi .if !defined(CLIENT_ONLY) test: build @(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_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} prefix="${PREFIX}" all) .endif .endif pre-install: .if !defined(CLIENT_ONLY) @${MKDIR} ${STAGEDIR}${DATABASEDIR} .endif post-install: .if defined(CLIENT_ONLY) @${MKDIR} ${STAGEDIR}${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/CHANGES ${STAGEDIR}${DOCSDIR} @for dir in drafts rfc; do \ ${MKDIR} ${STAGEDIR}${DOCSDIR}/$${dir}; \ ${INSTALL_DATA} ${WRKSRC}/doc/$${dir}/* ${STAGEDIR}${DOCSDIR}/$${dir}; \ done @for prog in ldapcompare ldapdelete ldapexop ldapmodify ldapmodrdn ldappasswd ldapsearch ldapurl ldapwhoami; do\ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$${prog}; \ 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} ${STAGEDIR}${LDAP_RUN_DIR} .if ${PORT_OPTIONS:MSMBPWD} @(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} @(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 Index: head/net/openldap24-server/distinfo =================================================================== --- head/net/openldap24-server/distinfo (revision 442533) +++ head/net/openldap24-server/distinfo (revision 442534) @@ -1,2 +1,3 @@ -SHA256 (openldap-2.4.44.tgz) = d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400 -SIZE (openldap-2.4.44.tgz) = 5658830 +TIMESTAMP = 1496558623 +SHA256 (openldap-2.4.45.tgz) = cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824 +SIZE (openldap-2.4.45.tgz) = 5672845 Index: head/net/openldap24-server/files/patch-libraries__libldap__tls_o.c =================================================================== --- head/net/openldap24-server/files/patch-libraries__libldap__tls_o.c (revision 442533) +++ head/net/openldap24-server/files/patch-libraries__libldap__tls_o.c (nonexistent) @@ -1,11 +0,0 @@ ---- libraries/libldap/tls_o.c 2009/02/10 12:27:22 1.6 -+++ libraries/libldap/tls_o.c 2009/03/02 16:43:38 1.7 -@@ -421,7 +421,7 @@ - xn = X509_get_subject_name(x); - der_dn->bv_len = i2d_X509_NAME( xn, NULL ); - der_dn->bv_val = xn->bytes->data; -- X509_free(x); -+ /* Don't X509_free, the session is still using it */ - return 0; - } - Property changes on: head/net/openldap24-server/files/patch-libraries__libldap__tls_o.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/openldap24-server/files/patch-des =================================================================== --- head/net/openldap24-server/files/patch-des (revision 442533) +++ head/net/openldap24-server/files/patch-des (nonexistent) @@ -1,204 +0,0 @@ ---- 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 - - --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 --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; ibv_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; ibv_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: head/net/openldap24-server/files/patch-des ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property