diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-04 11:22:40 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-04 11:22:40 +0100 |
commit | fe1c8b732bd548b699d4c2ef725f67f8b8c8911c (patch) | |
tree | 84c0b6ca01b7cb63c7d6e685a63823200ce1007f /net-vpn | |
parent | 7c7c2c9727d6b2ff30945b5aea0d575e1c406d8b (diff) |
gentoo resync : 04.05.2018
Diffstat (limited to 'net-vpn')
-rw-r--r-- | net-vpn/Manifest.gz | bin | 4873 -> 4710 bytes | |||
-rw-r--r-- | net-vpn/kvpnc/Manifest | 9 | ||||
-rw-r--r-- | net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch | 11 | ||||
-rw-r--r-- | net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch | 53 | ||||
-rw-r--r-- | net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch | 38 | ||||
-rw-r--r-- | net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch | 59 | ||||
-rw-r--r-- | net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch | 15 | ||||
-rw-r--r-- | net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild | 55 | ||||
-rw-r--r-- | net-vpn/kvpnc/metadata.xml | 8 |
9 files changed, 0 insertions, 248 deletions
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz Binary files differindex 733efea35af1..b8bed1823f4b 100644 --- a/net-vpn/Manifest.gz +++ b/net-vpn/Manifest.gz diff --git a/net-vpn/kvpnc/Manifest b/net-vpn/kvpnc/Manifest deleted file mode 100644 index cda39e3b2db2..000000000000 --- a/net-vpn/kvpnc/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX kvpnc-0.9.6a-gcc47.patch 399 BLAKE2B 7288edbac430dbb442c81b8ad4c48183387227bdf66d0f3a5567c24e57302567c37c001c5eea04e903585b69b092f7af20c74fbfa2fd7e4bc87c25d2784881e0 SHA512 0c3850b0dcccaf57d39110a91c22e9f21931153b4978608f02f0cbda98533bdba56cdc2f7a0fc6554d15a042e9362f54d5cb4dfca9ab719df51a476aef22d1ce -AUX kvpnc-0.9.6a-gcc6.patch 1870 BLAKE2B 31597859a15c4c612015f161eee7b995ee9a72875a3feed2f08b444642511584bb2db5b41edeb3146915b7201d626f35afe75928d388c3ed4c53fc5da1abe5c6 SHA512 759de3b77c46106473830907bdd346b455110b3fe6fb5a6b0abf4279b9674a82007b968083347e2de56ed9fc4643710f2846f8d6652e6febcc0680be9d0db493 -AUX kvpnc-0.9.6a-ifconfig.patch 1800 BLAKE2B 7f8bcc02e6e7c39f65ddebf5ac225e1a3b83171e96f033b62e8adcaff95557677a515781ab00c5f86195329d19a5dd8ec3794bda04d9a3fe7380b806d3db8c0a SHA512 9bb42e100e79f29d1f070f744c1b522d3ea367e810da1c1fece092ca2e740a9fd6d8d975291884dea0b168de3e82e399e1daff979ad89069dc00ab703c03818f -AUX kvpnc-0.9.6a-kicon.patch 2273 BLAKE2B bf9fa922c7f14a86a29ec92c8b50cadd1b62b7fc4c9f1b6ef5155a6df3b5e5ddc059b75dd2c2766839c32c669e41b1e3d2409d8acd6adb7f88c7407d3c85b387 SHA512 37b5cf6699ef29f016913e2cb41eb974a527e1386df6b7077412abbcbfa78c37a4bafe83766fa722b5b7ecefc6b58afdb25bd619044f7c0d49fa6f23181c5694 -AUX kvpnc-0.9.6a-scriptsec.patch 1017 BLAKE2B 942c72a8bb84371dd43b7ff5b413918f242f5b9709281340c68cb0bdedd9bdb17f9537e4889f598f116efe6e266adfb44207d0ff028232ad089de88fdee94643 SHA512 517d69e5f4b2911f3ef3fc165eb242b11075b46ef7e25d7f0b311da20bfdb14ebb56d91fa2a052330ee928a04e2299a4a01020a5eac270f31d020f2ca0672595 -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 -EBUILD kvpnc-0.9.6a-r3.ebuild 1163 BLAKE2B aca78bf6ea0f4b175c0fbed1b80593b0b8dc89cf5d8b603392862e023ee3f257b4d65f6850ade5cda712f90029cadd7ed35de51aee0d6bee04609a6c1d51c963 SHA512 e76df71584d58a28d32e2324d97af33565f87f1df843a34bdaebc3e883253f21111cc1ad32e722b1d1edc9bf7e6285e680175d4279a5db3744527da91152c941 -MISC metadata.xml 255 BLAKE2B c034706780f889b331e993d25fc5b7127e47555bef2e7cdc2c49d289154ec119175d3557ac86bca6dfa3de9275549c1adc08ff8480b0d5e862fa426eb2ea3d51 SHA512 8b2fdb47579200da9614f4dd4397bfbbf59c42fb6fc0509a1875f32458a67650d7a54e5bc621acc0accf7c17c1973941719284dff783208448abd61527d644c1 diff --git a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch b/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch deleted file mode 100644 index db59b5baaf86..000000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index ba086a6337cc..000000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-gcc6.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index 1413bccc97e1..000000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-ifconfig.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 deleted file mode 100644 index d898dafbaba2..000000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-kicon.patch +++ /dev/null @@ -1,59 +0,0 @@ -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 deleted file mode 100644 index 4e8b4d6d92b7..000000000000 --- a/net-vpn/kvpnc/files/kvpnc-0.9.6a-scriptsec.patch +++ /dev/null @@ -1,15 +0,0 @@ -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-r3.ebuild b/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild deleted file mode 100644 index 724d336c326d..000000000000 --- a/net-vpn/kvpnc/kvpnc-0.9.6a-r3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# 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-vpn/kvpnc/metadata.xml b/net-vpn/kvpnc/metadata.xml deleted file mode 100644 index bddd8b4a2053..000000000000 --- a/net-vpn/kvpnc/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> -</pkgmetadata> |