svn commit: r402811 - in branches/2015Q4/net/openldap24-server: . files

[Xin LI]

Author: delphij
Date: Wed Dec  2 05:36:45 2015
New Revision: 402811
URL: https://svnweb.freebsd.org/changeset/ports/402811

Log:
  MFH: r402810
  
  Update OpenLDAP to 2.4.43.
  
  While there, revert previous NDEBUG behavior for non-debug builds.
  
  Approved by:	ports-secteam

Deleted:
  branches/2015Q4/net/openldap24-server/files/patch-CVE-2015-6908
Modified:
  branches/2015Q4/net/openldap24-server/Makefile
  branches/2015Q4/net/openldap24-server/distinfo
Directory Properties:
  branches/2015Q4/   (props changed)

Modified: branches/2015Q4/net/openldap24-server/Makefile
==============================================================================
--- branches/2015Q4/net/openldap24-server/Makefile	Wed Dec  2 05:35:50 2015	(r402810)
+++ branches/2015Q4/net/openldap24-server/Makefile	Wed Dec  2 05:36:45 2015	(r402811)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.42
+DISTVERSION=		2.4.43
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -56,10 +56,10 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	2
-PORTREVISION_SERVER=	2
+PORTREVISION_CLIENT=	0
+PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	2
-OPENLDAP_SHLIB_MINOR=	10.5
+OPENLDAP_SHLIB_MINOR=	10.6
 OPENLDAP_MAJOR=		${DISTVERSION:R}
 
 OPTIONS_DEFINE=		DEBUG FETCH GSSAPI
@@ -189,15 +189,6 @@ CONFIGURE_ARGS=		--with-threads=posix \
 # 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
@@ -283,6 +274,12 @@ CONFIGURE_ARGS+=	--enable-constraint=${O
 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

Modified: branches/2015Q4/net/openldap24-server/distinfo
==============================================================================
--- branches/2015Q4/net/openldap24-server/distinfo	Wed Dec  2 05:35:50 2015	(r402810)
+++ branches/2015Q4/net/openldap24-server/distinfo	Wed Dec  2 05:36:45 2015	(r402811)
@@ -1,2 +1,2 @@
-SHA256 (openldap-2.4.42.tgz) = eeb7b0e2c5852bfd2650e83909bb6152835c0b862fab10b63954dc1bcbba8e63
-SIZE (openldap-2.4.42.tgz) = 5645925
+SHA256 (openldap-2.4.43.tgz) = 34d78e5598a2b0360d26a9050fcdbbe198c65493b013bb607839d5598b6978c8
+SIZE (openldap-2.4.43.tgz) = 5654057