aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorEdwin Groothuis <edwin@FreeBSD.org>2003-10-17 12:41:12 +0000
committerEdwin Groothuis <edwin@FreeBSD.org>2003-10-17 12:41:12 +0000
commitd4626f9b85370a80e3da9c9d6a8679914df0acc3 (patch)
tree54a513fc484754b785e4d54efc43387eeed97a19 /security
parent849c886c9121b6a7910b6ed40dc6b2a63cd0bbda (diff)
downloadports-d4626f9b85370a80e3da9c9d6a8679914df0acc3.tar.gz
ports-d4626f9b85370a80e3da9c9d6a8679914df0acc3.zip
Notes
Diffstat (limited to 'security')
-rw-r--r--security/isakmpd/Makefile11
-rw-r--r--security/isakmpd/distinfo3
-rw-r--r--security/isakmpd/files/patch-Makefile (renamed from security/isakmpd/files/patch-aa)14
-rw-r--r--security/isakmpd/files/patch-conf.c9
-rw-r--r--security/isakmpd/files/patch-crypto.h12
-rw-r--r--security/isakmpd/files/patch-samples::Makefile (renamed from security/isakmpd/files/patch-ab)0
6 files changed, 13 insertions, 36 deletions
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index 18b548b12a99..a61f96a24b7f 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 <bsd.port.mk>
diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo
index cf2a4cb419fa..3ab7d6acc46a 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-aa b/security/isakmpd/files/patch-Makefile
index 71f752585eeb..919007998b63 100644
--- a/security/isakmpd/files/patch-aa
+++ b/security/isakmpd/files/patch-Makefile
@@ -1,18 +1,18 @@
---- Makefile.orig Sun Aug 26 00:22:26 2001
-+++ Makefile Wed Jan 9 22:06:58 2002
-@@ -43,9 +43,9 @@
+--- 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. linux is the name for Linux with
+ # 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= linux
+ #OS= freeswan
#OS= bsdi
-@@ -159,6 +159,7 @@
+@@ -157,6 +157,7 @@
USE_LIBDES= yes
LDADD+= -lkeynote -lm
DPADD+= ${LIBKEYNOTE} ${LIBM}
@@ -20,7 +20,7 @@
CFLAGS+= -DUSE_KEYNOTE
.endif
-@@ -204,4 +205,3 @@
+@@ -202,4 +203,3 @@
${PROG} beforedepend: ${GENERATED}
.include <bsd.prog.mk>
diff --git a/security/isakmpd/files/patch-conf.c b/security/isakmpd/files/patch-conf.c
deleted file mode 100644
index 519308708fdb..000000000000
--- 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 5e72d19b6124..000000000000
--- 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 <des.h>
-+#define OPENSSL_DES_LIBDES_COMPATIBILITY
-+#include <openssl/des.h>
- #ifdef USE_BLOWFISH
- #include <blf.h>
- #endif
diff --git a/security/isakmpd/files/patch-ab b/security/isakmpd/files/patch-samples::Makefile
index 516941d79013..516941d79013 100644
--- a/security/isakmpd/files/patch-ab
+++ b/security/isakmpd/files/patch-samples::Makefile