Fixed dbus detection bug for dnsmasq script

Package-Manager: portage-2.1.6.11/cvs/Linux i686

4 files changed, 43 insertions, 14 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/Manifest b/net-dns/openresolv/Manifest
index cd1489aafbaf..9ea562137399 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX openresolv-3.3-dnsmasq-dbus_pid.patch 872 RMD160 08cbafdc7731842a7cf4dd1cd903953231a08db8 SHA1 2fa4cfdc488e11885b726edad07ae84c21c439f0 SHA256 c09aaba9a4025a5d4c14e58bef4cd340ab8c61750eebfad093fcaf31eabb4593
 DIST openresolv-2.0.1.tar.bz2 8898 RMD160 69b052fca48e27ba62f95f6a3ab46cb146d4dc3c SHA1 38ff27a8e26405b20f3b242cf1c0315c9edc7c7b SHA256 97437dd7545554f7a2e101dffeea7501d69de58359dab54161f0838fc0dff7c5
 DIST openresolv-2.0.tar.bz2 9211 RMD160 fdac1ae91c6ee5e36ae809570aae3d3310124b30 SHA1 91cbbcae79686ae2b661e8e2dcf461809e9e200e SHA256 6f32ce4ada191019188b2bdd1a6440052c25305ceb67b29833bd8d83da98adf9
 DIST openresolv-3.0.tar.bz2 9156 RMD160 28caf8c8b561268336f6f42ff73f18d30df71719 SHA1 ed35f88680d5f104a560c28f675c4e747ee518b4 SHA256 e4f9e3511792a277f886a53698ffc5075c5d5e6e0687dc765f59975ad642859c
@@ -12,13 +10,6 @@ EBUILD openresolv-2.0.ebuild 1085 RMD160 dbe79c87069109b96a10adbabc701e5e56c1c24
 EBUILD openresolv-3.0.ebuild 1349 RMD160 4ba2d82b2668ad64517c6f9900047ef40b026d6e SHA1 5c3ba7ed22082d4c9272c320fa3b671ecd17e623 SHA256 5d4e3fb32411e9c7721b54cf93f3fc6f19ddabc37f8976b3e2cffb10dfe6aabd
 EBUILD openresolv-3.1.1.ebuild 1351 RMD160 6b2fe10fb7178ee52778fd97a0651ea17f61e41d SHA1 5702cdd8fbb996a64e9b7697ac60d42b36323bc4 SHA256 6f03f191170083885db6d9b42b9c4bc035f88304cd64226e9889e8c418d63e2c
 EBUILD openresolv-3.2.ebuild 1349 RMD160 443bf810521a389a2f0049340d532fe73f90e42a SHA1 885ed8c1e0335c8aad9f386ad610b73e9d6eb918 SHA256 4f450967f9c5a38b2c8f5ac514207276a24ef7d711412e96bf83119dec02912d
-EBUILD openresolv-3.3.ebuild 1394 RMD160 017bdac3e9b0df4d704e093313db90939d234d83 SHA1 609eba9ac8f51c28432fc4ef5d3bf24f956f0c3a SHA256 203421361243c49b0ba8445e02f9b67bafc359280394a39f563948ee56a34b61
-MISC ChangeLog 4390 RMD160 982772a445a1f87fc9e6d2cbaa93eb26a1177a33 SHA1 45b3035e20c953c454a4588633f364410d5b8657 SHA256 6af12780ca81cd2bdb1a926c7c398c3f1feaef0b3767f034d99c908d246e5a49
+EBUILD openresolv-3.3-r1.ebuild 1481 RMD160 9eac0daef152ec25bc0e955fba01eab11f171614 SHA1 e3c9a1491e2565fd4701d0c93160e73f3b6e4878 SHA256 9eaa7843022f20d8fb954d01a84470a47fd07da185adca784f255393a8fc8292
+MISC ChangeLog 4612 RMD160 82ff36c5033040a43e98da6995928c673528b6bb SHA1 b1970de300e0882a88b0d705ed96c64db34b183a SHA256 ce1e75fbb9bdfe3256588f97a015aaf9329f3b9d9dc5d73186d819c057a3f896
 MISC metadata.xml 315 RMD160 22169f34ce4339237cd154625165db8392a2625e SHA1 c577e94a97b82c2d67790e2b3f65a9f4bc1c919e SHA256 535c23e2542894c12240ece5716ec2138be18fb8a116c9b5e538ce6b41bce28a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAknvKr0ACgkQ5BmOA85PVLhelwCdHM8t8Nk8FR+9Duj4lQ/C/nxy
-pwsAn1IJifoya19V76vLVq6+QDi9nnDe
-=6LD8
------END PGP SIGNATURE-----
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
 }