svn commit: r382886 - in head/net/openldap24-server: . files

[Xin LI]

Author: delphij
Date: Wed Apr  1 01:02:17 2015
New Revision: 382886
URL: https://svnweb.freebsd.org/changeset/ports/382886
QAT: https://qat.redports.org/buildarchive/r382886/

Log:
  Add a patch to improve Outlook interoperability at expense of possible
  RFC violation.  This patch is optional and not enabled by default.
  
  For detailed discussion please follow:
  
  	http://www.openldap.org/lists/openldap-technical/201211/msg00175.html
  
  Requested by:	Tim Gustafson <tjg ucsc edu>

Added:
  head/net/openldap24-server/files/extrapatch-outlook-servers__slapd__schema_prep.c   (contents, props changed)
Modified:
  head/net/openldap24-server/Makefile

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Wed Apr  1 00:34:05 2015	(r382885)
+++ head/net/openldap24-server/Makefile	Wed Apr  1 01:02:17 2015	(r382886)
@@ -59,7 +59,7 @@ BROKEN=			incompatible OpenLDAP version:
 .endif
 
 PORTREVISION_CLIENT=	1
-PORTREVISION_SERVER=	3
+PORTREVISION_SERVER=	4
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	10.3
 OPENLDAP_MAJOR=		${DISTVERSION:R}
@@ -77,6 +77,7 @@ OPTIONS_DEFINE+=	DEREF DYNGROUP DYNLIST 
 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
 
@@ -120,6 +121,7 @@ SMBPWD_DESC=		With Samba Password hashes
 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)
@@ -473,6 +475,13 @@ LIB_DEPENDS+=		libslp.so:${PORTSDIR}/net
 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
 

Added: head/net/openldap24-server/files/extrapatch-outlook-servers__slapd__schema_prep.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/openldap24-server/files/extrapatch-outlook-servers__slapd__schema_prep.c	Wed Apr  1 01:02:17 2015	(r382886)
@@ -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,