diff options
-rw-r--r-- | databases/openldap-client/Makefile | 3 | ||||
-rw-r--r-- | databases/openldap-cloak/Makefile | 3 | ||||
-rw-r--r-- | databases/openldap-doc/distinfo | 8 | ||||
-rw-r--r-- | databases/openldap-nops/Makefile | 3 | ||||
-rw-r--r-- | databases/openldap-server/Makefile | 3 | ||||
-rw-r--r-- | databases/openldap-smbk5pwd/Makefile | 3 | ||||
-rw-r--r-- | databases/openldap/Makefile | 3 | ||||
-rw-r--r-- | databases/openldap/Makefile.version | 4 | ||||
-rw-r--r-- | databases/openldap/distinfo | 11 | ||||
-rw-r--r-- | databases/openldap/patches/patch-de | 8 | ||||
-rw-r--r-- | databases/openldap/patches/patch-libraries_librewrite_session.c | 24 |
11 files changed, 21 insertions, 52 deletions
diff --git a/databases/openldap-client/Makefile b/databases/openldap-client/Makefile index 685fb9d649d..6ec24a31b9f 100644 --- a/databases/openldap-client/Makefile +++ b/databases/openldap-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2014/07/18 11:31:25 ryoon Exp $ +# $NetBSD: Makefile,v 1.18 2014/10/01 08:32:31 adam Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} -PKGREVISION= 1 COMMENT= Lightweight Directory Access Protocol libraries and client programs CONFLICTS+= openldap<2.3.23nb1 diff --git a/databases/openldap-cloak/Makefile b/databases/openldap-cloak/Makefile index e2fb7da2159..66f332bef0b 100644 --- a/databases/openldap-cloak/Makefile +++ b/databases/openldap-cloak/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.13 2014/02/12 23:17:39 tron Exp $ +# $NetBSD: Makefile,v 1.14 2014/10/01 08:32:32 adam Exp $ PKGNAME= ${DISTNAME:S/-/-cloak-/} -PKGREVISION= 1 COMMENT= Remove null-ops for OpenLDAP CONFLICTS+= openldap<2.3.23nb1 diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo index ef50a823e95..a96da2d6cfa 100644 --- a/databases/openldap-doc/distinfo +++ b/databases/openldap-doc/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.10 2014/01/28 20:18:09 adam Exp $ +$NetBSD: distinfo,v 1.11 2014/10/01 08:32:32 adam Exp $ -SHA1 (openldap-2.4.39.tgz) = 2b8e8401214867c361f7212e7058f95118b5bd6c -RMD160 (openldap-2.4.39.tgz) = da68043bd38e9d58811599d43bfdbc8f6c9b6f58 -Size (openldap-2.4.39.tgz) = 5509060 bytes +SHA1 (openldap-2.4.40.tgz) = 0cfac3b024b99de2e2456cc7254481b6644e0b96 +RMD160 (openldap-2.4.40.tgz) = 38a914d785040730e9e595fe007ea4a0d0635344 +Size (openldap-2.4.40.tgz) = 5641865 bytes diff --git a/databases/openldap-nops/Makefile b/databases/openldap-nops/Makefile index 92666fe1ac6..2074521d8fb 100644 --- a/databases/openldap-nops/Makefile +++ b/databases/openldap-nops/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.17 2014/02/12 23:17:39 tron Exp $ +# $NetBSD: Makefile,v 1.18 2014/10/01 08:32:32 adam Exp $ PKGNAME= ${DISTNAME:S/-/-nops-/} -PKGREVISION= 1 COMMENT= Remove null-ops for OpenLDAP CONFLICTS+= openldap<2.3.23nb1 diff --git a/databases/openldap-server/Makefile b/databases/openldap-server/Makefile index 5249d09b6e1..3235177fc08 100644 --- a/databases/openldap-server/Makefile +++ b/databases/openldap-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.41 2014/05/09 08:12:00 tron Exp $ +# $NetBSD: Makefile,v 1.42 2014/10/01 08:32:32 adam Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} -PKGREVISION= 2 COMMENT= Lightweight Directory Access Protocol server suite CONFLICTS+= openldap<2.3.23nb1 diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile index 268cd7ff0e5..fdffbe2d93c 100644 --- a/databases/openldap-smbk5pwd/Makefile +++ b/databases/openldap-smbk5pwd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2014/02/12 23:17:40 tron Exp $ +# $NetBSD: Makefile,v 1.17 2014/10/01 08:32:32 adam Exp $ PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/} -PKGREVISION= 1 COMMENT= Samba and Kerberos password sync for OpenLDAP CONFLICTS+= openldap<2.3.23nb1 diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 93efc741ecc..d54ef9205e9 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.143 2014/02/12 23:17:39 tron Exp $ +# $NetBSD: Makefile,v 1.144 2014/10/01 08:32:31 adam Exp $ .include "../../databases/openldap/Makefile.version" DISTNAME= openldap-${OPENLDAP_VERSION} -PKGREVISION= 1 CATEGORIES= databases MASTER_SITES= # empty DISTFILES= # empty diff --git a/databases/openldap/Makefile.version b/databases/openldap/Makefile.version index e7691454ca7..5b17b0e7ce9 100644 --- a/databases/openldap/Makefile.version +++ b/databases/openldap/Makefile.version @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.version,v 1.8 2014/01/28 20:18:08 adam Exp $ +# $NetBSD: Makefile.version,v 1.9 2014/10/01 08:32:31 adam Exp $ # used by databases/openldap/Makefile # used by databases/openldap/Makefile.common # used by databases/openldap-docs/Makefile -OPENLDAP_VERSION= 2.4.39 +OPENLDAP_VERSION= 2.4.40 diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index d0eabb83e79..a4bbd67ceeb 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.96 2014/07/18 11:31:25 ryoon Exp $ +$NetBSD: distinfo,v 1.97 2014/10/01 08:32:31 adam Exp $ -SHA1 (openldap-2.4.39.tgz) = 2b8e8401214867c361f7212e7058f95118b5bd6c -RMD160 (openldap-2.4.39.tgz) = da68043bd38e9d58811599d43bfdbc8f6c9b6f58 -Size (openldap-2.4.39.tgz) = 5509060 bytes +SHA1 (openldap-2.4.40.tgz) = 0cfac3b024b99de2e2456cc7254481b6644e0b96 +RMD160 (openldap-2.4.40.tgz) = 38a914d785040730e9e595fe007ea4a0d0635344 +Size (openldap-2.4.40.tgz) = 5641865 bytes SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980 SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de @@ -17,6 +17,5 @@ SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 22a39eda3e9375e35cec4be57d92a SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47 SHA1 (patch-da) = 880b25a9266ee057f7269c5be46ef3c3fecf16b4 SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16 -SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198 +SHA1 (patch-de) = f371fc2bd2534832bf57c363095eecacb5cb1fe3 SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688 -SHA1 (patch-libraries_librewrite_session.c) = e698d168556750ea790c563d439dd2fd8c87038e diff --git a/databases/openldap/patches/patch-de b/databases/openldap/patches/patch-de index 22481545120..3ede6425e64 100644 --- a/databases/openldap/patches/patch-de +++ b/databases/openldap/patches/patch-de @@ -1,9 +1,9 @@ -$NetBSD: patch-de,v 1.3 2012/08/06 13:33:38 adam Exp $ +$NetBSD: patch-de,v 1.4 2014/10/01 08:32:31 adam Exp $ ---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2012-07-31 16:39:26.000000000 +0000 +--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2014-09-19 01:48:49.000000000 +0000 +++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c -@@ -69,8 +69,15 @@ static ObjectClass *oc_krb5KDCEntry; - #include <gcrypt.h> +@@ -70,8 +70,15 @@ static ObjectClass *oc_krb5KDCEntry; + #include <nettle/md4.h> typedef unsigned char DES_cblock[8]; #elif HAVE_OPENSSL +#ifdef __NetBSD__ diff --git a/databases/openldap/patches/patch-libraries_librewrite_session.c b/databases/openldap/patches/patch-libraries_librewrite_session.c deleted file mode 100644 index 905861bc43d..00000000000 --- a/databases/openldap/patches/patch-libraries_librewrite_session.c +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-libraries_librewrite_session.c,v 1.1 2014/05/09 08:12:00 tron Exp $ - -Fix for CVE-2013-4449 taken from the OpenLDA GIT repository: - -http://www.openldap.org/devel/gitweb.cgi?p=openldap.git;a=commit;h=59688044386dfeee0c837a15133f4e878f1bb661 - ---- libraries/librewrite/session.c.orig 2014-01-25 13:36:15.000000000 +0000 -+++ libraries/librewrite/session.c 2014-05-09 09:03:51.000000000 +0100 -@@ -161,6 +161,7 @@ - #ifdef USE_REWRITE_LDAP_PVT_THREADS - if ( session ) { - ldap_pvt_thread_mutex_lock( &session->ls_mutex ); -+ session->ls_count++; - } - ldap_pvt_thread_rdwr_runlock( &info->li_cookies_mutex ); - #endif /* USE_REWRITE_LDAP_PVT_THREADS */ -@@ -178,6 +179,7 @@ - ) - { - assert( session != NULL ); -+ session->ls_count--; - ldap_pvt_thread_mutex_unlock( &session->ls_mutex ); - } - |