diff --git a/ChangeLog b/ChangeLog index d319b220b..2fb2fce38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,6 @@ -* 2019-03-??: Version 1.5.2 +* 2019-04-03: Version 1.5.2 + * PR #424: Two small trust anchor fetcher fixes + Thanks Maciej S. Szmigiero * Issue #422: Enable server side and update client side TCP Fast Open implementation. Thanks Craig Andrews * Issue #423: Fix insecure delegation detection while scheduling. diff --git a/configure.ac b/configure.ac index 262b56fd4..dd8ff09f4 100644 --- a/configure.ac +++ b/configure.ac @@ -53,8 +53,8 @@ AC_SUBST([runstatedir], [$with_piddir]) # Don't 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(STUBBY_RELEASE_CANDIDATE, [-rc1]) +AC_SUBST(RELEASE_CANDIDATE, []) +AC_SUBST(STUBBY_RELEASE_CANDIDATE, []) # Set current date from system if not set AC_ARG_WITH([current-date], @@ -64,7 +64,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, [0x010501c1]) +AC_SUBST(GETDNS_NUMERIC_VERSION, [0x01050200]) 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" @@ -109,7 +109,7 @@ AC_DEFINE_UNQUOTED([STUBBY_PACKAGE_STRING], ["0.2.6$STUBBY_RELEASE_CANDIDATE"], # getdns-1.4.2 had libversion 10:2:0 # getdns-1.5.0 had libversion 11:0:1 # getdns-1.5.1 had libversion 11:1:1 -# getdns-1.5.2 will have libversion 11:2:1 +# getdns-1.5.2 has libversion 11:2:1 GETDNS_LIBVERSION=11:2:1 AC_SUBST(GETDNS_COMPILATION_COMMENT) diff --git a/stubby b/stubby index 376a8dbc5..b0d3154af 160000 --- a/stubby +++ b/stubby @@ -1 +1 @@ -Subproject commit 376a8dbc5c4a8b1f52726182966b2ea9ff36be9d +Subproject commit b0d3154af61e1b46a30b56d239dc074273642217