[packages/NetworkManager] up to 1.12.2

[atler]

commit d2402bc3a58f995da103a8e8dc4ef5ede658dd2b
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Jul 25 13:39:43 2018 +0200

    up to 1.12.2

 NetworkManager.spec          |  8 +++----
 accept_non_null_device.patch | 54 --------------------------------------------
 2 files changed, 3 insertions(+), 59 deletions(-)
---
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 95e88a9..8e8b67d 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -6,20 +6,19 @@
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager
-Version:	1.12.0
-Release:	2
+Version:	1.12.2
+Release:	1
 Epoch:		2
 License:	GPL v2+
 Group:		Networking/Admin
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.12/%{name}-%{version}.tar.xz
-# Source0-md5:	f728a42310c85b53386b172b15d7fc20
+# Source0-md5:	94d02b80b120f166927e6ef242b29a9b
 Source1:	%{name}.conf
 Source3:	%{name}.tmpfiles
 Source4:	%{name}.init
 Patch0:		ifcfg-path.patch
 Patch1:		%{name}-sh.patch
 Patch2:		systemd-fallback.patch
-Patch3:		accept_non_null_device.patch
 URL:		https://wiki.gnome.org/Projects/NetworkManager
 BuildRequires:	ModemManager-devel >= 1.0.0
 BuildRequires:	audit-libs-devel
@@ -194,7 +193,6 @@ Bashowe uzupełnianie nazw dla polecenia NetworkManagera (nmcli).
 %patch0 -p1
 %patch1 -p1
 %{?with_systemd:%patch2 -p1}
-%patch3 -p1
 
 %build
 %{__gtkdocize}
diff --git a/accept_non_null_device.patch b/accept_non_null_device.patch
deleted file mode 100644
index aa32c36..0000000
--- a/accept_non_null_device.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 9748aef7c7982ad1fe377ab6fc64255fcdb52762 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani at redhat.com>
-Date: Fri, 6 Jul 2018 15:54:16 +0200
-Subject: [PATCH] manager: accept non-null device for VPN activations
-
-Commit 10753c36168a ("manager: merge VPN handling into
-_new_active_connection()") added a check to fail the activation of
-VPNs when a device is passed to ActivateConnection(), since the device
-argument is ignored for VPNs.
-
-This broke activating VPNs from nm-applet as nm-applet sets both the
-specific_object (parent-connection) and device arguments in the
-activation request.
-
-Note that we already check in _new_active_connection() that when a
-device is supplied, it matches the device of the parent
-connection. Therefore, the check can be dropped.
-
-Reported-by: Michael Biebl <biebl at debian.org>
-Fixes: 10753c36168a82cd658df8a7da800960fddd78ed
-
-https://github.com/NetworkManager/NetworkManager/pull/159
-(cherry picked from commit e205664ba8c25939f1678d1b078a67989c180046)
----
- src/nm-manager.c | 16 +---------------
- 1 file changed, 1 insertion(+), 15 deletions(-)
-
-diff --git a/src/nm-manager.c b/src/nm-manager.c
-index 0fea13de69..289dcf8382 100644
---- a/src/nm-manager.c
-+++ b/src/nm-manager.c
-@@ -4611,21 +4611,7 @@ validate_activation_request (NMManager *self,
- 		}
- 	}
- 
--	if (is_vpn && device) {
--		/* VPN's are treated specially. Maybe the should accept a device as well,
--		 * however, later on during activation, we don't handle the device.
--		 *
--		 * Maybe we should, and maybe it makes sense to specify a device
--		 * when activating a VPN. But for now, just error out.  */
--		g_set_error_literal (error,
--		                     NM_MANAGER_ERROR,
--		                     NM_MANAGER_ERROR_UNKNOWN_DEVICE,
--		                     "Cannot specify device when activating VPN");
--		return NULL;
--	}
--
--	nm_assert (   ( is_vpn && !device)
--	           || (!is_vpn && NM_IS_DEVICE (device)));
-+	nm_assert (is_vpn || NM_IS_DEVICE (device));
- 
- 	*out_device = device;
- 	*out_is_vpn = is_vpn;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/NetworkManager.git/commitdiff/d2402bc3a58f995da103a8e8dc4ef5ede658dd2b