- update openldap to 2.4.24, fixes CVE-2011-1024 and CVE-2011-1025.

ok pea@ sthen@
This commit is contained in:
jasper 2011-03-03 14:52:04 +00:00
parent 4969d3057a
commit bbf1976d5e
4 changed files with 22 additions and 20 deletions

View File

@ -1,20 +1,18 @@
# $OpenBSD: Makefile,v 1.100 2011/01/13 15:41:40 pea Exp $
# $OpenBSD: Makefile,v 1.101 2011/03/03 14:52:04 jasper Exp $
COMMENT-main= Open source LDAP software (client)
COMMENT-server= Open source LDAP software (server)
DISTNAME= openldap-2.4.23
DISTNAME= openldap-2.4.24
PKGNAME-main= ${DISTNAME:S/-/-client-/}
PKGNAME-server= ${DISTNAME:S/-/-server-/}
REVISION-server= 1
SHARED_LIBS += lber 10.0 # .7.6
SHARED_LIBS += ldap 10.0 # .7.6
SHARED_LIBS += ldap_r 10.0 # .7.6
SHARED_LIBS += lber-2.4 10.0 # .7.6
SHARED_LIBS += ldap-2.4 10.0 # .7.6
SHARED_LIBS += ldap_r-2.4 10.0 # .7.6
SHARED_LIBS += lber 11.0 # .8.0
SHARED_LIBS += ldap 11.0 # .8.0
SHARED_LIBS += ldap_r 11.0 # .8.0
SHARED_LIBS += lber-2.4 11.0 # .8.0
SHARED_LIBS += ldap-2.4 11.0 # .8.0
SHARED_LIBS += ldap_r-2.4 11.0 # .8.0
CATEGORIES= databases net
HOMEPAGE= http://www.openldap.org/

View File

@ -1,5 +1,5 @@
MD5 (openldap-2.4.23.tgz) = kBULjA0BkuELMBV+aIRN3w==
RMD160 (openldap-2.4.23.tgz) = 0iaOj7iUaA0dmSb+3Kc28ZXgoL4=
SHA1 (openldap-2.4.23.tgz) = JgJ+cCAlbF9H4XeH8X7osxr0I3g=
SHA256 (openldap-2.4.23.tgz) = Wl7ekdXoqzx/Y3YgqimjuW6zQxiosmyO7y0seJ/AVeM=
SIZE (openldap-2.4.23.tgz) = 5182440
MD5 (openldap-2.4.24.tgz) = EW/h4jp7Z2htXmInQ2fmwA==
RMD160 (openldap-2.4.24.tgz) = ud9qWlYrg/5K2S+HeZCbNvq2XFI=
SHA1 (openldap-2.4.24.tgz) = pLqtPUWuWBC6X+5IYDIQaXxw1S8=
SHA256 (openldap-2.4.24.tgz) = /c7LZAgqDY4STxOzH8z0dlkB4p3sr0Ikso1M/5ChRhQ=
SIZE (openldap-2.4.24.tgz) = 5240643

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.1 2011/01/07 10:24:30 pea Exp $
--- configure.in.orig Wed Sep 30 02:24:39 2009
+++ configure.in Mon May 3 18:32:18 2010
$OpenBSD: patch-configure_in,v 1.2 2011/03/03 14:52:04 jasper Exp $
--- configure.in.orig Mon Jan 31 21:51:37 2011
+++ configure.in Wed Mar 2 15:44:56 2011
@@ -582,7 +582,7 @@ SLAPD_SQL_LIBS=
SLAPD_SQL_INCLUDES=
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_in,v 1.1 2011/01/07 10:24:30 pea Exp $
SASL_LIBS=
TLS_LIBS=
MODULES_LIBS=
@@ -1901,6 +1901,7 @@ if test $ol_enable_wrappers != no ; then
@@ -1908,6 +1908,7 @@ if test $ol_enable_wrappers != no ; then
save_LIBS="$LIBS"
LIBS="$LIBS -lwrap"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2011/01/07 10:24:30 pea Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2011/03/03 14:52:04 jasper Exp $
@pkgpath ${BASE_PKGPATH}
bin/ldapadd
@bin bin/ldapcompare
@ -108,10 +108,12 @@ lib/libldap_r.la
@man man/man3/ldap_delete_ext.3
@man man/man3/ldap_delete_ext_s.3
@man man/man3/ldap_delete_s.3
@man man/man3/ldap_destroy.3
@man man/man3/ldap_dn2ad_canonical.3
@man man/man3/ldap_dn2dcedn.3
@man man/man3/ldap_dn2str.3
@man man/man3/ldap_dn2ufn.3
@man man/man3/ldap_dup.3
@man man/man3/ldap_err2string.3
@man man/man3/ldap_errlist.3
@man man/man3/ldap_error.3
@ -129,6 +131,7 @@ lib/libldap_r.la
@man man/man3/ldap_get_values.3
@man man/man3/ldap_get_values_len.3
@man man/man3/ldap_init.3
@man man/man3/ldap_init_fd.3
@man man/man3/ldap_initialize.3
@man man/man3/ldap_install_tls.3
@man man/man3/ldap_is_ldap_url.3
@ -183,6 +186,7 @@ lib/libldap_r.la
@man man/man3/ldap_search_st.3
@man man/man3/ldap_set_option.3
@man man/man3/ldap_set_rebind_proc.3
@man man/man3/ldap_set_urllist_proc.3
@man man/man3/ldap_simple_bind.3
@man man/man3/ldap_simple_bind_s.3
@man man/man3/ldap_sort.3