aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2015-09-12 04:59:03 +0000
committerXin LI <delphij@FreeBSD.org>2015-09-12 04:59:03 +0000
commitb3538f944aa41600e4aca5fd59b095edf7838aac (patch)
tree40d9996b4c39be23b8b2cd807b0c8012a368ed05
parent4e37e63a9047e24582b0e0b6d03ec8449f91de2d (diff)
downloadports-b3538f944aa41600e4aca5fd59b095edf7838aac.tar.gz
ports-b3538f944aa41600e4aca5fd59b095edf7838aac.zip
Notes
-rw-r--r--net/openldap24-server/Makefile4
-rw-r--r--net/openldap24-server/files/patch-CVE-2015-690811
2 files changed, 13 insertions, 2 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 16cf8cdf07d1..0593cd69ad41 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -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}
diff --git a/net/openldap24-server/files/patch-CVE-2015-6908 b/net/openldap24-server/files/patch-CVE-2015-6908
new file mode 100644
index 000000000000..5b64e6010e84
--- /dev/null
+++ b/net/openldap24-server/files/patch-CVE-2015-6908
@@ -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;
+ }
+