From 1f2aa585fc113e34c634887bc00c492b8d38604f Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 4 Jun 2021 20:53:14 +0200
Subject: [PATCH] getdns-1.7.0 release

---
 CMakeLists.txt | 6 +++---
 ChangeLog      | 3 ++-
 stubby         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bac3a089..413709da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,13 +19,13 @@ 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 "-rc.1")
+set(RELEASE_CANDIDATE "")
 
 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 0x010600C1)
+set(GETDNS_NUMERIC_VERSION 0x01070000)
 set(API_VERSION "December 2015")
 set(API_NUMERIC_VERSION 0x07df0c00)
 
@@ -69,7 +69,7 @@ set(API_NUMERIC_VERSION 0x07df0c00)
 # getdns-1.5.1 had libversion 11:1:1
 # getdns-1.5.2 had libversion 11:2:1
 # getdns-1.6.0 had libversion 11:3:1
-# getdns-1.7.0 will have libversion 12:0:2
+# getdns-1.7.0 has libversion 12:0:2
 set(GETDNS_VERSION_CURRENT 12)
 set(GETDNS_VERSION_REVISION 0)
 set(GETDNS_VERSION_AGE 2)
diff --git a/ChangeLog b/ChangeLog
index c7d1b037..7bcb12e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-* 2021-06-??: Version 1.7.0
+* 2021-06-04: 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
@@ -20,6 +20,7 @@
     #320 .
   * Eventloop extensions back to the old names libgetdns_ext_event,
     libgetdns_ext_ev and libgetdns_ext_uv.
+  * Compilation warning fixes. Thanks Andreas!
 
 * 2020-02-28: Version 1.6.0
   * Issues #457, #458, #461: New symbols with libnettle >= 3.4.
diff --git a/stubby b/stubby
index 391e5d30..40b6bf95 160000
--- a/stubby
+++ b/stubby
@@ -1 +1 @@
-Subproject commit 391e5d300b44f8be5231dd00ae51a880fb4c020e
+Subproject commit 40b6bf95391f639cc86e5d328e89011ef4c16437