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

[Christian Lackas]

>Number:         66202
>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 May 03 05:40:24 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Christian Lackas
>Release:        FreeBSD 5.2.1-RELEASE-p5 i386
>Organization:
Delta Consulting
>Environment:
System: FreeBSD zel726.zel.kfa-juelich.de 5.2.1-RELEASE-p5 FreeBSD 5.2.1-RELEASE-p5 #5: Wed Apr 21 01:10:49 CEST 2004 root at zel726.zel.kfa-juelich.de:/usr/obj/usr/src/sys/KERNEL.ZEL726 i386


	
>Description:
	
	Update to vpnc-0.2-rm+zomb-pre9.tar.gz  Sun May 2 05:32:00 CEST 2004
	including minor bugfix for this version
	
>How-To-Repeat:
	
>Fix:

	cd /usr/ports/security && patch -p0 </path/to/patch

Patch follows:

diff -urN /usr/ports/security/vpnc/Makefile vpnc/Makefile
--- /usr/ports/security/vpnc/Makefile	Fri Apr 30 16:08:59 2004
+++ vpnc/Makefile	Mon May  3 12:42:39 2004
@@ -7,11 +7,11 @@
 
 PORTNAME=	vpnc
 PORTVERSION=	0.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
 	http://dragon.roe.ch/mirrors/distfiles/vpnc/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-rm+zomb-pre8
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rm+zomb-pre9
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${STARTSCRIPT}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
diff -urN /usr/ports/security/vpnc/distinfo vpnc/distinfo
--- /usr/ports/security/vpnc/distinfo	Fri Apr 30 16:09:00 2004
+++ vpnc/distinfo	Mon May  3 12:42:39 2004
@@ -1,4 +1,4 @@
-MD5 (vpnc-0.2-rm+zomb-pre8.tar.gz) = f6b5c2ffbc0b18df1b56667261d3643b
-SIZE (vpnc-0.2-rm+zomb-pre8.tar.gz) = 51147
+MD5 (vpnc-0.2-rm+zomb-pre9.tar.gz) = 252b565a4cb8a85644fa00fc96d4c3c2
+SIZE (vpnc-0.2-rm+zomb-pre9.tar.gz) = 52182
 MD5 (vpnc-wrapper-1.9) = 85ec82bd75095c19d55d29cdfa499d4c
 SIZE (vpnc-wrapper-1.9) = 6213
diff -urN /usr/ports/security/vpnc/files/patch-vpnc.c vpnc/files/patch-vpnc.c
--- /usr/ports/security/vpnc/files/patch-vpnc.c	Fri Apr 30 16:09:00 2004
+++ vpnc/files/patch-vpnc.c	Mon May  3 14:15:42 2004
@@ -1,13 +1,35 @@
---- vpnc.c.orig	Sun Apr 25 02:46:23 2004
-+++ vpnc.c	Sun Apr 25 02:46:50 2004
-@@ -2036,8 +2036,8 @@
+--- vpnc.c.dist	Mon May  3 14:13:05 2004
++++ vpnc.c	Mon May  3 14:13:41 2004
+@@ -1527,10 +1527,10 @@
+ 	  reject = ISAKMP_N_ATTRIBUTES_NOT_SUPPORTED;
+ 	  break;
+ 	}
+-	strbuf = xallocc(a->u.lots.length)+1;
++	strbuf = xallocc(a->u.lots.length+1);
+ 	memcpy(strbuf, a->u.lots.data, a->u.lots.length);
+ 	addenv("CISCO_DEF_DOMAIN", strbuf);
+-	/*free(strbuf); free(): invalid pointer 0x80593f9! FIXME */
++	free(strbuf);
+ 	break;
+ 	
+       case ISAKMP_MODECFG_ATTRIB_CISCO_BANNER:
+@@ -1538,7 +1538,7 @@
+ 	  reject = ISAKMP_N_ATTRIBUTES_NOT_SUPPORTED;
+ 	  break;
+ 	}
+-	strbuf = xallocc(a->u.lots.length)+1;
++	strbuf = xallocc(a->u.lots.length+1);
+ 	memcpy(strbuf, a->u.lots.data, a->u.lots.length);
+ 	addenv("CISCO_BANNER", strbuf);
+ 	free(strbuf);
+@@ -2162,8 +2162,8 @@
      else
        read_config_file (argv[i], config, 0);
  
 -  read_config_file ("/etc/vpnc/default.conf", config, 1);
 -  read_config_file ("/etc/vpnc.conf", config, 1);
-+  read_config_file ("%%PREFIX%%/etc/vpnc/default.conf", config, 1);
-+  read_config_file ("%%PREFIX%%/etc/vpnc.conf", config, 1);
++  read_config_file ("/usr/local/etc/vpnc/default.conf", config, 1);
++  read_config_file ("/usr/local/etc/vpnc.conf", config, 1);
  
    if (!print_config) {
      if (!config[CONFIG_IKE_DH])
diff -urN /usr/ports/security/vpnc/pkg-message vpnc/pkg-message
--- /usr/ports/security/vpnc/pkg-message	Mon Dec 22 20:25:01 2003
+++ vpnc/pkg-message	Mon May  3 12:42:39 2004
@@ -1,7 +1,9 @@
-If vpnc fails with
+If vpnc under FreeBSD 4 fails with
 
     socket(SOCK_RAW): Protocol not supported
 
-check your kernel configuration. The ESP protocol is only
+check your kernel configuration. The ESP protocol may be only
 enabled for FAST_IPSEC (this cannot be configured together with
 IPSEC). See LINT for further details.
+
+Under FreeBSD 5 vpnc should work without any IPSEC enabled.





-- 
Murphys Law 2: Jedes Programm, das gut beginnt, endet schlecht. Alles,
was schlecht beginnt, endet furchtbar.  Folgerung: Was einfach aussieht,
ist schwierig.  Was schwierig aussieht, ist unmöglich.
http://www.lackas.net/ http://www.haik.de/ http://www.c95.de/

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