diff options
| author | manu <manu@pkgsrc.org> | 2015-08-10 12:47:50 +0000 |
|---|---|---|
| committer | manu <manu@pkgsrc.org> | 2015-08-10 12:47:50 +0000 |
| commit | 840d92b30942dd4b35d40c141e1dbcf7ef7bebc3 (patch) | |
| tree | c6b0c1403fa13698f53949d6c2e6131040865985 /databases | |
| parent | 45bd115854d35166669512e133d250be189700ae (diff) | |
| download | pkgsrc-840d92b30942dd4b35d40c141e1dbcf7ef7bebc3.tar.gz | |
Use OpenSSL libcrypto instead of libdes on NetBSD
All recent NetBSD releases now have an OpenSSL recent enough so
that the DES symbols required by slapo-smbk5pwd can be found in
OpenSSL's libcrypto. We therefore do not need to link with -ldes
anymore, especialy since it now causes a build failure.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/openldap-smbk5pwd/Makefile | 6 | ||||
| -rw-r--r-- | databases/openldap/distinfo | 3 | ||||
| -rw-r--r-- | databases/openldap/patches/patch-de | 20 |
3 files changed, 2 insertions, 27 deletions
diff --git a/databases/openldap-smbk5pwd/Makefile b/databases/openldap-smbk5pwd/Makefile index fdffbe2d93c..7d894abcc3b 100644 --- a/databases/openldap-smbk5pwd/Makefile +++ b/databases/openldap-smbk5pwd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2014/10/01 08:32:32 adam Exp $ +# $NetBSD: Makefile,v 1.18 2015/08/10 12:47:50 manu Exp $ PKGNAME= ${DISTNAME:S/-/-smbk5pwd-/} COMMENT= Samba and Kerberos password sync for OpenLDAP @@ -18,10 +18,6 @@ do-install: .include "../../mk/bsd.prefs.mk" -.if ${OPSYS} == "NetBSD" -LIBS+= -ldes -.endif - .include "../../databases/openldap-server/options.mk" .include "../../mk/krb5.buildlink3.mk" diff --git a/databases/openldap/distinfo b/databases/openldap/distinfo index 377a9232f35..524844e57fb 100644 --- a/databases/openldap/distinfo +++ b/databases/openldap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.99 2015/07/17 14:49:05 adam Exp $ +$NetBSD: distinfo,v 1.100 2015/08/10 12:47:50 manu Exp $ SHA1 (openldap-2.4.41.tgz) = c6880df9fec928a5f010b78a4285b497e8a12d6b RMD160 (openldap-2.4.41.tgz) = b07662d9b93e67eb7f1bb8374ee5b25bc76e7a47 @@ -17,6 +17,5 @@ SHA1 (patch-contrib_slapd-modules_nops_Makefile) = c51bccf34c3f3112232a134038622 SHA1 (patch-contrib_slapd-modules_nops_slapo-nops.5) = f32352f19361b7e9aa5b038ae8578def7c08fa47 SHA1 (patch-da) = 75e26bd08c6e66b69192ebfbb36db974d391ec3e SHA1 (patch-dd) = 9c74118ff0b2232bda729c9917082fceef41dd16 -SHA1 (patch-de) = f371fc2bd2534832bf57c363095eecacb5cb1fe3 SHA1 (patch-its7506) = a50f9428d6d7dd28f71d21e11ae3f8b0f1372f75 SHA1 (patch-libraries_libldap_os-local.c) = 7cd4f8638456fae12499de0d36d7802e47d3d688 diff --git a/databases/openldap/patches/patch-de b/databases/openldap/patches/patch-de deleted file mode 100644 index 3ede6425e64..00000000000 --- a/databases/openldap/patches/patch-de +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-de,v 1.4 2014/10/01 08:32:31 adam Exp $ - ---- contrib/slapd-modules/smbk5pwd/smbk5pwd.c.orig 2014-09-19 01:48:49.000000000 +0000 -+++ contrib/slapd-modules/smbk5pwd/smbk5pwd.c -@@ -70,8 +70,15 @@ static ObjectClass *oc_krb5KDCEntry; - #include <nettle/md4.h> - typedef unsigned char DES_cblock[8]; - #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> - #include <openssl/md4.h> -+#endif - #else - #error Unsupported crypto backend. - #endif |