From f561df45ac8a825e67ea29bf91894b1204d66ddd Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Thu, 17 Mar 2016 15:56:07 -0500
Subject: [PATCH] Fix activating connections in some cases (rh #1316488)

---
 ...ix-handling-of-available-connections.patch | 44 +++++++++++++++++++
 NetworkManager.spec                           |  8 +++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 0001-device-fix-handling-of-available-connections.patch

diff --git a/0001-device-fix-handling-of-available-connections.patch b/0001-device-fix-handling-of-available-connections.patch
new file mode 100644
index 0000000..7e0884e
--- /dev/null
+++ b/0001-device-fix-handling-of-available-connections.patch
@@ -0,0 +1,44 @@
+From ca5da5d80f3a21847bb807021e2e40d25bca50d0 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Fri, 11 Mar 2016 15:36:35 +0100
+Subject: [PATCH] device: fix handling of available connections
+
+The prune list is for elements that must be deleted from the list of
+available connections. So, when processing all the existing
+connections an element must be deleted from the prune list iff it's
+available.
+
+Fixes: 8b2abe0e2c8f162544a2562fc18a7becbc55d233
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1316488
+---
+ src/devices/nm-device.c | 11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
+index 51a84bf..f4e2ce1 100644
+--- a/src/devices/nm-device.c
++++ b/src/devices/nm-device.c
+@@ -9664,14 +9664,13 @@ nm_device_recheck_available_connections (NMDevice *self)
+ 			connection = NM_CONNECTION (iter->data);
+ 
+ 			if (nm_device_check_connection_available (self,
+-				                                  connection,
+-				                                  NM_DEVICE_CHECK_CON_AVAILABLE_NONE,
+-				                                  NULL)) {
++			                                          connection,
++			                                          NM_DEVICE_CHECK_CON_AVAILABLE_NONE,
++			                                          NULL)) {
+ 				if (available_connections_add (self, connection))
+ 					changed = TRUE;
+-			} else {
+-				if (prune_list && g_hash_table_remove (prune_list, connection))
+-					changed = TRUE;
++				if (prune_list)
++					g_hash_table_remove (prune_list, connection);
+ 			}
+ 		}
+ 
+-- 
+2.5.0
+
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 3d8a645..2824f62 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -7,7 +7,7 @@
 
 %global ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad)
 
-%global snapshot .beta2
+%global snapshot .beta2.1
 %global git_sha %{nil}
 %global rpm_version 1.2.0
 %global real_version 1.1.91
@@ -162,6 +162,8 @@ BuildRequires: dbus-python
 BuildRequires: libselinux-devel
 BuildRequires: polkit-devel
 
+Patch0: 0001-device-fix-handling-of-available-connections.patch
+
 
 %description
 NetworkManager is a system service that manages network interfaces and
@@ -333,6 +335,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 %setup -q -n NetworkManager-%{real_version}
 
 #%patch1 -p1
+%patch0 -p1 -b .available-connections
 
 %build
 
@@ -630,6 +633,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar 17 2016 Dan Williams <dcbw@redhat.com> - 1:1.2.0-0.6.beta2.1
+- Fix activating connections in some cases (rh #1316488)
+
 * Tue Mar  1 2016 Lubomir Rintel <lkundrak@v3.sk> - 1:1.2.0-0.6.beta2
 - Update to NetworkManager 1.2-beta2
 - Resync with contrib/rpm