[kde-plasma-networkmanagement] 0.9.0.3-1
Rex Dieter
rdieter at fedoraproject.org
Mon Jun 18 16:22:53 UTC 2012
commit c7793a6127a38d42123a68e506fc58758de85bbe
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Mon Jun 18 11:25:58 2012 -0500
0.9.0.3-1
- update to 0.9.0.3
- Password dialog is missing password field (#832893, kde#299868)
.gitignore | 2 +-
...-Eliminate-OpenSSL-dependencies-support-n.patch | 289 --------------------
...-Fix-cancellation-of-in-progress-connecti.patch | 140 ----------
...t-Fix-handling-of-host-list-in-XML-config.patch | 49 ----
...-Connect-to-host-as-soon-as-it-s-selected.patch | 26 --
...-Add-a-comment-about-why-we-re-removing-i.patch | 28 --
...t-Use-Q_UNUSED-instead-of-self-assignment.patch | 69 -----
kde-plasma-networkmanagement.spec | 32 +--
networkmanagement-0.9.0.3-wpa2ent_dialog.patch | 32 +++
sources | 2 +-
10 files changed, 48 insertions(+), 621 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f0604ad..c4f6c74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/networkmanagement-0.9.0.2.tar.bz2
+/networkmanagement-0.9.0.3.tar.bz2
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index a1979bc..30f7e9b 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -1,7 +1,7 @@
Name: kde-plasma-networkmanagement
Epoch: 1
-Version: 0.9.0.2
-Release: 3%{?dist}
+Version: 0.9.0.3
+Release: 1%{?dist}
Summary: NetworkManager KDE 4 integration
Group: Applications/Internet
@@ -12,18 +12,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# yes, 0.9.0 is still under "unstable"
Source0: ftp://ftp.kde.org/pub/kde/unstable/networkmanagement/%{version}/src/networkmanagement-%{version}.tar.bz2
-# https://git.reviewboard.kde.org/r/104979/
-Patch1: 0001-OpenConnect-Fix-cancellation-of-in-progress-connecti.patch
-Patch2: 0002-OpenConnect-Fix-handling-of-host-list-in-XML-config.patch
-Patch3: 0003-OpenConnect-Connect-to-host-as-soon-as-it-s-selected.patch
-Patch4: 0004-OpenConnect-Add-a-comment-about-why-we-re-removing-i.patch
-Patch5: 0005-OpenConnect-Use-Q_UNUSED-instead-of-self-assignment.patch
-# https://git.reviewboard.kde.org/r/105185/
-patch10: 0001-OpenConnect-Eliminate-OpenSSL-dependencies-support-n.patch
-
# Add plasma-nm to default systray if needed, for upgraders...
Source10: 00-fedora-networkmanagement.js
+# https://bugs.kde.org/show_bug.cgi?id=299868
+Patch1: networkmanagement-0.9.0.3-wpa2ent_dialog.patch
+
BuildRequires: gettext
BuildRequires: kdelibs4-devel
BuildRequires: kdebase-workspace-devel
@@ -33,7 +27,7 @@ BuildRequires: mobile-broadband-provider-info-devel
BuildRequires: pkgconfig(NetworkManager) >= 0.9.0
BuildRequires: pkgconfig(libnm-glib) pkgconfig(libnm-util)
%if 0%{?fedora} || 0%{?epel}
-BuildRequires: pkgconfig(openconnect) >= 3.11
+BuildRequires: pkgconfig(openconnect) >= 3.99
%endif
# multilib upgrades
@@ -103,12 +97,9 @@ Requires: NetworkManager-openconnect
%prep
%setup -q -n networkmanagement-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch10 -p1
+
+%patch1 -p1 -b wpa2ent_dialog
+
%build
mkdir -p %{_target_platform}
@@ -235,6 +226,11 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%changelog
+* Mon Jun 18 2012 Rex Dieter <rdieter at fedoraproject.org>
+- 0.9.0.3-1
+- update to 0.9.0.3
+- Password dialog is missing password field (#832893, kde#299868)
+
* Tue Jun 14 2012 David Woodhouse <David.Woodhouse at intel.com> - 0.9.0.2-3
- Merge OpenConnect fixes to build with new libopenconnect
diff --git a/networkmanagement-0.9.0.3-wpa2ent_dialog.patch b/networkmanagement-0.9.0.3-wpa2ent_dialog.patch
new file mode 100644
index 0000000..e925b3e
--- /dev/null
+++ b/networkmanagement-0.9.0.3-wpa2ent_dialog.patch
@@ -0,0 +1,32 @@
+diff --git a/libs/service/secretstorage.cpp b/libs/service/secretstorage.cpp
+index fabb1f9..52c2188 100644
+--- a/libs/service/secretstorage.cpp
++++ b/libs/service/secretstorage.cpp
+@@ -19,6 +19,8 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+ #include "secretstorage.h"
++#include "../internals/settings/802-11-wireless-security.h"
++#include "../internals/settings/802-1x.h"
+
+ #include <KConfigGroup>
+ #include <kwallet.h>
+@@ -153,6 +155,18 @@ void SecretStorage::walletOpenedForRead(bool success)
+ if (i.next().key() != con->uuid())
+ continue;
+
++ Knm::WirelessSecuritySetting * settingSecurity = static_cast<Knm::WirelessSecuritySetting *>(con->setting(Knm::Setting::WirelessSecurity));
++ if (settingSecurity) {
++ Knm::Security8021xSetting * setting8021x = static_cast<Knm::Security8021xSetting *>(con->setting(Knm::Setting::Security8021x));
++
++ if (setting8021x) {
++ if (settingSecurity->securityType() == Knm::WirelessSecuritySetting::EnumSecurityType::DynamicWep ||
++ settingSecurity->securityType() == Knm::WirelessSecuritySetting::EnumSecurityType::WpaEap) {
++ setting8021x->setEnabled(true); // needed for needSecrets() below, otherwise needSecrets() returns an empty list.
++ }
++ }
++ }
++
+ QPair<QString,GetSecretsFlags> pair = i.value();
+ bool settingsFound = false;
+ foreach (Knm::Setting * setting, con->settings()) {
diff --git a/sources b/sources
index fa18a0e..2eeaddb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-be89971692f5b353c1e2bf5d67f3a046 networkmanagement-0.9.0.2.tar.bz2
+951b2aef094bc7ed403af0136b5e29dd networkmanagement-0.9.0.3.tar.bz2
More information about the scm-commits
mailing list