ports/74271: [maintainer-update] security/vpnc

[Christian Lackas]

>Number:         74271
>Category:       ports
>Synopsis:       [maintainer-update] security/vpnc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 22 21:20:26 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Christian Lackas
>Release:        FreeBSD 5.2.1-RELEASE-p11 i386
>Organization:
Delta Consulting
>Environment:
System: FreeBSD zel726.zel.kfa-juelich.de 5.2.1-RELEASE-p11 FreeBSD 5.2.1-RELEASE-p11 #21: Fri Oct 15 13:17:34 CEST 2004 root at zel726.zel.kfa-juelich.de:/usr/obj/usr/src/sys/KERNEL.ZEL726 i386


	
>Description:

	Update to 0.3.2
	# added support for preshared without xauth
	# fixed NAT-T support with IOS and PIX
	# fixed IP-Len header (Christian Lackas)
	# fixed reconnection problems with IOS and PIX
	
>How-To-Repeat:

>Fix:

	Apply attached patch.
	Removed files: files/patch-tunip.c, files/patch-sysdep.h


diff -urN /usr/ports/security/vpnc/Makefile vpnc/Makefile
--- /usr/ports/security/vpnc/Makefile	Fri Nov 19 11:46:48 2004
+++ vpnc/Makefile	Mon Nov 22 22:19:42 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vpnc
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/:source \
 	http://dragon.roe.ch/mirrors/distfiles/vpnc/:script
diff -urN /usr/ports/security/vpnc/distinfo vpnc/distinfo
--- /usr/ports/security/vpnc/distinfo	Fri Nov 19 11:46:48 2004
+++ vpnc/distinfo	Mon Nov 22 22:14:20 2004
@@ -1,4 +1,4 @@
-MD5 (vpnc-0.3.1.tar.gz) = 02b814ee7bd5ff3f5a5535eff4e3387d
-SIZE (vpnc-0.3.1.tar.gz) = 56007
+MD5 (vpnc-0.3.2.tar.gz) = aaccdffc5656095a45dfe87c5bf612cb
+SIZE (vpnc-0.3.2.tar.gz) = 56669
 MD5 (vpnc-wrapper-1.10) = 32c11fe4de7f0cda2fdfcc7dd2a40271
 SIZE (vpnc-wrapper-1.10) = 6414
diff -urN /usr/ports/security/vpnc/files/patch-sysdep.h vpnc/files/patch-sysdep.h
--- /usr/ports/security/vpnc/files/patch-sysdep.h	Thu Nov 18 13:22:50 2004
+++ vpnc/files/patch-sysdep.h	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- sysdep.h.dist	Wed Nov 17 16:37:52 2004
-+++ sysdep.h	Wed Nov 17 16:37:37 2004
-@@ -1,6 +1,7 @@
- #ifndef __SYSDEP_H__
- #define __SYSDEP_H__
- 
-+#include <sys/types.h>
- #include <netinet/in.h>
-
- int tun_open(char *dev);
diff -urN /usr/ports/security/vpnc/files/patch-tunip.c vpnc/files/patch-tunip.c
--- /usr/ports/security/vpnc/files/patch-tunip.c	Thu Nov 18 13:22:50 2004
+++ vpnc/files/patch-tunip.c	Thu Jan  1 01:00:00 1970
@@ -1,26 +0,0 @@
-Index: tunip.c
-===================================================================
---- tunip.c	(revision 35)
-+++ tunip.c	(working copy)
-@@ -596,10 +596,6 @@
- 	/* Fill non-mutable fields */
- 	ip->ip_v = IPVERSION;
- 	ip->ip_hl = 5;
--	ip->ip_len = encap->buflen + (peer->remote_sa->md_algo? 12 :0);
--#ifdef NEED_IPLEN_FIX
--	ip->ip_len = htons(ip->ip_len);
--#endif
- 	/*gcry_md_get_algo_dlen(md_algo); see RFC .. only use 96 bit */
- 	ip->ip_id = htons(ip_id++);
- 	ip->ip_p = IPPROTO_ESP;
-@@ -614,6 +610,10 @@
- 
- 	encap_esp_encapsulate(encap, peer);
- 
-+	ip->ip_len = encap->buflen;
-+#ifdef NEED_IPLEN_FIX
-+	ip->ip_len = htons(ip->ip_len);
-+#endif
- 	ip->ip_sum = in_cksum((u_short *) encap->buf, sizeof(struct ip));
- 
- 	sent = sendto(encap->fd, encap->buf, encap->buflen, 0,

>Release-Note:
>Audit-Trail:
>Unformatted: