From 1aef5fb3e4419c7da39bd3ab7216d1085a6e2bc2 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 24 Aug 2017 13:29:16 +0200
Subject: [PATCH] Bumb version + ChangeLog

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

diff --git a/ChangeLog b/ChangeLog
index bae0d547..a0226b71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+* 2017-0?-??: Version 1.1.3
+  * No annotations with the output of getdns_query anymore,
+    unless -V option is given to increase verbosity
+    Thanks Ollivier Robert
+  * getdns_query will now exit with failure status if replies are BOGUS
+  * Bugfix: dnssec_return_validation_chain now also works when fallback
+    to full recursion was needed with dnssec_roadblock_avoidance
+  * More clear build instructions from Paul Hoffman.  Thanks.
+  * Bugfix #320.1: Eliminate multiple closing of file descriptors
+    Thanks Neil Cook
+  * Bugfix #320.2: Array bounds bug in upstream_select
+    Thanks Neil Cook
+  * Bugfix #318: getdnsapi/getdns/README.md links to nonexistent wiki
+    pages.  Thanks James Raftery
+  * Bugfix #322: MacOS 10.10 (Yosemite) provides TCP fastopen interface
+    but does not have it implemented.  Thanks Joel Purra
+  * Compile without Stubby by default.  Stubby now has a git repository
+    of its own.  The new Stubby repository is added as a submodule.
+    Stubby will still be build alongside getdns with the --with-stubby
+    configure option.
+
 * 2017-07-03: Version 1.1.2
   * Bugfix for parallel make install
   * Bugfix to trigger event callbacks on socket errors
diff --git a/configure.ac b/configure.ac
index a48577e4..2156085e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,12 +36,12 @@ sinclude(./m4/acx_getaddrinfo.m4)
 sinclude(./m4/ax_check_compile_flag.m4)
 sinclude(./m4/pkg.m4)
 
-AC_INIT([getdns], [1.1.2], [users@getdnsapi.net], [], [https://getdnsapi.net])
+AC_INIT([getdns], [1.1.3], [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, [])
+AC_SUBST(RELEASE_CANDIDATE, [-rc1])
 
 # 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, [0x01010200])
+AC_SUBST(GETDNS_NUMERIC_VERSION, [0x010102c1])
 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"
@@ -85,8 +85,9 @@ GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRE
 # getdns-1.1.0 had libversion 6:0:0
 # getdns-1.1.1 had libversion 6:1:0
 # getdns-1.1.2 has libversion 7:0:1
+# getdns-1.1.3 will have libversion 7:1:1
 #
-GETDNS_LIBVERSION=7:0:1
+GETDNS_LIBVERSION=7:1:1
 
 AC_SUBST(GETDNS_COMPILATION_COMMENT)
 AC_SUBST(GETDNS_LIBVERSION)