diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/vpnc/Makefile | 21 | ||||
-rw-r--r-- | net/vpnc/distinfo | 11 | ||||
-rw-r--r-- | net/vpnc/options.mk | 2 | ||||
-rw-r--r-- | net/vpnc/patches/patch-ac | 23 | ||||
-rw-r--r-- | net/vpnc/patches/patch-ag | 13 |
5 files changed, 45 insertions, 25 deletions
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile index 9da8a38acb9..aae33a8e6d0 100644 --- a/net/vpnc/Makefile +++ b/net/vpnc/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2008/07/13 22:46:48 smb Exp $ +# $NetBSD: Makefile,v 1.24 2009/02/04 21:51:27 drochner Exp $ # -DISTNAME= vpnc-0.5.1 -PKGREVISION= 1 +DISTNAME= vpnc-0.5.3 CATEGORIES= net security MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/ @@ -24,7 +23,8 @@ OWN_DIRS= ${PKG_SYSCONFDIR}/vpnc SUBST_CLASSES+= paths SUBST_MESSAGE.paths= fixing pathnames SUBST_STAGE.paths= post-patch -SUBST_FILES.paths= config.c vpnc-script makeman.pl pcf2vpnc vpnc.8.template vpnc-disconnect +SUBST_FILES.paths= config.c vpnc-script.in makeman.pl pcf2vpnc +SUBST_FILES.paths+= vpnc.8.template vpnc-disconnect SUBST_SED.paths= -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' SUBST_SED.paths+= -e 's|@PREFIX@|${PREFIX}|g' SUBST_SED.paths+= -e 's|@PKGMANDIR@|${PKGMANDIR}|g' @@ -36,9 +36,12 @@ SUBST_SED.paths+= -e 's|@SH@|${SH}|g' BUILD_DEFS+= VARBASE EGDIR= ${PREFIX}/share/examples/vpnc -CONF_FILES+= ${EGDIR}/default.conf ${PKG_SYSCONFDIR}/vpnc/default.conf +CONF_FILES+= ${EGDIR}/default.conf \ + ${PKG_SYSCONFDIR}/vpnc/default.conf CONF_FILES_MODE= 0600 -CONF_FILES_PERMS+= ${EGDIR}/vpnc-script ${PKG_SYSCONFDIR}/vpnc/vpnc-script ${ROOT_USER} ${ROOT_GROUP} 755 +CONF_FILES_PERMS+= ${EGDIR}/vpnc-script \ + ${PKG_SYSCONFDIR}/vpnc/vpnc-script \ + ${ROOT_USER} ${ROOT_GROUP} 755 do-install: ${INSTALL_PROGRAM} ${WRKSRC}/vpnc ${DESTDIR}${PREFIX}/sbin @@ -48,8 +51,10 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/vpnc-disconnect ${DESTDIR}${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/pcf2vpnc ${DESTDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/vpnc.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_MAN} ${WRKSRC}/pcf2vpnc.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_MAN} ${WRKSRC}/cisco-decrypt.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/pcf2vpnc.1 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_MAN} ${WRKSRC}/cisco-decrypt.1 \ + ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/vpnc .include "options.mk" diff --git a/net/vpnc/distinfo b/net/vpnc/distinfo index 0070ebc6cc2..9026ee63a93 100644 --- a/net/vpnc/distinfo +++ b/net/vpnc/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.11 2008/05/29 20:50:31 sketch Exp $ +$NetBSD: distinfo,v 1.12 2009/02/04 21:51:27 drochner Exp $ -SHA1 (vpnc-0.5.1.tar.gz) = efc71dba03aa40945af35e4b074d99f922ff7ffd -RMD160 (vpnc-0.5.1.tar.gz) = 76dd5a3a38bd2109cf8e1fbad85e2762e8489832 -Size (vpnc-0.5.1.tar.gz) = 91496 bytes +SHA1 (vpnc-0.5.3.tar.gz) = 321527194e937371c83b5e7c38e46fca4f109304 +RMD160 (vpnc-0.5.3.tar.gz) = 6f3926901e75dc98762f6ef45782930f2fb76a2f +Size (vpnc-0.5.3.tar.gz) = 98740 bytes SHA1 (patch-aa) = 09d912a32883bec22d80ef7c469b818ac1602d82 SHA1 (patch-ab) = 14aa011b36fcf1da54d506fd5398cfc55cb11748 -SHA1 (patch-ac) = 3155cbf04ad7effc9470e4b06409abfe12ee2daa +SHA1 (patch-ac) = 702fbfeea42eddbaf109ad42247e074ce7eb0f3b SHA1 (patch-ad) = 7e31f1804541eb4de9924edcc517304487aad0f2 SHA1 (patch-ae) = d831819831a5861550c5924955cc270c58341d9d SHA1 (patch-af) = d41aaab81061db058c4b38013f07815e1e8cf506 +SHA1 (patch-ag) = deb35a38ec71babc909f24bafffee98cfdd17f73 diff --git a/net/vpnc/options.mk b/net/vpnc/options.mk index 3d0d19f8bf4..f993b2a925e 100644 --- a/net/vpnc/options.mk +++ b/net/vpnc/options.mk @@ -1,3 +1,5 @@ +# $NetBSD: options.mk,v 1.2 2009/02/04 21:51:27 drochner Exp $ + PKG_OPTIONS_VAR= PKG_OPTIONS.openvpnc PKG_SUPPORTED_OPTIONS= openssl # off by default PKG_SUGGESTED_OPTIONS= diff --git a/net/vpnc/patches/patch-ac b/net/vpnc/patches/patch-ac index dbcdac5e458..0019844abe0 100644 --- a/net/vpnc/patches/patch-ac +++ b/net/vpnc/patches/patch-ac @@ -1,24 +1,23 @@ -$NetBSD: patch-ac,v 1.6 2008/05/29 20:50:31 sketch Exp $ +$NetBSD: patch-ac,v 1.7 2009/02/04 21:51:27 drochner Exp $ ---- vpnc-script.orig 2007-09-06 21:05:15.000000000 +0100 -+++ vpnc-script 2008-05-29 13:32:02.000000000 +0100 -@@ -56,18 +56,19 @@ - ;; - esac +--- vpnc-script.in.orig 2009-02-04 14:40:43.000000000 +0100 ++++ vpnc-script.in +@@ -48,18 +48,19 @@ PATH=/sbin:/usr/sbin:$PATH + + OS="`uname -s`" -DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute -RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup --FULL_SCRIPTNAME=/usr/local/sbin/vpnc +STATEDIR=@VARBASE@/run/vpnc +DEFAULT_ROUTE_FILE=$STATEDIR/defaultroute +RESOLV_CONF_BACKUP=$STATEDIR/resolv.conf-backup -+FULL_SCRIPTNAME=@PREFIX@/sbin/vpnc + FULL_SCRIPTNAME=@PREFIX@/sbin/vpnc SCRIPTNAME=`basename $FULL_SCRIPTNAME` # some systems, eg. Darwin & FreeBSD, prune /var/run on boot --if ! [ -d "/var/run/vpnc" ]; then +-if [ ! -d "/var/run/vpnc" ]; then - mkdir -p /var/run/vpnc -+if ! [ -d $STATEDIR ]; then ++if [ ! -d $STATEDIR ]; then + mkdir -p $STATEDIR fi @@ -28,11 +27,11 @@ $NetBSD: patch-ac,v 1.6 2008/05/29 20:50:31 sketch Exp $ if [ "$OS" = "Linux" ]; then ifconfig_syntax_ptp="pointopoint" -@@ -157,7 +158,7 @@ +@@ -163,7 +164,7 @@ else # use route command # isn't -n supposed to give --numeric output? # apperently not... # Get rid of lines containing IPv6 addresses (':') -- netstat -r -n | sed 's/default/0.0.0.0/' | sed 's/^.*:.*$//' | grep '^0.0.0.0' | awk '{print $2}' +- netstat -r -n | awk '/:/ { next; } /^(default|0\.0\.0\.0)/ { print $2; }' + netstat -r -n | awk '/:/ { next; } $2 ~ /^link/ { next; } /^(default|0\.0\.0\.0)/ { print $2; }' } diff --git a/net/vpnc/patches/patch-ag b/net/vpnc/patches/patch-ag new file mode 100644 index 00000000000..88a5e53f1ce --- /dev/null +++ b/net/vpnc/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2009/02/04 21:51:27 drochner Exp $ + +--- tunip.c.orig 2009-02-04 16:07:34.000000000 +0100 ++++ tunip.c +@@ -881,7 +881,7 @@ static void vpnc_main_loop(struct sa_blo + } + } + DEBUG(2,printf("lifetime status: %ld of %u seconds used, %u|%u of %u kbytes used\n", +- time(NULL) - s->ipsec.life.start, ++ (long)(time(NULL) - s->ipsec.life.start), + s->ipsec.life.seconds, + s->ipsec.life.rx/1024, + s->ipsec.life.tx/1024, |