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

[Jan Steffens]

    Date: Tuesday, March 6, 2012 @ 03:14:00
  Author: heftig
Revision: 152262

adapt to dnsmasq path change

Added:
  networkmanager/trunk/dnsmasq-path.patch
Modified:
  networkmanager/trunk/PKGBUILD

--------------------+
 PKGBUILD           |    8 +++++---
 dnsmasq-path.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-06 08:12:42 UTC (rev 152261)
+++ PKGBUILD	2012-03-06 08:14:00 UTC (rev 152262)
@@ -7,7 +7,7 @@
 
 pkgname=networkmanager
 pkgver=0.9.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -24,15 +24,17 @@
 backup=('etc/NetworkManager/NetworkManager.conf')
 install=networkmanager.install
 source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.9/NetworkManager-${pkgver}.tar.xz
-        NetworkManager.conf disable_set_hostname.patch)
+        NetworkManager.conf disable_set_hostname.patch dnsmasq-path.patch)
 sha256sums=('437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf'
             '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
-            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460')
+            '25056837ea92e559f09563ed817e3e0cd9333be861b8914e45f62ceaae2e0460'
+            '65124505048cc8396daf0242c9f5d532fa669b4bbca305998c248ab2329490cb')
 
 build() {
   cd "${srcdir}/NetworkManager-${pkgver}"
 
   patch -Np1 -i "${srcdir}/disable_set_hostname.patch"
+  patch -Np1 -i "${srcdir}/dnsmasq-path.patch"
 
   ./configure \
     --prefix=/usr \

Added: dnsmasq-path.patch
===================================================================
--- dnsmasq-path.patch	                        (rev 0)
+++ dnsmasq-path.patch	2012-03-06 08:14:00 UTC (rev 152262)
@@ -0,0 +1,30 @@
+diff -u -r NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c
+--- NetworkManager-0.9.2.0/src/dns-manager/nm-dns-dnsmasq.c	2011-10-10 23:38:20.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dns-manager/nm-dns-dnsmasq.c	2012-03-06 09:07:24.137460927 +0100
+@@ -52,8 +52,11 @@
+ find_dnsmasq (void)
+ {
+ 	static const char *paths[] = {
++		"/usr/local/bin/dnsmasq",
+ 		"/usr/local/sbin/dnsmasq",
++		"/usr/bin/dnsmasq",
+ 		"/usr/sbin/dnsmasq",
++		"/bin/dnsmasq",
+ 		"/sbin/dnsmasq",
+ 		NULL
+ 	};
+diff -u -r NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c
+--- NetworkManager-0.9.2.0/src/dnsmasq-manager/nm-dnsmasq-manager.c	2011-04-19 07:06:22.000000000 +0200
++++ NetworkManager-0.9.2.0-dnsmasq/src/dnsmasq-manager/nm-dnsmasq-manager.c	2012-03-06 09:07:58.603851818 +0100
+@@ -170,8 +170,11 @@
+ nm_find_dnsmasq (void)
+ {
+ 	static const char *dnsmasq_binary_paths[] = {
++		"/usr/local/bin/dnsmasq",
+ 		"/usr/local/sbin/dnsmasq",
++		"/usr/bin/dnsmasq",
+ 		"/usr/sbin/dnsmasq",
++		"/bin/dnsmasq",
+ 		"/sbin/dnsmasq",
+ 		NULL
+ 	};