Update to vpnc-0.2-rm+zomb-pre8

Add fulltunnel wrapper script by Daniel Roethlisberger

PR:		65945
Submitted by:	Christian Lackas

Mark broken on AMD64

6 files changed, 32 insertions, 27 deletions

diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index e91782d738c7..c316506196ec 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -7,22 +7,32 @@
 
 PORTNAME=	vpnc
 PORTVERSION=	0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security
-MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-rm+zomb-pre7
+MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
+	http://dragon.roe.ch/mirrors/distfiles/vpnc/
+DISTNAME=	${PORTNAME}-${PORTVERSION}-rm+zomb-pre8
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${STARTSCRIPT}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	delta@lackas.net
 COMMENT=	Client for Cisco 3000 VPN Concentrator
 
 LIB_DEPENDS=	gcrypt.10:${PORTSDIR}/security/libgcrypt-devel
 
+STARTSCRIPT=    vpnc-wrapper-1.9
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 ALL_TARGET=	vpnc
 
 MAN8=		vpnc.8
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+BROKEN=		"Crashes on startup"
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/vpnc.c
@@ -32,9 +42,12 @@ post-patch:
 
 do-install:
 	@${INSTALL_PROGRAM} -m 751 ${WRKSRC}/vpnc ${PREFIX}/sbin/vpnc
+	@${CP} ${DISTDIR}/${STARTSCRIPT} ${WRKDIR}/vpnc.sh-fulltunnel
+	@${REINPLACE_CMD} -e 's|PREFIX=/usr/local|PREFIX=${PREFIX}|' ${WRKDIR}/vpnc.sh-fulltunnel
 	@${CP} ${FILESDIR}/vpnc.sh ${WRKDIR}
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKDIR}/vpnc.sh
 	@${INSTALL_SCRIPT} -m 755 ${WRKDIR}/vpnc.sh ${PREFIX}/etc/rc.d/vpnc.sh.sample
+	@${INSTALL_SCRIPT} -m 755 ${WRKDIR}/vpnc.sh-fulltunnel ${PREFIX}/etc/rc.d/vpnc.sh.sample-fulltunnel
 	@${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
@@ -49,4 +62,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/security/vpnc/distinfo b/security/vpnc/distinfo
index 76baee4f3826..ba33476b34d0 100644
--- a/security/vpnc/distinfo
+++ b/security/vpnc/distinfo
@@ -1,2 +1,4 @@
-MD5 (vpnc-0.2-rm+zomb-pre7.tar.gz) = 3aae30829aab05dca932c3f77800b155
-SIZE (vpnc-0.2-rm+zomb-pre7.tar.gz) = 48362
+MD5 (vpnc-0.2-rm+zomb-pre8.tar.gz) = f6b5c2ffbc0b18df1b56667261d3643b
+SIZE (vpnc-0.2-rm+zomb-pre8.tar.gz) = 51147
+MD5 (vpnc-wrapper-1.9) = 85ec82bd75095c19d55d29cdfa499d4c
+SIZE (vpnc-wrapper-1.9) = 6213
diff --git a/security/vpnc/files/patch-Makefile b/security/vpnc/files/patch-Makefile
index fd7743740664..ff63c0b80845 100644
--- a/security/vpnc/files/patch-Makefile
+++ b/security/vpnc/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Nov  2 01:21:39 2003
-+++ Makefile	Wed Dec 17 09:56:14 2003
-@@ -15,14 +15,14 @@
+--- Makefile.orig	Sun Apr 25 02:43:56 2004
++++ Makefile	Sun Apr 25 02:44:38 2004
+@@ -15,9 +15,9 @@
  # along with this program; if not, write to the Free Software
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
@@ -13,8 +13,3 @@
  
  ifeq ($(shell uname -s), Linux)
  SYSDEP=sysdep-linux.o
- endif
- ifeq ($(shell uname -s), NetBSD)
- CFLAGS += -DSOCKADDR_IN_SIN_LEN
- SYSDEP=sysdep-bsd.o
- endif
diff --git a/security/vpnc/files/patch-vpnc.c b/security/vpnc/files/patch-vpnc.c
index 94d812863690..ea5659a0ac0e 100644
--- a/security/vpnc/files/patch-vpnc.c
+++ b/security/vpnc/files/patch-vpnc.c
@@ -1,11 +1,13 @@
---- vpnc.c.orig	Tue Dec 16 00:25:01 2003
-+++ vpnc.c	Tue Dec 16 00:25:33 2003
-@@ -2007,7 +2007,7 @@
+--- vpnc.c.orig	Sun Apr 25 02:46:23 2004
++++ vpnc.c	Sun Apr 25 02:46:50 2004
+@@ -2036,8 +2036,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);
  
-   if (!config[CONFIG_IKE_DH])
-     config[CONFIG_IKE_DH] = "dh2";
+   if (!print_config) {
+     if (!config[CONFIG_IKE_DH])
diff --git a/security/vpnc/files/patch-vpnc.conf b/security/vpnc/files/patch-vpnc.conf
deleted file mode 100644
index a20010fcb187..000000000000
--- a/security/vpnc/files/patch-vpnc.conf
+++ /dev/null
@@ -1,8 +0,0 @@
---- vpnc.conf.orig	Mon Mar  1 16:04:25 2004
-+++ vpnc.conf	Sun Oct 26 05:39:27 2003
-@@ -1,4 +1,4 @@
--Interface name vpnunikl
-+Interface name tun0
- IKE DH Group dh2
- Perfect Forward Secrecy nopfs
- IPSec gateway 131.246.118.240
diff --git a/security/vpnc/pkg-plist b/security/vpnc/pkg-plist
index b06165543ad6..131ca3c84ee0 100644
--- a/security/vpnc/pkg-plist
+++ b/security/vpnc/pkg-plist
@@ -1,6 +1,7 @@
 sbin/vpnc
 etc/vpnc.conf.sample
 etc/rc.d/vpnc.sh.sample
+etc/rc.d/vpnc.sh.sample-fulltunnel
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/TODO