diff --git a/.gitignore b/.gitignore index b9dd6e2..3b5e9f7 100644 --- a/.gitignore +++ b/.gitignore @@ -309,3 +309,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-0.9.9.98.git20140620.63b0a2f5.tar.bz2 /NetworkManager-0.9.10.0.git20140704.6eb82acd.tar.bz2 /NetworkManager-1.0.0.tar.xz +/NetworkManager-1.0.1.git20150305.2a72527c.tar.bz2 diff --git a/NetworkManager-1.0.0-bridge_resume.patch b/NetworkManager-1.0.0-bridge_resume.patch deleted file mode 100644 index 987cde6..0000000 --- a/NetworkManager-1.0.0-bridge_resume.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a687d1f9e0f75b987f40335934b54aa748f6724b Mon Sep 17 00:00:00 2001 -From: Dan Williams -Date: Fri, 9 Jan 2015 15:47:54 -0600 -Subject: core: ensure manager state is updated on resume with connectivity - checking enabled (rh #1162636) (bgo #742675) - -On resume configured interfaces are unmanaged to clear their pre-resume -state and then re-managed. Eventually the interface should end up moving -to the DISCONNECTED state, which should trigger an auto-activate check in -the Policy. If connectivity checking was enabled, that auto-activate check -would fail because the Manager's state was still NM_STATE_ASLEEP. - -This caused bridge slaves not to auto-activate on resume, which left bridges -without connectivity. - -The manager never left NM_STATE_ASLEEP when connectivity checking was -enabled due to nm_manager_update_state() returning early when kicking -off a connectivity check. Instead, the manager's state should always -be updated to accurately reflect the current state. - -https://bugzilla.redhat.com/show_bug.cgi?id=1162636 -https://bugzilla.gnome.org/show_bug.cgi?id=742675 - -diff --git a/src/nm-manager.c b/src/nm-manager.c -index f3c5081..3d7b80d 100644 ---- a/src/nm-manager.c -+++ b/src/nm-manager.c -@@ -645,10 +645,9 @@ nm_manager_update_state (NMManager *manager) - nm_connectivity_check_async (priv->connectivity, - checked_connectivity, - g_object_ref (manager)); -- return; -- } -+ } else -+ nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL); - -- nm_connectivity_set_online (priv->connectivity, new_state >= NM_STATE_CONNECTED_LOCAL); - set_state (manager, new_state); - } - --- -cgit v0.10.2 - diff --git a/NetworkManager.spec b/NetworkManager.spec index 43c13bf..b7ca71d 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,10 +7,10 @@ %define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad) -%define snapshot %{nil} -%define git_sha %{nil} -%define realversion 1.0.0 -%define release_version 4 +%define snapshot .git20150305 +%define git_sha 2a72527c +%define realversion 1.0.1 +%define release_version 1 %define epoch_version 1 %define obsoletes_nmver 1:0.9.9.95-1 @@ -71,18 +71,13 @@ Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ -Source: %{name}-%{realversion}%{snapshot}%{git_sha_version}.tar.xz +Source: %{name}-%{realversion}%{snapshot}%{git_sha_version}.tar.bz2 Source1: NetworkManager.conf Source2: 00-server.conf Source3: 20-connectivity-fedora.conf # Not upstream. Patch0: 0000-explain-dns1-dns2.patch -Patch1: 0001-rh1116999-resolv-conf-symlink.patch - -# http://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=a687d1f9e0f75b987f40335934b54aa748f6724b -# https://bugzilla.redhat.com/show_bug.cgi?id=1162636 -Patch2: NetworkManager-1.0.0-bridge_resume.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -366,8 +361,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %setup -q -n NetworkManager-%{realversion} %patch0 -p1 -b .0000-explain-dns1-dns2.orig -%patch1 -p1 -b .0001-rh1116999-resolv-conf-symlink.orig -%patch2 -p1 -b .bridge_resume %build @@ -660,6 +653,18 @@ fi %endif %changelog +* Thu Mar 5 2015 Dan Williams - 1:1.0.1-1.git20150305 +- Update to 1.0.2 development snapshot + +* Thu Mar 5 2015 Dan Williams - 1:1.0.0-7 +- dns: revert resolv.conf symlink stuff (should only be in F23+, not F22) + +* Thu Mar 5 2015 Dan Williams - 1:1.0.0-6 +- connectivity: fix checking when no valid DNS servers are present (rh #1199098) + +* Wed Mar 4 2015 Dan Williams - 1:1.0.0-5 +- core: flush IPv6LL address when deconfiguring managed devices (rh #1193127) (rh #1184997) + * Thu Jan 29 2015 Adam Williamson - 1:1.0.0-4 - core: resume bridged connections properly (rh #1162636, backport from master) diff --git a/sources b/sources index 3c4e59c..9e90f93 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71cae8707a90fa92e28cafbc9262b548 NetworkManager-1.0.0.tar.xz +4993694facaf7b9af7cd5b58dc30e8eb NetworkManager-1.0.1.git20150305.2a72527c.tar.bz2