From 64dcd7e6d65a76487af7c4a5b3643fe2c871e2f1 Mon Sep 17 00:00:00 2001
From: Sander Hoentjen <shoentjen@antagonist.nl>
Date: Sun, 18 Nov 2018 16:40:41 +0100
Subject: [PATCH] Update to 1.3.3 Fixes CVE-2018-14663

---
 .gitignore   |  1 +
 dnsdist.spec | 13 ++++++++-----
 sources      |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 52d9af2..24eb0af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /dnsdist-1.1.0.tar.bz2
 /dnsdist-1.2.0.tar.bz2
 /dnsdist-1.3.0.tar.bz2
+/dnsdist-1.3.3.tar.bz2
diff --git a/dnsdist.spec b/dnsdist.spec
index 1761345..6797de9 100644
--- a/dnsdist.spec
+++ b/dnsdist.spec
@@ -3,14 +3,13 @@
 %endif
 
 Name: dnsdist
-Version: 1.3.0
-Release: 2%{?dist}
+Version: 1.3.3
+Release: 1%{?dist}
 Summary: Highly DNS-, DoS- and abuse-aware loadbalancer
 Group: System Environment/Daemons
 License: GPLv2
 URL: https://dnsdist.org
 Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.bz2
-Patch0: fix-sigabrt.patch
 
 BuildRequires: boost-devel
 BuildRequires: gcc-c++
@@ -46,8 +45,7 @@ legitimate users while shunting or blocking abusive traffic.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p2
+%autosetup
 
 # run as dnsdist user
 sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.in
@@ -62,6 +60,7 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
     --enable-dns-over-tls \
     --enable-libsodium \
     --enable-libssl \
+    --with-ebpf=no \
 %ifnarch aarch64 ppc64 ppc64le
     --with-luajit \
 %else
@@ -113,6 +112,10 @@ exit 0
 
 
 %changelog
+* Sun Nov 18 2018 Sander Hoentjen <sander@hoentjen.eu> - 1.3.3-1
+- Update to 1.3.3
+- Fixes CVE-2018-14663
+
 * Wed Jun 06 2018 Ruben Kerkhof <ruben@rubenkerkhof.com> - 1.3.0-2
 - Fix sigabrt on TCP query (https://github.com/PowerDNS/pdns/issues/6712)
 
diff --git a/sources b/sources
index a10976e..a039376 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (dnsdist-1.3.0.tar.bz2) = 35c5dd1f5104ed7f043ce04cbaac14e2eebb2b61ed827e838f5ac0ee1fd4afd4310853df8a193abc37654d2438b10297c611d4b05d8d1bd5e50424d1409851dc
+SHA512 (dnsdist-1.3.3.tar.bz2) = c0e3435eafc1f7bcdf41346cecf7b089cc142716f94058f9ec262d0c6ad16467e0b8bed5abc648829c597120c94f998602849ded574e75bfc1a1fb70c1b719ad