Date: Tuesday, August 16, 2011 @ 12:42:38 Author: dreisner Revision: 135618
upgpkg: vpnc 0.5.3.svn457-1 - update to svn trunk snapshot -- fixes many bug reports - use vpnc-script from david woodhouse: http://git.infradead.org/users/dwmw2/vpnc-scripts.git adds ipv6 support, and fixes a few bugs - remove patch. this is covered by the script above. - remove net-tools dependency. we survive on iproute2 now - remove unreliable /etc/rc.d file -- vpnc has a timeout we can never be aware of, so it doesn't make sense to track it in the same way we track other daemons. Modified: vpnc/trunk/PKGBUILD Deleted: vpnc/trunk/fix-iproute-syntax.patch vpnc/trunk/vpnc.rc --------------------------+ PKGBUILD | 40 ++++++++++++++++++---------------------- fix-iproute-syntax.patch | 26 -------------------------- vpnc.rc | 35 ----------------------------------- 3 files changed, 18 insertions(+), 83 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-08-16 16:22:48 UTC (rev 135617) +++ PKGBUILD 2011-08-16 16:42:38 UTC (rev 135618) @@ -1,43 +1,39 @@ # $Id$ -# Maintainer: Thomas Baechler <tho...@archlinux.org> +# Maintainer: Dave Reisner <dreis...@archlinux.org> +# Contributor: Thomas Baechler <tho...@archlinux.org> pkgname=vpnc -pkgver=0.5.3 -pkgrel=4 +pkgver=0.5.3.svn457 +pkgrel=1 pkgdesc="VPN client for cisco3000 VPN Concentrators" url="http://www.unix-ag.uni-kl.de/~massar/vpnc/" license=('GPL') -depends=('libgcrypt' 'openssl' 'iproute2' 'net-tools') +depends=('libgcrypt' 'openssl' 'iproute2') optdepends=('openresolv: Let vpnc manage resolv.conf') arch=('i686' 'x86_64') -source=("http://www.unix-ag.uni-kl.de/~massar/vpnc/$pkgname-$pkgver.tar.gz" - 'vpnc.conf' - 'vpnc.rc' - fix-iproute-syntax.patch) +source=("ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz" + 'vpnc.conf') backup=('etc/vpnc/default.conf') -md5sums=('4378f9551d5b077e1770bbe09995afb3' - 'a3f4e0cc682f437e310a1c86ae198e45' - 'c5885162ac198eaa36da9a01e7c0c55b' - '193a35773594667a2782701aff372551') +md5sums=('033e642e17200a0efc0eda1c1c1886a2' + 'a3f4e0cc682f437e310a1c86ae198e45') build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd "$srcdir/$pkgname-$pkgver" # Build hybrid support sed -i 's|^#OPENSSL|OPENSSL|g' Makefile - - # Fix vpnc-script - sed 's|/sbin/resolvconf|/usr/sbin/resolvconf|g' -i vpnc-script.in - patch -p1 -i "${srcdir}"/fix-iproute-syntax.patch + # fix resolvconf location for community/openresolv + sed -i 's|/sbin/resolvconf|/usr&|g' vpnc-script + make PREFIX=/usr } package() { - cd "${srcdir}"/${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" PREFIX=/usr install + cd "$srcdir/$pkgname-$pkgver" - install -D -m644 "${srcdir}"/vpnc.conf "${pkgdir}"/etc/vpnc/default.conf - install -D -m755 "${srcdir}"/vpnc.rc "${pkgdir}"/etc/rc.d/vpnc - rm -f "${pkgdir}"/etc/vpnc/vpnc.conf + make DESTDIR="$pkgdir" PREFIX=/usr install + + rm -f "$pkgdir"/etc/vpnc/vpnc.conf + install -D -m644 "$srcdir"/vpnc.conf "$pkgdir"/etc/vpnc/default.conf } Deleted: fix-iproute-syntax.patch =================================================================== --- fix-iproute-syntax.patch 2011-08-16 16:22:48 UTC (rev 135617) +++ fix-iproute-syntax.patch 2011-08-16 16:42:38 UTC (rev 135618) @@ -1,26 +0,0 @@ -From a1cac186f66d0f2e8b1dce67e648aae4219c3013 Mon Sep 17 00:00:00 2001 -From: Alessandro Suardi <alessandro.sua...@gmail.com> -Date: Sat, 28 May 2011 23:20:15 +0100 -Subject: [PATCH 1/1] Cope with new kernel/iproute including ipid in route list - -Signed-off-by: David Woodhouse <david.woodho...@intel.com> ---- - vpnc-script | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/vpnc-script b/vpnc-script -index cc62997..e0140c5 100755 ---- a/vpnc-script.in -+++ b/vpnc-script.in -@@ -139,7 +139,7 @@ destroy_tun_device() { - - if [ -n "$IPROUTE" ]; then - fix_ip_get_output () { -- sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g' -+ sed 's/cache//;s/metric \?[0-9]\+ [0-9]\+//g;s/hoplimit [0-9]\+//g;s/ipid 0x....//g' - } - - set_vpngateway_route() { --- -1.7.3.4 - Deleted: vpnc.rc =================================================================== --- vpnc.rc 2011-08-16 16:22:48 UTC (rev 135617) +++ vpnc.rc 2011-08-16 16:42:38 UTC (rev 135618) @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Connecting to VPN" - /usr/sbin/vpnc - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon vpnc - stat_done - fi - ;; - stop) - stat_busy "Disconnecting from VPN" - /usr/sbin/vpnc-disconnect - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon vpnc - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0