From 606b83d8576ceeeeb6adbd191953a39c40be52e2 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 15 Jun 2017 21:43:23 +0200
Subject: [PATCH] Bump version

---
 ChangeLog    | 4 +++-
 configure.ac | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1ebc847dd..fab12d742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-* 2017-06-??: Version 1.1.1
+* 2017-06-15: Version 1.1.1
+  * Bugfix #306 hanging/segfaulting on certain (IPv6) upstream failures
+  * Spelling fix s/receive/receive.  Thanks Andreas Schulze.
   * Added stubby-setdns-macos.sh script to support Homebrew formula
   * Include stubby.conf in the districution tarball
   * Bugfix #286 reschedule reused listening addresses
diff --git a/configure.ac b/configure.ac
index c6bd47a5a..708a39794 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,7 @@ AC_INIT([getdns], [1.1.1], [users@getdnsapi.net], [], [https://getdnsapi.net])
 # Dont forget to put a dash in front of the release candidate!!!
 # That is how it is done with semantic versioning!
 #
-AC_SUBST(RELEASE_CANDIDATE, [rc1])
+AC_SUBST(RELEASE_CANDIDATE, [])
 
 # Set current date from system if not set
 AC_ARG_WITH([current-date],
@@ -51,7 +51,7 @@ AC_ARG_WITH([current-date],
   [CURRENT_DATE="`date -u +%Y-%m-%dT%H:%M:%SZ`"])
 
 AC_SUBST(GETDNS_VERSION, ["AC_PACKAGE_VERSION$RELEASE_CANDIDATE"])
-AC_SUBST(GETDNS_NUMERIC_VERSION, [0x010100c1])
+AC_SUBST(GETDNS_NUMERIC_VERSION, [0x01010100])
 AC_SUBST(API_VERSION, ["December 2015"])
 AC_SUBST(API_NUMERIC_VERSION, [0x07df0c00])
 GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRENT_DATE for the $API_VERSION version of the API"
@@ -83,7 +83,7 @@ GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRE
 # getdns-0.9.0 had libversion 5:0:4
 # getdns-1.0.0 had libversion 5:1:4
 # getdns-1.1.0 had libversion 6:0:0
-# getdns-1.1.1 will have libversion 6:1:0
+# getdns-1.1.1 has libversion 6:1:0
 #
 GETDNS_LIBVERSION=6:1:0