[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/networkmanager-qt/files/

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/networkmanager-qt/files/

[Andreas Sturmlechner]

commit:     7072a25658ad67287801ab24d9b636b63b85e1fc
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Mar 12 08:41:37 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 13 09:33:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7072a256

kde-frameworks/networkmanager-qt: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/7434

 .../files/networkmanager-qt-add_EAP-PWD.patch      | 58 ----------------------
 1 file changed, 58 deletions(-)

diff --git a/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch b/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch
deleted file mode 100644
index adba0ed461c..00000000000
--- a/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From f185da94f628e4384607703928e26fcf2f34fa7a Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Mon, 11 Dec 2017 14:24:14 +0100
-Subject: 802-11-x: support for PWD EAP method
-
----
- src/settings/security8021xsetting.cpp | 7 ++++++-
- src/settings/security8021xsetting.h   | 2 +-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/settings/security8021xsetting.cpp b/src/settings/security8021xsetting.cpp
-index 0fc9bde..38323b0 100644
---- a/src/settings/security8021xsetting.cpp
-+++ b/src/settings/security8021xsetting.cpp
-@@ -569,7 +569,8 @@ QStringList NetworkManager::Security8021xSetting::needSecrets(bool requestNew) c
-             !privateKeyPasswordFlags().testFlag(NotRequired)) {
-         secrets << QLatin1String(NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD);
-     } else if ((eapMethods().contains(EapMethodTtls) || eapMethods().contains(EapMethodPeap) ||
--                eapMethods().contains(EapMethodLeap) || eapMethods().contains(EapMethodFast)) &&
-+                eapMethods().contains(EapMethodLeap) || eapMethods().contains(EapMethodFast) ||
-+                eapMethods().contains(EapMethodPwd)) &&
-                (password().isEmpty() || requestNew) && !passwordFlags().testFlag(NotRequired)) {
-         secrets << QLatin1String(NM_SETTING_802_1X_PASSWORD);
-         secrets << QLatin1String(NM_SETTING_802_1X_PASSWORD_RAW);
-@@ -655,6 +656,8 @@ void NetworkManager::Security8021xSetting::fromMap(const QVariantMap &setting)
-                 eapMethods << EapMethodSim;
-             } else if (method == "fast") {
-                 eapMethods << EapMethodFast;
-+            } else if (method == "pwd") {
-+                eapMethods << EapMethodPwd;
-             }
-         }
- 
-@@ -862,6 +865,8 @@ QVariantMap NetworkManager::Security8021xSetting::toMap() const
-                 methods << "sim";
-             } else if (method == EapMethodFast) {
-                 methods << "fast";
-+            } else if (method == EapMethodPwd) {
-+                methods << "pwd";
-             }
-         }
- 
-diff --git a/src/settings/security8021xsetting.h b/src/settings/security8021xsetting.h
-index 8b1f5a3..5289771 100644
---- a/src/settings/security8021xsetting.h
-+++ b/src/settings/security8021xsetting.h
-@@ -37,7 +37,7 @@ class NETWORKMANAGERQT_EXPORT Security8021xSetting : public Setting
- public:
-     typedef QSharedPointer<Security8021xSetting> Ptr;
-     typedef QList<Ptr> List;
--    enum EapMethod {EapMethodUnknown = 0, EapMethodLeap, EapMethodMd5, EapMethodTls, EapMethodPeap, EapMethodTtls, EapMethodSim, EapMethodFast};
-+    enum EapMethod {EapMethodUnknown = 0, EapMethodLeap, EapMethodMd5, EapMethodTls, EapMethodPeap, EapMethodTtls, EapMethodSim, EapMethodFast, EapMethodPwd};
-     enum PeapVersion {PeapVersionUnknown = -1, PeapVersionZero, PeapVersionOne};
-     enum PeapLabel {PeapLabelUnknown = 0, PeapLabelForce};
-     enum FastProvisioning {FastProvisioningUnknown = -1, FastProvisioningDisabled, FastProvisioningAllowUnauthenticated, FastProvisioningAllowAuthenticated, FastProvisioningAllowBoth};
--- 
-cgit v0.11.2
-