Fixed dbus detection bug for dnsmasq script

(Portage version: 2.1.6.11/cvs/Linux i686)

3 files changed, 40 insertions, 2 deletions

diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog
index 6dc89d8bd2dc..2d72b6ecbd0f 100644
--- a/net-dns/openresolv/ChangeLog
+++ b/net-dns/openresolv/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/openresolv
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.35 2009/04/22 14:33:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.36 2009/04/30 15:30:56 lack Exp $
+
+*openresolv-3.3-r1 (30 Apr 2009)
+
+  30 Apr 2009; Jim Ramsay <lack@gentoo.org> -openresolv-3.3.ebuild,
+  +openresolv-3.3-r1.ebuild, +files/openresolv-3.3-dnsmasq-dbus_pid.patch:
+  Fixed dbus detection bug for dnsmasq script
 
   22 Apr 2009; Alexey Shvetsov <alexxy@gentoo.org> openresolv-3.3:
   Fix bug #263015
diff --git a/net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch b/net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch
new file mode 100644
index 000000000000..59c73c2febc8
--- /dev/null
+++ b/net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch
@@ -0,0 +1,27 @@
+From 580cc04369dcb19a6a48ff67371e9fd292781066 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <lack@gentoo.org>
+Date: Thu, 30 Apr 2009 15:59:58 +0100
+Subject: [PATCH] Fix dnsmasq finding the right pidfile.
+
+---
+ dnsmasq.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/dnsmasq.in b/dnsmasq.in
+index 8fdd999..09120d1 100644
+--- a/dnsmasq.in
++++ b/dnsmasq.in
+@@ -43,8 +43,8 @@ newresolv="$newconf"
+ # Check for DBus support in the binary
+ dbus=false
+ : ${dbus_pid:=/var/run/dbus/dbus.pid}
+-[ -s "$dbus_pid" ] || dbuspid=/var/run/dbus.pid
+-[ -s "$dbus_pid" ] || dbuspid=/var/run/dbus/pid
++[ -s "$dbus_pid" ] || dbus_pid=/var/run/dbus.pid
++[ -s "$dbus_pid" ] || dbus_pid=/var/run/dbus/pid
+ if [ -s "$dbus_pid" -a -s "$dnsmasq_pid" ]; then
+ 	if dnsmasq --version 2>/dev/null | \
+ 		grep -q "^Compile time options.*[[:space:]]DBus[[:space:]]"
+-- 
+1.6.2
+
diff --git a/net-dns/openresolv/openresolv-3.3.ebuild b/net-dns/openresolv/openresolv-3.3-r1.ebuild
index cc0eecdeabd1..ee43944c187c 100644
--- a/net-dns/openresolv/openresolv-3.3.ebuild
+++ b/net-dns/openresolv/openresolv-3.3-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.3.ebuild,v 1.2 2009/04/22 14:33:20 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/openresolv-3.3-r1.ebuild,v 1.1 2009/04/30 15:30:56 lack Exp $
 
+EAPI=2
 inherit eutils
 
 DESCRIPTION="A framework for managing DNS information"
@@ -22,6 +23,10 @@ pkg_setup() {
 	export LIBEXECDIR="${PREFIX}/lib/resolvconf"
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/openresolv-3.3-dnsmasq-dbus_pid.patch"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install
 }