aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Jaeger <pi@FreeBSD.org>2018-06-20 15:06:52 +0000
committerKurt Jaeger <pi@FreeBSD.org>2018-06-20 15:06:52 +0000
commitb0010a09dc7aefd098e28e3a92cc2fe918e1036e (patch)
tree2576a5c6527de6a3f4522fd56fc5d9a454c2be6e
parent1d63cb39aa446522e13b4894431b7313781c573e (diff)
downloadports-b0010a09dc7aefd098e28e3a92cc2fe918e1036e.tar.gz
ports-b0010a09dc7aefd098e28e3a92cc2fe918e1036e.zip
MFH: r472842
dns/knot-resolver: update 2.1.1 -> 2.3.0, fixing CVE-2018-1110 PR: 229040 Reported by: freebsd-vheg@riseup.net Approved by: Leo Vandewoestijne <freebsd@dns.company> (maintainer) Relnotes: https://www.knot-resolver.cz/2018-04-23-knot-resolver-2.3.0.html Security: CVE-2018-1110 Approved by: portmgr (miwi)
Notes
Notes: svn path=/branches/2018Q2/; revision=472874
-rw-r--r--dns/knot-resolver/Makefile4
-rw-r--r--dns/knot-resolver/distinfo6
-rw-r--r--dns/knot-resolver/files/patch-contrib_ucw_mempool-fmt.c11
-rw-r--r--dns/knot-resolver/pkg-plist5
4 files changed, 8 insertions, 18 deletions
diff --git a/dns/knot-resolver/Makefile b/dns/knot-resolver/Makefile
index efcec390ec3f..a4a39f27b356 100644
--- a/dns/knot-resolver/Makefile
+++ b/dns/knot-resolver/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= knot-resolver
-DISTVERSION= 2.1.1
+DISTVERSION= 2.3.0
CATEGORIES= dns ipv6
MASTER_SITES= https://secure.nic.cz/files/knot-resolver/ \
https://dns.company/downloads/knot-resolver/
@@ -86,7 +86,7 @@ PORTDOCS= AUTHORS COPYING CodingStyle README.md
STRIP_TARGETS= sbin/kresd \
sbin/kresc \
- lib/libkres.so.6 \
+ lib/libkres.so.7 \
lib/kdns_modules/ahocorasick.so \
lib/kdns_modules/cookies.so \
lib/kdns_modules/dnstap.so \
diff --git a/dns/knot-resolver/distinfo b/dns/knot-resolver/distinfo
index e4413294281e..96231fa016ab 100644
--- a/dns/knot-resolver/distinfo
+++ b/dns/knot-resolver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1520372546
-SHA256 (knot-resolver-2.1.1.tar.xz) = 0b9caee03d7cd30e1dc8fa0ce5fafade31fc1785314986bbf77cad446522a1b3
-SIZE (knot-resolver-2.1.1.tar.xz) = 1490064
+TIMESTAMP = 1529357112
+SHA256 (knot-resolver-2.3.0.tar.xz) = 2d19c5daf8440bd3d2acd1886b9ede65f04f7753c6fd4618a92a1a4ba3b27a9b
+SIZE (knot-resolver-2.3.0.tar.xz) = 1522788
diff --git a/dns/knot-resolver/files/patch-contrib_ucw_mempool-fmt.c b/dns/knot-resolver/files/patch-contrib_ucw_mempool-fmt.c
deleted file mode 100644
index f51157a6b8e1..000000000000
--- a/dns/knot-resolver/files/patch-contrib_ucw_mempool-fmt.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- contrib/ucw/mempool-fmt.c.orig 2018-03-06 23:36:10 UTC
-+++ contrib/ucw/mempool-fmt.c
-@@ -11,7 +11,7 @@
- #include <ucw/lib.h>
- #include <ucw/mempool.h>
-
--#include <alloca.h>
-+#include "alloc.h"
- #include <stdio.h>
- #include <string.h>
-
diff --git a/dns/knot-resolver/pkg-plist b/dns/knot-resolver/pkg-plist
index d1049259a434..ce2adf161243 100644
--- a/dns/knot-resolver/pkg-plist
+++ b/dns/knot-resolver/pkg-plist
@@ -22,9 +22,9 @@ include/libkres/nsrep.h
include/libkres/pack.h
include/libkres/resolve.h
include/libkres/rplan.h
-include/libkres/set.h
include/libkres/signature.h
include/libkres/ta.h
+include/libkres/trie.h
include/libkres/utils.h
include/libkres/zonecut.h
lib/kdns_modules/ahocorasick.so
@@ -61,6 +61,7 @@ lib/kdns_modules/kres.lua
lib/kdns_modules/kres-gen.lua
lib/kdns_modules/policy.lua
lib/kdns_modules/predict.lua
+lib/kdns_modules/prefill.lua
lib/kdns_modules/priming.lua
lib/kdns_modules/prometheus.lua
lib/kdns_modules/renumber.lua
@@ -74,7 +75,7 @@ lib/kdns_modules/view.lua
lib/kdns_modules/workarounds.lua
lib/kdns_modules/zonefile.lua
lib/libkres.so
-lib/libkres.so.6
+lib/libkres.so.7
libdata/pkgconfig/libkres.pc
man/man8/kresd.8.gz
sbin/kresc