[Midnightbsd-cvs] mports [20044] trunk/net/openldap24-server: bump version
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Aug 26 08:04:31 EDT 2015
Revision: 20044
http://svnweb.midnightbsd.org/mports/?rev=20044
Author: laffer1
Date: 2015-08-26 08:04:30 -0400 (Wed, 26 Aug 2015)
Log Message:
-----------
bump version
Modified Paths:
--------------
trunk/net/openldap24-server/Makefile
trunk/net/openldap24-server/distinfo
Added Paths:
-----------
trunk/net/openldap24-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
trunk/net/openldap24-server/files/patch-build__top.mk
trunk/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
Removed Paths:
-------------
trunk/net/openldap24-server/files/patch-ITS8027
trunk/net/openldap24-server/files/patch-ITS8046
Modified: trunk/net/openldap24-server/Makefile
===================================================================
--- trunk/net/openldap24-server/Makefile 2015-08-26 01:59:16 UTC (rev 20043)
+++ trunk/net/openldap24-server/Makefile 2015-08-26 12:04:30 UTC (rev 20044)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= openldap
-DISTVERSION= 2.4.40
+DISTVERSION= 2.4.41
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -28,8 +28,6 @@
.endif
.else
PKGNAMESUFFIX?= -server
-# Do not use ${PKGNAMESUFFIX} here has it can change later
-OPTIONSFILE?= ${PORT_DBDIR}/${PORTNAME}24-server/options
.endif
EXTRACT_SUFX= .tgz
@@ -38,8 +36,10 @@
LICENSE= openldap2.8
+GNU_CONFIGURE= yes
+# :keepla because port uses lt_dlopen
+USES= cpe libtool:keepla
USE_OPENSSL= yes
-USES= libtool:keepla
.if !defined(CLIENT_ONLY)
USERS= ldap
GROUPS= ldap
@@ -52,13 +52,13 @@
BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
.endif
-PORTREVISION_CLIENT= 1
+PORTREVISION_CLIENT= 0
PORTREVISION_SERVER= 0
OPENLDAP_SHLIB_MAJOR= 2
-OPENLDAP_SHLIB_MINOR= 10.3
+OPENLDAP_SHLIB_MINOR= 10.4
OPENLDAP_MAJOR= ${DISTVERSION:R}
-OPTIONS_DEFINE= FETCH GSSAPI
+OPTIONS_DEFINE= DEBUG FETCH GSSAPI
FETCH_DESC= Enable fetch(3) support
GSSAPI_DESC= With GSSAPI support (implies SASL support)
@@ -71,6 +71,7 @@
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
@@ -114,6 +115,7 @@
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)
@@ -124,7 +126,6 @@
OPENLDAP_PKGFILESUFX=
.endif
-GNU_CONFIGURE= yes
CONFIGURE_SED= -e 's,uuid/uuid.h,xxuuid/uuid.h,g'
.include <bsd.mport.options.mk>
@@ -269,6 +270,12 @@
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
@@ -426,6 +433,7 @@
CONFIGURE_ARGS+= --enable-sql=${BACKEND_ENABLE}
PLIST_SUB+= BACK_SQL=${BACKEND_PLIST}
LIB_DEPENDS+= libodbc.so:${PORTSDIR}/databases/unixODBC
+LDFLAGS+= -L${LOCALBASE}/lib
.else
PLIST_SUB+= BACK_SQL="@comment "
.endif
@@ -467,6 +475,13 @@
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
@@ -539,6 +554,10 @@
${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
Modified: trunk/net/openldap24-server/distinfo
===================================================================
--- trunk/net/openldap24-server/distinfo 2015-08-26 01:59:16 UTC (rev 20043)
+++ trunk/net/openldap24-server/distinfo 2015-08-26 12:04:30 UTC (rev 20044)
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.40.tgz) = d12611a5c25b6499293c2bb7b435dc2b174db73e83f5a8cb7e34f2ce5fa6dadb
-SIZE (openldap-2.4.40.tgz) = 5641865
+SHA256 (openldap-2.4.41.tgz) = 27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e
+SIZE (openldap-2.4.41.tgz) = 5644124
Added: trunk/net/openldap24-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
===================================================================
--- trunk/net/openldap24-server/files/extrapatch-outlook-servers__slapd__schema_prep.c (rev 0)
+++ trunk/net/openldap24-server/files/extrapatch-outlook-servers__slapd__schema_prep.c 2015-08-26 12:04:30 UTC (rev 20044)
@@ -0,0 +1,15 @@
+#
+# This patch is obtained from:
+#
+# http://www.openldap.org/lists/openldap-technical/201212/msg00055.html
+#
+--- servers/slapd/schema_prep.c.orig 2014-09-18 18:48:49.000000000 -0700
++++ servers/slapd/schema_prep.c 2015-03-31 17:26:23.439844478 -0700
+@@ -908,6 +908,7 @@
+ "DESC 'RFC4519: common supertype of name attributes' "
+ "EQUALITY caseIgnoreMatch "
+ "SUBSTR caseIgnoreSubstringsMatch "
++ "ORDERING caseIgnoreOrderingMatch "
+ "SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{32768} )",
+ NULL, SLAP_AT_ABSTRACT,
+ NULL, NULL,
Property changes on: trunk/net/openldap24-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
___________________________________________________________________
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
Deleted: trunk/net/openldap24-server/files/patch-ITS8027
===================================================================
--- trunk/net/openldap24-server/files/patch-ITS8027 2015-08-26 01:59:16 UTC (rev 20043)
+++ trunk/net/openldap24-server/files/patch-ITS8027 2015-08-26 12:04:30 UTC (rev 20044)
@@ -1,26 +0,0 @@
-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
-
Deleted: trunk/net/openldap24-server/files/patch-ITS8046
===================================================================
--- trunk/net/openldap24-server/files/patch-ITS8046 2015-08-26 01:59:16 UTC (rev 20043)
+++ trunk/net/openldap24-server/files/patch-ITS8046 2015-08-26 12:04:30 UTC (rev 20044)
@@ -1,34 +0,0 @@
-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
-
Added: trunk/net/openldap24-server/files/patch-build__top.mk
===================================================================
--- trunk/net/openldap24-server/files/patch-build__top.mk (rev 0)
+++ trunk/net/openldap24-server/files/patch-build__top.mk 2015-08-26 12:04:30 UTC (rev 20044)
@@ -0,0 +1,11 @@
+--- build/top.mk.orig 2014-09-18 18:48:49.000000000 -0700
++++ build/top.mk 2015-04-27 12:02:52.234737749 -0700
+@@ -59,8 +59,6 @@
+ INSTALL_DATA = $(INSTALL) -m 644
+ INSTALL_SCRIPT = $(INSTALL)
+
+-STRIP = -s
+-
+ LINT = lint
+ 5LINT = 5lint
+
Property changes on: trunk/net/openldap24-server/files/patch-build__top.mk
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ 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-contrib_slapd-modules_passwd_sha2_sha2.h
===================================================================
--- trunk/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h (rev 0)
+++ trunk/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h 2015-08-26 12:04:30 UTC (rev 20044)
@@ -0,0 +1,24 @@
+--- contrib/slapd-modules/passwd/sha2/sha2.h.orig 2014-09-19 01:48:49 UTC
++++ contrib/slapd-modules/passwd/sha2/sha2.h
+@@ -142,6 +142,21 @@ typedef struct _SHA512_CTX {
+
+ typedef SHA512_CTX SHA384_CTX;
+
++#define SHA256_Init _sha2_SHA256_Init
++#define SHA256_Update _sha2_SHA256_Update
++#define SHA256_Final _sha2_SHA256_Final
++#define SHA256_End _sha2_SHA256_End
++#define SHA256_Data _sha2_SHA256_Data
++#define SHA384_Init _sha2_SHA384_Init
++#define SHA384_Update _sha2_SHA384_Update
++#define SHA384_Final _sha2_SHA384_Final
++#define SHA384_End _sha2_SHA384_End
++#define SHA384_Data _sha2_SHA384_Data
++#define SHA512_Init _sha2_SHA512_Init
++#define SHA512_Update _sha2_SHA512_Update
++#define SHA512_Final _sha2_SHA512_Final
++#define SHA512_End _sha2_SHA512_End
++#define SHA512_Data _sha2_SHA512_Data
+
+ /*** SHA-256/384/512 Function Prototypes ******************************/
+ #ifndef NOPROTO
Property changes on: trunk/net/openldap24-server/files/patch-contrib_slapd-modules_passwd_sha2_sha2.h
___________________________________________________________________
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
More information about the Midnightbsd-cvs
mailing list