[arch-commits] Commit in kvpnc/trunk (PKGBUILD vpnc-paths.patch)

[Dave Reisner]

    Date: Sunday, May 19, 2013 @ 20:46:22
  Author: dreisner
Revision: 91107

upgpkg: kvpnc 0.9.6a-4

- fix default path to vpnc (/usr/sbin -> /usr/bin)

Added:
  kvpnc/trunk/vpnc-paths.patch
Modified:
  kvpnc/trunk/PKGBUILD

------------------+
 PKGBUILD         |   17 +++++++++++++----
 vpnc-paths.patch |   20 ++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-19 17:26:53 UTC (rev 91106)
+++ PKGBUILD	2013-05-19 18:46:22 UTC (rev 91107)
@@ -4,7 +4,7 @@
 
 pkgname=kvpnc
 pkgver=0.9.6a
-pkgrel=3
+pkgrel=4
 pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
 arch=(i686 x86_64)
 url="http://home.gna.org/kvpnc/"
@@ -12,12 +12,21 @@
 depends=('kdelibs' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4' 'optipng')
 install=kvpnc.install
-source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2)
-md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7')
+source=(http://download.gna.org/$pkgname/$pkgname-${pkgver}-kde4.tar.bz2
+        "vpnc-paths.patch")
+md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7'
+         '4bf6a10c7be84656723183b876cbaf9d')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver-kde4"
+
+  patch -Np0 <"$srcdir/vpnc-paths.patch"
+
+  sed -i '1,1i#include <unistd.h>' src/kvpnc.cpp
+}
+
 build() {
   cd $srcdir
-  sed -i '1,1i#include <unistd.h>' ${pkgname}-${pkgver}-kde4/src/kvpnc.cpp
 
   export LDFLAGS=-lX11
   mkdir build

Added: vpnc-paths.patch
===================================================================
--- vpnc-paths.patch	                        (rev 0)
+++ vpnc-paths.patch	2013-05-19 18:46:22 UTC (rev 91107)
@@ -0,0 +1,20 @@
+--- src/kvpncconfig.cpp.orig	2013-05-19 14:37:11.867517045 -0400
++++ src/kvpncconfig.cpp	2013-05-19 14:37:31.702107829 -0400
+@@ -865,7 +865,7 @@
+     enableDebugXl2tpdtunnel = QVariant(configgroup.readEntry("EnableDebugXl2tpdtunnel", false)).toBool();
+ 
+ 
+-    pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/sbin/vpnc");
++    pathToVpnc = configgroup.readEntry("Path to vpnc-bin", "/usr/bin/vpnc");
+     pathToCiscoVpnc = configgroup.readEntry("Path to vpnclient", "/usr/local/bin/vpnclient");
+     pathToSetkey = configgroup.readEntry("Path to setkey", "/usr/sbin/setkey");
+     pathToRacoon = configgroup.readEntry("Path to racoon", "/usr/sbin/racoon");
+@@ -1489,7 +1489,7 @@
+ void KVpncConfig::checkStandardPathValues()
+ {
+     if (pathToVpnc.isEmpty())
+-        pathToVpnc = "/usr/sbin/vpnc";
++        pathToVpnc = "/usr/bin/vpnc";
+ 
+     if (pathToCiscoVpnc.isEmpty())
+         pathToCiscoVpnc = "/usr/local/bin/vpnclient";