diff options
Diffstat (limited to 'security/isakmpd/patches/patch-ae')
-rw-r--r-- | security/isakmpd/patches/patch-ae | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/security/isakmpd/patches/patch-ae b/security/isakmpd/patches/patch-ae index 62bc0419d55..cba3fdd8fbb 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.5 2003/12/30 15:57:53 bad 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 |