[arch-commits] Commit in networkmanager/trunk (PKGBUILD disable_set_hostname.patch)

[Jan Steffens]

    Date: Tuesday, April 12, 2016 @ 11:39:33
  Author: heftig
Revision: 264701

1.1.93-1

Modified:
  networkmanager/trunk/PKGBUILD
Deleted:
  networkmanager/trunk/disable_set_hostname.patch

----------------------------+
 PKGBUILD                   |   10 ++++------
 disable_set_hostname.patch |   19 -------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-12 08:35:51 UTC (rev 264700)
+++ PKGBUILD	2016-04-12 09:39:33 UTC (rev 264701)
@@ -8,7 +8,7 @@
 
 pkgbase=networkmanager
 pkgname=(networkmanager libnm-glib)
-pkgver=1.0.12
+pkgver=1.1.93
 pkgrel=1
 pkgdesc="Network Management daemon"
 arch=(i686 x86_64)
@@ -21,14 +21,12 @@
              python-gobject)
 checkdepends=(libx11 python-dbus)
 source=(https://download.gnome.org/sources/NetworkManager/${pkgver:0:3}/NetworkManager-$pkgver.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
-sha256sums=('3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e'
-            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+        NetworkManager.conf)
+sha256sums=('34d3557ea168abcb47fcbed4572f6b50c82db6a896f7de282dcff78ac0c7a6e3'
+            '2c6a647b5aec9f3c356d5d95251976a21297c6e64bd8d2a59339f8450a86cb3b')
 
 prepare() {
   cd NetworkManager-$pkgver
-  patch -Np1 -i ../disable_set_hostname.patch
   2to3 -w libnm src tools
   NOCONFIGURE=1 ./autogen.sh
 }

Deleted: disable_set_hostname.patch
===================================================================
--- disable_set_hostname.patch	2016-04-12 08:35:51 UTC (rev 264700)
+++ disable_set_hostname.patch	2016-04-12 09:39:33 UTC (rev 264701)
@@ -1,19 +0,0 @@
-diff -Nur NetworkManager-0.9.0.orig/src/nm-policy.c NetworkManager-0.9.0/src/nm-policy.c
---- NetworkManager-0.9.0.orig/src/nm-policy.c	2011-08-23 06:41:02.099686450 +0000
-+++ NetworkManager-0.9.0/src/nm-policy.c	2011-08-23 06:43:38.227791737 +0000
-@@ -302,6 +302,7 @@
- 		return;
- 	}
- 
-+#if 0
- 	/* Try automatically determined hostname from the best device's IP config */
- 	if (!best4)
- 		best4 = get_best_ip4_device (policy->manager, &best_req4);
-@@ -356,6 +357,7 @@
- 		}
- 	}
- 
-+#endif
- 	/* If no automatically-configured hostname, try using the hostname from
- 	 * when NM started up.
- 	 */