rpms/NetworkManager
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Apply patch from master so connections finish connecting properly (bgo #685581)

Browse Source
This commit is contained in:
Dan Winship 2012-10-06 15:51:27 -04:00
parent 4b595f89d5
commit 0b8cc37839
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NetworkManager.spec
View File

@ -19,7 +19,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.9.7.0 Version: 0.9.7.0
Release: 3%{snapshot}%{?dist} Release: 4%{snapshot}%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
@ -28,6 +28,7 @@ Source: %{name}-%{realversion}%{snapshot}.tar.bz2
Source1: NetworkManager.conf Source1: NetworkManager.conf
Patch1: explain-dns1-dns2.patch Patch1: explain-dns1-dns2.patch
Patch2: nss-error.patch Patch2: nss-error.patch
Patch3: finish-connecting.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires(post): chkconfig Requires(post): chkconfig
@ -151,6 +152,7 @@ NetworkManager functionality from applications that use glib.
%patch1 -p1 -b .explain-dns1-dns2 %patch1 -p1 -b .explain-dns1-dns2
%patch2 -p1 -b .nss-error %patch2 -p1 -b .nss-error
%patch3 -p1 -b .finish-connecting
%build %build
@ -348,6 +350,9 @@ exit 0
%{_datadir}/gtk-doc/html/libnm-util/* %{_datadir}/gtk-doc/html/libnm-util/*
%changelog %changelog
* Sat Oct 6 2012 Dan Winship <danw@redhat.com> - 0.9.7.0-4.git20121004
- Apply patch from master so connections finish connecting properly (bgo #685581)
* Fri Oct 5 2012 Dan Williams <dcbw@redhat.com> - 0.9.7.0-3.git20121004 * Fri Oct 5 2012 Dan Williams <dcbw@redhat.com> - 0.9.7.0-3.git20121004
- Forward-port some forgotton fixes from F17 - Forward-port some forgotton fixes from F17
- Fix networked-filesystem systemd dependencies (rh #787314) - Fix networked-filesystem systemd dependencies (rh #787314)

36
finish-connecting.patch Normal file
View File

@ -0,0 +1,36 @@
From ba48be3a344b64dfb808cb6f3e545829d9884bee Mon Sep 17 00:00:00 2001
From: Dan Winship <danw@gnome.org>
Date: Fri, 5 Oct 2012 16:41:02 -0400
Subject: [PATCH 1/2] core: fix NMDevice::state-changed emission of ACTIVATED
(bgo #685581)
NMPolicy was calling nm_device_state_changed() from inside its
NMDevice::state-changed handler, which caused the D-Bus signal to get
lost. Use nm_device_queue_state() instead.
---
src/nm-policy.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 92f771d..6722fb6 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -1453,11 +1453,11 @@ device_state_changed (NMDevice *device,
/* Activate secondary (VPN) connections */
if (!activate_secondary_connections (policy, connection, device))
- nm_device_state_changed (device, NM_DEVICE_STATE_FAILED,
- NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED);
+ nm_device_queue_state (device, NM_DEVICE_STATE_FAILED,
+ NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED);
} else
- nm_device_state_changed (device, NM_DEVICE_STATE_ACTIVATED,
- NM_DEVICE_STATE_REASON_NONE);
+ nm_device_queue_state (device, NM_DEVICE_STATE_ACTIVATED,
+ NM_DEVICE_STATE_REASON_NONE);
break;
default:
--
1.7.11.4