From a833e3f4a431b8eea751b7420e127787f9c92117 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 4 Dec 2017 12:06:33 +0000
Subject: gentoo resync : 04.12.2017

---
 .../pdns-recursor/files/CVE-2017-15090-4.0.6.patch | 15 ----
 .../pdns-recursor/files/CVE-2017-15092-4.0.6.patch | 85 ----------------------
 2 files changed, 100 deletions(-)
 delete mode 100644 net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
 delete mode 100644 net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch

(limited to 'net-dns/pdns-recursor/files')

diff --git a/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
deleted file mode 100644
index fa0bfd099abf..000000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15090-4.0.6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/validate-recursor.cc pdns-recursor-4.0.6/validate-recursor.cc
---- pdns-recursor-4.0.6.orig/validate-recursor.cc	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/validate-recursor.cc	2017-11-02 18:29:16.612520450 +0100
-@@ -87,6 +87,11 @@
-     bool first = true;
-     for(const auto& csp : cspmap) {
-       for(const auto& sig : csp.second.signatures) {
-+
-+        if (!csp.first.first.isPartOf(sig->d_signer)) {
-+          return increaseDNSSECStateCounter(Bogus);
-+        }
-+
-         vState newState = getKeysFor(sro, sig->d_signer, keys); // XXX check validity here
- 
-         if (newState == Bogus) // No hope
diff --git a/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch b/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch
deleted file mode 100644
index 1425c33586c2..000000000000
--- a/net-dns/pdns-recursor/files/CVE-2017-15092-4.0.6.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-diff -ru pdns-recursor-4.0.6.orig/html/local.js pdns-recursor-4.0.6/html/local.js
---- pdns-recursor-4.0.6.orig/html/local.js	2017-07-04 17:43:07.000000000 +0200
-+++ pdns-recursor-4.0.6/html/local.js	2017-11-02 18:26:04.624586674 +0100
-@@ -63,7 +63,7 @@
- 
- 	$.getJSON(qstring,
- 		  function(data) {
--		      var bouw="<table><tr><th>Number</th><th>Domain</th><th>Type</th></tr>";
-+		      var table = $('<table><tr><th>Number</th><th>Domain</th><th>Type</th></tr></table>');
- 		      var num=0;
- 		      var total=0, rest=0;
- 		      $.each(data["entries"], function(a,b) {
-@@ -75,12 +75,26 @@
- 			  if(b[1].length > 25)
- 			      b[1]=b[1].substring(0,25);
- 
--			  bouw=bouw+("<tr><td>"+b[0]+"</td><td>"+b[1]+"</td><td>"+b[2]+"</td></tr>");
--		      });
--		      bouw+="<tr><td>"+rest+"</td><td>Rest</td></tr>";
--		      bouw=bouw+"</table>";
--		      $("#queryring").html(bouw);
--
-+			  var line = $('<tr />');
-+			  var number = $('<td />');
-+			  number.text(b[0]);
-+			  var domain = $('<td />');
-+			  domain.text(b[1]);
-+			  var type = $('<td />');
-+			  type.text(b[2]);
-+			  line.append(number);
-+			  line.append(domain);
-+			  line.append(type);
-+			  table.append(line);
-+                      });
-+		      var line = $('<tr />');
-+		      var number = $('<td />');
-+		      number.text(rest);
-+		      var label = $('<td>Rest</td>');
-+		      line.append(number);
-+		      line.append(label);
-+		      table.append(line);
-+		      $("#queryring").html(table);
- 		  });
- 
- 	filtered=$("#filter2").is(':checked')
-@@ -91,7 +105,7 @@
- 
- 	$.getJSON(qstring, 
- 		  function(data) {
--		      var bouw="<table><tr><th>Number</th><th>Servfail domain</th><th>Type</th></tr>";
-+		      var table = $('<table><tr><th>Number</th><th>Servfail domain</th><th>Type</th></tr></table>');
- 		      var num=0, total=0, rest=0;
- 		      $.each(data["entries"], function(a,b) {
- 			  total+=b[0];
-@@ -101,11 +115,26 @@
- 			  }
- 			  if(b[1].length > 25)
- 			      b[1]=b[1].substring(0,25);
--			  bouw=bouw+("<tr><td>"+b[0]+"</td><td>"+b[1]+"</td><td>"+b[2]+"</td></tr>");
-+			  var line = $('<tr />');
-+			  var number = $('<td />');
-+			  number.text(b[0]);
-+			  var domain = $('<td />');
-+			  domain.text(b[1]);
-+			  var type = $('<td />');
-+			  type.text(b[2]);
-+			  line.append(number);
-+			  line.append(domain);
-+			  line.append(type);
-+			  table.append(line);
- 		      });
--		      bouw+="<tr><td>"+rest+"</td><td>Rest</td></tr>";
--		      bouw=bouw+"</table>";
--		      $("#servfailqueryring").html(bouw);
-+		      var line = $('<tr />');
-+		      var number = $('<td />');
-+		      number.text(rest);
-+		      var label = $('<td>Rest</td>');
-+		      line.append(number);
-+		      line.append(label);
-+		      table.append(line);
-+		      $("#servfailqueryring").html(table);
- 
- 		  });
- 
-- 
cgit v1.2.3