[arch-commits] Commit in kvpnc/repos (10 files)

Dave Reisner dreisner at nymeria.archlinux.org
Sun May 19 18:46:49 UTC 2013


    Date: Sunday, May 19, 2013 @ 20:46:49
  Author: dreisner
Revision: 91108

archrelease: copy trunk to community-i686, community-x86_64

Added:
  kvpnc/repos/community-i686/PKGBUILD
    (from rev 91107, kvpnc/trunk/PKGBUILD)
  kvpnc/repos/community-i686/kvpnc.install
    (from rev 91107, kvpnc/trunk/kvpnc.install)
  kvpnc/repos/community-i686/vpnc-paths.patch
    (from rev 91107, kvpnc/trunk/vpnc-paths.patch)
  kvpnc/repos/community-x86_64/PKGBUILD
    (from rev 91107, kvpnc/trunk/PKGBUILD)
  kvpnc/repos/community-x86_64/kvpnc.install
    (from rev 91107, kvpnc/trunk/kvpnc.install)
  kvpnc/repos/community-x86_64/vpnc-paths.patch
    (from rev 91107, kvpnc/trunk/vpnc-paths.patch)
Deleted:
  kvpnc/repos/community-i686/PKGBUILD
  kvpnc/repos/community-i686/kvpnc.install
  kvpnc/repos/community-x86_64/PKGBUILD
  kvpnc/repos/community-x86_64/kvpnc.install

-----------------------------------+
 /PKGBUILD                         |   88 ++++++++++++++++++++++++++++++
 /kvpnc.install                    |  104 ++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD           |   35 ------------
 community-i686/kvpnc.install      |   52 ------------------
 community-i686/vpnc-paths.patch   |   20 ++++++
 community-x86_64/PKGBUILD         |   35 ------------
 community-x86_64/kvpnc.install    |   52 ------------------
 community-x86_64/vpnc-paths.patch |   20 ++++++
 8 files changed, 232 insertions(+), 174 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-05-19 18:46:22 UTC (rev 91107)
+++ community-i686/PKGBUILD	2013-05-19 18:46:49 UTC (rev 91108)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Danial Olsen <do at meyl.fo>
-
-pkgname=kvpnc
-pkgver=0.9.6a
-pkgrel=3
-pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
-arch=(i686 x86_64)
-url="http://home.gna.org/kvpnc/"
-license=("GPL")
-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')
-
-build() {
-  cd $srcdir
-  sed -i '1,1i#include <unistd.h>' ${pkgname}-${pkgver}-kde4/src/kvpnc.cpp
-
-  export LDFLAGS=-lX11
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver}-kde4 \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-  find -name '*.png' -exec optipng -quiet -force -fix {} \;
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}

Copied: kvpnc/repos/community-i686/PKGBUILD (from rev 91107, kvpnc/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-05-19 18:46:49 UTC (rev 91108)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Danial Olsen <do at meyl.fo>
+
+pkgname=kvpnc
+pkgver=0.9.6a
+pkgrel=4
+pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
+arch=(i686 x86_64)
+url="http://home.gna.org/kvpnc/"
+license=("GPL")
+depends=('kdelibs' 'hicolor-icon-theme')
+makedepends=('cmake' 'automoc4' 'optipng')
+install=kvpnc.install
+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
+
+  export LDFLAGS=-lX11
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver}-kde4 \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+  find -name '*.png' -exec optipng -quiet -force -fix {} \;
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+}

Deleted: community-i686/kvpnc.install
===================================================================
--- community-i686/kvpnc.install	2013-05-19 18:46:22 UTC (rev 91107)
+++ community-i686/kvpnc.install	2013-05-19 18:46:49 UTC (rev 91108)
@@ -1,52 +0,0 @@
-# arg 1: the new package version
-post_install() {
-  echo "
-You will need a vpn client, these are supported:
------------------------------------------------
-- vpnc >= 0.2-rm+zomb-pre9  Cisco VPN
-- FreeS/WAN (OpenS/WAN too) >= 2.x  IPSec VPN Linux 2.4/2.6
-- racoon (ipsec-tools) > = 1.x  IPSec VPN Linux 2.6
-- pptpclient  PPTP VPN
-- OpenVPN  VPN based on SSL
-
-
-======================================================
-Howto setup KVpnc for use without root password - sudo
-======================================================
-
-1. install sudo
-
-2. edit /etc/sudoers
-
-        #  Cmnd alias specification
-        Cmnd_Alias KVPNC = /usr/bin/kvpnc
-
-        # User privilege specification
-        ALL ALL=NOPASSWD:KVPNC
-
-3. edit desktop link (/usr/share/applications/kde4/kvpnc.desktop)
-
-        replace the folling lines:
-
-        Exec=kvpnc
-        X-KDE-SubstituteUID=true
-
-        with:
-
-        Exec=sudo kvpnc
-        X-KDE-SubstituteUID=false
-"
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-# arg 1: the old package version
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-

Copied: kvpnc/repos/community-i686/kvpnc.install (from rev 91107, kvpnc/trunk/kvpnc.install)
===================================================================
--- community-i686/kvpnc.install	                        (rev 0)
+++ community-i686/kvpnc.install	2013-05-19 18:46:49 UTC (rev 91108)
@@ -0,0 +1,52 @@
+# arg 1: the new package version
+post_install() {
+  echo "
+You will need a vpn client, these are supported:
+-----------------------------------------------
+- vpnc >= 0.2-rm+zomb-pre9  Cisco VPN
+- FreeS/WAN (OpenS/WAN too) >= 2.x  IPSec VPN Linux 2.4/2.6
+- racoon (ipsec-tools) > = 1.x  IPSec VPN Linux 2.6
+- pptpclient  PPTP VPN
+- OpenVPN  VPN based on SSL
+
+
+======================================================
+Howto setup KVpnc for use without root password - sudo
+======================================================
+
+1. install sudo
+
+2. edit /etc/sudoers
+
+        #  Cmnd alias specification
+        Cmnd_Alias KVPNC = /usr/bin/kvpnc
+
+        # User privilege specification
+        ALL ALL=NOPASSWD:KVPNC
+
+3. edit desktop link (/usr/share/applications/kde4/kvpnc.desktop)
+
+        replace the folling lines:
+
+        Exec=kvpnc
+        X-KDE-SubstituteUID=true
+
+        with:
+
+        Exec=sudo kvpnc
+        X-KDE-SubstituteUID=false
+"
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+
+# arg 1: the old package version
+post_remove() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+

Copied: kvpnc/repos/community-i686/vpnc-paths.patch (from rev 91107, kvpnc/trunk/vpnc-paths.patch)
===================================================================
--- community-i686/vpnc-paths.patch	                        (rev 0)
+++ community-i686/vpnc-paths.patch	2013-05-19 18:46:49 UTC (rev 91108)
@@ -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";

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-05-19 18:46:22 UTC (rev 91107)
+++ community-x86_64/PKGBUILD	2013-05-19 18:46:49 UTC (rev 91108)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Danial Olsen <do at meyl.fo>
-
-pkgname=kvpnc
-pkgver=0.9.6a
-pkgrel=3
-pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
-arch=(i686 x86_64)
-url="http://home.gna.org/kvpnc/"
-license=("GPL")
-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')
-
-build() {
-  cd $srcdir
-  sed -i '1,1i#include <unistd.h>' ${pkgname}-${pkgver}-kde4/src/kvpnc.cpp
-
-  export LDFLAGS=-lX11
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver}-kde4 \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-  find -name '*.png' -exec optipng -quiet -force -fix {} \;
-}
-
-package() {
-  cd $srcdir/build
-  make DESTDIR=$pkgdir install
-}

Copied: kvpnc/repos/community-x86_64/PKGBUILD (from rev 91107, kvpnc/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-05-19 18:46:49 UTC (rev 91108)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Danial Olsen <do at meyl.fo>
+
+pkgname=kvpnc
+pkgver=0.9.6a
+pkgrel=4
+pkgdesc="A KDE Desktop Environment frontend for various vpn clients"
+arch=(i686 x86_64)
+url="http://home.gna.org/kvpnc/"
+license=("GPL")
+depends=('kdelibs' 'hicolor-icon-theme')
+makedepends=('cmake' 'automoc4' 'optipng')
+install=kvpnc.install
+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
+
+  export LDFLAGS=-lX11
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver}-kde4 \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+  find -name '*.png' -exec optipng -quiet -force -fix {} \;
+}
+
+package() {
+  cd $srcdir/build
+  make DESTDIR=$pkgdir install
+}

Deleted: community-x86_64/kvpnc.install
===================================================================
--- community-x86_64/kvpnc.install	2013-05-19 18:46:22 UTC (rev 91107)
+++ community-x86_64/kvpnc.install	2013-05-19 18:46:49 UTC (rev 91108)
@@ -1,52 +0,0 @@
-# arg 1: the new package version
-post_install() {
-  echo "
-You will need a vpn client, these are supported:
------------------------------------------------
-- vpnc >= 0.2-rm+zomb-pre9  Cisco VPN
-- FreeS/WAN (OpenS/WAN too) >= 2.x  IPSec VPN Linux 2.4/2.6
-- racoon (ipsec-tools) > = 1.x  IPSec VPN Linux 2.6
-- pptpclient  PPTP VPN
-- OpenVPN  VPN based on SSL
-
-
-======================================================
-Howto setup KVpnc for use without root password - sudo
-======================================================
-
-1. install sudo
-
-2. edit /etc/sudoers
-
-        #  Cmnd alias specification
-        Cmnd_Alias KVPNC = /usr/bin/kvpnc
-
-        # User privilege specification
-        ALL ALL=NOPASSWD:KVPNC
-
-3. edit desktop link (/usr/share/applications/kde4/kvpnc.desktop)
-
-        replace the folling lines:
-
-        Exec=kvpnc
-        X-KDE-SubstituteUID=true
-
-        with:
-
-        Exec=sudo kvpnc
-        X-KDE-SubstituteUID=false
-"
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-# arg 1: the old package version
-post_remove() {
-  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-

Copied: kvpnc/repos/community-x86_64/kvpnc.install (from rev 91107, kvpnc/trunk/kvpnc.install)
===================================================================
--- community-x86_64/kvpnc.install	                        (rev 0)
+++ community-x86_64/kvpnc.install	2013-05-19 18:46:49 UTC (rev 91108)
@@ -0,0 +1,52 @@
+# arg 1: the new package version
+post_install() {
+  echo "
+You will need a vpn client, these are supported:
+-----------------------------------------------
+- vpnc >= 0.2-rm+zomb-pre9  Cisco VPN
+- FreeS/WAN (OpenS/WAN too) >= 2.x  IPSec VPN Linux 2.4/2.6
+- racoon (ipsec-tools) > = 1.x  IPSec VPN Linux 2.6
+- pptpclient  PPTP VPN
+- OpenVPN  VPN based on SSL
+
+
+======================================================
+Howto setup KVpnc for use without root password - sudo
+======================================================
+
+1. install sudo
+
+2. edit /etc/sudoers
+
+        #  Cmnd alias specification
+        Cmnd_Alias KVPNC = /usr/bin/kvpnc
+
+        # User privilege specification
+        ALL ALL=NOPASSWD:KVPNC
+
+3. edit desktop link (/usr/share/applications/kde4/kvpnc.desktop)
+
+        replace the folling lines:
+
+        Exec=kvpnc
+        X-KDE-SubstituteUID=true
+
+        with:
+
+        Exec=sudo kvpnc
+        X-KDE-SubstituteUID=false
+"
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_upgrade() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+
+# arg 1: the old package version
+post_remove() {
+  which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
+}
+

Copied: kvpnc/repos/community-x86_64/vpnc-paths.patch (from rev 91107, kvpnc/trunk/vpnc-paths.patch)
===================================================================
--- community-x86_64/vpnc-paths.patch	                        (rev 0)
+++ community-x86_64/vpnc-paths.patch	2013-05-19 18:46:49 UTC (rev 91108)
@@ -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";




More information about the arch-commits mailing list