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

[Ionut Biru]

    Date: Tuesday, November 23, 2010 @ 10:06:38
  Author: ibiru
Revision: 100418

upgpkg: networkmanager 0.8.2-4
disable changing hostname. this feature is breaking X

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-11-23 14:03:44 UTC (rev 100417)
+++ PKGBUILD	2010-11-23 15:06:38 UTC (rev 100418)
@@ -7,7 +7,7 @@
 
 pkgname=networkmanager
 pkgver=0.8.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -18,17 +18,20 @@
 options=('!libtool')
 backup=('etc/NetworkManager/nm-system-settings.conf')
 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
-        nm-system-settings.conf create_dirs.patch dhcpcd.patch)
+        nm-system-settings.conf create_dirs.patch dhcpcd.patch disable_set_hostname.patch)
 sha256sums=('58e49dcd83cb641a9dcaad4fd566a08196c862479ad3086c00f28f03768eb4f1'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
             '2961ce4cf3079edbf27927a67573ce85dad2268f610fd123dd781eb5ba764c12'
-            '528b0bd28565da4711b1f57632352db29401e57e1d88bcefe1624709f9fbf044')
+            '528b0bd28565da4711b1f57632352db29401e57e1d88bcefe1624709f9fbf044'
+            '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553')
 
 build() {
   cd "${srcdir}/NetworkManager-${pkgver}"
 
   patch -Np1 -i "${srcdir}/create_dirs.patch"
   patch -Np1 -i "${srcdir}/dhcpcd.patch"
+  patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
+
   autoreconf -fi
 
   ./configure --prefix=/usr --sysconfdir=/etc \

Added: disable_set_hostname.patch
===================================================================
--- disable_set_hostname.patch	                        (rev 0)
+++ disable_set_hostname.patch	2010-11-23 15:06:38 UTC (rev 100418)
@@ -0,0 +1,19 @@
+diff -Nur NetworkManager-0.8.2.orig/src/nm-policy.c NetworkManager-0.8.2/src/nm-policy.c
+--- NetworkManager-0.8.2.orig/src/nm-policy.c	2010-11-03 12:58:42.000000000 -0700
++++ NetworkManager-0.8.2/src/nm-policy.c	2010-11-23 06:22:32.436707081 -0800
+@@ -342,6 +342,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);
+@@ -396,6 +397,7 @@
+ 		}
+ 	}
+ 
++#endif
+ 	/* If no automatically-configured hostname, try using the hostname from
+ 	 * when NM started up.
+ 	 */