summaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
Diffstat (limited to 'databases')
-rw-r--r--databases/openldap-doc/Makefile6
-rw-r--r--databases/openldap-doc/distinfo8
-rw-r--r--databases/openldap/Makefile6
-rw-r--r--databases/openldap/Makefile.common7
-rw-r--r--databases/openldap/Makefile.version6
-rw-r--r--databases/openldap/distinfo14
-rw-r--r--databases/openldap/patches/patch-ah8
-rw-r--r--databases/openldap/patches/patch-an4
-rw-r--r--databases/openldap/patches/patch-de18
9 files changed, 44 insertions, 33 deletions
diff --git a/databases/openldap-doc/Makefile b/databases/openldap-doc/Makefile
index cab4709fbdd..3c8b6de5af7 100644
--- a/databases/openldap-doc/Makefile
+++ b/databases/openldap-doc/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2012/07/29 10:10:16 adam Exp $
+# $NetBSD: Makefile,v 1.24 2012/08/06 13:33:38 adam Exp $
-DISTNAME= openldap-2.4.31
+.include "../../databases/openldap/Makefile.version"
+
+DISTNAME= openldap-${OPENLDAP_VERSION}
PKGNAME= ${DISTNAME:S/-/-doc-/}
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
diff --git a/databases/openldap-doc/distinfo b/databases/openldap-doc/distinfo
index b51d4d0c408..1075e5849bf 100644
--- a/databases/openldap-doc/distinfo
+++ b/databases/openldap-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2012/07/29 10:10:16 adam Exp $
+$NetBSD: distinfo,v 1.3 2012/08/06 13:33:38 adam Exp $
-SHA1 (openldap-2.4.31.tgz) = 8315a283fb3724abe6062e38d93bb69298d05765
-RMD160 (openldap-2.4.31.tgz) = 47a50d8f42540f115b8e8b9ec531982b5c3a32d1
-Size (openldap-2.4.31.tgz) = 5444236 bytes
+SHA1 (openldap-2.4.32.tgz) = 294d5e9711bcb6850188ed895eeb986d43b62664
+RMD160 (openldap-2.4.32.tgz) = 5d5cfa9c9bb798a1655c2fc30ac4483f4fb04e95
+Size (openldap-2.4.32.tgz) = 5450134 bytes
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index dd45d9eef48..c8ff595ad27 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.138 2012/07/29 10:10:16 adam Exp $
+# $NetBSD: Makefile,v 1.139 2012/08/06 13:33:38 adam Exp $
-DISTNAME= openldap-2.4.31
+.include "../../databases/openldap/Makefile.version"
+
+DISTNAME= openldap-${OPENLDAP_VERSION}
CATEGORIES= databases
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/databases/openldap/Makefile.common b/databases/openldap/Makefile.common
index 9fc6f3657a8..46353392767 100644
--- a/databases/openldap/Makefile.common
+++ b/databases/openldap/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.31 2012/07/29 10:10:16 adam Exp $
+# $NetBSD: Makefile.common,v 1.32 2012/08/06 13:33:38 adam Exp $
#
# used by databases/openldap-client/Makefile
# used by databases/openldap-cloak/Makefile
@@ -6,8 +6,9 @@
# used by databases/openldap-server/Makefile
# used by databases/openldap-smbk5pwd/Makefile
-# please stick to the "stable" releases as much as possible!
-DISTNAME= openldap-2.4.31
+.include "../../databases/openldap/Makefile.version"
+
+DISTNAME= openldap-${OPENLDAP_VERSION}
CATEGORIES= databases
MASTER_SITES= ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \
http://www.openldap.org/software/download/OpenLDAP/openldap-release/ \
diff --git a/databases/openldap/Makefile.version b/databases/openldap/Makefile.version
new file mode 100644
index 00000000000..8f70eb2d63e
--- /dev/null
+++ b/databases/openldap/Makefile.version
@@ -0,0 +1,6 @@
+# $NetBSD: Makefile.version,v 1.1 2012/08/06 13:33:38 adam Exp $
+# used by databases/openldap/Makefile
+# used by databases/openldap/Makefile.common
+# used by databases/openldap-docs/Makefile
+
+OPENLDAP_VERSION= 2.4.32
diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo
index 7cdc3d45d4e..611bbbb0f1a 100644
--- a/databases/openldap/distinfo
+++ b/databases/openldap/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.85 2012/07/29 10:10:16 adam Exp $
+$NetBSD: distinfo,v 1.86 2012/08/06 13:33:38 adam Exp $
-SHA1 (openldap-2.4.31.tgz) = 8315a283fb3724abe6062e38d93bb69298d05765
-RMD160 (openldap-2.4.31.tgz) = 47a50d8f42540f115b8e8b9ec531982b5c3a32d1
-Size (openldap-2.4.31.tgz) = 5444236 bytes
+SHA1 (openldap-2.4.32.tgz) = 294d5e9711bcb6850188ed895eeb986d43b62664
+RMD160 (openldap-2.4.32.tgz) = 5d5cfa9c9bb798a1655c2fc30ac4483f4fb04e95
+Size (openldap-2.4.32.tgz) = 5450134 bytes
SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896
-SHA1 (patch-ah) = 5c833010b5e875c12322a112f42fc723ab070a92
+SHA1 (patch-ah) = d374ec9b369500e7ac9a7f76c8762d14ff061528
SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
-SHA1 (patch-an) = a2ef7e96505df948494673f1d1805f1090adad8e
+SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
SHA1 (patch-da) = 39f51d21b06d03ffc9d83fd39e88f5b6af1d4f60
SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
-SHA1 (patch-de) = c18fd4103d6a6ac7925d59513a9b6bc2196679ba
+SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198
SHA1 (patch-libraries_libmdb_mdb.c) = 2ba3d25dfb1aa6b5e81eed77a46ad58aa74733b5
diff --git a/databases/openldap/patches/patch-ah b/databases/openldap/patches/patch-ah
index 4ffdf236424..cbf5ef14e3f 100644
--- a/databases/openldap/patches/patch-ah
+++ b/databases/openldap/patches/patch-ah
@@ -1,11 +1,11 @@
-$NetBSD: patch-ah,v 1.8 2012/03/13 19:57:11 adam Exp $
+$NetBSD: patch-ah,v 1.9 2012/08/06 13:33:38 adam Exp $
---- libraries/libldap/init.c.orig 2007-09-01 01:13:55.000000000 +0200
+--- libraries/libldap/init.c.orig 2012-07-31 16:39:26.000000000 +0000
+++ libraries/libldap/init.c
-@@ -636,7 +636,11 @@ void ldap_int_initialize( struct ldapopt
-
+@@ -643,7 +643,11 @@ void ldap_int_initialize( struct ldapopt
#if defined(HAVE_TLS) || defined(HAVE_CYRUS_SASL)
{
+ LDAP_MUTEX_LOCK( &ldap_int_hostname_mutex );
- char *name = ldap_int_hostname;
+ char *name;
+#if defined(LDAP_R_COMPILE)
diff --git a/databases/openldap/patches/patch-an b/databases/openldap/patches/patch-an
index d5fb61d3d52..23d34c324ac 100644
--- a/databases/openldap/patches/patch-an
+++ b/databases/openldap/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.4 2012/03/13 19:57:11 adam Exp $
+$NetBSD: patch-an,v 1.5 2012/08/06 13:33:38 adam Exp $
--- libraries/libldap/ldap-int.h.orig 2005-10-11 21:10:47.000000000 -0400
+++ libraries/libldap/ldap-int.h
-@@ -733,7 +733,7 @@ LDAP_F (int) ldap_int_sasl_close LDAP_P(
+@@ -743,7 +743,7 @@ LDAP_F (int) ldap_int_sasl_close LDAP_P(
LDAP_F (int) ldap_int_sasl_external LDAP_P((
LDAP *ld, LDAPConn *conn,
diff --git a/databases/openldap/patches/patch-de b/databases/openldap/patches/patch-de
index 872de9f1931..22481545120 100644
--- a/databases/openldap/patches/patch-de
+++ b/databases/openldap/patches/patch-de
@@ -1,20 +1,20 @@
-$NetBSD: patch-de,v 1.2 2012/03/13 19:57:11 adam Exp $
+$NetBSD: patch-de,v 1.3 2012/08/06 13:33:38 adam Exp $
---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2009-08-04 17:38:01.000000000 +0200
-+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 2009-08-04 22:56:06.000000000 +0200
-@@ -68,9 +68,15 @@
- #ifdef HAVE_GNUTLS
+--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2012-07-31 16:39:26.000000000 +0000
++++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c
+@@ -69,8 +69,15 @@ static ObjectClass *oc_krb5KDCEntry;
#include <gcrypt.h>
typedef unsigned char DES_cblock[8];
- #else
+ #elif HAVE_OPENSSL
+#ifdef __NetBSD__
+#include <des.h>
++#include <md4.h>
+typedef des_key_schedule DES_key_schedule;
+typedef des_cblock DES_cblock;
+#else
#include <openssl/des.h>
-+#endif
#include <openssl/md4.h>
++#endif
+ #else
+ #error Unsupported crypto backend.
#endif
- #include "ldap_utf8.h"
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-09 21:24:50 +0000