[Midnightbsd-cvs] mports [20833] trunk/net/openldap24-server: openldap server 2.4.42

[laffer1 at midnightbsd.org]

Revision: 20833
          http://svnweb.midnightbsd.org/mports/?rev=20833
Author:   laffer1
Date:     2015-11-13 07:40:08 -0500 (Fri, 13 Nov 2015)
Log Message:
-----------
openldap server 2.4.42

Modified Paths:
--------------
    trunk/net/openldap24-server/Makefile
    trunk/net/openldap24-server/distinfo
    trunk/net/openldap24-server/pkg-plist
    trunk/net/openldap24-server/pkg-plist.client

Added Paths:
-----------
    trunk/net/openldap24-server/files/patch-CVE-2015-6908

Modified: trunk/net/openldap24-server/Makefile
===================================================================
--- trunk/net/openldap24-server/Makefile	2015-11-13 12:31:20 UTC (rev 20832)
+++ trunk/net/openldap24-server/Makefile	2015-11-13 12:40:08 UTC (rev 20833)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.41
+DISTVERSION=		2.4.42
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -52,10 +52,10 @@
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	2
+PORTREVISION_SERVER=	2
 OPENLDAP_SHLIB_MAJOR=	2
-OPENLDAP_SHLIB_MINOR=	10.4
+OPENLDAP_SHLIB_MINOR=	10.5
 OPENLDAP_MAJOR=		${DISTVERSION:R}
 
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
@@ -185,6 +185,15 @@
 # XXX FreeBSD does not implement O_DSYNC and fdatasync at this time.
 CFLAGS+=		-DMDB_DSYNC=O_SYNC -Dfdatasync=fsync
 
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug=yes
+.else
+CONFIGURE_ARGS+=	--disable-debug
+CFLAGS+=		-DNDEBUG
+.endif
+
+MAKE_ENV+=		STRIP=${STRIP}
+
 .if !${PORT_OPTIONS:MFETCH}
 CONFIGURE_ARGS+=	--without-fetch
 .endif
@@ -270,12 +279,6 @@
 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
@@ -505,10 +508,10 @@
 PLIST_SUB+=		OPENLDAP_MAJOR=${OPENLDAP_MAJOR}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,%LOCALSTATEDIR%/run/,${LDAP_RUN_DIR}/,g' \
+	@${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' \
+	@${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)
@@ -553,7 +556,7 @@
 	done
 
 	@for library in lber ldap ldap_r; do \
-		${STRIP_CMD} }${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
+		${STRIP_CMD} ${PREFIX}/lib/lib$${library}-${OPENLDAP_MAJOR}.so.${OPENLDAP_SHLIB_MAJOR}; \
 	done
 .else
 	@${MKDIR} ${FAKE_DESTDIR}${LDAP_RUN_DIR}

Modified: trunk/net/openldap24-server/distinfo
===================================================================
--- trunk/net/openldap24-server/distinfo	2015-11-13 12:31:20 UTC (rev 20832)
+++ trunk/net/openldap24-server/distinfo	2015-11-13 12:40:08 UTC (rev 20833)
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.41.tgz) = 27856bb4a8b44feca2b326c309000e16a9dadd52362c8ab6eec6c67a43737f6e
-SIZE (openldap-2.4.41.tgz) = 5644124
+SHA256 (openldap-2.4.42.tgz) = eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63
+SIZE (openldap-2.4.42.tgz) = 5645925

Added: trunk/net/openldap24-server/files/patch-CVE-2015-6908
===================================================================
--- trunk/net/openldap24-server/files/patch-CVE-2015-6908	                        (rev 0)
+++ trunk/net/openldap24-server/files/patch-CVE-2015-6908	2015-11-13 12:40:08 UTC (rev 20833)
@@ -0,0 +1,11 @@
+--- libraries/liblber/io.c.orig	2015-08-14 15:25:28 UTC
++++ libraries/liblber/io.c
+@@ -679,7 +679,7 @@ done:
+ 		return (ber->ber_tag);
+ 	}
+ 
+-	assert( 0 ); /* ber structure is messed up ?*/
++	/* invalid input */
+ 	return LBER_DEFAULT;
+ }
+ 


Property changes on: trunk/net/openldap24-server/files/patch-CVE-2015-6908
___________________________________________________________________
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-11-13 12:31:20 UTC (rev 20832)
+++ trunk/net/openldap24-server/pkg-plist	2015-11-13 12:40:08 UTC (rev 20833)
@@ -26,7 +26,9 @@
 @sample etc/openldap/schema/pmi.schema.sample
 etc/openldap/schema/ppolicy.ldif
 @sample etc/openldap/schema/ppolicy.schema.sample
-%%BACK_BDB%%etc/DB_CONFIG.example
+ at sample etc/openldap/slapd.conf.sample
+ at sample etc/openldap/slapd.ldif.sample
+%%BACK_BDB%%etc/openldap/DB_CONFIG.example
 %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
 %%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.%%SHLIB_MINOR%%
 %%SLAPI%%lib/libslapi.a
@@ -161,7 +163,7 @@
 sbin/slappasswd
 sbin/slapschema
 sbin/slaptest
- at dir etc/schema
+ at dir etc/openldap/schema
 %%MODULES%%@dir libexec/openldap
 @dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%LDAP_RUN_DIR%%
 @dir(%%LDAP_USER%%,%%LDAP_GROUP%%,775) %%DATABASEDIR%%

Modified: trunk/net/openldap24-server/pkg-plist.client
===================================================================
--- trunk/net/openldap24-server/pkg-plist.client	2015-11-13 12:31:20 UTC (rev 20832)
+++ trunk/net/openldap24-server/pkg-plist.client	2015-11-13 12:40:08 UTC (rev 20833)
@@ -8,6 +8,7 @@
 bin/ldapsearch
 bin/ldapurl
 bin/ldapwhoami
+ at sample etc/openldap/ldap.conf.sample
 include/lber.h
 include/lber_types.h
 include/ldap.h