88eb08ea76
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.
49 lines
1.6 KiB
Text
49 lines
1.6 KiB
Text
$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 Tue Dec 30 16:51:15 2003
|
|
@@ -35,26 +35,23 @@
|
|
LIBCRYPTO= /usr/lib/libcrypto.a
|
|
LIBSYSDEPDIR= ${.CURDIR}/sysdep/common/libsysdep
|
|
|
|
-LDADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a -lipsec
|
|
-DPADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a ${LIBIPSEC}
|
|
+LDADD+= ${LIBSYSDEPDIR}/libsysdep.a -lipsec
|
|
+DPADD+= ${LIBSYSDEPDIR}/libsysdep.a ${LIBIPSEC}
|
|
|
|
-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)
|
|
-CFLAGS+= -I/usr/pkg/include/openssl
|
|
-.elif exists(/usr/include/openssl/rsa.h)
|
|
-CFLAGS+= -I/usr/include -I/usr/include/openssl
|
|
-.endif
|
|
# mandatory for gmp
|
|
-CFLAGS+= -I/usr/pkg/include
|
|
-LDADD+= -L/usr/pkg/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
|
|
+.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 +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
|
|
-.endif
|
|
+ ln -sf @BUILDLINK_PREFIX.openssl@/include/openssl ssl
|