ports/62111: update port security/vpnc

[Christian Lackas]

>Number:         62111
>Category:       ports
>Synopsis:       update port security/vpnc
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 30 05:00:37 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Christian Lackas
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
>Environment:
System: FreeBSD router.cleanlaser.de 4.9-STABLE FreeBSD 4.9-STABLE #12: Thu Oct 30 19:11:13 CET 2003 root at router.cleanlaser.de:/usr/obj/usr/src/sys/DELTA i386


	
>Description:

	update to new vpnc version, fixes and additions to man-page,
	using new libgcrypt-devel port

>How-To-Repeat:
	
>Fix:

Apply patch:

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

diff -urN /usr/ports/security/vpnc/Makefile vpnc/Makefile
--- /usr/ports/security/vpnc/Makefile	Mon Dec 22 20:23:14 2003
+++ vpnc/Makefile	Fri Jan 30 01:30:11 2004
@@ -7,44 +7,40 @@
 
 PORTNAME=	vpnc
 PORTVERSION=	0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-rm+zomb-pre6
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rm+zomb-pre7
 
 MAINTAINER=	delta at lackas.net
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
-LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt-devel
 
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 ALL_TARGET=	vpnc
 
-MAN8=		vpnc.8
-
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/vpnc.c
-	@${REINPLACE_CMD} -e \
-		's|%%CC%%|${CC}|;s|%%CFLAGS%%|${CFLAGS}|' \
-			${WRKSRC}/Makefile
+MAN8=vpnc.8
 
 do-install:
-	@${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${PREFIX}/sbin
+	@${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${PREFIX}/sbin/vpnc
 	@${INSTALL_SCRIPT} -m 755 ${FILESDIR}/vpnc.sh ${PREFIX}/etc/rc.d/vpnc.sh.sample
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${PREFIX}/etc/rc.d/vpnc.sh.sample
 	@${INSTALL_DATA} -m 600 ${WRKSRC}/vpnc.conf ${PREFIX}/etc/vpnc.conf.sample
+.if !defined(NO_INSTALL_MANPAGES)
 	@${INSTALL_MAN} ${FILESDIR}/vpnc.8 ${PREFIX}/man/man8
+.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
 .endif
-
-post-install:
 	@${CAT} ${PKGMESSAGE}
-	@${REINPLACE_CMD} -e \
-		's|%%PREFIX%%|${PREFIX}|' ${PREFIX}/etc/rc.d/vpnc.sh.sample
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/vpnc.c
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|;s|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff -urN /usr/ports/security/vpnc/distinfo vpnc/distinfo
--- /usr/ports/security/vpnc/distinfo	Wed Dec 17 16:19:50 2003
+++ vpnc/distinfo	Fri Jan 30 01:06:02 2004
@@ -1 +1 @@
-MD5 (vpnc-0.2-rm+zomb-pre6.tar.gz) = e2061c70455f333b2ee9089c6e25adec
+MD5 (vpnc-0.2-rm+zomb-pre7.tar.gz) = 3aae30829aab05dca932c3f77800b155
diff -urN /usr/ports/security/vpnc/files/patch-Makefile vpnc/files/patch-Makefile
--- /usr/ports/security/vpnc/files/patch-Makefile	Mon Dec 22 20:23:15 2003
+++ vpnc/files/patch-Makefile	Fri Jan 30 01:06:31 2004
@@ -14,8 +14,7 @@
  ifeq ($(shell uname -s), Linux)
  SYSDEP=sysdep-linux.o
  endif
--ifeq ($(shell uname -s), NetBSD)
-+ifeq ($(shell uname -s), FreeBSD)
+ ifeq ($(shell uname -s), NetBSD)
  CFLAGS += -DSOCKADDR_IN_SIN_LEN
  SYSDEP=sysdep-bsd.o
  endif
diff -urN /usr/ports/security/vpnc/files/vpnc.8 vpnc/files/vpnc.8
--- /usr/ports/security/vpnc/files/vpnc.8	Mon Dec 22 20:23:15 2003
+++ vpnc/files/vpnc.8	Fri Jan 30 01:06:42 2004
@@ -30,7 +30,7 @@
 TUN/TAP driver in Linux kernel 2.4 and above and
 device 
 .BR tun (4)
-on BSD.
+on BSD. It runs completely in user space.
 
 The vpnc daemon by it self does not set any routes. The user
 has to do it on its own, e.g. for a full tunnel under FreeBSD
@@ -62,7 +62,10 @@
 .IP "--ifname name"
 name of the tun-interface to use
 .IP "--local-port port number"
-use this port for the connection <0-65535>, use 0 for random
+use this port for the connection <0-65535> to allow multiple instances of vpnc
+running, use 0 a for 
+.I random
+port
 .IP "--pid-file filename"
 store the pid of background process there
 .IP "--dh IKE DH group"
@@ -72,7 +75,8 @@
 .IP "--non-inter"
 non interactive mode, don't ask any questions
 .IP "--debug nr"
-set debugging level <0/1/2/3/99>
+set debugging level: none(0), basic(1), control flow(2), packet dump(3),
+include username/password(99)
 .IP "--no-detach"
 do not send daemon to background
 .IP "--print-config"
@@ -103,7 +107,7 @@
 .P
 Xauth username abcdef
 .P
-Xauth passwort 123456
+Xauth password 123456
 .PD
 .RE
 

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