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

Fix updating resolv.conf (rh #672282)

Browse Source
This commit is contained in:
Jiří Klimeš 2011-02-23 10:21:21 +01:00
parent 82da7ab587
commit 8d0ac9988c
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
NetworkManager.spec
View File

@ -20,7 +20,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.8.2
Release: 8%{snapshot}%{?dist}
Release: 9%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@ -34,6 +34,7 @@ Patch3: nm-applet-no-notifications.patch
Patch4: modem-ip-interface-property-change.patch
Patch5: no-unused-but-set-warning.patch
Patch6: fix-uninitialized.patch
Patch7: fix-resolv-conf-updating.patch
Patch10: Port-to-libnotify-070.patch
Patch11: gtk3-1.patch
Patch12: gtk3-2.patch
@ -175,6 +176,7 @@ tar -xjf %{SOURCE1}
%patch4 -p1 -b .modem-ip-iface
%patch5 -p1 -b .no-unused-but-set
%patch6 -p1 -b .uninitialized
%patch7 -p1 -b .resolv-conf-updating
pushd network-manager-applet-%{realversion}
%patch10 -p1 -b .libnotify-070
%patch11 -p1 -b .gtk3-1
@ -444,6 +446,9 @@ fi
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
* Wed Feb 23 2011 Jiří Klimeš <jklimes@redhat.com> - 0.8.2-9.git20101117
- Fix updating resolv.conf (rh #672282)
* Fri Feb 11 2011 Matthias Clasen <mclasen@redhat.com> - 0.8.2-8.git20101117
- Rebuild against newer gtk

57
fix-resolv-conf-updating.patch Normal file
View File

@ -0,0 +1,57 @@
From 0d157c412776877a3cc76b845910036d29ca2f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
Date: Tue, 22 Feb 2011 18:28:12 +0100
Subject: [PATCH] dns: fix up updating resolv.conf (rh #672282)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Jiří Klimeš <jklimes@redhat.com>
---
src/dns-manager/nm-dns-manager.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index b0cdcc2..32800d0 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Copyright (C) 2004 - 2005 Colin Walters <walters@redhat.com>
- * Copyright (C) 2004 - 2010 Red Hat, Inc.
+ * Copyright (C) 2004 - 2011 Red Hat, Inc.
* Copyright (C) 2005 - 2008 Novell, Inc.
* and others
*/
@@ -861,7 +861,7 @@ nm_dns_manager_remove_ip4_config (NMDnsManager *mgr,
g_object_unref (config);
- if (config_changed (mgr))
+ if (!config_changed (mgr))
return TRUE;
if (!update_dns (mgr, iface, FALSE, &error)) {
@@ -906,7 +906,7 @@ nm_dns_manager_add_ip6_config (NMDnsManager *mgr,
if (!g_slist_find (priv->configs, config))
priv->configs = g_slist_append (priv->configs, g_object_ref (config));
- if (config_changed (mgr))
+ if (!config_changed (mgr))
return TRUE;
if (!update_dns (mgr, iface, FALSE, &error)) {
@@ -946,7 +946,7 @@ nm_dns_manager_remove_ip6_config (NMDnsManager *mgr,
g_object_unref (config);
- if (config_changed (mgr))
+ if (!config_changed (mgr))
return TRUE;
if (!update_dns (mgr, iface, FALSE, &error)) {
--
1.7.4