From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 4 Apr 2017 14:44:22 +0000 (+0200)
Subject: Prepare 1.2.5 release
X-Git-Tag: v1.2.5~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94d51d00dc6d17204140371c8a2ebf5e778f1a2d;p=thirdparty%2Fknot-resolver.git

Prepare 1.2.5 release
---

diff --git a/NEWS b/NEWS
index d49cd77f8..a07de1d3e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,38 @@
+Knot Resolver 1.2.5 (2017-04-06)
+================================
+
+Security
+--------
+- layer/validate: clear AD if closest encloser proof has opt-outed
+  NSEC3 (#169)
+- layer/validate: check if NSEC3 records in wildcard expansion proof
+  has an opt-out
+- dnssec/nsec: missed wildcard no-data answers validation has been
+  implemented
+
+Improvements
+------------
+- modules/dnstap: a DNSTAP support module
+  (Contributed by Vicky Shrestha)
+- modules/workarounds: a module adding workaround for know
+  DNS protocol violators
+- layer/iterate: fix logging of glue addresses
+- allow bits=0 and consequently 0.0.0.0/0 matches in view and renumber
+  modules.
+- modules/padding: Improve default padding of responses
+  (Contributed by Daniel Kahn Gillmor)
+
+Bugfixes
+--------
+- trust anchors: Improve trust anchors storage format (#167)
+- trust anchors: support non-root TAs, one domain per file
+- policy.DENY: set AA flag and clear AD flag
+- lib/resolve: avoid unnecessary DS queries
+- lib/nsrep: don't treat servers with NOIP4 + NOIP6 flags as timeouted
+- layer/iterate: During packet classification (answer vs. referral)
+  don't analyze AUTHORITY section in authoritative answer in ANSWER
+  section contains records that have been requested
+
 Knot Resolver 1.2.4 (2017-03-09)
 ================================
 
diff --git a/config.mk b/config.mk
index 92829262e..71a1bd17a 100644
--- a/config.mk
+++ b/config.mk
@@ -1,7 +1,7 @@
 # Project
 MAJOR := 1
-MINOR := 3
-PATCH := 0
+MINOR := 2
+PATCH := 5
 EXTRA := -dev
 ABIVER := 3
 BUILDMODE := dynamic