mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00
Code Issues Releases Activity

Update OpenLDAP to 2.4.43.

Browse Source 
While there, revert previous NDEBUG behavior for non-debug builds.

MFH: 2015Q4
This commit is contained in:
Xin LI 2015-12-02 05:35:50 +00:00
parent f0db24db9d
commit 65ae0f2ee7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=402810
3 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
net/openldap24-server/Makefile
View File

@ -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=${OVERLAY_ENABLE}
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

4
net/openldap24-server/distinfo
View File

@ -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

11
net/openldap24-server/files/patch-CVE-2015-6908
View File

@ -1,11 +0,0 @@
--- 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;
}