diff options
| author | fredb <fredb@pkgsrc.org> | 2000-09-25 04:00:15 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2000-09-25 04:00:15 +0000 |
| commit | 49e9db95e1ad38002748908032c6fbd5ea15531c (patch) | |
| tree | b15c6d30fe1871cdca46bf544a19068a45928368 /security/isakmpd/patches | |
| parent | d34afbcc5072850a0ef7fb21e8f9b8040946baed (diff) | |
| download | pkgsrc-49e9db95e1ad38002748908032c6fbd5ea15531c.tar.gz | |
Update to 2000-09-15 snapshot, to let this build on NetBSD-1.5, and remove
BROKEN variable. Unfortunately, no ChangeLog is available.
Patch system dependent make goo to use 'SSLBASE', mirroring it's use in
bsd.pkg.mk, rather than obsolete 'PATENTEDOPENSSLSRC'. Also, replace hard-
coded "/usr/pkg", replacing it with ${LOCALBASE}. Finally, set 'LOCALBASE'
and 'SSLBASE' conditionally within the package, for convenience.
Diffstat (limited to 'security/isakmpd/patches')
| -rw-r--r-- | security/isakmpd/patches/patch-aa | 21 | ||||
| -rw-r--r-- | security/isakmpd/patches/patch-ac | 49 |
2 files changed, 66 insertions, 4 deletions
diff --git a/security/isakmpd/patches/patch-aa b/security/isakmpd/patches/patch-aa index 8f80c7070dd..413c0dcc1dd 100644 --- a/security/isakmpd/patches/patch-aa +++ b/security/isakmpd/patches/patch-aa @@ -1,7 +1,20 @@ -$NetBSD: patch-aa,v 1.1 2000/03/27 16:04:13 itojun Exp $ ---- Makefile- Tue Mar 28 00:30:18 2000 -+++ Makefile Tue Mar 28 00:31:27 2000 -@@ -59,7 +59,8 @@ +$NetBSD: patch-aa,v 1.2 2000/09/25 04:00:15 fredb Exp $ + +--- Makefile.orig Tue Sep 12 10:34:40 2000 ++++ Makefile Sun Sep 24 10:58:25 2000 +@@ -43,9 +43,9 @@ + # openbsd means 2.5 or newer, openbsd-encap is for older kernels with PF_ENCAP + # linux is the name for Linux with FreeS/WAN integrated, freebsd/netbsd means + # FreeBSD/NetBSD with KAME IPsec. +-OS= openbsd ++#OS= openbsd + #OS= openbsd-encap +-#OS= netbsd ++OS= netbsd + #OS= freebsd + #OS= linux + +@@ -56,7 +56,8 @@ .PATH: ${.CURDIR}/sysdep/${OS} PROG= isakmpd diff --git a/security/isakmpd/patches/patch-ac b/security/isakmpd/patches/patch-ac new file mode 100644 index 00000000000..c82d18cab6d --- /dev/null +++ b/security/isakmpd/patches/patch-ac @@ -0,0 +1,49 @@ +$NetBSD: patch-ac,v 1.1 2000/09/25 04:00:15 fredb Exp $ + +--- sysdep/netbsd/Makefile.sysdep.orig Mon Jun 19 22:27:43 2000 ++++ sysdep/netbsd/Makefile.sysdep Sun Sep 24 22:28:35 2000 +@@ -32,20 +32,28 @@ + # Not yet + #FEATURES+= policy x509 + +-LIBGMP= /usr/pkg/lib/libgmp.a ++# The following defaults are the NetBSD package system defaults ++LOCALBASE?= /usr/pkg ++.if exists(/usr/include/openssl/ssl.h) ++SSLBASE?= /usr ++.else ++SSLBASE?= ${LOCALBASE} ++.endif ++ ++LIBGMP= ${LOCALBASE}/lib/libgmp.a + LIBCRYPTO= /usr/lib/libcrypto.a + LIBSYSDEPDIR= ${.CURDIR}/sysdep/common/libsysdep + + LDADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a -lipsec + DPADD+= ${LIBGMP} ${LIBSYSDEPDIR}/libsysdep.a ${LIBIPSEC} + +-CFLAGS+= -DNO_RSA -DNO_IDEA -DNO_RC5 \ +- -I${.CURDIR}/sysdep/common +-.if !defined(PATENTEDOPENSSLSRC) +-CFLAGS+= -I/usr/pkg/include -I/usr/pkg/include/openssl +-LDADD+= -L/usr/pkg/lib ++CFLAGS+= -DNO_IDEA -DNO_RC5 \ ++ -I${.CURDIR}/sysdep/common -I${LOCALBASE}/include ++.if ${SSLBASE} == "/usr" ++CFLAGS+= -I${SSLBASE}/include/openssl + .else +-CFLAGS+= -I/usr/include -I/usr/include/openssl ++CFLAGS+= -I${SSLBASE}/include -I${SSLBASE}/include/openssl ++LDFLAGS+= -L${SSLBASE}/lib -Wl,-R${SSLBASE}/lib + .endif + + IPSEC_SRCS= pf_key_v2.c +@@ -73,8 +81,3 @@ + + beforedepend: + rm -f ssl +-.if !defined(PATENTEDOPENSSLSRC) +- ln -sf /usr/pkg/include/openssl ssl +-.else +- ln -sf /usr/include/openssl ssl +-.endif |