4 files changed, 78 insertions, 85 deletions

diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 2d96e96d0497..9885e30d13c9 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -10,7 +10,7 @@
 #       - $LOCALBASE/sbin/setkey Vs /usr/sbin/setkey
 
 PORTNAME=	ipsec-tools
-PORTVERSION=	0.7.3
+PORTVERSION=	0.8.0
 CATEGORIES=	security
 MASTER_SITES=	SF
 
@@ -59,8 +59,8 @@ PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 900007
-BROKEN=		fails to build with new utmpx
+.if ${OSVERSION} < 900007
+EXTRA_PATCHES=files/patch8-utmp.diff
 .endif
 
 .ifdef(WITH_DEBUG)
@@ -161,16 +161,18 @@ CONFIGURE_ARGS+=	--enable-idea
 CONFIGURE_ARGS+=	--disable-idea
 .endif
 
+.if ${OSVERSION} < 800000
 .ifdef(WITH_NATT)
 pre-configure:
 	@${ECHO_MSG} "===> -------------------------------------------------------------------------"
 	@${ECHO_MSG} "===> ATTENTION: You need a kernel patch to enable NAT-Traversal functionality!"
-	@${ECHO_MSG} "===> You can download the patch here:"
-	@${ECHO_MSG} "===>     http://ipsec-tools.sf.net/freebsd6-natt.diff"
+	@${ECHO_MSG} "===> latest known patch for FreeBSD 7 is available here:"
+	@${ECHO_MSG} "===>     http://people.freebsd.org/~bz/20110123-01-stable7-natt.diff"
 	@${ECHO_MSG} "===> You might possibly have to do some steps manually if it fails to apply."
 	@${ECHO_MSG} "===> -------------------------------------------------------------------------"
 	@sleep 3
 .endif
+.endif
 
 post-install:
 	@if [ -z `/sbin/sysctl -a | ${GREP} -q ipsec && ${ECHO_CMD} ipsec` ]; then \
diff --git a/security/ipsec-tools/distinfo b/security/ipsec-tools/distinfo
index 49cf957bc878..721aeee0c963 100644
--- a/security/ipsec-tools/distinfo
+++ b/security/ipsec-tools/distinfo
@@ -1,3 +1,2 @@
-MD5 (ipsec-tools-0.7.3.tar.bz2) = 821bd84e8d4ad5a93bf594b8b3d66e1e
-SHA256 (ipsec-tools-0.7.3.tar.bz2) = e6131d010b71d984194eb28267e6c01b49784a17a077bbafae58063f10b33b67
-SIZE (ipsec-tools-0.7.3.tar.bz2) = 776096
+SHA256 (ipsec-tools-0.8.0.tar.bz2) = 2359a24aa8eda9ca7043fc47950c8e6b7f58a07c5d5ad316aa7de2bc5e3a8717
+SIZE (ipsec-tools-0.8.0.tar.bz2) = 809297
diff --git a/security/ipsec-tools/files/patch-configure b/security/ipsec-tools/files/patch-configure
deleted file mode 100644
index 40076f479141..000000000000
--- a/security/ipsec-tools/files/patch-configure
+++ /dev/null
@@ -1,77 +0,0 @@
---- configure.orig	Wed Apr 26 15:28:47 2006
-+++ configure	Wed Apr 26 15:28:56 2006
-@@ -25122,6 +25122,74 @@
- fi
- 
- 
-+	echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
-+echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
-+if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char iconv_open ();
-+int
-+main ()
-+{
-+iconv_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag"
-+			 || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_iconv_iconv_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_iconv_iconv_open=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6
-+if test $ac_cv_lib_iconv_iconv_open = yes; then
-+  LIBS="$LIBS -liconv"
-+fi
-+
- 	{ echo "$as_me:$LINENO: checking if iconv second argument needs const" >&5
- echo $ECHO_N "checking if iconv second argument needs const... $ECHO_C" >&6; }
- 	saved_CFLAGS=$CFLAGS
diff --git a/security/ipsec-tools/files/patch8-utmp.diff b/security/ipsec-tools/files/patch8-utmp.diff
new file mode 100644
index 000000000000..db37400f4319
--- /dev/null
+++ b/security/ipsec-tools/files/patch8-utmp.diff
@@ -0,0 +1,69 @@
+--- src/racoon/isakmp_cfg.c	21 Sep 2010 13:14:17 -0000	1.24
++++ src/racoon/isakmp_cfg.c	4 Aug 2010 09:16:58 -0000	1.23
+@@ -38,7 +38,7 @@
+ #include <sys/socket.h>
+ #include <sys/queue.h>
+ 
+-#include <utmpx.h>
++#include <utmp.h>
+ #if defined(__APPLE__) && defined(__MACH__)
+ #include <util.h>
+ #endif
+@@ -1661,7 +1661,8 @@ isakmp_cfg_accounting_system(port, raddr
+ 	int inout;
+ {
+ 	int error = 0;
+-	struct utmpx ut;
++	struct utmp ut;
++	char term[UT_LINESIZE];
+ 	char addr[NI_MAXHOST];
+ 	
+ 	if (usr == NULL || usr[0]=='\0') {
+@@ -1670,33 +1671,36 @@ isakmp_cfg_accounting_system(port, raddr
+ 		return -1;
+ 	}
+ 
+-	memset(&ut, 0, sizeof ut);
+-	gettimeofday((struct timeval *)&ut.ut_tv, NULL);
+-	snprintf(ut.ut_id, sizeof ut.ut_id, TERMSPEC, port);
++	sprintf(term, TERMSPEC, port);
+ 
+ 	switch (inout) {
+ 	case ISAKMP_CFG_LOGIN:
+-		ut.ut_type = USER_PROCESS;
+-		strncpy(ut.ut_user, usr, sizeof ut.ut_user);
++		strncpy(ut.ut_name, usr, UT_NAMESIZE);
++		ut.ut_name[UT_NAMESIZE - 1] = '\0';
++
++		strncpy(ut.ut_line, term, UT_LINESIZE);
++		ut.ut_line[UT_LINESIZE - 1] = '\0';
+ 
+ 		GETNAMEINFO_NULL(raddr, addr);
+-		strncpy(ut.ut_host, addr, sizeof ut.ut_host);
++		strncpy(ut.ut_host, addr, UT_HOSTSIZE);
++		ut.ut_host[UT_HOSTSIZE - 1] = '\0';
+ 
++		ut.ut_time = time(NULL);
++ 
+ 		plog(LLV_INFO, LOCATION, NULL,
+ 			"Accounting : '%s' logging on '%s' from %s.\n",
+-			ut.ut_user, ut.ut_id, addr);
++			ut.ut_name, ut.ut_line, ut.ut_host);
+ 
+-		pututxline(&ut);
++		login(&ut);
+ 
+ 		break;
+ 	case ISAKMP_CFG_LOGOUT:	
+-		ut.ut_type = DEAD_PROCESS;
+ 
+ 		plog(LLV_INFO, LOCATION, NULL,
+ 			"Accounting : '%s' unlogging from '%s'.\n",
+-			usr, ut.ut_id);
++			usr, term);
+ 
+-		pututxline(&ut);
++		logout(term);
+ 
+ 		break;
+ 	default: