Move VPN packages into net-vpn/

3 files changed, 64 insertions, 0 deletions

diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch
new file mode 100644
index 000000000000..db59b5baaf86
--- /dev/null
+++ b/net-vpn/kvpnc/files/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/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch
new file mode 100644
index 000000000000..1413bccc97e1
--- /dev/null
+++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch
@@ -0,0 +1,38 @@
+diff -ruN kvpnc-0.9.6a-kde4/src/kvpncconfig.cpp kvpnc-0.9.6a-kde4-patched/src/kvpncconfig.cpp
+--- kvpnc-0.9.6a-kde4/src/kvpncconfig.cpp	2010-03-08 05:26:33.000000000 -0500
++++ kvpnc-0.9.6a-kde4-patched/src/kvpncconfig.cpp	2013-05-23 10:36:35.536865224 -0400
+@@ -58,8 +58,8 @@
+     pathToPing = "";
+     pathToOpenvpn = "/usr/sbin/openvpn";
+     pathToIp = "/sbin/ip";
+-    pathToIfconfig = "/sbin/ifconfig";
+-    pathToRoute = "/sbin/route";
++    pathToIfconfig = "/bin/ifconfig";
++    pathToRoute = "/bin/route";
+     pathToNetstat = "/bin/netstat";
+     pathToL2tpd = "/usr/sbin/l2tpd";
+     pathToPkcs11Tool = "/usr/bin/pkcs11-tool";
+@@ -874,8 +874,8 @@
+     pathToOpenssl = configgroup.readEntry("Path to openssl", "/usr/bin/openssl");
+     pathToIpsec = configgroup.readEntry("Path to freeswan", "/usr/sbin/ipsec");
+     pathToIp = configgroup.readEntry("Path to iputility", "/sbin/ip");
+-    pathToIfconfig = configgroup.readEntry("Path to ifconfig", "/sbin/ifconfig");
+-    pathToRoute = configgroup.readEntry("Path to route", "/sbin/route");
++    pathToIfconfig = configgroup.readEntry("Path to ifconfig", "/bin/ifconfig");
++    pathToRoute = configgroup.readEntry("Path to route", "/bin/route");
+     pathToNetstat = configgroup.readEntry("Path to netstat", "/bin/netstat");
+     pathToPppd = configgroup.readEntry("Path to pppd", "/usr/sbin/pppd");
+     pathToPptp = configgroup.readEntry("Path to pptp", "/usr/sbin/pptp");
+@@ -1516,10 +1516,10 @@
+         pathToIp = "/sbin/ip";
+ 
+     if (pathToIfconfig.isEmpty())
+-        pathToIfconfig = "/sbin/ifconfig";
++        pathToIfconfig = "/bin/ifconfig";
+ 
+     if (pathToRoute.isEmpty())
+-        pathToRoute = "/sbin/route";
++        pathToRoute = "/bin/route";
+ 
+     if (pathToNetstat.isEmpty())
+         pathToNetstat = "/bin/netstat";
diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch
new file mode 100644
index 000000000000..4e8b4d6d92b7
--- /dev/null
+++ b/net-vpn/kvpnc/files/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);
+