From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- net-vpn/kvpnc/Manifest | 10 ++++ net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch | 11 +++++ net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch | 53 +++++++++++++++++++++ net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch | 38 +++++++++++++++ net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch | 59 ++++++++++++++++++++++++ net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch | 15 ++++++ net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild | 52 +++++++++++++++++++++ net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild | 57 +++++++++++++++++++++++ net-vpn/kvpnc/metadata.xml | 8 ++++ 9 files changed, 303 insertions(+) create mode 100644 net-vpn/kvpnc/Manifest create mode 100644 net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch create mode 100644 net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch create mode 100644 net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch create mode 100644 net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch create mode 100644 net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch create mode 100644 net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild create mode 100644 net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild create mode 100644 net-vpn/kvpnc/metadata.xml (limited to 'net-vpn/kvpnc') diff --git a/net-vpn/kvpnc/Manifest b/net-vpn/kvpnc/Manifest new file mode 100644 index 000000000000..d74351556f47 --- /dev/null +++ b/net-vpn/kvpnc/Manifest @@ -0,0 +1,10 @@ +AUX kvpnc-0.9.6a-gcc47.patch 399 SHA256 d40fd7dd4f1970d780fdd27459cb3bfe86702f499995ec716516630e54ef8f8b SHA512 0c3850b0dcccaf57d39110a91c22e9f21931153b4978608f02f0cbda98533bdba56cdc2f7a0fc6554d15a042e9362f54d5cb4dfca9ab719df51a476aef22d1ce WHIRLPOOL dc3680b4230f459e5b46f6de1a564129d67500b2b2fba22e341258c86e25de50473374693e343c656481357eeafa292c3991b0e4de41bda4a2e1f7b69a963619 +AUX kvpnc-0.9.6a-gcc6.patch 1870 SHA256 990fff27c4bedaf3c04c89439f71ea560bdfe8e13a959b1e3a29f0afe91b9291 SHA512 759de3b77c46106473830907bdd346b455110b3fe6fb5a6b0abf4279b9674a82007b968083347e2de56ed9fc4643710f2846f8d6652e6febcc0680be9d0db493 WHIRLPOOL 52883b210019ff02209271ba8440a23fd67c675f29e9262c103e2262c7e429270ccaa5d8feaf1efc2d0675b210012a5240699c81b3ac607bf9f3633f2a34609f +AUX kvpnc-0.9.6a-ifconfig.patch 1800 SHA256 551feb4d3728b37ca98b55c53de54883bbcee6b3edeb17a59c77dd312bc06b4e SHA512 9bb42e100e79f29d1f070f744c1b522d3ea367e810da1c1fece092ca2e740a9fd6d8d975291884dea0b168de3e82e399e1daff979ad89069dc00ab703c03818f WHIRLPOOL fc93ffe698e220691dcffa616bcdf58c2e783dfb6b4be856bfaecdbf3152b43d9936f5a08596856dfbfb0bedbebf5ab89c65497e6b4822d61f6a8df8c788b717 +AUX kvpnc-0.9.6a-kicon.patch 2273 SHA256 aa61c6ed39662c5257c2af875bdab8180cd4e217295fc09640a8099725b54cad SHA512 37b5cf6699ef29f016913e2cb41eb974a527e1386df6b7077412abbcbfa78c37a4bafe83766fa722b5b7ecefc6b58afdb25bd619044f7c0d49fa6f23181c5694 WHIRLPOOL 12ad2d65fa77940565bae25feb815dddf824f67833a7d02de905ef87667fd312548423c4a87e533da2bd07d6fd6d54f1bb424f49851204638e87532cc250f66f +AUX kvpnc-0.9.6a-scriptsec.patch 1017 SHA256 4219c7bbc86e2e7546e1b5c79b173d54fb562d5e532f7a6a08ae1e3a77dd8f5f SHA512 517d69e5f4b2911f3ef3fc165eb242b11075b46ef7e25d7f0b311da20bfdb14ebb56d91fa2a052330ee928a04e2299a4a01020a5eac270f31d020f2ca0672595 WHIRLPOOL 448908a67ffa2cacc081906e8f6c9d2256dd389983182867e438072a62e88c5c6af9e563546ac705e88187160cd39162e4aa8515abfa0e8cb4df5b6b9731746e +DIST kvpnc-0.9.6-kde4-locale.tar.bz2 2020192 SHA256 a675f9ed3d66e7fa94a0fd530fa60521d0ef739043bcfe2702be77b0299a47c7 SHA512 a2e5c7f465ec77e61f882cb2a45da7da3c868de164e8cdefe2a987d9040e1762ebd6f3e089f008dfcc7f7fad47b9847c059d615c94a995805af0ca3f1fd4d209 WHIRLPOOL 03b5a49027d024cb2645ea481735223f1551d65fed027690619f75ed38c05ecdc3b31b73e4e1d4309450088b709e35535081c614e4a9136d2da8fc954d739a15 +DIST kvpnc-0.9.6a-kde4.tar.bz2 579425 SHA256 6bf8c1f13f8d54f73f7ebb4102f912a5ebc01697ea36975977de8e57c97771f3 SHA512 e30e3fcb9729a378c84d636c7efe0e45ce7d15bcfab2f5f6cd4e37951de1db10c343e5e14dc13aafc4d540058ebc2ca0c2ad30c555fd78f0de552107d13d2467 WHIRLPOOL 8dadbf4fa0ba3790d8545a05cf9db5e462ba1d5a72c898faeee556d7e071c71e2cfaf81a07b5ff17a790399f044b87d1dc56f43799c7f58df049cf43829896cf +EBUILD kvpnc-0.9.6a-r2.ebuild 1189 SHA256 b8001af073b906f2ffab74b52fb414af6ce5b71c2faf684211be0bf26123257f SHA512 4bd09a81923bfd53ca4b4b120f3bc823258556f11407c23537ade2a31dd6fdd806ed175f286bdcd639282e002ac89e3c5af31bd354611c781cdb4a97926e187e WHIRLPOOL ee197670f6d6960e4c0da9c3c4cf3e41eb6f68fb04771b4b8c8f16e7fb6aeca1578f46e79b64ff7cade811445d6da7f934ae6b1dc457f6d4ee9aad37e22818e9 +EBUILD kvpnc-0.9.6a-r3.ebuild 1299 SHA256 0730c578af10cce46e024abd4176bb9f295af0cf4784a33d3d470fb09e7b5ed6 SHA512 8f937093bb1b52431851411ce45d962dce070b3973f7a9e045408548ae79a4df04fb704e980db1ba82ed10b4b897eebe5883f7c0b630405017bfa12a7f92ebd9 WHIRLPOOL 3ce07bca888869dd6545c18cc6cf41629837fadca285c912c0289c8dd9c57ec8b7a355b4c15c809a6c2977348551d5e66988817480edfe417affed437d00d40e +MISC metadata.xml 255 SHA256 129c40b6bbc7ae3de67b33141bfb7bd3d0145918b6f3a6b3eea31e85d094e0b1 SHA512 8b2fdb47579200da9614f4dd4397bfbbf59c42fb6fc0509a1875f32458a67650d7a54e5bc621acc0accf7c17c1973941719284dff783208448abd61527d644c1 WHIRLPOOL 5f6cba6fd18443ff4df7c4a036d335adae5980b208a4259a360565bed527673781e92a2e4a0153f9838998c3777b86b807581f6fa828777acd43e59629a7b10b 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 + #include + #include ++#include + + #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 000000000000..ba086a6337cc --- /dev/null +++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch @@ -0,0 +1,53 @@ +Author: Pino Toscano +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 +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 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-kicon.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch new file mode 100644 index 000000000000..d898dafbaba2 --- /dev/null +++ b/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch @@ -0,0 +1,59 @@ +Author: Christoph Feck +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 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); + diff --git a/net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild b/net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild new file mode 100644 index 000000000000..4b9e050da5a2 --- /dev/null +++ b/net-vpn/kvpnc/kvpnc-0.9.6a-r2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +KDE_LINGUAS="ar br cs da de el en_GB eo es et eu fr ga gl hi hne it ja ka lt +ms nb nds nl nn pa pl pt pt_BR ro ru sv tr uk zh_CN zh_TW" +inherit kde4-base + +DESCRIPTION="KDE 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" +) + +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() { + mycmakeargs=( "-DWITH_libgcrypt=ON" ) + kde4-base_src_configure +} 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 000000000000..05326c98d5be --- /dev/null +++ b/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +QT3SUPPORT_REQUIRED="true" +KDE_LINGUAS="ar br cs da de el en_GB eo es et eu fr ga gl hi hne it ja ka lt +ms nb nds nl nn pa pl pt pt_BR ro ru sv tr uk zh_CN zh_TW" +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-vpn/kvpnc/metadata.xml b/net-vpn/kvpnc/metadata.xml new file mode 100644 index 000000000000..bddd8b4a2053 --- /dev/null +++ b/net-vpn/kvpnc/metadata.xml @@ -0,0 +1,8 @@ + + + + + kde@gentoo.org + Gentoo KDE Project + + -- cgit v1.2.3