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

[Xin LI]

Author: delphij
Date: Sat Sep 12 04:59:03 2015
New Revision: 396731
URL: https://svnweb.freebsd.org/changeset/ports/396731

Log:
  Apply upstream fix for CVE-2015-6908.
  
  Obtained from:	OpenLDAP git 6fe51a9ab04fd28bbc171da3cf12f1c1040d6629
  Security:	CVE-2015-6908
  MFH:		2015Q3

Added:
  head/net/openldap24-server/files/patch-CVE-2015-6908   (contents, props changed)
Modified:
  head/net/openldap24-server/Makefile

Modified: head/net/openldap24-server/Makefile
==============================================================================
--- head/net/openldap24-server/Makefile	Sat Sep 12 00:29:12 2015	(r396730)
+++ head/net/openldap24-server/Makefile	Sat Sep 12 04:59:03 2015	(r396731)
@@ -56,8 +56,8 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	0
-PORTREVISION_SERVER=	0
+PORTREVISION_CLIENT=	1
+PORTREVISION_SERVER=	1
 OPENLDAP_SHLIB_MAJOR=	2
 OPENLDAP_SHLIB_MINOR=	10.5
 OPENLDAP_MAJOR=		${DISTVERSION:R}

Added: head/net/openldap24-server/files/patch-CVE-2015-6908
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/openldap24-server/files/patch-CVE-2015-6908	Sat Sep 12 04:59:03 2015	(r396731)
@@ -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;
+ }
+