[arch-commits] Commit in networkmanager/trunk (4 files)

[Jan Steffens]

    Date: Wednesday, May 6, 2015 @ 21:19:07
  Author: heftig
Revision: 238557

Proper fix for FS#44878

Added:
  networkmanager/trunk/0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
Modified:
  networkmanager/trunk/NetworkManager.conf
  networkmanager/trunk/PKGBUILD
  networkmanager/trunk/networkmanager.install

------------------------------------------------------------+
 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch |   34 +++++++++++
 NetworkManager.conf                                        |    1 
 PKGBUILD                                                   |   12 ++-
 networkmanager.install                                     |    6 -
 4 files changed, 41 insertions(+), 12 deletions(-)

Added: 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
===================================================================
--- 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch	                        (rev 0)
+++ 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch	2015-05-06 19:19:07 UTC (rev 238557)
@@ -0,0 +1,34 @@
+From 35c9e8d5321b6451fb74f8e7231a690c940a6e69 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 6 May 2015 20:49:57 +0200
+Subject: [PATCH] dns: Fix falling back in the resolv.conf methods
+
+---
+ src/dns-manager/nm-dns-manager.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
+index 2f8ceab..eade2a0 100644
+--- a/src/dns-manager/nm-dns-manager.c
++++ b/src/dns-manager/nm-dns-manager.c
+@@ -782,13 +782,16 @@ update_dns (NMDnsManager *self,
+ 
+ #ifdef NETCONFIG_PATH
+ 	if (success == FALSE) {
++		g_clear_error (error);
+ 		success = dispatch_netconfig (searches, nameservers,
+ 		                              nis_domain, nis_servers, error);
+ 	}
+ #endif
+ 
+-	if (success == FALSE)
++	if (success == FALSE) {
++		g_clear_error (error);
+ 		success = update_resolv_conf (searches, nameservers, error);
++	}
+ 
+ 	/* signal that resolv.conf was changed */
+ 	if (success)
+-- 
+2.4.0
+

Modified: NetworkManager.conf
===================================================================
--- NetworkManager.conf	2015-05-06 18:29:44 UTC (rev 238556)
+++ NetworkManager.conf	2015-05-06 19:19:07 UTC (rev 238557)
@@ -2,7 +2,6 @@
 plugins=keyfile
 dhcp=dhclient
 dns=default
-rc-manager=none
 
 ## Set static hostname
 #[keyfile]

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-06 18:29:44 UTC (rev 238556)
+++ PKGBUILD	2015-05-06 19:19:07 UTC (rev 238557)
@@ -9,7 +9,7 @@
 pkgbase=networkmanager
 pkgname=(networkmanager libnm-glib)
 pkgver=1.0.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
@@ -19,16 +19,18 @@
              modemmanager dbus-glib iproute2 libnl nss polkit wpa_supplicant libsoup
              systemd libmm-glib rp-pppoe libnewt libndp libteam vala)
 checkdepends=(libx11 python-gobject python-dbus)
-#source=(git://anongit.freedesktop.org/NetworkManager/NetworkManager#commit=93c1041
 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
+        NetworkManager.conf disable_set_hostname.patch
+        0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch)
 sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff'
-            '9cf2cc3f55f20e6bb4fddb335311d124991c4c65633a2b3d638c66f41333ae11'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            '4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a')
 
 prepare() {
   cd NetworkManager-$pkgver
   patch -Np1 -i ../disable_set_hostname.patch
+  patch -Np1 -i ../0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
   NOCONFIGURE=1 ./autogen.sh
 }
 

Modified: networkmanager.install
===================================================================
--- networkmanager.install	2015-05-06 18:29:44 UTC (rev 238556)
+++ networkmanager.install	2015-05-06 19:19:07 UTC (rev 238557)
@@ -5,11 +5,5 @@
   by /etc/NetworkManager/NetworkManager.conf. Make sure you move
   any custom settings to the new config file.
 MSG
-  (( $(vercmp $2 1.0.2-2) < 0 )) && cat <<MSG
-ATTENTION:
-  NetworkManager does not automatically use resolvconf for managing resolv.conf
-  anymore. If you were depending on the use of resolvconf (probably not), then
-  set rc-manager=resolvconf in /etc/NetworkManager/NetworkManager.conf.
-MSG
   true
 }