This is a new version taken from OpenBSD just before their next release.

Exact list of changes is unknown (you might take a look at OpenBSD's
log entries at http://www.openbsd.org/cgi-bin/cvsweb/src/sbin/isakmpd/)

4 files changed, 67 insertions, 24 deletions

diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index cf5e1c2d681..24f41cd7f5c 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,15 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2001/06/11 11:23:20 itojun Exp $
+# $NetBSD: Makefile,v 1.16 2001/10/22 05:51:25 martti Exp $
 #
 
-DISTNAME=		isakmpd-20010611
+DISTNAME=		isakmpd-20011018
 CATEGORIES=		security net
 MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
 
 MAINTAINER=		itojun@kame.net
 COMMENT=		OpenBSD IKE daemon
 
-USE_SSL=		yes
-
 # this is not compatible with cross build - there's no other way
 .if !exists(/usr/include/netinet6/ipsec.h)
 IGNORE+=		"${PKGNAME} requires ipsec-ready NetBSD"
@@ -21,4 +19,19 @@ WRKSRC=			${WRKDIR}/isakmpd
 
 MAKE_ENV+=		BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man
 
+post-patch:
+	@${ECHO_MSG} "Fixing references to buildlink directories"
+	@for i in `${FIND} ${WRKSRC} -name '*Makefile*'`; do		\
+		${MV} $${i} $${i}.orig;					\
+		${SED} "s+@BUILDLINK_DIR@+${BUILDLINK_DIR}+g"		\
+			< $${i}.orig > $${i};				\
+	done
+	@${ECHO_MSG} "Fixing manual page references"
+	@for i in isakmpd.8 isakmpd.conf.5 isakmpd.policy.5; do		\
+		${MV} ${WRKSRC}/$${i} ${WRKSRC}/$${i}.orig;		\
+		${SED} "s+/usr/share/ipsec+${PREFIX}/share/examples+g"	\
+			< ${WRKSRC}/$${i}.orig > ${WRKSRC}/$${i};	\
+	done
+
+.include "../../security/openssl/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/isakmpd/distinfo b/security/isakmpd/distinfo
index 9688c7e9bf6..be9a7f1db2c 100644
--- a/security/isakmpd/distinfo
+++ b/security/isakmpd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2001/06/11 11:23:20 itojun Exp $
+$NetBSD: distinfo,v 1.5 2001/10/22 05:51:25 martti Exp $
 
-SHA1 (isakmpd-20010611.tar.gz) = e370eec7eb56f1a797edb3f6a8eaf71d793ff7e8
-Size (isakmpd-20010611.tar.gz) = 324329 bytes
-SHA1 (patch-aa) = d1616a16251ccd770c392e60057b357b7224d38a
+SHA1 (isakmpd-20011018.tar.gz) = 2d838bffbaa875b4acc3e7d07abe6ac8807cb366
+Size (isakmpd-20011018.tar.gz) = 339344 bytes
+SHA1 (patch-aa) = 22903f2d4ba4f92f716920a121d861550bd8bc51
 SHA1 (patch-ab) = f30c790f42d72866e95092848e102e4c3728365c
 SHA1 (patch-ad) = 8c477b99fd3d82ccb52b01374450295cc25244c0
-SHA1 (patch-ae) = f289972d8b22c8253667e655db95ad0952c4a2e1
+SHA1 (patch-ae) = 06b210382eb731561a09a676e8c57f2c3cdd9a25
diff --git a/security/isakmpd/patches/patch-aa b/security/isakmpd/patches/patch-aa
index c9ba94cc4ac..3fc89651566 100644
--- a/security/isakmpd/patches/patch-aa
+++ b/security/isakmpd/patches/patch-aa
@@ -1,16 +1,24 @@
-$NetBSD: patch-aa,v 1.4 2001/04/03 13:06:28 itojun Exp $
+$NetBSD: patch-aa,v 1.5 2001/10/22 05:51:25 martti Exp $
 
---- Makefile.orig	Sat Mar 24 01:14:34 2001
-+++ Makefile	Tue Apr  3 22:00:03 2001
-@@ -44,9 +44,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.
+--- Makefile.orig	Sun Aug 26 00:22:26 2001
++++ Makefile	Thu Oct 18 11:19:22 2001
+@@ -43,8 +43,8 @@
+ 
+ # 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=		openbsd-encap
 -#OS=		netbsd
++#OS=		openbsd
 +OS=		netbsd
  #OS=		freebsd
  #OS=		linux
  #OS=		bsdi
+@@ -74,7 +74,7 @@
+ 		isakmp_num.c isakmp_num.h ipsec_fld.c ipsec_fld.h \
+ 		isakmp_fld.c isakmp_fld.h
+ MAN=		isakmpd.8 isakmpd.conf.5 isakmpd.policy.5
+-CFLAGS+=	-Wall -Wstrict-prototypes -Wmissing-prototypes \
++CFLAGS+=	-Wall -Wmissing-prototypes \
+ 		-DNEED_SYSDEP_APP \
+ 		-I${.CURDIR} -I${.CURDIR}/sysdep/${OS} -I.
+ 
diff --git a/security/isakmpd/patches/patch-ae b/security/isakmpd/patches/patch-ae
index edb9a513c9b..7108b58f476 100644
--- a/security/isakmpd/patches/patch-ae
+++ b/security/isakmpd/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2001/04/05 23:29:43 itojun Exp $
+$NetBSD: patch-ae,v 1.2 2001/10/22 05:51:25 martti Exp $
 
---- sysdep/netbsd/Makefile.sysdep-	Fri Apr  6 08:26:44 2001
-+++ sysdep/netbsd/Makefile.sysdep	Fri Apr  6 08:26:53 2001
-@@ -36,8 +36,8 @@
+--- sysdep/netbsd/Makefile.sysdep.orig	Mon Aug 13 14:33:35 2001
++++ sysdep/netbsd/Makefile.sysdep	Sat Oct 20 15:46:49 2001
+@@ -36,26 +36,20 @@
  LIBCRYPTO=	/usr/lib/libcrypto.a
  LIBSYSDEPDIR=	${.CURDIR}/sysdep/common/libsysdep
  
@@ -11,9 +11,21 @@ $NetBSD: patch-ae,v 1.1 2001/04/05 23:29:43 itojun Exp $
 +LDADD+=		${LIBSYSDEPDIR}/libsysdep.a -lipsec
 +DPADD+=		${LIBSYSDEPDIR}/libsysdep.a ${LIBIPSEC}
  
- CFLAGS+=	-DNO_RSA -DNO_IDEA -DNO_RC5 \
+ CFLAGS+=	-DNO_RSA -DNO_IDEA -DNO_RC5 -DHAVE_GETNAMEINFO \
+ 		-DHAVE_GETIFADDRS \
  		-I${.CURDIR}/sysdep/common
-@@ -54,7 +54,6 @@
+-.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_DIR@/include -I@BUILDLINK_DIR@/include/openssl
++LDADD+=		-L@BUILDLINK_DIR@/lib
+ 
+ IPSEC_SRCS=	pf_key_v2.c
  IPSEC_CFLAGS=	-DUSE_PF_KEY_V2
  
  USE_LIBCRYPTO=	defined
@@ -21,3 +33,13 @@ $NetBSD: patch-ae,v 1.1 2001/04/05 23:29:43 itojun Exp $
  
  # 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
+@@ -73,8 +67,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_DIR@/include/openssl ssl