From 86aa356b48391d476e1bddda620e44e3d89f0141 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 27 May 2021 20:39:26 +0200
Subject: [PATCH] Release version 1.7.0 tomorrow

---
 CMakeLists.txt | 15 ++++++++-------
 ChangeLog      |  2 +-
 stubby         |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 811525d2..353ac49f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,19 +13,19 @@ endif ()
 
 set(PACKAGE "getdns")
 set(PACKAGE_NAME "getdns")
-set(PACKAGE_VERSION "1.6.1")
+set(PACKAGE_VERSION "1.7.0")
 set(PACKAGE_BUGREPORT "team@getdnsapi.net")
 set(PACKAGE_URL "https://getdnsapi.net")
 
 # Dont forget to put a dash in front of the release candidate!!!
 # That is how it is done with semantic versioning!
-set(RELEASE_CANDIDATE "-rc1")
+set(RELEASE_CANDIDATE "-rc.1")
 
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}${RELEASE_CANDIDATE}")
 set(PACKAGE_TARNAME "${PACKAGE}-${PACKAGE_VERSION}${RELEASE_CANDIDATE}")
 
 set(GETDNS_VERSION "${PACKAGE_VERSION}${RELEASE_CANDIDATE}")
-set(GETDNS_NUMERIC_VERSION 0x01060000)
+set(GETDNS_NUMERIC_VERSION 0x010600C1)
 set(API_VERSION "December 2015")
 set(API_NUMERIC_VERSION 0x07df0c00)
 
@@ -68,10 +68,11 @@ set(API_NUMERIC_VERSION 0x07df0c00)
 # getdns-1.5.0 had libversion 11:0:1
 # getdns-1.5.1 had libversion 11:1:1
 # getdns-1.5.2 had libversion 11:2:1
-# getdns-1.6.0 has libversion 11:3:1
-set(GETDNS_VERSION_CURRENT 11)
-set(GETDNS_VERSION_REVISION 3)
-set(GETDNS_VERSION_AGE 1)
+# getdns-1.6.0 had libversion 11:3:1
+# getdns-1.7.0 will have libversion 12:0:2
+set(GETDNS_VERSION_CURRENT 12)
+set(GETDNS_VERSION_REVISION 0)
+set(GETDNS_VERSION_AGE 2)
 
 project(getdns VERSION ${PACKAGE_VERSION} LANGUAGES C)
 
diff --git a/ChangeLog b/ChangeLog
index 4f77b479..6e8591c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-* 2021-05-28: Version 1.6.1-rc.1
+* 2021-06-??: Version 1.7.0
   * Make TLS Handshake timeout max 4/5th of timeout for the query,
     just like connection setup timeout was, so fallback transport
     have a chance too when TCP connection setup is less well
diff --git a/stubby b/stubby
index f3d3197d..391e5d30 160000
--- a/stubby
+++ b/stubby
@@ -1 +1 @@
-Subproject commit f3d3197d125a635b57e39c4a7d1d8bd9d0c6d07c
+Subproject commit 391e5d300b44f8be5231dd00ae51a880fb4c020e