[arch-commits] Commit in vpnc/trunk (PKGBUILD fix-iproute-syntax.patch)
Thomas Bächler
thomas at archlinux.org
Sat Aug 13 09:06:20 UTC 2011
Date: Saturday, August 13, 2011 @ 05:06:19
Author: thomas
Revision: 135374
vpnc: Fix FS#25002 (add net-tools dep for now), FS#23452 (fix path, add optdepend) and FS#25095 (add supplied patch)
Added:
vpnc/trunk/fix-iproute-syntax.patch
Modified:
vpnc/trunk/PKGBUILD
--------------------------+
PKGBUILD | 28 ++++++++++++++++++----------
fix-iproute-syntax.patch | 26 ++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 10 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-08-13 09:04:20 UTC (rev 135373)
+++ PKGBUILD 2011-08-13 09:06:19 UTC (rev 135374)
@@ -3,33 +3,41 @@
pkgname=vpnc
pkgver=0.5.3
-pkgrel=3
+pkgrel=4
pkgdesc="VPN client for cisco3000 VPN Concentrators"
url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
license=('GPL')
-depends=('libgcrypt' 'openssl' 'iproute2')
+depends=('libgcrypt' 'openssl' 'iproute2' 'net-tools')
+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')
+ 'vpnc.conf'
+ 'vpnc.rc'
+ fix-iproute-syntax.patch)
backup=('etc/vpnc/default.conf')
md5sums=('4378f9551d5b077e1770bbe09995afb3'
'a3f4e0cc682f437e310a1c86ae198e45'
- 'c5885162ac198eaa36da9a01e7c0c55b')
+ 'c5885162ac198eaa36da9a01e7c0c55b'
+ '193a35773594667a2782701aff372551')
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
make PREFIX=/usr
}
package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir PREFIX=/usr install
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" PREFIX=/usr install
- 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
+ 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
}
Added: fix-iproute-syntax.patch
===================================================================
--- fix-iproute-syntax.patch (rev 0)
+++ fix-iproute-syntax.patch 2011-08-13 09:06:19 UTC (rev 135374)
@@ -0,0 +1,26 @@
+From a1cac186f66d0f2e8b1dce67e648aae4219c3013 Mon Sep 17 00:00:00 2001
+From: Alessandro Suardi <alessandro.suardi at 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.Woodhouse at 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
+
More information about the arch-commits
mailing list