Merge branch 'f22'

.gitignore

@@ -9,3 +9,4 @@ NetworkManager-openvpn-0.8.1.tar.bz2
 /NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2
 /NetworkManager-openvpn-0.9.9.0-da5fb9b.tar.bz2
 /NetworkManager-openvpn-1.0.0.tar.xz
+/NetworkManager-openvpn-1.0.2.tar.xz

0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch

@@ -1,42 +0,0 @@
-From 81149fd01897166cee5649d2da3801f2a5a45b5c Mon Sep 17 00:00:00 2001
-From: Dan Williams <dcbw@redhat.com>
-Date: Wed, 8 Apr 2015 09:37:56 -0500
-Subject: [PATCH] core: use a default renegotiation interval of zero (rh
- #969433)
-
-Since the client and server do not negotiate options, each side gets
-to specify its own --reneg-sec to control when each side renegotiates.
-OpenVPN defaults to 3600, so if the client and server don't agree this
-causes too-frequent renegotiations.
-
-This is worse with two-factor authentication, becuase it can mean that
-the client requests a password/PIN from the user much more often then
-the server actually wants.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=969433
----
- src/nm-openvpn-service.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
-index 8282573..93ced6c 100644
---- a/src/nm-openvpn-service.c
-+++ b/src/nm-openvpn-service.c
-@@ -1115,6 +1115,14 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
- 			free_openvpn_args (args);
- 			return FALSE;
- 		}
-+	} else {
-+		/* Either the server and client must agree on the renegotiation
-+		 * interval, or it should be disabled on one side to prevent
-+		 * too-frequent renegotiations, which make two-factor auth quite
-+		 * painful.
-+		 */
-+		add_openvpn_arg (args, "--reneg-sec");
-+		add_openvpn_arg (args, "0");
- 	}
- 
- 	if (debug) {
--- 
-2.1.0
-

NetworkManager-openvpn.spec

@@ -4,8 +4,8 @@
 Summary:   NetworkManager VPN plugin for OpenVPN
 Name:      NetworkManager-openvpn
 Epoch:     1
-Version:   1.0.0
-Release:   3%{?snapshot}%{?dist}
+Version:   1.0.2
+Release:   1%{?snapshot}%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
@@ -16,9 +16,6 @@ Group:     System Environment/Base
 # mv NetworkManager-openvpn-0.9.9.0.tar.bz2 NetworkManager-openvpn-0.9.9.0-5afb8eb.tar.bz2
 Source0:   http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.0/%{name}-%{version}%{?commit:-%{commit}}.tar.xz
 
-Patch0:    0001-core-use-a-default-renegotiation-interval-of-zero-rh.patch
-Patch1:    nm-max-allowed.patch
-
 BuildRequires: gtk3-devel
 BuildRequires: dbus-devel
 BuildRequires: NetworkManager-devel
@@ -61,14 +58,11 @@ the OpenVPN server with NetworkManager (GNOME files).
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
 
 %build
 if [ ! -f configure ]; then
   ./autogen.sh
 fi
-autoreconf -i
 %configure \
         --disable-static \
         --disable-dependency-tracking \
@@ -101,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.ui
 
 %changelog
+* Tue May 5 2015 Lubomir Rintel <lkundrak@v3.sk> - 1:1.0.2-1
+- Update to 1.0.2 release
+
 * Wed Apr  8 2015 Dan Williams <dcbw@redhat.com> - 1:1.0.0-3
 - Default client renegotiation interval to zero (rh #969433)
 

nm-max-allowed.patch

@@ -1,12 +0,0 @@
-diff -up NetworkManager-openvpn-1.0.0/configure.ac.foo NetworkManager-openvpn-1.0.0/configure.ac
---- NetworkManager-openvpn-1.0.0/configure.ac.foo	2015-04-08 10:18:31.993032447 -0500
-+++ NetworkManager-openvpn-1.0.0/configure.ac	2015-04-08 10:18:49.078818846 -0500
-@@ -71,7 +71,7 @@ PKG_CHECK_MODULES(NM,
- 	libnm-util >= 0.9.10
- 	libnm-glib >= 0.9.10
- 	libnm-glib-vpn >= 0.9.10)
--NM_CFLAGS="$NM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_0_9_10"
-+NM_CFLAGS="$NM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_0_99"
- AC_SUBST(NM_CFLAGS)
- AC_SUBST(NM_LIBS)
- 

sources

@@ -1 +1 @@
-1ed64b76a363dd1c7999eafcecef0e14  NetworkManager-openvpn-1.0.0.tar.xz
+511eae0d4ac17c6d2659a3da2646296f  NetworkManager-openvpn-1.0.2.tar.xz