diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2009-05-04 01:40:59 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2009-05-04 01:40:59 +0000 |
| commit | b036f3cfe62018e0a1cf1ca61af38ad64721d2fa (patch) | |
| tree | 38791c9496698800811d1673ba5447a28ee55d11 /net-dns/openresolv | |
| parent | Masking kde-base/ksudoku-0.4 for removal (diff) | |
| download | gentoo-2-b036f3cfe62018e0a1cf1ca61af38ad64721d2fa.tar.gz gentoo-2-b036f3cfe62018e0a1cf1ca61af38ad64721d2fa.tar.bz2 gentoo-2-b036f3cfe62018e0a1cf1ca61af38ad64721d2fa.zip | |
Patch no longer needed (Part of 3.3.2)
(Portage version: 2.1.6.11/cvs/Linux i686)
Diffstat (limited to 'net-dns/openresolv')
| -rw-r--r-- | net-dns/openresolv/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch | 27 |
2 files changed, 5 insertions, 28 deletions
diff --git a/net-dns/openresolv/ChangeLog b/net-dns/openresolv/ChangeLog index c20812bb79ca..6540973b0100 100644 --- a/net-dns/openresolv/ChangeLog +++ b/net-dns/openresolv/ChangeLog @@ -1,6 +1,10 @@ # 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.37 2009/05/01 18:29:45 lack Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/openresolv/ChangeLog,v 1.38 2009/05/04 01:40:58 lack Exp $ + + 01 May 2009; Jim Ramsay <lack@gentoo.org> + -files/openresolv-3.3-dnsmasq-dbus_pid.patch: + Patch no longer needed (Part of 3.3.2) *openresolv-3.3.2 (01 May 2009) 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 deleted file mode 100644 index 59c73c2febc8..000000000000 --- a/net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - |