[NetworkManager-openconnect] Add gnome-keyring support

[David Woodhouse]

commit 7ef759a9aea58d0c9f5ddadfc19b41e811fab3a2
Author: David Woodhouse <David.Woodhouse at intel.com>
Date:   Sun Jun 17 00:03:24 2012 +0100

    Add gnome-keyring support

 .gitignore                                         |    1 +
 0001-Check-for-success-when-dropping-privs.patch   |   36 --
 ...ultiple-domains-back-to-NM-if-given-by-vp.patch |   55 ---
 ...istent-tundev-on-demand-for-each-connecti.patch |  273 ------------
 0003-Wait-for-QUIT-command-before-exiting.patch    |   61 ---
 ...roper-cancellation-now-that-libopenconnec.patch |   93 ----
 ...r-warnings-about-ignoring-return-value-fr.patch |   44 --
 0006-Fix-error-check-for-write-failing.patch       |   27 --
 ...-cancel-after-failure-causes-the-next-att.patch |   58 ---
 0008-service-fix-up-indentation.patch              |  147 -------
 ...VPNGATEWAY-is-an-IPv6-address-send-it-as-.patch |   62 ---
 ...ss-IPv6-related-information-to-NM-as-well.patch |  442 --------------------
 0011-Update-to-SSL-library-agnostic-API.patch      |  131 ------
 0012-Use-GChecksum-for-sha1-not-OpenSSL.patch      |   48 ---
 0013-Make-OpenSSL-UI-support-optional.patch        |  164 --------
 0014-Support-new-libopenconnect.patch              |  116 -----
 0015-Mark-two-strings-for-translation.patch        |   28 --
 0016-Updated-Norwegian-bokm-l-translation.patch    |  204 ---------
 0017-Updated-Norwegian-bokm-l-translation.patch    |   82 ----
 0018-Updated-Spanish-translation.patch             |  192 ---------
 0019-Updated-Polish-translation.patch              |  187 ---------
 ...ultiple-domains-back-to-NM-if-given-by-vp.patch |   57 ---
 NetworkManager-openconnect.spec                    |   51 +--
 sources                                            |    2 +-
 24 files changed, 9 insertions(+), 2552 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3aeaae0..a0339f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ NetworkManager-openconnect-0.8.1.tar.bz2
 /NetworkManager-openconnect-0.9.3.995.git20120302.tar.bz2
 /NetworkManager-openconnect-0.9.3.997.tar.bz2
 /NetworkManager-openconnect-0.9.4.0.tar.xz
+/NetworkManager-openconnect-0.9.4.0.git20120612.tar.xz
diff --git a/NetworkManager-openconnect.spec b/NetworkManager-openconnect.spec
index f7cb861..b566aad 100644
--- a/NetworkManager-openconnect.spec
+++ b/NetworkManager-openconnect.spec
@@ -3,40 +3,19 @@
 %define gtk3_version        3.0.0
 %define openconnect_version 3.99
 
-%define snapshot %{nil}
+%define snapshot .git20120612
 %define realversion 0.9.4.0
 
 Summary:   NetworkManager VPN integration for openconnect
 Name:      NetworkManager-openconnect
 Version:   0.9.4.0
-Release:   5%{snapshot}%{?dist}
+Release:   6%{snapshot}%{?dist}
 License:   GPLv2+, LGPLv2.1
 Group:     System Environment/Base
 URL:       http://www.gnome.org/projects/NetworkManager/
 Source:    ftp://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/%{name}-%{realversion}%{snapshot}.tar.xz
-Patch1: 0001-Check-for-success-when-dropping-privs.patch
-Patch2: 0002-Create-persistent-tundev-on-demand-for-each-connecti.patch
-Patch3: 0003-Wait-for-QUIT-command-before-exiting.patch
-Patch4: 0004-Implement-proper-cancellation-now-that-libopenconnec.patch
-Patch5: 0005-Fix-compiler-warnings-about-ignoring-return-value-fr.patch
-Patch6: 0006-Fix-error-check-for-write-failing.patch
-Patch7: 0007-Fix-Hitting-cancel-after-failure-causes-the-next-att.patch
-Patch8: 0008-service-fix-up-indentation.patch
-Patch9: 0009-service-If-VPNGATEWAY-is-an-IPv6-address-send-it-as-.patch
-# Enable this when NM is updated to match.
-#Patch10: 0010-service-pass-IPv6-related-information-to-NM-as-well.patch
-Patch11: 0011-Update-to-SSL-library-agnostic-API.patch
-Patch12: 0012-Use-GChecksum-for-sha1-not-OpenSSL.patch
-Patch13: 0013-Make-OpenSSL-UI-support-optional.patch
-Patch14: 0014-Support-new-libopenconnect.patch
-Patch15: 0015-Mark-two-strings-for-translation.patch
-Patch16: 0016-Updated-Norwegian-bokm-l-translation.patch
-Patch17: 0017-Updated-Norwegian-bokm-l-translation.patch
-Patch18: 0018-Updated-Spanish-translation.patch
-Patch19: 0019-Updated-Polish-translation.patch
-# Cope with the absence of patch #10. In fact, just use the original from n-m-vpnc
-#Patch20: 0020-core-pass-multiple-domains-back-to-NM-if-given-by-vp.patch
-Patch20: 0001-core-pass-multiple-domains-back-to-NM-if-given-by-vp.patch
+# Revert the bit which only builds against NetworkManager HEAD:
+Patch1: build-against-nm-0.9.4.patch
 
 BuildRequires: gtk3-devel             >= %{gtk3_version}
 BuildRequires: dbus-devel             >= %{dbus_version}
@@ -68,25 +47,6 @@ with NetworkManager and the GNOME desktop
 %prep
 %setup -q -n NetworkManager-openconnect-%{realversion}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-#%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
 
 %build
 autoreconf
@@ -137,6 +97,9 @@ fi
 %{_datadir}/gnome-vpn-properties/openconnect/nm-openconnect-dialog.ui
 
 %changelog
+* Sat Jun 16 2012 David Woodhouse <David.Woodhouse at intel.com> - 0.9.4-6
+- Add gnome-keyring support for saving passwords (bgo #638861)
+
 * Wed Jun 13 2012 David Woodhouse <David.Woodhouse at intel.com> - 0.9.4-5
 - Update to work with new libopenconnect
 
diff --git a/sources b/sources
index 1792956..b3db0fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b06b92f2b54f7a70f534fd614ba67cf8  NetworkManager-openconnect-0.9.4.0.tar.xz
+8041a269a51f1cad661017c5afcc5d7a  NetworkManager-openconnect-0.9.4.0.git20120612.tar.xz