From 690254e2a6516cd24132f47eaffea748023f4405 Mon Sep 17 00:00:00 2001 From: edwin Date: Fri, 17 Oct 2003 12:41:12 +0000 Subject: Upgrade to the latests isakmpd version. --- security/isakmpd/Makefile | 11 +++++------ security/isakmpd/distinfo | 3 +-- security/isakmpd/files/patch-Makefile | 27 ++++++++++++++++++++++++++ security/isakmpd/files/patch-aa | 27 -------------------------- security/isakmpd/files/patch-ab | 11 ----------- security/isakmpd/files/patch-conf.c | 9 --------- security/isakmpd/files/patch-crypto.h | 12 ------------ security/isakmpd/files/patch-samples::Makefile | 11 +++++++++++ 8 files changed, 44 insertions(+), 67 deletions(-) create mode 100644 security/isakmpd/files/patch-Makefile delete mode 100644 security/isakmpd/files/patch-aa delete mode 100644 security/isakmpd/files/patch-ab delete mode 100644 security/isakmpd/files/patch-conf.c delete mode 100644 security/isakmpd/files/patch-crypto.h create mode 100644 security/isakmpd/files/patch-samples::Makefile (limited to 'security/isakmpd') diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile index 18b548b..a61f96a 100644 --- a/security/isakmpd/Makefile +++ b/security/isakmpd/Makefile @@ -9,11 +9,10 @@ # PORTNAME= isakmpd -PORTVERSION= 20021118 -PORTREVISION= 2 +PORTVERSION= 20030903 CATEGORIES= security net MASTER_SITES= ${MASTER_SITE_NETBSD} -MASTER_SITE_SUBDIR= LOCAL_PORTS +MASTER_SITE_SUBDIR= . MAINTAINER= ports@FreeBSD.org COMMENT= OpenBSD IKE daemon @@ -38,8 +37,8 @@ MAN8= certpatch.8 isakmpd.8 MANCOMPRESSED= yes post-patch: - @(cd ${WRKSRC}; ${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" \ - conf.h ike_auth.c isakmpd.8 isakmpd.conf.5 \ - isakmpd.policy.5 policy.h) +.for f in conf.h ike_auth.c isakmpd.8 isakmpd.conf.5 isakmpd.policy.5 policy.h + ${REINPLACE_CMD} -e "s!/etc/!${PREFIX}/etc/!" ${WRKSRC}/${f} +.endfor .include diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo index cf2a4cb..3ab7d6a 100644 --- a/security/isakmpd/distinfo +++ b/security/isakmpd/distinfo @@ -1,2 +1 @@ -MD5 (isakmpd-20021118.tar.gz) = d48318144623fa1484edaf24e660205f -MD5 (010_isakmpd.patch) = b2f2a29ab1db1a31f32e14073bf5d51b +MD5 (isakmpd-20030903.tar.gz) = 7a692835f7928ae0a1a8f6f2d119b4aa diff --git a/security/isakmpd/files/patch-Makefile b/security/isakmpd/files/patch-Makefile new file mode 100644 index 0000000..9190079 --- /dev/null +++ b/security/isakmpd/files/patch-Makefile @@ -0,0 +1,27 @@ +--- Makefile.orig Fri Aug 29 00:43:35 2003 ++++ Makefile Thu Oct 16 18:54:23 2003 +@@ -38,9 +38,9 @@ + + # openbsd means OpenBSD 2.5 or newer. freeswan is the name for Linux with + # FreeS/WAN integrated, freebsd/netbsd means FreeBSD/NetBSD with KAME IPsec. +-OS= openbsd ++#OS= openbsd + #OS= netbsd +-#OS= freebsd ++OS= freebsd + #OS= freeswan + #OS= bsdi + +@@ -157,6 +157,7 @@ + USE_LIBDES= yes + LDADD+= -lkeynote -lm + DPADD+= ${LIBKEYNOTE} ${LIBM} ++POLICY= policy.c + CFLAGS+= -DUSE_KEYNOTE + .endif + +@@ -202,4 +203,3 @@ + ${PROG} beforedepend: ${GENERATED} + + .include +-.include diff --git a/security/isakmpd/files/patch-aa b/security/isakmpd/files/patch-aa deleted file mode 100644 index 71f7525..0000000 --- a/security/isakmpd/files/patch-aa +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.orig Sun Aug 26 00:22:26 2001 -+++ Makefile Wed Jan 9 22:06:58 2002 -@@ -43,9 +43,9 @@ - - # openbsd means OpenBSD 2.5 or newer. linux is the name for Linux with - # FreeS/WAN integrated, freebsd/netbsd means FreeBSD/NetBSD with KAME IPsec. --OS= openbsd -+#OS= openbsd - #OS= netbsd --#OS= freebsd -+OS= freebsd - #OS= linux - #OS= bsdi - -@@ -159,6 +159,7 @@ - USE_LIBDES= yes - LDADD+= -lkeynote -lm - DPADD+= ${LIBKEYNOTE} ${LIBM} -+POLICY= policy.c - CFLAGS+= -DUSE_KEYNOTE - .endif - -@@ -204,4 +205,3 @@ - ${PROG} beforedepend: ${GENERATED} - - .include --.include diff --git a/security/isakmpd/files/patch-ab b/security/isakmpd/files/patch-ab deleted file mode 100644 index 516941d..0000000 --- a/security/isakmpd/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- samples/Makefile.orig Tue May 2 16:33:55 2000 -+++ samples/Makefile Wed Jan 9 22:08:47 2002 -@@ -31,7 +31,7 @@ - # - - FILES= VPN-* policy singlehost-* --TARGETDIR= /usr/share/ipsec/isakmpd -+TARGETDIR= ${PREFIX}/share/examples/isakmpd - - # The mkdir below is for installation on OpenBSD pre 2.7 - install: diff --git a/security/isakmpd/files/patch-conf.c b/security/isakmpd/files/patch-conf.c deleted file mode 100644 index 5193087..0000000 --- a/security/isakmpd/files/patch-conf.c +++ /dev/null @@ -1,9 +0,0 @@ ---- conf.c.orig Mon Nov 18 06:58:04 2002 -+++ conf.c Sat Feb 8 11:39:43 2003 -@@ -254,5 +254,5 @@ - if (!section) - { -- log_print ("conf_parse_line: %d: malloc (%d) failed", ln, i); -+ log_print ("conf_parse_line: %d: malloc (%ld) failed", ln, (long) i); - return; - } diff --git a/security/isakmpd/files/patch-crypto.h b/security/isakmpd/files/patch-crypto.h deleted file mode 100644 index 5e72d19..0000000 --- a/security/isakmpd/files/patch-crypto.h +++ /dev/null @@ -1,12 +0,0 @@ ---- crypto.h.orig Fri Feb 21 10:11:51 2003 -+++ crypto.h Fri Feb 21 10:11:58 2003 -@@ -49,7 +49,8 @@ - - #else - --#include -+#define OPENSSL_DES_LIBDES_COMPATIBILITY -+#include - #ifdef USE_BLOWFISH - #include - #endif diff --git a/security/isakmpd/files/patch-samples::Makefile b/security/isakmpd/files/patch-samples::Makefile new file mode 100644 index 0000000..516941d --- /dev/null +++ b/security/isakmpd/files/patch-samples::Makefile @@ -0,0 +1,11 @@ +--- samples/Makefile.orig Tue May 2 16:33:55 2000 ++++ samples/Makefile Wed Jan 9 22:08:47 2002 +@@ -31,7 +31,7 @@ + # + + FILES= VPN-* policy singlehost-* +-TARGETDIR= /usr/share/ipsec/isakmpd ++TARGETDIR= ${PREFIX}/share/examples/isakmpd + + # The mkdir below is for installation on OpenBSD pre 2.7 + install: -- cgit v1.1