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

[Jan Steffens]

    Date: Thursday, July 16, 2015 @ 13:32:05
  Author: heftig
Revision: 242276

1.0.4

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

------------------------------------------------------------+
 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch |   34 -----------
 PKGBUILD                                                   |   13 +---
 2 files changed, 5 insertions(+), 42 deletions(-)

Deleted: 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch
===================================================================
--- 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch	2015-07-16 09:18:27 UTC (rev 242275)
+++ 0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch	2015-07-16 11:32:05 UTC (rev 242276)
@@ -1,34 +0,0 @@
-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: PKGBUILD
===================================================================
--- PKGBUILD	2015-07-16 09:18:27 UTC (rev 242275)
+++ PKGBUILD	2015-07-16 11:32:05 UTC (rev 242276)
@@ -8,8 +8,8 @@
 
 pkgbase=networkmanager
 pkgname=(networkmanager libnm-glib)
-pkgver=1.0.2
-pkgrel=4
+pkgver=1.0.4
+pkgrel=1
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
 license=(GPL2 LGPL2.1)
@@ -20,17 +20,14 @@
              systemd libgudev libmm-glib rp-pppoe libnewt libndp libteam vala)
 checkdepends=(libx11 python-gobject python-dbus)
 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch
-        0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch)
-sha256sums=('359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff'
+        NetworkManager.conf disable_set_hostname.patch)
+sha256sums=('e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9'
             '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
-            '4c5cbd0871437c43c2081fe4a1e58d6464c9b960798fd57fd80a79135647e50a')
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
 
 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
 }