Bug 65945 - update of security/vpnc
Summary: update of security/vpnc
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs mailing list
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-04-25 02:20 UTC by Christian Lackas
Modified: 2004-04-29 14:42 UTC (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Christian Lackas 2004-04-25 02:20:20 UTC
	Update of port security/vpnc:

		- update to current version vpnc-0.2-rm+zomb-pre8.tar.gz  Sun Apr 25 02:13:30 CEST 2004
		- added nice fulltunnel wrapper script provided by Daniel Roethlisberger <daniel@roe.ch>

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

Patch follows:



EOPatch


Regards,
 Christian


-- 
Old Japanese proverb:
    There are two kinds of fools -- those who never climb Mt. Fuji,
    and those who climb it twice.
http://www.lackas.net/	http://www.couven95.de/	http://www.haik.de/--MX6ahT2S49BC098MY1Kajfm3kzNZJbG9IJQ1Kv7H8f7E1mQG
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN vpnc/Makefile /tmp/vpnc/Makefile
--- vpnc/Makefile	Mon Mar  1 17:29:27 2004
+++ /tmp/vpnc/Makefile	Sun Apr 25 02:52:37 2004
@@ -7,10 +7,16 @@
 
 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/
+
+STARTSCRIPT=	vpnc-wrapper-1.9
+
+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
@@ -32,9 +38,12 @@
 
 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
diff -urN vpnc/distinfo /tmp/vpnc/distinfo
--- vpnc/distinfo	Mon Apr  5 20:11:19 2004
+++ /tmp/vpnc/distinfo	Sun Apr 25 02:40:41 2004
@@ -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 -urN vpnc/files/patch-Makefile /tmp/vpnc/files/patch-Makefile
--- vpnc/files/patch-Makefile	Fri Jan 30 14:34:26 2004
+++ /tmp/vpnc/files/patch-Makefile	Sun Apr 25 02:50:01 2004
@@ -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 -urN vpnc/files/patch-vpnc.c /tmp/vpnc/files/patch-vpnc.c
--- vpnc/files/patch-vpnc.c	Mon Dec 22 20:23:15 2003
+++ /tmp/vpnc/files/patch-vpnc.c	Sun Apr 25 02:50:01 2004
@@ -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 -urN vpnc/files/patch-vpnc.conf /tmp/vpnc/files/patch-vpnc.conf
--- vpnc/files/patch-vpnc.conf	Mon Mar  1 17:29:28 2004
+++ /tmp/vpnc/files/patch-vpnc.conf	Thu Jan  1 01:00:00 1970
@@ -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 -urN vpnc/pkg-plist /tmp/vpnc/pkg-plist
--- vpnc/pkg-plist	Mon Dec 22 20:23:14 2003
+++ /tmp/vpnc/pkg-plist	Tue Mar  9 00:54:16 2004
@@ -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
Comment 1 Tilman Keskinoz freebsd_committer 2004-04-29 14:42:13 UTC
State Changed
From-To: open->closed

committed, thanks