mstevens pushed to pdns (f20). "Update to 3.3.2"

[notifications at fedoraproject.org]

>From dfa94b850b32d188dcd45632fddbdcaa1ed49c95 Mon Sep 17 00:00:00 2001
From: Morten Stevens <mstevens at imt-systems.com>
Date: Fri, 1 May 2015 18:08:05 +0200
Subject: Update to 3.3.2


diff --git a/.gitignore b/.gitignore
index dc18fb4..09d674b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ pdns-2.9.22.tar.gz
 /pdns-3.3-rc2.tar.gz
 /pdns-3.3.tar.gz
 /pdns-3.3.1.tar.gz
+/pdns-3.3.2.tar.gz
diff --git a/CVE-2015-1868.patch b/CVE-2015-1868.patch
deleted file mode 100644
index 5c695de..0000000
--- a/CVE-2015-1868.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/pdns/dnsparser.cc b/pdns/dnsparser.cc
-index 595a4af..b89d840 100644
---- a/pdns/dnsparser.cc
-+++ b/pdns/dnsparser.cc
-@@ -455,9 +455,10 @@ string PacketReader::getText(bool multi)
- 
- void PacketReader::getLabelFromContent(const vector<uint8_t>& content, uint16_t& frompos, string& ret, int recurs) 
- {
--  if(recurs > 1000) // the forward reference-check below should make this test 100% obsolete
-+  if(recurs > 100) // the forward reference-check below should make this test 100% obsolete
-     throw MOADNSException("Loop");
- 
-+  int pos = frompos;
-   for(;;) {
-     unsigned char labellen=content.at(frompos++);
- 
-@@ -470,7 +471,7 @@ void PacketReader::getLabelFromContent(const vector<uint8_t>& content, uint16_t&
-       uint16_t offset=256*(labellen & ~0xc0) + (unsigned int)content.at(frompos++) - sizeof(dnsheader);
-       //        cout<<"This is an offset, need to go to: "<<offset<<endl;
- 
--      if(offset >= frompos-2)
-+      if(offset >= pos)
-         throw MOADNSException("forward reference during label decompression");
-       return getLabelFromContent(content, offset, ret, ++recurs);
-     }
-
diff --git a/pdns.spec b/pdns.spec
index 94cbc42..f4e3d17 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -2,8 +2,8 @@
 %global backends %{nil}
 
 Name: pdns
-Version: 3.3.1
-Release: 3%{?dist}
+Version: 3.3.2
+Release: 1%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 Group: System Environment/Daemons
 License: GPLv2
@@ -11,7 +11,6 @@ URL: http://powerdns.com
 Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Source1: pdns.service
 Patch0: pdns-default-config.patch
-Patch1: CVE-2015-1868.patch
 
 Requires(pre): shadow-utils
 Requires(post): systemd-sysv
@@ -131,7 +130,6 @@ This package contains the opendbx backend for %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .default-config-patch
-%patch1 -p1 -b .CVE-2015-1868
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED"
@@ -263,6 +261,9 @@ exit 0
 %{_libdir}/%{name}/libopendbxbackend.so
 
 %changelog
+* Fri May 01 2015 Morten Stevens <mstevens at imt-systems.com> - 3.3.2-1
+- Update to latest upstream release 3.3.2
+
 * Mon Apr 27 2015 Morten Stevens <mstevens at imt-systems.com> - 3.3.1-3
 - CVE-2015-1868
 - Run the unit tests during check
diff --git a/sources b/sources
index 5a73878..cca84e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-074e2ff211fd12ecad25b5c1cc190dd4  pdns-3.3.1.tar.gz
+8e338464ad1c25360d3ed6e7252f6ea8  pdns-3.3.2.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/pdns.git/commit/?h=f20&id=dfa94b850b32d188dcd45632fddbdcaa1ed49c95