Fixup error message for bug #239846.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.27-rc8 x86_64

5 files changed, 30 insertions, 10 deletions

diff --git a/net-dns/pdns-recursor/ChangeLog b/net-dns/pdns-recursor/ChangeLog
index 4947105e879a..8b17c9c25650 100644
--- a/net-dns/pdns-recursor/ChangeLog
+++ b/net-dns/pdns-recursor/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/pdns-recursor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.24 2008/09/04 10:52:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.25 2008/10/06 08:24:14 swegener Exp $
+
+  06 Oct 2008; Sven Wegener <swegener@gentoo.org>
+  +files/pdns-recursor-3.1.7-error-message.patch,
+  pdns-recursor-3.1.6.ebuild, pdns-recursor-3.1.7.ebuild:
+  Fixup error message for bug #239846.
 
   04 Sep 2008; Sven Wegener <swegener@gentoo.org>
   -pdns-recursor-3.1.5.ebuild:
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index a41ca08953cb..c9d1b1360a72 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX pdns-recursor-3.1.6-gcc-4.3.patch 286 RMD160 e83a67968952e9345e702b50eb7a1022fd831899 SHA1 656cca5c67ae12ea3f037d94a80c94f4634ac5e1 SHA256 b478865b2f2ccae41a5a516c86994c58307d065bc26234d670e12bd0dfe4c1d0
+AUX pdns-recursor-3.1.7-error-message.patch 459 RMD160 bfccb73616ff69999c4f509d613e649a9dd21abe SHA1 edf0aac4fc2ff223dd5f78e02db9284c9a83cc12 SHA256 240997d49805155a8a820c502256909ca00ba95896e8a15360bdc20c545a0d67
 AUX precursor 580 RMD160 71be0984e72763e09173b81f7a76bb5df56667a6 SHA1 ea316b070e8eb123f02e24cd60c568b4dd5aefc6 SHA256 f17d76262bea558604fa01e9d661bbb54af387bd976b54a8a59f7ad4a5a56014
 AUX recursor.conf 452 RMD160 6708700e955dd29041e360d5f0a68c9d3293d665 SHA1 455cbbd4335dbd032b2274498044ba680693d306 SHA256 b36b3310a26785d5e8a38c03bce9afcf8a08e321a81ee385e9557dcaa3957255
 DIST pdns-recursor-3.1.6.tar.bz2 171424 RMD160 dc62fc2efb5d0f5840dfff1b8156197062020a47 SHA1 9d3a7a92afbb6c0ae75c9d5eab396e524c3e8c31 SHA256 55bbb45d2395a2af4fd0c07ad65a59e29e426c1820dc3c4bff6a65876b4206f5
 DIST pdns-recursor-3.1.7.tar.bz2 174424 RMD160 359b3e3fff942f9fd14bebe4bc16b9d6cd23d0e3 SHA1 3e9c46e432d57edd58f767311247e750350883e9 SHA256 2255ea25071f7ccb3e096e85c7fb38f860a02d29f277dfbef66c7a1f5735051f
-EBUILD pdns-recursor-3.1.6.ebuild 1249 RMD160 402aff7ce0d7a13850967908dd199dd2539e6dcd SHA1 a68c33735bd1ff2d9589b7a3d1788672132eda9c SHA256 c72815992c389e36aeb2c11c6fe4b1cd157d3dddb2c3b2f443f5b7a74884f80e
-EBUILD pdns-recursor-3.1.7.ebuild 1293 RMD160 4afa57ceebf00baec4dbf4879c11ff40d3012d50 SHA1 e47873907060516afe4c9f31f3fff1e4ea1c0105 SHA256 eceed520e4e1647c38406f36ee27730b6be70f621cd1ca1192314a3dc91576fd
-MISC ChangeLog 4063 RMD160 065c2bde2abd8afecb934ebed4c5a6fa8455c667 SHA1 7194da1aa336b20f42af35fbd1e40a13c561d191 SHA256 6204b069fd11439cbe7e5c561e9d80d7a67ace36e7c3411b86e4c69764f807a6
+EBUILD pdns-recursor-3.1.6.ebuild 1305 RMD160 6b6e6fdc56d31f2c5291db83019cecad384985ce SHA1 57a9ef00d0b17653020b451e896cf8e0b523512d SHA256 a0d69ad47a61fe2bffe9e41866e050b4ea8ae069f9a143c9ad5d8024388953df
+EBUILD pdns-recursor-3.1.7.ebuild 1348 RMD160 777fb1b58873d38fbd95b91bcc6a0ef4ed6a127b SHA1 cb99ce3824f9e9600d4d3727f6c06262b091f442 SHA256 6b6be7701b90af8ac089b43122b884e85634297f5dbd2a7386e6e99fe0b0e850
+MISC ChangeLog 4261 RMD160 1f11f30d601cf9e46a8e4d2fd2defe3b08bdf73d SHA1 9cf74f47dd89097daa51137421e7c3782f9c0d86 SHA256 43b7552c6ef360a7edebd4babd18b61b91ea0e275b0110c9505fb9410bde887f
 MISC metadata.xml 837 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 SHA1 4b574c68576b1c058956085df7a07e250361455c SHA256 742f9fd882ba627c0a7b26dff7fe7b439b8ccf728a1394725bbd85f2a28a7d4b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAki/vggACgkQI1lqEGTUzyT3vACg0vpkEghfLJRdGlh6LWVH71He
-gXsAnAokwQ6fU032MqfQCbm6siiDvq6g
-=kWKH
+iEYEARECAAYFAkjpyzYACgkQI1lqEGTUzyRIyQCgmUNvgad1BlGdyoIdEfSFzi0w
+5YIAoLuPOSjMlC8LIVXNjoWtwxC1T7Ao
+=hqEH
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-error-message.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-error-message.patch
new file mode 100644
index 000000000000..18d73a98c46c
--- /dev/null
+++ b/net-dns/pdns-recursor/files/pdns-recursor-3.1.7-error-message.patch
@@ -0,0 +1,11 @@
+--- pdns-recursor-3.1.7/rec_channel.cc
++++ pdns-recursor-3.1.7/rec_channel.cc
+@@ -100,7 +100,7 @@
+   strcpy(remote.sun_path,(path+"/"+fname).c_str());
+   if(::connect(d_fd, (sockaddr*)&remote, sizeof(remote)) < 0) {
+     unlink(d_local.sun_path);
+-    throw AhuException("Unable to connect to remote '"+path+fname+"': "+string(strerror(errno)));
++    throw AhuException("Unable to connect to remote '"+path+"/"+fname+"': "+string(strerror(errno)));
+   }
+ }
+ 
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild
index 7194af3bd944..6a84d066517a 100644
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild,v 1.5 2008/08/04 19:03:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.6.ebuild,v 1.6 2008/10/06 08:24:14 swegener Exp $
 
 inherit toolchain-funcs flag-o-matic eutils
 
@@ -22,6 +22,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-gcc-4.3.patch
+	epatch "${FILESDIR}"/${PN}-3.1.7-error-message.patch
 
 	sed -i -e s:/var/run/:/var/lib/powerdns: "${S}"/config.h || die
 }
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild
index 9aa8a1de7a8e..78b0d0a2db1c 100644
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild,v 1.2 2008/06/28 12:10:34 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.7.ebuild,v 1.3 2008/10/06 08:24:14 swegener Exp $
 
-inherit toolchain-funcs flag-o-matic
+inherit toolchain-funcs flag-o-matic eutils
 
 DESCRIPTION="The PowerDNS Recursor"
 HOMEPAGE="http://www.powerdns.com/"
@@ -25,6 +25,8 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 
+	epatch "${FILESDIR}"/${P}-error-message.patch
+
 	sed -i -e s:/var/run/:/var/lib/powerdns: "${S}"/config.h || die
 }