Wed Oct 1 08:32:32 2014 UTC ()
Changes 2.4.40:
Fixed libldap DNS SRV priority handling (ITS-7027)
Fixed libldap don't leak libldap err codes (ITS-7676)
Fixed libldap CR/LF handling (ITS-4635)
Fixed libldap ldif-wrap length (ITS-7871)
Fixed libldap GnuTLS ciphersuite parsing (ITS-7500)
Fixed libldap GnuTLS with newer versions (ITS-7430,ITS-6359)
Fixed libldif to correctly handle 4096 character lines (ITS-7859)
Fixed librewrite reference counting (ITS-7723)
Fixed slapacl with back-mdb reader transactions (ITS-7920)
Fixed slapd syncrepl to send cookie on fallback (ITS-7849)
Fixed slapd syncrepl SEGV when abandoning a connection (ITS-7928)
Fixed slapd slapcat with external schema (ITS-7895)
Fixed slapd schema RDN normalization (ITS-7935)
Fixed slapd with repeated language tags (ITS-7941)
Fixed slapd modrdn crash on naming attr with no matching rule (ITS-7850)
Fixed slapd memory leak in control handling (ITS-7942)
Fixed slapd-ldap removed dead code (ITS-7922)
Fixed slapd-mdb to work concurrently with slapadd (ITS-7798)
Fixed slapd-mdb with paged results (ITS-7705, ITS-7800)
Fixed slapd-mdb slapcat with nonexistent indices (ITS-7870)
Fixed slapd-mdb long lived reader transactions (ITS-7904)
Fixed slapd-mdb memory leak on matchedDN (ITS-7872)
Fixed slapd-mdb sorting of attribute values (ITS-7902)
Fixed slapd-mdb to flag attribute values as sorted (ITS-7903)
Fixed slapd-mdb index config handling (ITS-7912)
Fixed slapd-mdb entry release handling (ITS-7915)
Fixed slapd-mdb with aliases and referrals (ITS-7927)
Fixed slapd-mdb alias dereferencing (ITS-7702)
Fixed slapd-sock socket flushing (ITS-7937)
Fixed slapo-accesslog attribute normalization (ITS-7934)
Fixed slapo-accesslog internal search logging (ITS-7929)
Fixed slapo-auditlog connection destroy logic (ITS-7906,ITS-7923)
Fixed slapo-chain interaction with slapo-rwm (ITS-7930)
Fixed slapo-constraint connection destroy logic (ITS-7906,ITS-7923)
Fixed slapo-dds connection destroy logic (ITS-7906,ITS-7923)
Fixed slapo-dyngroup connection destroy logic (ITS-7906,ITS-7923)
Fixed slapo-memberof attr count (ITS-7893)
Fixed slapo-memberof frontendDB handling (ITS-7249)
Fixed slapo-memberof internal search logging (ITS-7929)
Fixed slapo-pcache config processing (ITS-7919)
Fixed slapo-pcache connection destroy logic (ITS-7906,ITS-7923)
Added slapo-ppolicy ORDERING rules (ITS-7838)
Fixed slapo-ppolicy timestamp resolution to use microseconds (ITS-7161)
Fixed slapo-ppolicy connection destroy logic (ITS-7906,ITS-7923)
Fixed slapo-refint to check for pauses in cn=config (ITS-7873)
Fixed slapo-refint internal search logging (ITS-7929)
Fixed slapo-refint connection destroy logic (ITS-7906,ITS-7923)
Fixed slapo-seqmod connection destroy logic (ITS-7906,ITS-7923)
Fixed slapo-slapover connection destroy logic (ITS-7906,ITS-7923)
Fixed slapo-sock db_init (ITS-7868)
Fixed slapo-sssvlv fix olcSssVlvMaxPerConn (ITS-7908)
Fixed slapo-translucent double free (ITS-7587)
Fixed slapo-translucent to work with manageDSAit (ITS-7864)
Fixed slapo-translucent to use local backend with local entries (ITS-7915)
Fixed slapo-unique connection destroy logic (ITS-7906,ITS-7923)
Fixed slapcacl with invalid suffix


(adam)
diff -r1.143 -r1.144 pkgsrc/databases/openldap/Makefile
diff -r1.8 -r1.9 pkgsrc/databases/openldap/Makefile.version
diff -r1.96 -r1.97 pkgsrc/databases/openldap/distinfo
diff -r1.17 -r1.18 pkgsrc/databases/openldap-client/Makefile
diff -r1.13 -r1.14 pkgsrc/databases/openldap-cloak/Makefile
diff -r1.10 -r1.11 pkgsrc/databases/openldap-doc/distinfo
diff -r1.17 -r1.18 pkgsrc/databases/openldap-nops/Makefile
diff -r1.41 -r1.42 pkgsrc/databases/openldap-server/Makefile
diff -r1.16 -r1.17 pkgsrc/databases/openldap-smbk5pwd/Makefile
diff -r1.3 -r1.4 pkgsrc/databases/openldap/patches/patch-de
diff -r1.1 -r0 pkgsrc/databases/openldap/patches/patch-libraries_librewrite_session.c
cvs diff -r1.143 -r1.144 pkgsrc/databases/openldap/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap/Makefile 2014/02/12 23:17:39 1.143
+++ pkgsrc/databases/openldap/Makefile 2014/10/01 08:32:31 1.144
@@ -1,19 +1,18 @@ @@ -1,19 +1,18 @@
1# $NetBSD: Makefile,v 1.143 2014/02/12 23:17:39 tron Exp $ 1# $NetBSD: Makefile,v 1.144 2014/10/01 08:32:31 adam Exp $
2 2
3.include "../../databases/openldap/Makefile.version" 3.include "../../databases/openldap/Makefile.version"
4 4
5DISTNAME= openldap-${OPENLDAP_VERSION} 5DISTNAME= openldap-${OPENLDAP_VERSION}
6PKGREVISION= 1 
7CATEGORIES= databases 6CATEGORIES= databases
8MASTER_SITES= # empty 7MASTER_SITES= # empty
9DISTFILES= # empty 8DISTFILES= # empty
10 9
11MAINTAINER= adam@NetBSD.org 10MAINTAINER= adam@NetBSD.org
12HOMEPAGE= http://www.openldap.org/ 11HOMEPAGE= http://www.openldap.org/
13COMMENT= Lightweight Directory Access Protocol meta-package 12COMMENT= Lightweight Directory Access Protocol meta-package
14LICENSE= modified-bsd 13LICENSE= modified-bsd
15 14
16META_PACKAGE= yes 15META_PACKAGE= yes
17 16
18DEPENDS+= openldap-client>=${PKGVERSION_NOREV}:../../databases/openldap-client 17DEPENDS+= openldap-client>=${PKGVERSION_NOREV}:../../databases/openldap-client
19DEPENDS+= openldap-server>=${PKGVERSION_NOREV}:../../databases/openldap-server 18DEPENDS+= openldap-server>=${PKGVERSION_NOREV}:../../databases/openldap-server
cvs diff -r1.8 -r1.9 pkgsrc/databases/openldap/Makefile.version (expand / switch to unified diff)

--- pkgsrc/databases/openldap/Makefile.version 2014/01/28 20:18:08 1.8
+++ pkgsrc/databases/openldap/Makefile.version 2014/10/01 08:32:31 1.9
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1# $NetBSD: Makefile.version,v 1.8 2014/01/28 20:18:08 adam Exp $ 1# $NetBSD: Makefile.version,v 1.9 2014/10/01 08:32:31 adam Exp $
2# used by databases/openldap/Makefile 2# used by databases/openldap/Makefile
3# used by databases/openldap/Makefile.common 3# used by databases/openldap/Makefile.common
4# used by databases/openldap-docs/Makefile 4# used by databases/openldap-docs/Makefile
5 5
6OPENLDAP_VERSION= 2.4.39 6OPENLDAP_VERSION= 2.4.40
cvs diff -r1.96 -r1.97 pkgsrc/databases/openldap/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/openldap/distinfo 2014/07/18 11:31:25 1.96
+++ pkgsrc/databases/openldap/distinfo 2014/10/01 08:32:31 1.97
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1$NetBSD: distinfo,v 1.96 2014/07/18 11:31:25 ryoon Exp $ 1$NetBSD: distinfo,v 1.97 2014/10/01 08:32:31 adam Exp $
2 2
3SHA1 (openldap-2.4.39.tgz) = 2b8e8401214867c361f7212e7058f95118b5bd6c 3SHA1 (openldap-2.4.40.tgz) = 0cfac3b024b99de2e2456cc7254481b6644e0b96
4RMD160 (openldap-2.4.39.tgz) = da68043bd38e9d58811599d43bfdbc8f6c9b6f58 4RMD160 (openldap-2.4.40.tgz) = 38a914d785040730e9e595fe007ea4a0d0635344
5Size (openldap-2.4.39.tgz) = 5509060 bytes 5Size (openldap-2.4.40.tgz) = 5641865 bytes
6SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980 6SHA1 (patch-ac) = 2995c518278b363bf9657e181c2340d3024d5980
7SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf 7SHA1 (patch-ad) = 24e7ec27d592dd76bdec1e4805801c5304951daf
8SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de 8SHA1 (patch-af) = 2e00b01bd813e73bdc1fb764a02e98d7755703de
9SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896 9SHA1 (patch-ag) = ec8581f7145ba47712be65f97051ffd2d7299896
10SHA1 (patch-ah) = 7b5a9d042df36f17bcb503372e301a0c6554af68 10SHA1 (patch-ah) = 7b5a9d042df36f17bcb503372e301a0c6554af68
11SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751 11SHA1 (patch-aj) = 857bbf14855d7d2a2911457bc6373d8beb69b751
12SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3 12SHA1 (patch-am) = fb8f3e7699f8b2ef55c066cdc6216522c101c7f3
13SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2 13SHA1 (patch-an) = 3e904d05a3e69930259329ca821d3bbf7dd54eb2
14SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3 14SHA1 (patch-ao) = 4fcbbfd4d6be792392e3646123022aeaf25923e3
15SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 36c416f21982235270ca9f0e4b54f677c4deb1ea 15SHA1 (patch-contrib_slapd-modules_cloak_Makefile) = 36c416f21982235270ca9f0e4b54f677c4deb1ea
16SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 22a39eda3e9375e35cec4be57d92a8eafca130a5 16SHA1 (patch-contrib_slapd-modules_nops_Makefile) = 22a39eda3e9375e35cec4be57d92a8eafca130a5
17SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47 17SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47
18SHA1 (patch-da) = 880b25a9266ee057f7269c5be46ef3c3fecf16b4 18SHA1 (patch-da) = 880b25a9266ee057f7269c5be46ef3c3fecf16b4
19SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16 19SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16
20SHA1 (patch-de) = be3833817205483b62cf3216b27f53a951621198 20SHA1 (patch-de) = f371fc2bd2534832bf57c363095eecacb5cb1fe3
21SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688 21SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688
22SHA1 (patch-libraries_librewrite_session.c) = e698d168556750ea790c563d439dd2fd8c87038e 
cvs diff -r1.17 -r1.18 pkgsrc/databases/openldap-client/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-client/Makefile 2014/07/18 11:31:25 1.17
+++ pkgsrc/databases/openldap-client/Makefile 2014/10/01 08:32:31 1.18
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.17 2014/07/18 11:31:25 ryoon Exp $ 1# $NetBSD: Makefile,v 1.18 2014/10/01 08:32:31 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-client-/} 3PKGNAME= ${DISTNAME:S/-/-client-/}
4PKGREVISION= 1 
5COMMENT= Lightweight Directory Access Protocol libraries and client programs 4COMMENT= Lightweight Directory Access Protocol libraries and client programs
6 5
7CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
8 7
9CONFIGURE_ARGS+= --disable-slapd 8CONFIGURE_ARGS+= --disable-slapd
10 9
11#BUILD_DIRS= include libraries clients 10#BUILD_DIRS= include libraries clients
12MAKE_DIRS= ${OPENLDAP_ETCDIR} 11MAKE_DIRS= ${OPENLDAP_ETCDIR}
13BUILD_DEFS+= OPENLDAP_ETCDIR 12BUILD_DEFS+= OPENLDAP_ETCDIR
14 13
15CNFS= ldap.conf 14CNFS= ldap.conf
16 15
17.include "options.mk" 16.include "options.mk"
cvs diff -r1.13 -r1.14 pkgsrc/databases/openldap-cloak/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-cloak/Makefile 2014/02/12 23:17:39 1.13
+++ pkgsrc/databases/openldap-cloak/Makefile 2014/10/01 08:32:32 1.14
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.13 2014/02/12 23:17:39 tron Exp $ 1# $NetBSD: Makefile,v 1.14 2014/10/01 08:32:32 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-cloak-/} 3PKGNAME= ${DISTNAME:S/-/-cloak-/}
4PKGREVISION= 1 
5COMMENT= Remove null-ops for OpenLDAP 4COMMENT= Remove null-ops for OpenLDAP
6 5
7CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server 7DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server
9 8
10USE_LIBTOOL= yes 9USE_LIBTOOL= yes
11 10
12BUILD_DIRS= include contrib/slapd-modules/cloak 11BUILD_DIRS= include contrib/slapd-modules/cloak
13INSTALLATION_DIRS= lib/openldap ${PKGMANDIR}/man5 12INSTALLATION_DIRS= lib/openldap ${PKGMANDIR}/man5
14 13
15do-install: 14do-install:
16 ${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/cloak/slapo-cloak.5\ 15 ${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/cloak/slapo-cloak.5\
17 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 16 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
cvs diff -r1.10 -r1.11 pkgsrc/databases/openldap-doc/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/openldap-doc/distinfo 2014/01/28 20:18:09 1.10
+++ pkgsrc/databases/openldap-doc/distinfo 2014/10/01 08:32:32 1.11
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.10 2014/01/28 20:18:09 adam Exp $ 1$NetBSD: distinfo,v 1.11 2014/10/01 08:32:32 adam Exp $
2 2
3SHA1 (openldap-2.4.39.tgz) = 2b8e8401214867c361f7212e7058f95118b5bd6c 3SHA1 (openldap-2.4.40.tgz) = 0cfac3b024b99de2e2456cc7254481b6644e0b96
4RMD160 (openldap-2.4.39.tgz) = da68043bd38e9d58811599d43bfdbc8f6c9b6f58 4RMD160 (openldap-2.4.40.tgz) = 38a914d785040730e9e595fe007ea4a0d0635344
5Size (openldap-2.4.39.tgz) = 5509060 bytes 5Size (openldap-2.4.40.tgz) = 5641865 bytes
cvs diff -r1.17 -r1.18 pkgsrc/databases/openldap-nops/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-nops/Makefile 2014/02/12 23:17:39 1.17
+++ pkgsrc/databases/openldap-nops/Makefile 2014/10/01 08:32:32 1.18
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.17 2014/02/12 23:17:39 tron Exp $ 1# $NetBSD: Makefile,v 1.18 2014/10/01 08:32:32 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-nops-/} 3PKGNAME= ${DISTNAME:S/-/-nops-/}
4PKGREVISION= 1 
5COMMENT= Remove null-ops for OpenLDAP 4COMMENT= Remove null-ops for OpenLDAP
6 5
7CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server 7DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server
9 8
10USE_LIBTOOL= yes 9USE_LIBTOOL= yes
11 10
12BUILD_DIRS= include contrib/slapd-modules/nops 11BUILD_DIRS= include contrib/slapd-modules/nops
13INSTALLATION_DIRS= lib/openldap ${PKGMANDIR}/man5 12INSTALLATION_DIRS= lib/openldap ${PKGMANDIR}/man5
14 13
15do-install: 14do-install:
16 ${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/nops/slapo-nops.5\ 15 ${INSTALL_MAN} ${WRKSRC}/contrib/slapd-modules/nops/slapo-nops.5\
17 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 16 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
cvs diff -r1.41 -r1.42 pkgsrc/databases/openldap-server/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-server/Makefile 2014/05/09 08:12:00 1.41
+++ pkgsrc/databases/openldap-server/Makefile 2014/10/01 08:32:32 1.42
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.41 2014/05/09 08:12:00 tron Exp $ 1# $NetBSD: Makefile,v 1.42 2014/10/01 08:32:32 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-server-/} 3PKGNAME= ${DISTNAME:S/-/-server-/}
4PKGREVISION= 2 
5COMMENT= Lightweight Directory Access Protocol server suite 4COMMENT= Lightweight Directory Access Protocol server suite
6 5
7CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
8 7
9DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client 8DEPENDS+= openldap-client>=2.3.27nb1:../../databases/openldap-client
10 9
11CFLAGS.FreeBSD+= -DMDB_DSYNC=O_SYNC 10CFLAGS.FreeBSD+= -DMDB_DSYNC=O_SYNC
12CFLAGS.DragonFly+= -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync 11CFLAGS.DragonFly+= -DMDB_DSYNC=O_SYNC -DMDB_FDATASYNC=fsync
13 12
14# slapd options 13# slapd options
15CONFIGURE_ARGS+= --enable-slapd 14CONFIGURE_ARGS+= --enable-slapd
16CONFIGURE_ARGS+= --enable-crypt 15CONFIGURE_ARGS+= --enable-crypt
17CONFIGURE_ARGS+= --enable-wrappers 16CONFIGURE_ARGS+= --enable-wrappers
cvs diff -r1.16 -r1.17 pkgsrc/databases/openldap-smbk5pwd/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/openldap-smbk5pwd/Makefile 2014/02/12 23:17:40 1.16
+++ pkgsrc/databases/openldap-smbk5pwd/Makefile 2014/10/01 08:32:32 1.17
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.16 2014/02/12 23:17:40 tron Exp $ 1# $NetBSD: Makefile,v 1.17 2014/10/01 08:32:32 adam Exp $
2 2
3PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/} 3PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/}
4PKGREVISION= 1 
5COMMENT= Samba and Kerberos password sync for OpenLDAP 4COMMENT= Samba and Kerberos password sync for OpenLDAP
6 5
7CONFLICTS+= openldap<2.3.23nb1 6CONFLICTS+= openldap<2.3.23nb1
8DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server 7DEPENDS+= openldap-server>=2.4.13nb1:../../databases/openldap-server
9 8
10USE_LIBTOOL= yes 9USE_LIBTOOL= yes
11 10
12BUILD_DIRS= include contrib/slapd-modules/smbk5pwd 11BUILD_DIRS= include contrib/slapd-modules/smbk5pwd
13INSTALLATION_DIRS+= lib/openldap 12INSTALLATION_DIRS+= lib/openldap
14 13
15do-install: 14do-install:
16 ${LIBTOOL} --mode=install ${INSTALL_LIB} \ 15 ${LIBTOOL} --mode=install ${INSTALL_LIB} \
17 ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \ 16 ${WRKSRC}/contrib/slapd-modules/smbk5pwd/smbk5pwd.la \
cvs diff -r1.3 -r1.4 pkgsrc/databases/openldap/patches/Attic/patch-de (expand / switch to unified diff)

--- pkgsrc/databases/openldap/patches/Attic/patch-de 2012/08/06 13:33:38 1.3
+++ pkgsrc/databases/openldap/patches/Attic/patch-de 2014/10/01 08:32:31 1.4
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-de,v 1.3 2012/08/06 13:33:38 adam Exp $ 1$NetBSD: patch-de,v 1.4 2014/10/01 08:32:31 adam Exp $
2 2
3--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2012-07-31 16:39:26.000000000 +0000 3--- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2014-09-19 01:48:49.000000000 +0000
4+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c 4+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c
5@@ -69,8 +69,15 @@ static ObjectClass *oc_krb5KDCEntry; 5@@ -70,8 +70,15 @@ static ObjectClass *oc_krb5KDCEntry;
6 #include <gcrypt.h> 6 #include <nettle/md4.h>
7 typedef unsigned char DES_cblock[8]; 7 typedef unsigned char DES_cblock[8];
8 #elif HAVE_OPENSSL 8 #elif HAVE_OPENSSL
9+#ifdef __NetBSD__ 9+#ifdef __NetBSD__
10+#include <des.h> 10+#include <des.h>
11+#include <md4.h> 11+#include <md4.h>
12+typedef des_key_schedule DES_key_schedule; 12+typedef des_key_schedule DES_key_schedule;
13+typedef des_cblock DES_cblock; 13+typedef des_cblock DES_cblock;
14+#else 14+#else
15 #include <openssl/des.h> 15 #include <openssl/des.h>
16 #include <openssl/md4.h> 16 #include <openssl/md4.h>
17+#endif 17+#endif
18 #else 18 #else
19 #error Unsupported crypto backend. 19 #error Unsupported crypto backend.
File Deleted: pkgsrc/databases/openldap/patches/Attic/patch-libraries_librewrite_session.c