Pullup ticket 490 - requested by Takahiro Kambe

security update for ipsec-tools

Revisions pulled up:
- pkgsrc/security/ipsec-tools/Makefile	1.13
- pkgsrc/security/ipsec-tools/distinfo	1.7
- pkgsrc/security/ipsec-tools/PLIST	1.3

   Module Name:		pkgsrc
   Committed By:	manu
   Date:		Wed Mar 23 16:49:39 UTC 2005

   Modified Files:
   	pkgsrc/security/ipsec-tools: Makefile distinfo

   Log Message:
   Upgrade to ipsec-tools 0.6b1.

   New features:
   - PAM support
   - privilege separation
---
   Module Name:		pkgsrc
   Committed By:	manu
   Date:		Wed Mar 23 17:27:17 UTC 2005

   Modified Files:
   	pkgsrc/security/ipsec-tools: PLIST

   Log Message:
   Missing installed files inPLIST

3 files changed, 28 insertions, 10 deletions

diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index ad2c0e818ea..1a73308b349 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2005/02/20 01:03:30 manu Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2005/05/11 14:18:27 salo Exp $
 #
 
-DISTNAME=		ipsec-tools-0.5
+DISTNAME=		ipsec-tools-0.6b1
 CATEGORIES=		security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
-EXTRACT_SUFX=		.tar.bz2
+EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		manu@NetBSD.org
 HOMEPAGE=		http://ipsec-tools.sourceforge.net/
@@ -28,6 +28,7 @@ LIBS+=			${BUILDLINK_LDADD.libradius}
 .endif
 
 CONFIGURE_ARGS+=	--enable-frag --enable-hybrid
+CONFIGURE_ARGS+=	--enable-adminport --enable-dpd
 CONFIGURE_ARGS+=	--enable-natt=kernel
 
 PKG_SYSCONFSUBDIR=	racoon
@@ -37,8 +38,8 @@ SAMPLE_DIR=	${WRKSRC}/src/racoon/samples
 EXAMPLE_DIR=	${PREFIX}/share/examples/ipsec-tools
 
 pre-configure:
-	${RM} ${WRKSRC}/src/racoon/cfparse.c
-	${RM} ${WRKSRC}/src/racoon/cftoken.c
+	${RM} -f ${WRKSRC}/src/racoon/cfparse.c
+	${RM} -f ${WRKSRC}/src/racoon/cftoken.c
 
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLE_DIR}
diff --git a/security/ipsec-tools/PLIST b/security/ipsec-tools/PLIST
index 926efe3de0c..02c53dbbde2 100644
--- a/security/ipsec-tools/PLIST
+++ b/security/ipsec-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/02/20 01:03:30 manu Exp $
+@comment $NetBSD: PLIST,v 1.2.2.1 2005/05/11 14:18:27 salo Exp $
 lib/libipsec.la
 include/libipsec/libpfkey.h
 sbin/setkey
@@ -28,6 +28,23 @@ share/examples/ipsec-tools/roadwarrior/client/phase1-down.sh
 share/examples/ipsec-tools/roadwarrior/server/racoon.conf
 share/examples/ipsec-tools/roadwarrior/server/racoon.conf-radius
 share/examples/ipsec-tools/roadwarrior/server/phase1-down.sh
+include/racoon/racoonctl.h
+include/racoon/var.h
+include/racoon/vmbuf.h
+include/racoon/misc.h
+include/racoon/gcmalloc.h
+include/racoon/admin.h
+include/racoon/schedule.h
+include/racoon/sockmisc.h
+include/racoon/isakmp_var.h
+include/racoon/isakmp.h
+include/racoon/isakmp_xauth.h
+include/racoon/isakmp_cfg.h
+include/racoon/isakmp_unity.h
+include/racoon/ipsec_doi.h
+include/racoon/evt.h
+lib/libracoon.la
+@dirrm include/racoon
 @dirrm include/libipsec
 @dirrm share/examples/ipsec-tools/roadwarrior/client
 @dirrm share/examples/ipsec-tools/roadwarrior/server
diff --git a/security/ipsec-tools/distinfo b/security/ipsec-tools/distinfo
index 99aeec76c19..e91ea397dbc 100644
--- a/security/ipsec-tools/distinfo
+++ b/security/ipsec-tools/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 13:10:07 agc Exp $
+$NetBSD: distinfo,v 1.6.2.1 2005/05/11 14:18:27 salo Exp $
 
-SHA1 (ipsec-tools-0.5.tar.bz2) = d52e75156b89c4a589ef014aaec07d0be2248710
-RMD160 (ipsec-tools-0.5.tar.bz2) = 96c3d9806ab7e83167c606990b144c3b57e6da22
-Size (ipsec-tools-0.5.tar.bz2) = 646397 bytes
+SHA1 (ipsec-tools-0.6b1.tgz) = db0234b1effda273028ee66ad72da8516a6f492b
+RMD160 (ipsec-tools-0.6b1.tgz) = ed6c572368cb0d22106bbf83466f3bc0a8cfdcc2
+Size (ipsec-tools-0.6b1.tgz) = 1195180 bytes