From d4bd6695641f6d2ec7ff8681913d304e995902f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 May 2018 03:22:09 +0100 Subject: gentoo resync : 29.05.2018 --- kde-plasma/plasma-nm/Manifest | 5 +- .../plasma-nm/files/plasma-nm-add_EAP-PWD.patch | 201 --------------------- kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild | 67 ------- kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild | 2 +- 4 files changed, 2 insertions(+), 273 deletions(-) delete mode 100644 kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch delete mode 100644 kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild (limited to 'kde-plasma/plasma-nm') diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest index fa419a21a90d..211242910cef 100644 --- a/kde-plasma/plasma-nm/Manifest +++ b/kde-plasma/plasma-nm/Manifest @@ -1,6 +1,3 @@ -AUX plasma-nm-add_EAP-PWD.patch 10213 BLAKE2B e35cf580481f9ddc139fd77d7f3a652440bff749a1c34e26ef579ff1dc9ac741b97d7f6f8ea2165c959febaedd16396e29af3a4adf20bb74b3ec6b73fb77193d SHA512 0db8b7e4c9e7ea51acb6ee7c8f79b1cb1040899b45e02a80f83d268197844e5bcee3b963796e9a70d364677adeff2180d5b4520d529c7603e10d91a9a0f162f7 -DIST plasma-nm-5.11.5.tar.xz 718500 BLAKE2B bdd9520cfa3a305f7f2c271fdfc9678b43ed46e160ff7c7485a963889b32e60f56408bcc39b4fce81e570ce194410730a628bb2eb96afcfba8704b787d90c05a SHA512 6bc42e9b385fff03d994d66fb2088ce22b2766588c655466e4e26a0b57f1533c142ce7712c9182d9003368f30086333ea9670bac54b9b797e58a968f8bfc3512 DIST plasma-nm-5.12.5.tar.xz 703236 BLAKE2B f522d11a182b589beae46a2aae6c59b6964da7d073e8bae14464cd99fb29d9fc0188113a7a00ed568646daf7a22ef2000c3ccaee848361f50caaff6087364c40 SHA512 7c61743d028d27ead7b7c373757f5ea82703808702d31546477558a631607c15d867140624391b803a72f5675c96853e1eea07c7af3001718a96c36d6c3191c6 -EBUILD plasma-nm-5.11.5.ebuild 1789 BLAKE2B 7c5af92a13398f943f6277e1b87864a40fd5c2a5ebb1f7765a64309a38e006339c4c0e63192e18180ad1b98143df2ffb4b743c990438f99930406c61b1d362ed SHA512 d376eaf845a52b6e916f554a848dcc767774bb972fde518e10404eda1b269025e4d4108132a64b4dff9d2c7453b88dd47ad5280ac12baef52eb3cc63d89d7618 -EBUILD plasma-nm-5.12.5.ebuild 2037 BLAKE2B 20ed095bc914a11b67b31ebb4da8328c2331f308907ed589d5cedd42fa759e975d1a056947f8b3bcc4efb16cfcb06ffe790d45d8d6b49c535cb2c3cf279be757 SHA512 2e46b88fa1c634df88c78a270cd765d5fef90458011d8d8212ae8737feb6255e316d0bea91679c4836f10cb3278ce710eb3cbf270e3273269758c0dbc498e0d6 +EBUILD plasma-nm-5.12.5.ebuild 2036 BLAKE2B a8417bd8a428d8aa36d1827acef456af43cea011ffaca8441dd88cda56795fed7e65c83b712199b47137ae94b7f3abbd76f044d4ac6927492be4aba6c153f1b9 SHA512 488710030d9c1caa29bf0d2983743351748b764b7610d2c5a969f6b510c6b592d3422b92013172e63e15e3a1565e1889c93673a5e280881ba4c6a7935e654c27 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689 diff --git a/kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch b/kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch deleted file mode 100644 index 896a8144d52d..000000000000 --- a/kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch +++ /dev/null @@ -1,201 +0,0 @@ -From b98333458ca1edd1cafb2a5b83d45f46faf14103 Mon Sep 17 00:00:00 2001 -From: Jan Grulich -Date: Wed, 13 Dec 2017 08:51:06 +0100 -Subject: 802-1x: Add support for EAP-PWD - -BUG:387685 ---- - libs/editor/settings/security802-1x.cpp | 49 +++++++++++++++++++++++++++++---- - libs/editor/settings/ui/802-1x.ui | 49 +++++++++++++++++++++++++++++---- - 3 files changed, 88 insertions(+), 12 deletions(-) - -diff --git a/libs/editor/settings/security802-1x.cpp b/libs/editor/settings/security802-1x.cpp -index d6405bf..461a38c 100644 ---- a/libs/editor/settings/security802-1x.cpp -+++ b/libs/editor/settings/security802-1x.cpp -@@ -40,6 +40,7 @@ Security8021x::Security8021x(const NetworkManager::Setting::Ptr &setting, bool w - m_ui->leapPassword->setPasswordOptionsEnabled(true); - m_ui->md5Password->setPasswordOptionsEnabled(true); - m_ui->peapPassword->setPasswordOptionsEnabled(true); -+ m_ui->pwdPassword->setPasswordOptionsEnabled(true); - m_ui->tlsPrivateKeyPassword->setPasswordOptionsEnabled(true); - m_ui->ttlsPassword->setPasswordOptionsEnabled(true); - -@@ -49,18 +50,20 @@ Security8021x::Security8021x(const NetworkManager::Setting::Ptr &setting, bool w - - m_ui->auth->setItemData(0, NetworkManager::Security8021xSetting::EapMethodTls); - m_ui->auth->setItemData(1, NetworkManager::Security8021xSetting::EapMethodLeap); -- m_ui->auth->setItemData(2, NetworkManager::Security8021xSetting::EapMethodFast); -- m_ui->auth->setItemData(3, NetworkManager::Security8021xSetting::EapMethodTtls); -- m_ui->auth->setItemData(4, NetworkManager::Security8021xSetting::EapMethodPeap); -+ m_ui->auth->setItemData(2, NetworkManager::Security8021xSetting::EapMethodPwd); -+ m_ui->auth->setItemData(3, NetworkManager::Security8021xSetting::EapMethodFast); -+ m_ui->auth->setItemData(4, NetworkManager::Security8021xSetting::EapMethodTtls); -+ m_ui->auth->setItemData(5, NetworkManager::Security8021xSetting::EapMethodPeap); - } else { - m_ui->auth->removeItem(2); // LEAP - m_ui->stackedWidget->removeWidget(m_ui->leapPage); - - m_ui->auth->setItemData(0, NetworkManager::Security8021xSetting::EapMethodMd5); - m_ui->auth->setItemData(1, NetworkManager::Security8021xSetting::EapMethodTls); -- m_ui->auth->setItemData(2, NetworkManager::Security8021xSetting::EapMethodFast); -- m_ui->auth->setItemData(3, NetworkManager::Security8021xSetting::EapMethodTtls); -- m_ui->auth->setItemData(4, NetworkManager::Security8021xSetting::EapMethodPeap); -+ m_ui->auth->setItemData(2, NetworkManager::Security8021xSetting::EapMethodPwd); -+ m_ui->auth->setItemData(3, NetworkManager::Security8021xSetting::EapMethodFast); -+ m_ui->auth->setItemData(4, NetworkManager::Security8021xSetting::EapMethodTtls); -+ m_ui->auth->setItemData(5, NetworkManager::Security8021xSetting::EapMethodPeap); - } - - // Set PEAP authentication as default -@@ -88,6 +91,8 @@ Security8021x::Security8021x(const NetworkManager::Setting::Ptr &setting, bool w - connect(m_ui->leapPassword, &PasswordField::passwordOptionChanged, this, &Security8021x::slotWidgetChanged); - connect(m_ui->fastAllowPacProvisioning, &QCheckBox::stateChanged, this, &Security8021x::slotWidgetChanged); - connect(m_ui->pacFile, &KUrlRequester::textChanged, this, &Security8021x::slotWidgetChanged); -+ connect(m_ui->pwdUsername, &KLineEdit::textChanged, this, &Security8021x::slotWidgetChanged); -+ connect(m_ui->pwdPassword, &PasswordField::textChanged, this, &Security8021x::slotWidgetChanged); - connect(m_ui->fastUsername, &KLineEdit::textChanged, this, &Security8021x::slotWidgetChanged); - connect(m_ui->fastPassword, &PasswordField::textChanged, this, &Security8021x::slotWidgetChanged); - connect(m_ui->fastPassword, &PasswordField::passwordOptionChanged, this, &Security8021x::slotWidgetChanged); -@@ -175,6 +180,18 @@ void Security8021x::loadConfig(const NetworkManager::Setting::Ptr &setting) - } else { - m_ui->leapPassword->setPasswordOption(PasswordField::AlwaysAsk); - } -+ -+ } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodPwd)) { -+ m_ui->auth->setCurrentIndex(m_ui->auth->findData(NetworkManager::Security8021xSetting::EapMethodPwd)); -+ m_ui->pwdUsername->setText(securitySetting->identity()); -+ -+ if (securitySetting->passwordFlags().testFlag(NetworkManager::Setting::None)) { -+ m_ui->pwdPassword->setPasswordOption(PasswordField::StoreForAllUsers); -+ } else if (securitySetting->passwordFlags().testFlag(NetworkManager::Setting::AgentOwned)) { -+ m_ui->pwdPassword->setPasswordOption(PasswordField::StoreForUser); -+ } else { -+ m_ui->pwdPassword->setPasswordOption(PasswordField::AlwaysAsk); -+ } - } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodFast)) { - m_ui->auth->setCurrentIndex(m_ui->auth->findData(NetworkManager::Security8021xSetting::EapMethodFast)); - m_ui->fastAnonIdentity->setText(securitySetting->anonymousIdentity()); -@@ -256,6 +273,8 @@ void Security8021x::loadSecrets(const NetworkManager::Setting::Ptr &setting) - m_ui->leapPassword->setText(securitySetting->password()); - } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodFast)) { - m_ui->fastPassword->setText(securitySetting->password()); -+ } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodPwd)) { -+ m_ui->pwdPassword->setText(securitySetting->password()); - } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodTtls)) { - m_ui->ttlsPassword->setText(securitySetting->password()); - } else if (eapMethods.contains(NetworkManager::Security8021xSetting::EapMethodPeap)) { -@@ -366,6 +385,22 @@ QVariantMap Security8021x::setting() const - } else { - setting.setPasswordFlags(NetworkManager::Setting::NotSaved); - } -+ } else if (method == NetworkManager::Security8021xSetting::EapMethodPwd) { -+ if (!m_ui->pwdUsername->text().isEmpty()) { -+ setting.setIdentity(m_ui->pwdUsername->text()); -+ } -+ -+ if (m_ui->pwdPassword->passwordOption() == PasswordField::StoreForAllUsers) { -+ setting.setPasswordFlags(NetworkManager::Setting::None); -+ } else if (m_ui->pwdPassword->passwordOption() == PasswordField::StoreForUser) { -+ setting.setPasswordFlags(NetworkManager::Setting::AgentOwned); -+ } else { -+ setting.setPasswordFlags(NetworkManager::Setting::NotSaved); -+ } -+ -+ if (!m_ui->pwdPassword->text().isEmpty()) { -+ setting.setPassword(m_ui->pwdPassword->text()); -+ } - } else if (method == NetworkManager::Security8021xSetting::EapMethodFast) { - if (!m_ui->fastAnonIdentity->text().isEmpty()) { - setting.setAnonymousIdentity(m_ui->fastAnonIdentity->text()); -@@ -580,6 +615,8 @@ bool Security8021x::isValid() const - // TODO Validate other certificates?? - } else if (method == NetworkManager::Security8021xSetting::EapMethodLeap) { - return !m_ui->leapUsername->text().isEmpty() && (!m_ui->leapPassword->text().isEmpty() || m_ui->leapPassword->passwordOption() == PasswordField::AlwaysAsk); -+ } else if (method == NetworkManager::Security8021xSetting::EapMethodPwd) { -+ return !m_ui->pwdUsername->text().isEmpty() && (!m_ui->pwdPassword->text().isEmpty() || m_ui->pwdPassword->passwordOption() == PasswordField::AlwaysAsk); - } else if (method == NetworkManager::Security8021xSetting::EapMethodFast) { - if (!m_ui->fastAllowPacProvisioning->isChecked() && !m_ui->pacFile->url().isValid()) { - return false; -diff --git a/libs/editor/settings/ui/802-1x.ui b/libs/editor/settings/ui/802-1x.ui -index aaa46fa..202cdf8 100644 ---- a/libs/editor/settings/ui/802-1x.ui -+++ b/libs/editor/settings/ui/802-1x.ui -@@ -50,6 +50,11 @@ - - - -+ PWD -+ -+ -+ -+ - FAST - - -@@ -298,6 +303,40 @@ - - - -+ -+ -+ -+ -+ -+ Username: -+ -+ -+ md5UserName -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ Password: -+ -+ -+ md5Password -+ -+ -+ -+ -+ -+ -+ true -+ -+ -+ -+ -+ - - - -@@ -696,16 +735,16 @@ -
kcombobox.h
- - -- KUrlRequester -- QWidget --
kurlrequester.h
-- -- - KLineEdit - QLineEdit -
klineedit.h
- - -+ KUrlRequester -+ QWidget -+
kurlrequester.h
-+ -+ - PasswordField - QLineEdit -
passwordfield.h
--- -cgit v0.11.2 - diff --git a/kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild deleted file mode 100644 index 5e0d40a6e6ce..000000000000 --- a/kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit kde5 - -DESCRIPTION="KDE Plasma applet for NetworkManager" -LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="amd64 ~arm x86" -IUSE="modemmanager openconnect teamd" - -DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kdbusaddons) - $(add_frameworks_dep kdeclarative) - $(add_frameworks_dep kdelibs4support) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kio) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kservice) - $(add_frameworks_dep kwallet) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep networkmanager-qt 'teamd=' '5.40.0-r1') - $(add_frameworks_dep plasma) - $(add_frameworks_dep solid) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui) - $(add_qt_dep qtnetwork) - $(add_qt_dep qtwidgets) - >=app-crypt/qca-2.1.1:2[qt5] - >=net-misc/networkmanager-0.9.10.0[teamd=] - modemmanager? ( - $(add_frameworks_dep modemmanager-qt) - $(add_qt_dep qtxml) - net-misc/mobile-broadband-provider-info - ) - openconnect? ( - $(add_qt_dep qtxml) - net-misc/networkmanager-openconnect - net-vpn/openconnect:= - ) -" -RDEPEND="${DEPEND} - $(add_plasma_dep plasma-workspace) - !kde-plasma/plasma-nm:4 -" - -PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch ) - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package modemmanager ModemManager) - $(cmake-utils_use_find_package modemmanager KF5ModemManagerQt) - $(cmake-utils_use_find_package openconnect OpenConnect) - ) - - kde5_src_configure -} diff --git a/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild index c6f2e64279b1..72bb68a3501a 100644 --- a/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-5.12.5.ebuild @@ -7,7 +7,7 @@ inherit kde5 DESCRIPTION="KDE Plasma applet for NetworkManager" LICENSE="GPL-2 LGPL-2.1" -KEYWORDS="amd64 ~arm ~x86" +KEYWORDS="amd64 ~arm x86" IUSE="modemmanager openconnect teamd" DEPEND=" -- cgit v1.2.3