diff options
| author | agc <agc> | 2003-12-30 23:20:42 +0000 |
|---|---|---|
| committer | agc <agc> | 2003-12-30 23:20:42 +0000 |
| commit | 35745e5df00e79f5ffd77916475a5c59b6a49e26 (patch) | |
| tree | ce703ed02137109df1900a0ac9d23a3c20811847 | |
| parent | a061a7f13e73b99c88069c257c78ddb6c42c0b13 (diff) | |
| download | pkgsrc-35745e5df00e79f5ffd77916475a5c59b6a49e26.tar.gz | |
Pull up a functionality fix to the pkgsrc-2003Q4 branch, requested by
Christoph Badura.
Module Name: pkgsrc
Committed By: bad
Date: Tue Dec 30 15:57:53 UTC 2003
Modified Files:
pkgsrc/security/isakmpd: distinfo
pkgsrc/security/isakmpd/patches: patch-ae
Log Message:
Get rid of -DNO_RSA in CFLAGS. This causes newer openssl headers to
not include <openssl/rsa.h> from <openssl/x509.h>. Fixes PR pkg/23901.
While here, apply the patches to properly buildlinkify it for openssl,
which I forgot to pass to agc@ for the last update.
| -rw-r--r-- | security/isakmpd/distinfo | 4 | ||||
| -rw-r--r-- | security/isakmpd/patches/patch-ae | 27 |
2 files changed, 13 insertions, 18 deletions
diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo index 7209206eb8f..b3dd40714c3 100644 --- a/security/isakmpd/distinfo +++ b/security/isakmpd/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.14 2003/10/10 12:56:18 agc Exp $ +$NetBSD: distinfo,v 1.14.2.1 2003/12/30 23:20:42 agc Exp $ SHA1 (isakmpd-20030903.tar.gz) = 3400947199759a69b878ea396a598d9df174c6e8 Size (isakmpd-20030903.tar.gz) = 358314 bytes SHA1 (patch-aa) = 4b7b92b5f220fb263ebb972120cc577a1264ef6c SHA1 (patch-ab) = f30c790f42d72866e95092848e102e4c3728365c SHA1 (patch-ad) = 8c477b99fd3d82ccb52b01374450295cc25244c0 -SHA1 (patch-ae) = b5242b6cdbda44160444a13894eac167677b769e +SHA1 (patch-ae) = c6ca573357381ae867b1251a90b0c4df4e82d95a SHA1 (patch-ag) = f0af67b96e2f72333e79486495ce6abf1b31b9c1 SHA1 (patch-aj) = 16e592ec1666b70ba6726e4a20878333ca50d7c2 SHA1 (patch-ak) = e168240460695a86533237856f3997b5c06d7805 diff --git a/security/isakmpd/patches/patch-ae b/security/isakmpd/patches/patch-ae index 62bc0419d55..454f10a85cd 100644 --- a/security/isakmpd/patches/patch-ae +++ b/security/isakmpd/patches/patch-ae @@ -1,15 +1,8 @@ -$NetBSD: patch-ae,v 1.4 2003/10/10 12:56:18 agc Exp $ +$NetBSD: patch-ae,v 1.4.2.1 2003/12/30 23:20:42 agc Exp $ --- sysdep/netbsd/Makefile.sysdep.orig Tue Jun 3 16:53:11 2003 -+++ sysdep/netbsd/Makefile.sysdep Wed Sep 3 13:34:57 2003 -@@ -29,32 +29,30 @@ - FEATURES= tripledes des blowfish cast ec aggressive debug x509 - FEATURES+= rawkey - # Not yet --#FEATURES+= policy isakmp_cfg -+#FEATURES+= policy isakmp_cfg - - LIBGMP= /usr/pkg/lib/libgmp.a ++++ sysdep/netbsd/Makefile.sysdep Tue Dec 30 16:51:15 2003 +@@ -35,26 +35,23 @@ LIBCRYPTO= /usr/lib/libcrypto.a LIBSYSDEPDIR= ${.CURDIR}/sysdep/common/libsysdep @@ -18,7 +11,8 @@ $NetBSD: patch-ae,v 1.4 2003/10/10 12:56:18 agc Exp $ +LDADD+= ${LIBSYSDEPDIR}/libsysdep.a -lipsec +DPADD+= ${LIBSYSDEPDIR}/libsysdep.a ${LIBIPSEC} - CFLAGS+= -DNO_RSA -DNO_IDEA -DNO_RC5 -DHAVE_GETNAMEINFO \ +-CFLAGS+= -DNO_RSA -DNO_IDEA -DNO_RC5 -DHAVE_GETNAMEINFO \ ++CFLAGS+= -DNO_IDEA -DNO_RC5 -DHAVE_GETNAMEINFO \ -DHAVE_GETIFADDRS \ -I${.CURDIR}/sysdep/common -.if exists(/usr/pkg/include/openssl/rsa.h) @@ -29,26 +23,27 @@ $NetBSD: patch-ae,v 1.4 2003/10/10 12:56:18 agc Exp $ # mandatory for gmp -CFLAGS+= -I/usr/pkg/include -LDADD+= -L/usr/pkg/lib -+CFLAGS+= -I/usr/include -I/usr/include/openssl -+LDADD+= -L/usr/lib ++CFLAGS+= -I@BUILDLINK_PREFIX.openssl@/include -I@BUILDLINK_PREFIX.openssl@/include/openssl ++LDADD+= -L@BUILDLINK_PREFIX.openssl@/lib IPSEC_SRCS= pf_key_v2.c IPSEC_CFLAGS= -DUSE_PF_KEY_V2 USE_LIBCRYPTO= defined - USE_GMP= defined +-USE_GMP= defined +.if ${FEATURES:Mpolicy} == "policy" +USE_KEYNOTE= defined +.endif # This is a hack in order to make sure libsysdep is built before the # linkstage of isakmpd. As a side effect the link is always done even if -@@ -72,8 +70,4 @@ +@@ -72,8 +69,4 @@ beforedepend: rm -f ssl -.if exists(/usr/pkg/include/openssl/rsa.h) - ln -sf /usr/pkg/include/openssl ssl -.elif exists(/usr/include/openssl/rsa.h) - ln -sf /usr/include/openssl ssl +- ln -sf /usr/include/openssl ssl -.endif ++ ln -sf @BUILDLINK_PREFIX.openssl@/include/openssl ssl |