jgrulich pushed to libnm-qt (f20). "Update to 0.9.8.4"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed Apr 8 07:31:47 UTC 2015
>From 79a33b42c0cb99d10b9646a5606cb9be76117e99 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich at redhat.com>
Date: Wed, 8 Apr 2015 09:30:39 +0200
Subject: Update to 0.9.8.4
diff --git a/.gitignore b/.gitignore
index ecbcd27..2fee083 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
/libnm-qt-0.9.9.1-gitb7f3d65.tar.xz
/libnm-qt-0.9.8.2.tar.xz
/libnm-qt-0.9.8.3.tar.xz
+/networkmanager-qt-0.9.8.4.tar.xz
diff --git a/0001-Do-not-remove-existing-secrets-when-loading-secrets.patch b/0001-Do-not-remove-existing-secrets-when-loading-secrets.patch
deleted file mode 100644
index 37b4896..0000000
--- a/0001-Do-not-remove-existing-secrets-when-loading-secrets.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1dc6e2fe7aef164ea2bd3db4d5436df2c333eead Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich at redhat.com>
-Date: Mon, 12 Jan 2015 11:16:43 +0100
-Subject: [PATCH] Do not remove existing secrets when loading secrets from
- string map
-
-E.g. when loading secrets for openconnect from plasma-nm secret agent
-we want to keep secrets we already have from NetworkManager and do not
-overwrite them with those secrets which are stored in KWallet
----
- settings/vpnsetting.cpp | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/settings/vpnsetting.cpp b/settings/vpnsetting.cpp
-index 9fa3f70..c7e1a19 100644
---- a/settings/vpnsetting.cpp
-+++ b/settings/vpnsetting.cpp
-@@ -174,15 +174,19 @@ QVariantMap NetworkManager::VpnSetting::toMap() const
-
- void NetworkManager::VpnSetting::secretsFromStringMap(const NMStringMap &map)
- {
-+ Q_D(VpnSetting);
-+
- if (map.contains(QLatin1String("VpnSecrets"))) {
- const QStringList list = map.value(QLatin1String("VpnSecrets")).split("%SEP%");
- NMStringMap map;
- if (list.count() % 2 == 0) {
- for (int i = 0; i < list.count(); i += 2) {
-- map.insert(list[i], list[i + 1]);
-+ if (d->secrets.contains(list[i])) {
-+ d->secrets.remove(list[i]);
-+ }
-+ d->secrets.insert(list[i], list[i + 1]);
- }
- }
-- setSecrets(map);
- }
- }
-
---
-2.1.0
-
diff --git a/0001-Do-not-return-an-empty-map-with-secrets.patch b/0001-Do-not-return-an-empty-map-with-secrets.patch
deleted file mode 100644
index b8c9110..0000000
--- a/0001-Do-not-return-an-empty-map-with-secrets.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 5c908dfb4b075d001cd1f2b43494e19ed18f1ba1 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich at redhat.com>
-Date: Thu, 8 Jan 2015 13:44:19 +0100
-Subject: [PATCH] Do not return an empty map with secrets
-
-This is causing some issues in secret agent from plasma-nm, because it
-always tries to store VPN secrets to KWallet even when the map is empty
-and when it loads this empty map later it overwrites the secrets we get
-from NetworkManager in GetSecrets method and thus when plasma-nm displays
-the auth dialog it doesn't have necessary secrets available.
-
-BUG:339296
-CCBUG:309931
-CCBUG:334474
----
- settings/vpnsetting.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/settings/vpnsetting.cpp b/settings/vpnsetting.cpp
-index ae7f385..9fa3f70 100644
---- a/settings/vpnsetting.cpp
-+++ b/settings/vpnsetting.cpp
-@@ -122,7 +122,9 @@ void NetworkManager::VpnSetting::secretsFromMap(const QVariantMap &secrets)
- QVariantMap NetworkManager::VpnSetting::secretsToMap() const
- {
- QVariantMap secretsMap;
-- secretsMap.insert(QLatin1String(NM_SETTING_VPN_SECRETS), QVariant::fromValue<NMStringMap>(secrets()));
-+ if (!secrets().isEmpty()) {
-+ secretsMap.insert(QLatin1String(NM_SETTING_VPN_SECRETS), QVariant::fromValue<NMStringMap>(secrets()));
-+ }
-
- qDebug() << secretsMap;
- return secretsMap;
---
-2.1.0
-
diff --git a/libnm-qt.spec b/libnm-qt.spec
index 09a770b..d785590 100644
--- a/libnm-qt.spec
+++ b/libnm-qt.spec
@@ -1,20 +1,18 @@
-%global git_commit 5cff3c5
+# %global git_commit 5cff3c5
Name: libnm-qt
-Version: 0.9.8.3
-Release: 3%{?dist}
+Version: 0.9.8.4
+Release: 1%{?dist}
Epoch: 2
Summary: Qt-only wrapper for NetworkManager DBus API
Group: System Environment/Libraries
License: LGPLv2+
URL: https://projects.kde.org/projects/extragear/libs/libnm-qt
-Source0: http://download.kde.org/unstable/networkmanager-qt/%{version}/src/%{name}-%{version}.tar.xz
+Source0: http://download.kde.org/unstable/networkmanager-qt/%{version}/src/networkmanager-qt-%{version}.tar.xz
# # Package from git snapshots using releaseme scripts
# Source0: %{name}-%{version}.tar.xz
# Upstream patches
-Patch0: 0001-Do-not-return-an-empty-map-with-secrets.patch
-Patch1: 0001-Do-not-remove-existing-secrets-when-loading-secrets.patch
BuildRequires: cmake >= 2.6
BuildRequires: pkgconfig(QtCore)
@@ -37,10 +35,7 @@ Qt libraries and header files for developing applications
that use NetworkManager
%prep
-%setup -qn %{name}-%{version}
-
-%patch0 -p1 -b .Do-not-return-an-empty-map-with-secrets
-%patch1 -p1 -b .Do-not-remove-existing-secrets-when-loading-secrets
+%setup -qn networkmanager-qt-%{version}
%build
mkdir -p %{_target_platform}
@@ -70,6 +65,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%{_includedir}/NetworkManagerQt/
%changelog
+* Wed Apr 08 2015 Jan Grulich <jgrulich at redhat.com> - 2:0.9.8.4-1
+- Update to 0.9.8.4
+
* Tue Jan 13 2015 Jan Grulich <jgrulich at redhat.com> - 2:0.9.8.3-4
- Do not remove existing secrets when loading secrets from string map
diff --git a/sources b/sources
index af76958..75a43f8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a463e9c59982255f6122a3e047a84fce libnm-qt-0.9.8.3.tar.xz
+d9fbdeef3e4ebe871a9d29d12d09f2f7 networkmanager-qt-0.9.8.4.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libnm-qt.git/commit/?h=f20&id=79a33b42c0cb99d10b9646a5606cb9be76117e99
More information about the scm-commits
mailing list