Update "ipsec-tools" package to version 0.6.1rc1.

Changes since version 0.6b2:
- NAT-T fixes for situations where NAT-T is not used
- OpenSSL 0.9.8 support
- keys are not restricted to OpenSSL default size anymore
- PKCS7 support
- SHA2 support

3 files changed, 22 insertions, 8 deletions

diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index d4e6d402ed6..219d81778ef 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 14:35:31 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.18 2005/08/05 12:04:33 tron Exp $
 
-DISTNAME=		ipsec-tools-0.6b2
+DISTNAME=		ipsec-tools-0.6.1rc1
 CATEGORIES=		security
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ipsec-tools/}
 EXTRACT_SUFX=		.tar.bz2
@@ -26,10 +25,17 @@ CONFIGURE_ARGS+=	--with-libradius
 LIBS+=			${BUILDLINK_LDADD.libradius}
 .endif
 
+.if exists(/usr/include/security/pam_modules.h)
+CONFIGURE_ARGS+=	--with-libpam
+.endif
+
 CONFIGURE_ARGS+=	--enable-frag --enable-hybrid
 CONFIGURE_ARGS+=	--enable-adminport --enable-dpd
 CONFIGURE_ARGS+=	--enable-natt=kernel
 
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+PLIST_SUBST+=		VARBASE=${VARBASE}
+
 PKG_SYSCONFSUBDIR=	racoon
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
@@ -39,6 +45,11 @@ EXAMPLE_DIR=	${PREFIX}/share/examples/ipsec-tools
 pre-configure:
 	${RM} -f ${WRKSRC}/src/racoon/cfparse.c
 	${RM} -f ${WRKSRC}/src/racoon/cftoken.c
+.if (${OPSYS} == "NetBSD")
+	${MKDIR} ${BUILDLINK_DIR}/include/netinet6
+	${EGREP} -v 'extern.*ipsec_.*_policy' /usr/include/netinet6/ipsec.h \
+	  >${BUILDLINK_DIR}/include/netinet6/ipsec.h
+.endif
 
 post-install:
 	${INSTALL_DATA_DIR} ${EXAMPLE_DIR}
diff --git a/security/ipsec-tools/PLIST b/security/ipsec-tools/PLIST
index 22688100e59..ee6f6221445 100644
--- a/security/ipsec-tools/PLIST
+++ b/security/ipsec-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2005/05/10 12:39:28 manu Exp $
+@comment $NetBSD: PLIST,v 1.5 2005/08/05 12:04:33 tron Exp $
 lib/libipsec.la
 include/libipsec/libpfkey.h
 sbin/setkey
@@ -11,6 +11,7 @@ man/man5/racoon.conf.5
 man/man8/racoon.8
 man/man8/setkey.8
 man/man8/plainrsa-gen.8
+man/man8/racoonctl.8
 share/examples/ipsec-tools/psk.txt
 share/examples/ipsec-tools/psk.txt.in
 share/examples/ipsec-tools/psk.txt.sample
@@ -49,3 +50,5 @@ lib/libracoon.la
 @dirrm share/examples/ipsec-tools/roadwarrior/server
 @dirrm share/examples/ipsec-tools/roadwarrior
 @dirrm share/examples/ipsec-tools
+@exec ${MKDIR} ${VARBASE}/racoon
+@unexec ${RMDIR} ${VARBASE}/racoon 2>/dev/null || ${TRUE}
diff --git a/security/ipsec-tools/distinfo b/security/ipsec-tools/distinfo
index 7deded4421e..4c99ba9a428 100644
--- a/security/ipsec-tools/distinfo
+++ b/security/ipsec-tools/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2005/05/10 12:39:28 manu Exp $
+$NetBSD: distinfo,v 1.9 2005/08/05 12:04:33 tron Exp $
 
-SHA1 (ipsec-tools-0.6b2.tar.bz2) = 7307fba1f0dcffe62a7f942ecf0ad0d35a39dbf1
-RMD160 (ipsec-tools-0.6b2.tar.bz2) = ca12613b1464dc533d66b19a9763e1349bb4cb84
-Size (ipsec-tools-0.6b2.tar.bz2) = 661381 bytes
+SHA1 (ipsec-tools-0.6.1rc1.tar.bz2) = 2ed2692165b1d59074e00d9f3465ed7e416d5b78
+RMD160 (ipsec-tools-0.6.1rc1.tar.bz2) = 985a15f0a004985c22d6d4a55fbeb786291f4d74
+Size (ipsec-tools-0.6.1rc1.tar.bz2) = 663281 bytes