Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Feb 2008 21:35:23 +0100 (CET)
From:      Pierre DAVID <Pierre.David@crc.u-strasbg.fr>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/120741: Upgrade vpnc to 0.5.1 in order to connect to newer Ciscos, patch included
Message-ID:  <200802162035.m1GKZN6Z019260@vagabond.ma.maison>
Resent-Message-ID: <200802162100.m1GL06JT047035@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         120741
>Category:       ports
>Synopsis:       Upgrade vpnc to 0.5.1 in order to connect to newer Ciscos, patch included
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 16 21:00:05 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Pierre DAVID
>Release:        FreeBSD 8.0-CURRENT i386
>Organization:
Centre Reseau Communication - Universite Louis Pasteur - FRANCE
>Environment:
System: FreeBSD vagabond.ma.maison 8.0-CURRENT FreeBSD 8.0-CURRENT #9: Sun Feb 10 14:49:49 CET 2008 pda@vagabond:/usr/obj/usr/src/sys/VAGABOND i386


The security/vpnc port is old. It cannot connect to newer Cisco VPN
concentrators.

Patch is included to upgrade the port to 0.5.1. Tested on -current.


diff -ruN vpnc.bak/Makefile vpnc/Makefile
--- vpnc.bak/Makefile	2007-10-11 23:59:47.000000000 +0200
+++ vpnc/Makefile	2008-02-16 21:03:57.061685294 +0100
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	vpnc
-PORTVERSION=	0.4.0
-PORTREVISION=	3
+PORTVERSION=	0.5.1
+PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	http://www.unix-ag.uni-kl.de/~massar/vpnc/
 
@@ -17,7 +17,7 @@
 LIB_DEPENDS=	gcrypt.13:${PORTSDIR}/security/libgcrypt
 
 USE_GMAKE=	yes
-ALL_TARGET=	vpnc
+ALL_TARGET=	vpnc vpnc.8
 
 USE_RC_SUBR=	vpnc
 USE_PERL5_BUILD=	yes
diff -ruN vpnc.bak/distinfo vpnc/distinfo
--- vpnc.bak/distinfo	2007-03-16 12:24:04.000000000 +0100
+++ vpnc/distinfo	2008-02-16 20:34:37.659854894 +0100
@@ -1,3 +1,3 @@
-MD5 (vpnc-0.4.0.tar.gz) = 604807e7dd90fce00a4e2344ee29c76d
-SHA256 (vpnc-0.4.0.tar.gz) = f91c6bc2547cb503fde4f244ba82304553fec3954c65521482f8db2491700586
-SIZE (vpnc-0.4.0.tar.gz) = 75491
+MD5 (vpnc-0.5.1.tar.gz) = 7a8e94dbe94f39a4fd89b72e0125f66f
+SHA256 (vpnc-0.5.1.tar.gz) = f63660bd020bbe6a39e8eb67ad60c54d719046c6198a6834371d098947f9a2ed
+SIZE (vpnc-0.5.1.tar.gz) = 91496
diff -ruN vpnc.bak/files/patch-Makefile vpnc/files/patch-Makefile
--- vpnc.bak/files/patch-Makefile	2007-08-07 10:12:45.000000000 +0200
+++ vpnc/files/patch-Makefile	2008-02-16 20:50:07.275976775 +0100
@@ -1,7 +1,10 @@
---- ./Makefile.orig	2007-02-19 21:51:12.000000000 +0100
-+++ ./Makefile	2007-07-24 16:45:36.000000000 +0200
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
 @@ -20,7 +20,7 @@
- # $Id: Makefile 148 2007-02-19 20:51:14Z Maurice Massar $
+ # $Id: Makefile 236 2007-09-05 20:40:59Z Joerg Mayer $
  
  DESTDIR=
 -PREFIX=/usr/local
@@ -9,13 +12,12 @@
  ETCDIR=/etc/vpnc
  BINDIR=$(PREFIX)/bin
  SBINDIR=$(PREFIX)/sbin
-@@ -34,8 +34,7 @@
- VERSION := $(shell sh mk-version)
- RELEASE_VERSION := $(shell cat VERSION)
+@@ -49,7 +49,7 @@
+ #OPENSSL_GPL_VIOLATION = -DOPENSSL_GPL_VIOLATION
+ #OPENSSLLIBS = -lcrypto
  
 -CC=gcc
--CFLAGS += -W -Wall -O3 -Wmissing-declarations -Wwrite-strings -g
 +CC=%%CC%%
- CPPFLAGS = -DVERSION=\"$(VERSION)\"
- LDFLAGS = -g $(shell libgcrypt-config --libs)
+ CFLAGS ?= -O3 -g
+ CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings
  CFLAGS +=  $(shell libgcrypt-config --cflags)
diff -ruN vpnc.bak/files/patch-vpnc-script vpnc/files/patch-vpnc-script
--- vpnc.bak/files/patch-vpnc-script	2007-03-16 12:24:04.000000000 +0100
+++ vpnc/files/patch-vpnc-script	2008-02-16 20:52:13.069011365 +0100
@@ -1,6 +1,9 @@
---- vpnc-script.orig	Tue Mar 13 16:03:06 2007
-+++ vpnc-script	Tue Mar 13 16:03:24 2007
-@@ -31,8 +31,8 @@
+
+$FreeBSD$
+
+--- vpnc-script.orig
++++ vpnc-script
+@@ -56,8 +56,8 @@
  		;;
  esac
  
@@ -8,6 +11,6 @@
 -RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup
 +DEFAULT_ROUTE_FILE=/var/run/vpnc.defaultroute
 +RESOLV_CONF_BACKUP=/var/run/vpnc.resolv.conf-backup
+ FULL_SCRIPTNAME=/usr/local/sbin/vpnc
+ SCRIPTNAME=`basename $FULL_SCRIPTNAME`
  
- # some systems, eg. Darwin & FreeBSD, prune /var/run on boot
- if ! [ -d "/var/run/vpnc" ]; then
>Description:
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200802162035.m1GKZN6Z019260>