use code checked out on 20010214 from openbsd repository.

too many changes to mention, so pls look at http://www.openbsd.org/plus.html

10 files changed, 41 insertions, 121 deletions

diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index e8966e45cc4..37efa2276b5 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.11 2000/11/25 23:51:17 kim Exp $
+# $NetBSD: Makefile,v 1.12 2001/02/14 13:27:32 itojun Exp $
 #
 
-DISTNAME=		isakmpd-000915-snap
-PKGNAME=		isakmpd-20000915
+DISTNAME=		isakmpd-20010214
+PKGNAME=		isakmpd-20010214
 CATEGORIES=		security net
-MASTER_SITES=		ftp://ftp.appli.se/pub/isakmpd/
+MASTER_SITES=		ftp://ftp.netbsd.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
 
 MAINTAINER=		itojun@kame.net
 
@@ -19,21 +19,8 @@ IGNORE+=		"${PKGNAME} requires ipsec-ready NetBSD"
 
 ALL_TARGET=		depend all
 
-PLIST_SRC=		${WRKDIR}/PLIST
-
-MANCOMPRESSED=		${MANZ}
-
-pre-install:
-	@${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
-	@for OPT in ${MANINSTALL} broken-solaris-needs-this; do \
-	  case $$OPT in \
-	    catinstall) \
-		${CAT} ${PKGDIR}/PLIST.cat >> ${PLIST_SRC}; \
-		;; \
-	    maninstall) \
-		${CAT} ${PKGDIR}/PLIST.man >> ${PLIST_SRC}; \
-		;; \
-	  esac; \
-	done
+WRKSRC=			${WRKDIR}/isakmpd
+
+MAKE_ENV+=		BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/isakmpd/files/md5 b/security/isakmpd/files/md5
index a428e3a6029..21a55bd28d5 100644
--- a/security/isakmpd/files/md5
+++ b/security/isakmpd/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2000/09/25 04:00:15 fredb Exp $
+$NetBSD: md5,v 1.4 2001/02/14 13:27:33 itojun Exp $
 
-MD5 (isakmpd-000915-snap.tar.gz) = ec7d6e283b5eb33fedf407ca01e9731f
+MD5 (isakmpd-20010214.tar.gz) = 8eee0802125e7dfc5b678eb007c4596e
diff --git a/security/isakmpd/files/patch-sum b/security/isakmpd/files/patch-sum
index 74808da0aae..e133fc1ae01 100644
--- a/security/isakmpd/files/patch-sum
+++ b/security/isakmpd/files/patch-sum
@@ -1,6 +1,5 @@
-$NetBSD: patch-sum,v 1.3 2000/10/04 16:37:13 itojun Exp $
+$NetBSD: patch-sum,v 1.4 2001/02/14 13:27:33 itojun Exp $
 
-MD5 (patch-aa) = d69c92e5aaf9d13b0eafd8acae235257
-MD5 (patch-ab) = b6039bd41bca32eb07e53571c95cec84
-MD5 (patch-ac) = a08a59413d867fccd20286c1e3853ac2
-MD5 (patch-ad) = c2bbd4aa659b780ca6f2f7d5debf449d
+MD5 (patch-aa) = 1c36000aa15ba9c03372beb57b533ffb
+MD5 (patch-ab) = 3e9959768a5ff4ba90d02808ab4e5a38
+MD5 (patch-ac) = 5f50fa0d9568e4ba01268d13271153a3
diff --git a/security/isakmpd/patches/patch-aa b/security/isakmpd/patches/patch-aa
index 413c0dcc1dd..7613d7a66e0 100644
--- a/security/isakmpd/patches/patch-aa
+++ b/security/isakmpd/patches/patch-aa
@@ -1,8 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2000/09/25 04:00:15 fredb Exp $
+$NetBSD: patch-aa,v 1.3 2001/02/14 13:27:33 itojun Exp $
 
---- Makefile.orig	Tue Sep 12 10:34:40 2000
-+++ Makefile	Sun Sep 24 10:58:25 2000
-@@ -43,9 +43,9 @@
+Index: Makefile
+===================================================================
+RCS file: /cvs/src/sbin/isakmpd/Makefile,v
+retrieving revision 1.31
+diff -u -r1.31 Makefile
+--- Makefile	2001/01/27 12:03:31	1.31
++++ Makefile	2001/02/14 13:12:35
+@@ -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.
@@ -14,13 +19,3 @@ $NetBSD: patch-aa,v 1.2 2000/09/25 04:00:15 fredb Exp $
  #OS=		freebsd
  #OS=		linux
  
-@@ -56,7 +56,8 @@
- .PATH:		${.CURDIR}/sysdep/${OS}
- 
- PROG=		isakmpd
--BINDIR?=	/sbin
-+BINDIR?=	${PREFIX}/sbin
-+MANDIR?=	${PREFIX}/man
- LDSTATIC?=	-static
- SRCS=		app.c attribute.c cert.c connection.c constants.c conf.c \
- 		cookie.c crypto.c dh.c doi.c exchange.c exchange_num.c \
diff --git a/security/isakmpd/patches/patch-ab b/security/isakmpd/patches/patch-ab
deleted file mode 100644
index 69eb66363a8..00000000000
--- a/security/isakmpd/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2000/03/27 16:04:13 itojun Exp $
---- apps/certpatch/Makefile-	Tue Mar 28 00:33:02 2000
-+++ apps/certpatch/Makefile	Tue Mar 28 00:32:28 2000
-@@ -37,7 +37,8 @@
- 
- PROG=		certpatch
- SRCS=		certpatch.c
--BINDIR=		/usr/sbin
-+BINDIR=		${PREFIX}/sbin
-+MANDIR=		${PREFIX}/man
- TOPSRC=		${.CURDIR}/../..
- TOPOBJ!=	cd ${TOPSRC}; printf "all:\n\t@pwd\n" |${MAKE} -f-
- OS!=		awk '/^OS=/ { print $$2 }' ${.CURDIR}/../../Makefile
diff --git a/security/isakmpd/patches/patch-ac b/security/isakmpd/patches/patch-ac
deleted file mode 100644
index c82d18cab6d..00000000000
--- a/security/isakmpd/patches/patch-ac
+++ /dev/null
@@ -1,49 +0,0 @@
-$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
diff --git a/security/isakmpd/patches/patch-ad b/security/isakmpd/patches/patch-ad
deleted file mode 100644
index 5a6410c6498..00000000000
--- a/security/isakmpd/patches/patch-ad
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/10/04 16:36:58 itojun Exp $
---- util.c-	Thu Oct  5 01:35:18 2000
-+++ util.c	Thu Oct  5 01:35:26 2000
-@@ -37,2 +37,3 @@
- #include <stdlib.h>
-+#include <string.h>
- 
diff --git a/security/isakmpd/pkg/PLIST b/security/isakmpd/pkg/PLIST
index bb0b596eb3c..fa9558723f7 100644
--- a/security/isakmpd/pkg/PLIST
+++ b/security/isakmpd/pkg/PLIST
@@ -1,3 +1,21 @@
-@comment $NetBSD: PLIST,v 1.3 2000/11/25 23:51:17 kim Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/02/14 13:27:34 itojun Exp $
 sbin/certpatch
 sbin/isakmpd
+man/cat5/isakmpd.conf.0
+man/cat5/isakmpd.policy.0
+man/cat8/certpatch.0
+man/cat8/isakmpd.0
+man/man5/isakmpd.conf.5
+man/man5/isakmpd.policy.5
+man/man8/certpatch.8
+man/man8/isakmpd.8
+share/examples/isakmpd/VPN-3way-template.conf
+share/examples/isakmpd/VPN-east.conf
+share/examples/isakmpd/VPN-west.conf
+share/examples/isakmpd/policy
+share/examples/isakmpd/singlehost-east.conf
+share/examples/isakmpd/singlehost-east.gdb
+share/examples/isakmpd/singlehost-setup.sh
+share/examples/isakmpd/singlehost-west.conf
+share/examples/isakmpd/singlehost-west.gdb
+@dirrm share/examples/isakmpd
diff --git a/security/isakmpd/pkg/PLIST.cat b/security/isakmpd/pkg/PLIST.cat
deleted file mode 100644
index e3b723bea1b..00000000000
--- a/security/isakmpd/pkg/PLIST.cat
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.cat,v 1.1 2000/11/25 23:51:18 kim Exp $
-man/cat5/isakmpd.conf.0
-man/cat5/isakmpd.policy.0
-man/cat8/certpatch.0
-man/cat8/isakmpd.0
diff --git a/security/isakmpd/pkg/PLIST.man b/security/isakmpd/pkg/PLIST.man
deleted file mode 100644
index b8d6fb54e83..00000000000
--- a/security/isakmpd/pkg/PLIST.man
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST.man,v 1.1 2000/11/25 23:51:18 kim Exp $
-man/man5/isakmpd.conf.5
-man/man5/isakmpd.policy.5
-man/man8/certpatch.8
-man/man8/isakmpd.8