diff --git a/ChangeLog b/ChangeLog index 8549d293..ce1cab78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -* 2018-12-??: Version 1.5.0 +* 2018-12-21: Version 1.5.0 * GETDNS_RESPSTATUS_NO_NAME for NODATA answers too * ZONEMD rr-type * getdns_query queries for addresses when a query name diff --git a/configure.ac b/configure.ac index 2c40affb..40c94977 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ 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(RELEASE_CANDIDATE, []) AC_SUBST(STUBBY_RELEASE_CANDIDATE, []) # Set current date from system if not set @@ -63,7 +63,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, [0x0104ffc1]) +AC_SUBST(GETDNS_NUMERIC_VERSION, [0x01050000]) 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" @@ -105,8 +105,8 @@ AC_DEFINE_UNQUOTED([STUBBY_PACKAGE_STRING], ["0.2.4$STUBBY_RELEASE_CANDIDATE"], # getdns-1.3.0 had libversion 9:0:3 # getdns-1.4.0 had libversion 10:0:0 # getdns-1.4.1 had libversion 10:1:0 -# getdns-1.4.2 has libversion 10:2:0 -# getdns-1.5.0 will have libversion 11:0:1 +# getdns-1.4.2 had libversion 10:2:0 +# getdns-1.5.0 has libversion 11:0:1 GETDNS_LIBVERSION=11:0:1 AC_SUBST(GETDNS_COMPILATION_COMMENT) diff --git a/stubby b/stubby index b04882ad..dc019d38 160000 --- a/stubby +++ b/stubby @@ -1 +1 @@ -Subproject commit b04882ad76cc2efdba6238f59e233844e4223908 +Subproject commit dc019d38f9ef3b68adc7bc663ea9dd6d32677d5a