Version bump.

(Portage version: 2.1.2_rc1-r6)
 (Signed Manifest commit)

4 files changed, 15 insertions, 137 deletions

diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index fc1ad775336a..bbade7b9e315 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pdns-recursor-3.1.3-svn-fixes.patch 2581 RMD160 d43cf5d93e76bca63f7f2e12c7463e12373e93ee SHA1 e573d2e00f4241f1309491bd5147ce6d4c63430c SHA256 eb11ea7a5c5f55ff86c87107f5b81c0a5641bd7cf6d60b9d5e9db4aac8d21187
-MD5 70b4dd6a2574d426d3752ee2e98b08a6 files/pdns-recursor-3.1.3-svn-fixes.patch 2581
-RMD160 d43cf5d93e76bca63f7f2e12c7463e12373e93ee files/pdns-recursor-3.1.3-svn-fixes.patch 2581
-SHA256 eb11ea7a5c5f55ff86c87107f5b81c0a5641bd7cf6d60b9d5e9db4aac8d21187 files/pdns-recursor-3.1.3-svn-fixes.patch 2581
 AUX precursor 501 RMD160 89beca9ada438592c409ad972d95eb264b934eff SHA1 f0cce888bc63d0bb53b55657eef8aae6f1753443 SHA256 a7e50ea28fd4453accdbe4f457ffe492585c8e8c5f84f330bf9a290aa6d000a1
 MD5 269ab7656f23317e2d4fb1015f855ed3 files/precursor 501
 RMD160 89beca9ada438592c409ad972d95eb264b934eff files/precursor 501
@@ -13,26 +9,26 @@ AUX recursor.conf 445 RMD160 99d1e4ac4cda6cf0b71f57dbb042633c2668c448 SHA1 e1653
 MD5 67f0a128d86501d8b6a9b554c4dc1eca files/recursor.conf 445
 RMD160 99d1e4ac4cda6cf0b71f57dbb042633c2668c448 files/recursor.conf 445
 SHA256 2f1931be48c333ed088cb1e3c0ada0e751c3909cee4bc8f9f63ae89ac2edc12a files/recursor.conf 445
-DIST pdns-recursor-3.1.3.tar.bz2 138992 RMD160 71c114471bab005846ba234e4023d5b59e7af030 SHA1 eaf853eb7dbbc1db08555fb44722149df08a0bb5 SHA256 07c20df3b6e9a4194a8ced8a535aa61c4f2805ee21c040882218975605b8ae2e
-EBUILD pdns-recursor-3.1.3-r1.ebuild 1111 RMD160 d13f484cc8822bb712a441342e069e95d21ceabb SHA1 5d5d51b2045596d87fa12fa558c7199688b75c75 SHA256 b7a0b36ca794329c5702fd8949870fb99d907c8d81ceed7a0a9852c4d39735e9
-MD5 bd24a812a3cc281765f788364d397f84 pdns-recursor-3.1.3-r1.ebuild 1111
-RMD160 d13f484cc8822bb712a441342e069e95d21ceabb pdns-recursor-3.1.3-r1.ebuild 1111
-SHA256 b7a0b36ca794329c5702fd8949870fb99d907c8d81ceed7a0a9852c4d39735e9 pdns-recursor-3.1.3-r1.ebuild 1111
-MISC ChangeLog 1619 RMD160 0651aa1a98002495fa34cd0b8dc4ea933184926a SHA1 1964335f0532b6196b8daa5e78a70a54a4fecf4b SHA256 574f4f6d8c9fbea5da85628ec5ffeaa46b919f73b2b5b07eb0a123ece1f136b5
-MD5 f33a2057e2fd9d715b1b5b3485e8bb87 ChangeLog 1619
-RMD160 0651aa1a98002495fa34cd0b8dc4ea933184926a ChangeLog 1619
-SHA256 574f4f6d8c9fbea5da85628ec5ffeaa46b919f73b2b5b07eb0a123ece1f136b5 ChangeLog 1619
+DIST pdns-recursor-3.1.4.tar.bz2 139191 RMD160 0c71b6817a274d85424164bfb88c482edff144b4 SHA1 d1fa344ec5f2feb12397361f92b011a0cb726d48 SHA256 9975ec73e311bda4c22f302f18f4ed4fe701d63bce3155f300ccc561d5b0cc39
+EBUILD pdns-recursor-3.1.4.ebuild 1022 RMD160 060caea8f4bbcc55df8e6b593cc4b3d27929efc0 SHA1 5a8d30c7603b042ea5dbd7d7ec0bcc0b02f83f4d SHA256 8dc71318721b0efb18306d8ba13e2f645d1e56cf27e55dad6dc0321f88aa84b9
+MD5 a12ddc3802a188c1144ab2dc737722d4 pdns-recursor-3.1.4.ebuild 1022
+RMD160 060caea8f4bbcc55df8e6b593cc4b3d27929efc0 pdns-recursor-3.1.4.ebuild 1022
+SHA256 8dc71318721b0efb18306d8ba13e2f645d1e56cf27e55dad6dc0321f88aa84b9 pdns-recursor-3.1.4.ebuild 1022
+MISC ChangeLog 1786 RMD160 7857de98b1ef39032fc791665124e78e17a1e628 SHA1 c860fe940220c92dc16deef0b244cc180463ad26 SHA256 dfb8ef9390d92c781ef3f79345694647c54d694c107ca0fba8b6ef3919534625
+MD5 945a5e6800a771ab2ace1be8086ad567 ChangeLog 1786
+RMD160 7857de98b1ef39032fc791665124e78e17a1e628 ChangeLog 1786
+SHA256 dfb8ef9390d92c781ef3f79345694647c54d694c107ca0fba8b6ef3919534625 ChangeLog 1786
 MISC metadata.xml 837 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 SHA1 4b574c68576b1c058956085df7a07e250361455c SHA256 742f9fd882ba627c0a7b26dff7fe7b439b8ccf728a1394725bbd85f2a28a7d4b
 MD5 5fd39b9552a8c80d492e32bba6cffda0 metadata.xml 837
 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 metadata.xml 837
 SHA256 742f9fd882ba627c0a7b26dff7fe7b439b8ccf728a1394725bbd85f2a28a7d4b metadata.xml 837
-MD5 65e16595d5dd3b382d4bd72e5071bafb files/digest-pdns-recursor-3.1.3-r1 262
-RMD160 80c81a36ea053ecabe0af159375c75215cc55a60 files/digest-pdns-recursor-3.1.3-r1 262
-SHA256 c4a94528ee71390e9df0d36dd9000fc1de7158d03454fd29a0334a4a94f4078b files/digest-pdns-recursor-3.1.3-r1 262
+MD5 e3a9d8066b97ed39d65c1d13b934316d files/digest-pdns-recursor-3.1.4 262
+RMD160 dbde2237f2e112f64d2113f7dbc4ee10464f4010 files/digest-pdns-recursor-3.1.4 262
+SHA256 d6e9cba91bea306d197feecbe88e5a4504a9aaa4d2e6275e49851d75eaf30f08 files/digest-pdns-recursor-3.1.4 262
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFVmQwI1lqEGTUzyQRAt7eAJ0SEF7mR+tWkQjc5d7wkszuoQsZiACgrjlr
-8tFW9gGIPpUyGlgTHRjAvSA=
-=/89S
+iD8DBQFFV35mI1lqEGTUzyQRAuTgAKCbqbo7Fnwgy+jo0fPHyq2I7QEylwCgitGk
+xWm7lgjqcj2Lih3gqDMQ91g=
+=hk87
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns-recursor/files/digest-pdns-recursor-3.1.3-r1 b/net-dns/pdns-recursor/files/digest-pdns-recursor-3.1.3-r1
deleted file mode 100644
index 35054411be7b..000000000000
--- a/net-dns/pdns-recursor/files/digest-pdns-recursor-3.1.3-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 fb6910c688008ecf247e4c731d8eb9a5 pdns-recursor-3.1.3.tar.bz2 138992
-RMD160 71c114471bab005846ba234e4023d5b59e7af030 pdns-recursor-3.1.3.tar.bz2 138992
-SHA256 07c20df3b6e9a4194a8ced8a535aa61c4f2805ee21c040882218975605b8ae2e pdns-recursor-3.1.3.tar.bz2 138992
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.3-svn-fixes.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.3-svn-fixes.patch
deleted file mode 100644
index c4a3294d7eb6..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.3-svn-fixes.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: pdns_recursor.cc
-===================================================================
---- pdns_recursor.cc	(revision 903)
-+++ pdns_recursor.cc	(revision 915)
-@@ -652,7 +652,7 @@
-     if(bytes==1)
-       conn->state=TCPConnection::BYTE1;
-     if(bytes==2) { 
--      conn->qlen=(conn->data[0]<<8)+conn->data[1];
-+      conn->qlen=(((unsigned char)conn->data[0]) << 8)+ (unsigned char)conn->data[1];
-       conn->bytesread=0;
-       conn->state=TCPConnection::GETQUESTION;
-     }
-@@ -664,10 +664,10 @@
-     }
-   }
-   else if(conn->state==TCPConnection::BYTE1) {
--    int bytes=recv(conn->fd,conn->data+1,1,0);
-+    int bytes=recv(conn->fd, conn->data+1, 1, 0);
-     if(bytes==1) {
-       conn->state=TCPConnection::GETQUESTION;
--      conn->qlen=(conn->data[0]<<8)+conn->data[1];
-+      conn->qlen=(((unsigned char)conn->data[0]) << 8)+ (unsigned char)conn->data[1];
-       conn->bytesread=0;
-     }
-     if(!bytes || bytes < 0) {
-@@ -680,7 +680,7 @@
-     }
-   }
-   else if(conn->state==TCPConnection::GETQUESTION) {
--    int bytes=recv(conn->fd,conn->data + conn->bytesread,conn->qlen - conn->bytesread, 0);
-+    int bytes=recv(conn->fd, conn->data + conn->bytesread, conn->qlen - conn->bytesread, 0);
-     if(!bytes || bytes < 0) {
-       L<<Logger::Error<<"TCP client "<< conn->remote.toString() <<" disconnected while reading question body"<<endl;
-       TCPConnection tmp(*conn);
-Index: syncres.cc
-===================================================================
---- syncres.cc	(revision 901)
-+++ syncres.cc	(revision 919)
-@@ -16,6 +16,7 @@
-     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
- 
-+#include <boost/algorithm/string.hpp>
- #include "utility.hh"
- #include "syncres.hh"
- #include <iostream>
-@@ -855,9 +856,18 @@
- 	return RCode::NXDomain;
-       }
-       if(!newtarget.empty()) {
-+	if(iequals(newtarget,qname)) {
-+	  LOG<<prefix<<qname<<": status=got a CNAME referral to self, returning SERVFAIL"<<endl;
-+	  return RCode::ServFail;
-+	}
-+	if(depth > 10) {
-+	  LOG<<prefix<<qname<<": status=got a CNAME referral, but recursing too deep, returning SERVFAIL"<<endl;
-+	  return RCode::ServFail;
-+	}
- 	LOG<<prefix<<qname<<": status=got a CNAME referral, starting over with "<<newtarget<<endl;
-+
- 	set<GetBestNSAnswer>beenthere2;
--	return doResolve(newtarget, qtype, ret,0,beenthere2);
-+	return doResolve(newtarget, qtype, ret, depth + 1, beenthere2);
-       }
-       if(nsset.empty() && !d_lwr.d_rcode) {
- 	LOG<<prefix<<qname<<": status=noerror, other types may exist, but we are done "<<(negindic ? "(have negative SOA)" : "")<<endl;
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.3-r1.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.3-r1.ebuild
deleted file mode 100644
index 438b0ad1d04c..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.3-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2006 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.3-r1.ebuild,v 1.1 2006/11/09 13:10:14 swegener Exp $
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.33.1"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-svn-fixes.patch
-}
-
-src_compile() {
-	filter-flags -ftree-vectorize
-
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control || die "dosbin failed"
-	doman pdns_recursor.1 rec_control.1 || die "doman failed"
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf || die "doins failed"
-
-	doinitd "${FILESDIR}"/precursor || die "doinitd failed"
-
-	keepdir /var/empty
-}