net-misc/kvpnc -> net-vpn/kvpnc, import 0.9.6a from Gentoo ebuild repo

12 files changed, 235 insertions, 5 deletions

diff --git a/net-misc/kvpnc/Manifest b/net-misc/kvpnc/Manifest
deleted file mode 100644
index 1280aa41..00000000
--- a/net-misc/kvpnc/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST kvpnc-0.9.0.tar.bz2 2486319 SHA256 ce86327d9656ae466237ebea0c0c46f1bde3f6379ebde69210af8abf5978374c
diff --git a/net-misc/kvpnc/ChangeLog b/net-vpn/kvpnc/ChangeLog
index 68afcd49..68afcd49 100644
--- a/net-misc/kvpnc/ChangeLog
+++ b/net-vpn/kvpnc/ChangeLog
diff --git a/net-vpn/kvpnc/Manifest b/net-vpn/kvpnc/Manifest
new file mode 100644
index 00000000..2bb2c57b
--- /dev/null
+++ b/net-vpn/kvpnc/Manifest
@@ -0,0 +1,3 @@
+DIST kvpnc-0.9.0.tar.bz2 2486319 SHA256 ce86327d9656ae466237ebea0c0c46f1bde3f6379ebde69210af8abf5978374c
+DIST kvpnc-0.9.6-kde4-locale.tar.bz2 2020192 BLAKE2B 89d0d95ad04c1dfedcce7b5eb6bb6b17f37f08cdd39822d0aa5679638187c32625b0b8bc95e967f2a9ce938a45d157655bb43071ae9dbd214e40faa5195b9316 SHA512 a2e5c7f465ec77e61f882cb2a45da7da3c868de164e8cdefe2a987d9040e1762ebd6f3e089f008dfcc7f7fad47b9847c059d615c94a995805af0ca3f1fd4d209
+DIST kvpnc-0.9.6a-kde4.tar.bz2 579425 BLAKE2B 1058e06b9a1d4325794a51f1ee34892b6898b6ffb077897a7c9e4617019be2da6e3759da5d2a4bb405424e8f18e7a01cad3bccf2d0f5f438e65d262c560f5484 SHA512 e30e3fcb9729a378c84d636c7efe0e45ce7d15bcfab2f5f6cd4e37951de1db10c343e5e14dc13aafc4d540058ebc2ca0c2ad30c555fd78f0de552107d13d2467
diff --git a/net-misc/kvpnc/files/kvpnc-0.9.0-gcc43.patch b/net-vpn/kvpnc/files/kvpnc-0.9.0-gcc43.patch
index a0bad6e7..a0bad6e7 100644
--- a/net-misc/kvpnc/files/kvpnc-0.9.0-gcc43.patch
+++ b/net-vpn/kvpnc/files/kvpnc-0.9.0-gcc43.patch
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 00000000..db59b5ba
--- /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-gcc6.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch
new file mode 100644
index 00000000..ba086a63
--- /dev/null
+++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch
@@ -0,0 +1,53 @@
+Author: Pino Toscano <pino@kde.org>
+Description: remove extra bool parameter for KConfigGroup::deleteEntry()
+ unneeded, and it does not match any of the actual signatures of the
+ function
+Bug-Debian: https://bugs.debian.org/811679
+Applied-Upstream: commit:1452683
+
+--- a/src/kvpncconfig.cpp
++++ b/src/kvpncconfig.cpp
+@@ -4305,7 +4305,7 @@
+     appPointer->processEvents();
+ 
+     if (useKwallet && KWallet::Wallet::isEnabled())
+-        configgroup.deleteEntry("First use of Kwallet", false);
++        configgroup.deleteEntry("First use of Kwallet");
+ 
+ 
+     /* = user data = */
+Author: Pino Toscano <pino@kde.org>
+Description: do not return bool for QString
+ GCC 6 cannot convert them
+Bug-Debian: https://bugs.debian.org/811679
+Applied-Upstream: commit:1452682
+
+--- a/src/utils.cpp
++++ b/src/utils.cpp
+@@ -914,7 +914,7 @@
+     NameAndPidOfProgramListenProcess->start(proc, args);
+     if (!NameAndPidOfProgramListenProcess->waitForStarted()) {
+         kError() << "netstat fails!" << endl;
+-        return false;
++        return "";
+     } else {
+         NameAndPidOfProgramListenProcess->waitForFinished();
+ 
+@@ -946,7 +946,7 @@
+     GetEmailAddressOfCertProcess->start(proc, args);
+     if (!GetEmailAddressOfCertProcess->waitForStarted()) {
+         kError() << "GetEmailAddressOfCertProcess" << endl;
+-        return false;
++        return "";
+     } else {
+         GetEmailAddressOfCertProcess->waitForFinished();
+         disconnect(GetEmailAddressOfCertProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readOutGetEmailAddressOfCert()));
+@@ -1159,7 +1159,7 @@
+     GetHostnameProcess->start(proc, args);
+     if (!GetHostnameProcess->waitForStarted()) {
+         kError() << "Unable to start getHostname process!" << endl;
+-        return false;
++        return "";
+     } else {
+         GetHostnameProcess->waitForFinished();
+         return Hostname;
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 00000000..1413bccc
--- /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-kicon.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch
new file mode 100644
index 00000000..d898dafb
--- /dev/null
+++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch
@@ -0,0 +1,59 @@
+Author: Christoph Feck <cfeck@kde.org>
+Description: Use KIcon to set window icons
+Bug: https://bugs.kde.org/show_bug.cgi?id=246016
+Bug-Debian: https://bugs.debian.org/599094
+Applied-Upstream: commit:1180094
+
+--- a/src/kvpnc.cpp
++++ b/src/kvpnc.cpp
+@@ -320,10 +320,7 @@ KVpnc::~KVpnc()
+ 
+ void KVpnc::initAction()
+ {
+-    disconnectedIcon = KIconLoader::global()->loadIcon("disconnected", KIconLoader::NoGroup);
+-    connectedIcon = KIconLoader::global()->loadIcon("connected", KIconLoader::NoGroup);
+-    connectingIcon = KIconLoader::global()->loadIcon("connecting" , KIconLoader::NoGroup);
+-    setWindowIcon(disconnectedIcon);
++    setWindowIcon(KIcon("disconnected"));
+ 
+     (void*) KStandardAction::quit(this, SLOT(quitCalled()), actionCollection());
+ 
+@@ -17449,7 +17446,7 @@ void KVpnc::setGuiStatus(int status)
+ 	QString ConnectionStatus = i18n("unknown");
+ 	QString Username = "";
+ 	if (status == KVpncEnum::connected) {
+-        setWindowIcon(connectedIcon);
++        setWindowIcon(KIcon("connected"));
+ 
+         durationString = (i18n("%1:%2:%3" , QString().sprintf("%02u", hour) , QString().sprintf("%02u", min) , QString().sprintf("%02u", sec)));
+         QString ConnectMsg = "";
+@@ -17502,7 +17499,7 @@ void KVpnc::setGuiStatus(int status)
+ 
+     }
+     else if (status == KVpncEnum::connecting) {
+-        setWindowIcon(connectingIcon);
++        setWindowIcon(KIcon("connecting"));
+         mw->buttonConnect->setEnabled(false);
+         mw->buttonDisconnect->setEnabled(true);
+         mw->SessionCombo->setEnabled(false);
+@@ -17531,7 +17528,7 @@ void KVpnc::setGuiStatus(int status)
+         connectClicked();
+ 
+ 	} else if (status == KVpncEnum::disconnected) {
+-        setWindowIcon(disconnectedIcon);
++        setWindowIcon(KIcon("disconnected"));
+         mw->buttonConnect->setEnabled(true);
+         mw->buttonDisconnect->setEnabled(false);
+         DisconnectAction->setEnabled(false);
+--- a/src/kvpnc.h
++++ b/src/kvpnc.h
+@@ -286,9 +286,6 @@ private:
+ 
+     int TimeOutProcess; //< for timeout
+     int ConnectingProcess; //< for killing process
+-    QPixmap connectedIcon;
+-    QPixmap disconnectedIcon;
+-    QPixmap connectingIcon;
+     QPixmap connectingStatusPixmap;
+     QPixmap disconnectedStatusPixmap;
+     QPixmap connectedStatusPixmap;
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 00000000..4e8b4d6d
--- /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);
+ 
diff --git a/net-misc/kvpnc/kvpnc-0.9.0.ebuild b/net-vpn/kvpnc/kvpnc-0.9.0.ebuild
index 121e220e..121e220e 100644
--- a/net-misc/kvpnc/kvpnc-0.9.0.ebuild
+++ b/net-vpn/kvpnc/kvpnc-0.9.0.ebuild
diff --git a/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild b/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild
new file mode 100644
index 00000000..724d336c
--- /dev/null
+++ b/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+QT3SUPPORT_REQUIRED="true"
+inherit kde4-base
+
+DESCRIPTION="KDELibs4-based frontend for various VPN clients"
+HOMEPAGE="https://userbase.kde.org/KVpnc"
+SRC_URI="http://download.gna.org/kvpnc/${P}-kde4.tar.bz2
+	http://download.gna.org/kvpnc/${P/a}-kde4-locale.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	dev-libs/libgcrypt:0
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+S=${WORKDIR}/${P}-kde4
+
+PATCHES=(
+	"${FILESDIR}/${P}-scriptsec.patch"
+	"${FILESDIR}/${P}-gcc47.patch"
+	"${FILESDIR}/${P}-ifconfig.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/${P}-kicon.patch"
+)
+
+src_prepare() {
+	mv -vf "${WORKDIR}"/${P/a}-kde4-locale/po . || die
+
+	echo "find_package ( Msgfmt REQUIRED )" >> CMakeLists.txt || die
+	echo "find_package ( Gettext REQUIRED )" >> CMakeLists.txt || die
+	echo "add_subdirectory ( po )" >> CMakeLists.txt || die
+
+	sed -i \
+		-e "s:0.9.2-svn:${PV}:" \
+		CMakeLists.txt || die
+
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_libgcrypt=ON
+	)
+	kde4-base_src_configure
+}
diff --git a/net-misc/kvpnc/metadata.xml b/net-vpn/kvpnc/metadata.xml
index f4dad097..b8db5a55 100644
--- a/net-misc/kvpnc/metadata.xml
+++ b/net-vpn/kvpnc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed --> 
-  <maintainer>
-    <email>voxus@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <use>
     <flag name="cisco">Adds support for Cisco client</flag>
   </use>