From 912882c8014b93ef44d55db7043f72884e5e38f9 Mon Sep 17 00:00:00 2001
From: Omar Vega Ramos <ovruni@gnu.org.pe>
Date: Tue, 8 Jan 2013 08:30:14 -0500
Subject: Add kvpnc-0.9.6a-scriptsec.patch and kvpnc-0.9.6a-gcc47.patch

---
 community/kvpnc/PKGBUILD                     | 12 +++++++++---
 community/kvpnc/kvpnc-0.9.6a-gcc47.patch     | 11 +++++++++++
 community/kvpnc/kvpnc-0.9.6a-scriptsec.patch | 15 +++++++++++++++
 3 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 community/kvpnc/kvpnc-0.9.6a-gcc47.patch
 create mode 100644 community/kvpnc/kvpnc-0.9.6a-scriptsec.patch

(limited to 'community')

diff --git a/community/kvpnc/PKGBUILD b/community/kvpnc/PKGBUILD
index 147671737..2c532795a 100644
--- a/community/kvpnc/PKGBUILD
+++ b/community/kvpnc/PKGBUILD
@@ -12,12 +12,18 @@ license=("GPL")
 depends=('kdelibs' 'hicolor-icon-theme')
 makedepends=('cmake' 'automoc4')
 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
+	kvpnc-0.9.6a-scriptsec.patch
+	kvpnc-0.9.6a-gcc47.patch)
+md5sums=('bf8b7224284f5d3f8ad5235c599fe9e7'
+	 'a0ee8caabf56732b8481a426e02f881b'
+	 '9725f5a005dca1e3d1cba86a8e52360a')
 
 build() {
   export LDFLAGS=-lX11
-
+  cd $srcdir/$pkgname-$pkgver-kde4
+  patch -Np1 -i ${srcdir}/kvpnc-0.9.6a-scriptsec.patch
+  patch -Np1 -i ${srcdir}/kvpnc-0.9.6a-gcc47.patch
   cd $srcdir
   mkdir build
   cd build
diff --git a/community/kvpnc/kvpnc-0.9.6a-gcc47.patch b/community/kvpnc/kvpnc-0.9.6a-gcc47.patch
new file mode 100644
index 000000000..db59b5baa
--- /dev/null
+++ b/community/kvpnc/kvpnc-0.9.6a-gcc47.patch
@@ -0,0 +1,11 @@
+diff -ruN kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp kvpnc-0.9.6a-kde4/src/kvpnc.cpp
+--- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp	2012-06-25 22:16:25.395420711 +0200
++++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp	2012-06-25 22:17:41.598424971 +0200
+@@ -75,6 +75,7 @@
+ #include <cstdlib>
+ #include <ctime>
+ #include <iomanip>
++#include <unistd.h>
+ 
+ #include "ui_mainviewbase4.h"
+ #include "ciscocertificateenrollment.h"
diff --git a/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch b/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch
new file mode 100644
index 000000000..4e8b4d6d9
--- /dev/null
+++ b/community/kvpnc/kvpnc-0.9.6a-scriptsec.patch
@@ -0,0 +1,15 @@
+diff -ruN kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp kvpnc-0.9.6a-kde4/src/kvpnc.cpp
+--- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp	2010-03-08 11:26:33.000000000 +0100
++++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp	2012-06-25 22:12:51.454408816 +0200
+@@ -6030,7 +6030,10 @@
+                     }
+ 
+ 
+-					if (GlobalConfig->OpenvpnNeedSecurityParameter || (OpenvpnMajor == 2 && OpenvpnMinor == 1 && OpenvpnExtraVer > 8 && OpenvpnExtra == "rc")||  ( OpenvpnMajor == 2 && OpenvpnMinor == 1 ) || (OpenvpnMajor > 2 && OpenvpnMinor >= 2)) {
++			if (GlobalConfig->OpenvpnNeedSecurityParameter || 
++                            (OpenvpnMajor == 2 && OpenvpnMinor == 1 && OpenvpnExtraVer > 8 && OpenvpnExtra == "rc")||
++                            (OpenvpnMajor == 2 && OpenvpnMinor >= 1 ) || 
++			    (OpenvpnMajor > 2)) {
+                         if (GlobalConfig->KvpncDebugLevel > 3)
+                             GlobalConfig->appendLogEntry(i18n("OpenVPN >= 2.1-rc9 detected, adding script security parameter to config."), KVpncEnum::info);
+ 
-- 
cgit v1.2.3-54-g00ecf