Version bump.

Package-Manager: portage-2.1.2_rc1-r6

2 files changed, 0 insertions, 70 deletions

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;