gentoo resync : 17.12.2017

4 files changed, 270 insertions, 0 deletions

diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 3731bb5c459f..8cbe3dabc1e8 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 08b71a07cf6d..fbb104150865 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,7 @@
+AUX plasma-nm-add_EAP-PWD.patch 10213 BLAKE2B e35cf580481f9ddc139fd77d7f3a652440bff749a1c34e26ef579ff1dc9ac741b97d7f6f8ea2165c959febaedd16396e29af3a4adf20bb74b3ec6b73fb77193d SHA512 0db8b7e4c9e7ea51acb6ee7c8f79b1cb1040899b45e02a80f83d268197844e5bcee3b963796e9a70d364677adeff2180d5b4520d529c7603e10d91a9a0f162f7
 DIST plasma-nm-5.10.5.tar.xz 706724 BLAKE2B baf83a37ba88e8b695b9dd46805c8652e5d7aa8e6033515812971da399baedb29761c6fcf1cff69bcdc7f2505e44d33529d9c4f731e0f955369e4c16cdaed3fc SHA512 f2502368e883b4be3dd416be6e294e87cef259ac8c1b7853b63fba291e19ac43c5175c186ee287fb843409251fc1ef97eac87de7929ef48695fc409a0de8e05b
 DIST plasma-nm-5.11.4.tar.xz 695232 BLAKE2B 4656cc59184f0ee119507190e8699c27c732a05889a6d6953627179ece9670a9b161b268b7480d96f228c5d5b23db034d8ab7fed5a9230bd3038043ae396211c SHA512 6ef1ab68434c14137fa1a5919dcccc9abb5086ce6d9f5e0ccbb0903adee450aec41aef90a031f060be61af7eb98fa2bf7d5474079148a51abf2518cd2eaed5a9
 EBUILD plasma-nm-5.10.5.ebuild 1726 BLAKE2B 7f2569f9074ffef65e61772735af2b8bfa96c6785d3598940f17e95b3bd3b702d8017ed9d73b822501a17dece2754926b9c37b08d874283972db91ff28bc16c4 SHA512 097e049b04cbc7902a8eb7ec8eb4948e9f8d509fdbcf7463daefdf5d688404784ab0378a4c5cbb475bf1616f878d38ec2450d9df9991c10fdbd26c23392e0176
+EBUILD plasma-nm-5.11.4-r1.ebuild 1791 BLAKE2B c61659aaa7d32d0b2785bfbe0fd066e6288d2247b940c33b220ed6b71ad3bdd0e656b82e457c0c83bccb2db2f1953b5bc5db617b9aa7aaadbef2c451e8318089 SHA512 47c1487ee3de1bb9a74cb628dd9899acd3dca88f4df050d5b0692f7d109c9720da957ee7e84e3f9fa0f2cf924dd7b98577d342bb0cfd1edc8751cd73f8a841d8
 EBUILD plasma-nm-5.11.4.ebuild 1728 BLAKE2B 12bf22894f3fa4051454b6389f38249de670fbdbcebe3e4a251dd7370e57cd99ef4fca2a10a147c6c993bfaa9a2c27ff25d06c3c64162e094843176b63591a3c SHA512 3cc241647c14078b0009892477529ddf010eefa39c1a8ad56ccfd2530c54a878e4b500aa7d5d442a876fb61e7b361552692cf4fc93350e1718a3867ffcc74195
 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
new file mode 100644
index 000000000000..896a8144d52d
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-add_EAP-PWD.patch
@@ -0,0 +1,201 @@
+From b98333458ca1edd1cafb2a5b83d45f46faf14103 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <jgrulich@redhat.com>
+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 @@
+      </item>
+      <item>
+       <property name="text">
++       <string>PWD</string>
++      </property>
++     </item>
++     <item>
++      <property name="text">
+        <string>FAST</string>
+       </property>
+      </item>
+@@ -298,6 +303,40 @@
+        </item>
+       </layout>
+      </widget>
++     <widget class="QWidget" name="pwdPage">
++      <layout class="QFormLayout" name="formLayout_8">
++       <item row="0" column="0">
++        <widget class="QLabel" name="label_33">
++         <property name="text">
++          <string>Username:</string>
++         </property>
++         <property name="buddy">
++          <cstring>md5UserName</cstring>
++         </property>
++        </widget>
++       </item>
++       <item row="0" column="1">
++        <widget class="KLineEdit" name="pwdUsername"/>
++       </item>
++       <item row="1" column="0">
++        <widget class="QLabel" name="label_34">
++         <property name="text">
++          <string>Password:</string>
++         </property>
++         <property name="buddy">
++          <cstring>md5Password</cstring>
++         </property>
++        </widget>
++       </item>
++       <item row="1" column="1">
++        <widget class="PasswordField" name="pwdPassword">
++         <property name="passwordModeEnabled" stdset="0">
++          <bool>true</bool>
++         </property>
++        </widget>
++       </item>
++      </layout>
++     </widget>
+      <widget class="QWidget" name="fastPage">
+       <layout class="QFormLayout" name="formLayout_4">
+        <item row="0" column="0">
+@@ -696,16 +735,16 @@
+    <header>kcombobox.h</header>
+   </customwidget>
+   <customwidget>
+-   <class>KUrlRequester</class>
+-   <extends>QWidget</extends>
+-   <header>kurlrequester.h</header>
+-  </customwidget>
+-  <customwidget>
+    <class>KLineEdit</class>
+    <extends>QLineEdit</extends>
+    <header>klineedit.h</header>
+   </customwidget>
+   <customwidget>
++   <class>KUrlRequester</class>
++   <extends>QWidget</extends>
++   <header>kurlrequester.h</header>
++  </customwidget>
++  <customwidget>
+    <class>PasswordField</class>
+    <extends>QLineEdit</extends>
+    <header>passwordfield.h</header>
+-- 
+cgit v0.11.2
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.11.4-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.11.4-r1.ebuild
new file mode 100644
index 000000000000..74809f59464c
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.11.4-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 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"
+
+PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
+
+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.41.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
+"
+
+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
+}