summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Ramsay <lack@gentoo.org>2009-05-04 01:40:59 +0000
committerJim Ramsay <lack@gentoo.org>2009-05-04 01:40:59 +0000
commitac29dbef741f8eb509a9491dd1ffdf41902a9012 (patch)
tree38dc5d5c347d7cec6c0e55259f91dbbd2eb07169 /net-dns/openresolv
parentMasking kde-base/ksudoku-0.4 for removal (diff)
downloadhistorical-ac29dbef741f8eb509a9491dd1ffdf41902a9012.tar.gz
historical-ac29dbef741f8eb509a9491dd1ffdf41902a9012.tar.bz2
historical-ac29dbef741f8eb509a9491dd1ffdf41902a9012.zip
Patch no longer needed (Part of 3.3.2)
Package-Manager: portage-2.1.6.11/cvs/Linux i686
Diffstat (limited to 'net-dns/openresolv')
-rw-r--r--net-dns/openresolv/ChangeLog6
-rw-r--r--net-dns/openresolv/Manifest3
-rw-r--r--net-dns/openresolv/files/openresolv-3.3-dnsmasq-dbus_pid.patch27
3 files changed, 6 insertions, 30 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/Manifest b/net-dns/openresolv/Manifest
index a66ba58c5f9d..83cfddb4f4df 100644
--- a/net-dns/openresolv/Manifest
+++ b/net-dns/openresolv/Manifest
@@ -1,4 +1,3 @@
-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
@@ -11,5 +10,5 @@ EBUILD openresolv-3.0.ebuild 1349 RMD160 4ba2d82b2668ad64517c6f9900047ef40b026d6
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.2.ebuild 1401 RMD160 dd47d918b53500c039cee4b2938afa86fca4c8c6 SHA1 c3a9be55d9eb5a953b77d866eb9ab46c2122d23c SHA256 668db449a2d2d9137e55ac97415ddcb2835d54ce611e84bcaeb3e7a3b89de6ab
-MISC ChangeLog 4823 RMD160 8981f34213bba27f50a309846e90e6af723f8d1b SHA1 8a25f12858439db2bab03b69fa73cf48e3e6b3a7 SHA256 f04814edbe149b940af9cd8f58346b35d7f0cad526781d9dbed68398f96a3ddc
+MISC ChangeLog 4957 RMD160 62334e314b487c40af8c993de35ce3fca161c744 SHA1 42f2c77e1c840e19f2ec67a1952c01722bb19b56 SHA256 a563a27aebb8bdb13a8fa1a6e9470f02d8270b0ccefc8910630be4a91ecd0a51
MISC metadata.xml 341 RMD160 3c913acf95bbe75c703c788af7aef99b76e1b6f3 SHA1 9441910f8e4a6cafccd4701c3daaf05b6be862d5 SHA256 beb1a30f85ba28709163805bb76e9bffaf10f85ab5a4bc59bb6d621c11e6c598
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
-