gentoo resync : 17.12.2017

4 files changed, 96 insertions, 0 deletions

diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index ebacff4c5540..3c0f7e1f8acb 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/networkmanager-qt/Manifest b/kde-frameworks/networkmanager-qt/Manifest
index dda07f67cc24..bc781a81f901 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,5 +1,7 @@
+AUX networkmanager-qt-add_EAP-PWD.patch 3077 BLAKE2B 5725f8f6b4a2580e50c236b366513e4adf99f46725742ba4716e73f0218457bc29651f2a7ad6c601a881b0582e90fbd754c766c66afb763f404f1e677d9e23f3 SHA512 fe483c7b53a98965e37e1e424dff2582b386aaaa420e95dddfef9619cf7297127714d079b5f4035936c22d7a0b3a0445fd1aada9706b7351e70760a0631c1303
 DIST networkmanager-qt-5.40.0.tar.xz 163456 BLAKE2B c8d0e85f06219ba5d89817c86cd97c493146b5a184f363b5367c93d138d52cb2c4901536afd9950a0c9cb54b1cd4ee9356f614d4573ddc6158da5cff873f99c7 SHA512 6c04dd10c85573fa33d1651aa17afd1f987cade3ec299b1f73c3f6052aaf65aa393aca97e0a22f6434e325e99a9c72c7c6398946c1573be3df57c08905460bac
 DIST networkmanager-qt-5.41.0.tar.xz 163516 BLAKE2B b07c191e25a70150ed436670bbcb964b1bc59c47deccfe0602e660e58bda3672a94901c82a8339252b10e0231ad0f9f0ff2b4910ff75f2a1148b651d86a7edd6 SHA512 7dcee7ca4025c9104ab9e1c583fcf0f1adc44c714817e730f35b0acca1ccb7ac059c9ce1bf499763e816f5231ef755c92ee5dc60792d1590139082c2aa856382
 EBUILD networkmanager-qt-5.40.0.ebuild 687 BLAKE2B 0a973209ba3928b911a35b1dd17336bf6650bccebd35c6da1d60704625703d6c7507aeb3bbae486601d51293f7b82a0f94cdfa981fa44fb2946d605f04d1f318 SHA512 dfbb706b1ca4dd91ac1fcdc7b6c59775de2e1b85eb3453f5c433106e29729a149c345e36333d5245d860b6078e308b4e234027953837d0b40e73282994673226
+EBUILD networkmanager-qt-5.41.0-r1.ebuild 740 BLAKE2B a2cf62a2bceac1fb2c669cac133409a868a6b121b264d75865e0345d34d4d4ee930cd63b0fccdce6464bff8bf868087e69772fd67b3067df513c5d3ebca84a25 SHA512 cfb9d895d77e88aa8f17f97911e60eab1478fde97b714aacb07a3d5bf6357e8561f335e5485154220ac5f9438da62085a5ab6d5db6fc7191d388f0f666d64ecb
 EBUILD networkmanager-qt-5.41.0.ebuild 689 BLAKE2B a15f2dcbeb52ae4c12ed9b27a4db341fc332969b4be3f3cc6183bf56e77d4eb6d97cedadc418e96d44b4e31eaefd9f8303fdb933f4341161c7f60c02258c8fda SHA512 f40a92f9a0ea91278a18fbbecbe6e62b177f932df333dd5b9c20202d3671ea0b7d0ffca5ede98f9d39a97d514676917686fd15da490f65224d338e46b67b517a
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
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
new file mode 100644
index 000000000000..adba0ed461cc
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/files/networkmanager-qt-add_EAP-PWD.patch
@@ -0,0 +1,58 @@
+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
+
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild
new file mode 100644
index 000000000000..5d77844fc2ec
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde5
+
+DESCRIPTION="NetworkManager bindings for Qt"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="teamd"
+
+PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
+
+COMMON_DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtnetwork)
+	|| (
+		>=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=]
+		>=net-misc/networkmanager-1.4.0-r1[elogind,teamd=]
+		>=net-misc/networkmanager-1.4.0-r1[systemd,teamd=]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-libs/libnm-qt:5
+"
+
+src_test() {
+	# bug: 625276
+	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
+
+	kde5_src_test
+}