From 6f20016889214d0fdc22b5fce816b5b1d66a6b39 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Fri, 10 Nov 2017 10:35:41 +0100 Subject: [PATCH 1/5] default_trust_anchor_location in api_information instead of trust_anchor_file --- src/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/context.c b/src/context.c index 994a9ac4..62678873 100644 --- a/src/context.c +++ b/src/context.c @@ -3903,7 +3903,7 @@ getdns_context_get_api_information(getdns_context* context) result, "compilation_comment", GETDNS_COMPILATION_COMMENT) && ! getdns_dict_util_set_string( - result, "trust_anchor_file", TRUST_ANCHOR_FILE) + result, "default_trust_anchor_location", TRUST_ANCHOR_FILE) && ! getdns_dict_set_int( result, "resolution_type", context->resolution_type) @@ -4623,6 +4623,7 @@ _getdns_context_config_setting(getdns_context *context, && !_streq(setting, "api_version_string") && !_streq(setting, "api_version_number") && !_streq(setting, "trust_anchor_file") + && !_streq(setting, "default_trust_anchor_location") && !_streq(setting, "compilation_comment") ) { r = GETDNS_RETURN_NOT_IMPLEMENTED; From 260416a8598304a8a04cb2188e32e6688833b94a Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Fri, 10 Nov 2017 10:42:17 +0100 Subject: [PATCH 2/5] Ignore SIGPIPE signal (for not suddenly stopping) --- src/tools/getdns_query.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/src/tools/getdns_query.c b/src/tools/getdns_query.c index 53e546e2..a9b4b96d 100644 --- a/src/tools/getdns_query.c +++ b/src/tools/getdns_query.c @@ -46,6 +46,10 @@ typedef unsigned short in_port_t; #include #endif +#ifdef HAVE_SIGNAL_H +#include +#endif + #ifdef HAVE_GETDNS_YAML2DICT getdns_return_t getdns_yaml2dict(const char *, getdns_dict **dict); #endif @@ -1794,27 +1798,10 @@ main(int argc, char **argv) } else if (listen_count) { assert(loop); -#ifndef GETDNS_ON_WINDOWS - if (i_am_stubby && !run_in_foreground) { - pid_t pid = fork(); - if (pid == -1) { - perror("Could not fork of stubby daemon\n"); - r = GETDNS_RETURN_GENERIC_ERROR; - - } else if (pid) { - FILE *fh = fopen("/var/rub/stubby.pid", "w"); - if (! fh) - fh = fopen("/tmp/stubby.pid", "w"); - if (fh) { - fprintf(fh, "%d", (int)pid); - fclose(fh); - batch_mode = 0; - } - } else - loop->vmt->run(loop); - } else +#ifdef SIGPIPE + (void) signal(SIGPIPE, SIG_IGN); #endif - loop->vmt->run(loop); + loop->vmt->run(loop); } else r = do_the_call(); From 6aa732b54dfaa4e9eaf4f4ece46874d334f01a19 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Sat, 11 Nov 2017 00:26:18 +0800 Subject: [PATCH 3/5] Update Stubby --- stubby | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stubby b/stubby index daa9dc64..a43be56e 160000 --- a/stubby +++ b/stubby @@ -1 +1 @@ -Subproject commit daa9dc64c0f4c574d18f8eb1a38705ddf9a26346 +Subproject commit a43be56e28f3a802f74b7c5b19b4b4c5fbaa908a From bf034eb3cd088469089097458fad773e39574259 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Sat, 11 Nov 2017 00:28:17 +0800 Subject: [PATCH 4/5] Bump version --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 9d652c6d..01dcbdb9 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,7 @@ AC_SUBST([runstatedir], [$with_piddir]) # 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], @@ -62,7 +62,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, [0x010200C1]) +AC_SUBST(GETDNS_NUMERIC_VERSION, [0x01020100]) 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" @@ -98,7 +98,7 @@ GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRE # getdns-1.1.2 had libversion 7:0:1 # getdns-1.1.3 had libversion 7:1:1 # getdns-1.2.0 had libversion 8:0:2 -# getdns-1.2.1 will have libversion 8:1:2 +# getdns-1.2.1 has libversion 8:1:2 # GETDNS_LIBVERSION=8:1:2 From f2f08514ce6d0255270ed550b28ce777c8efdf44 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Sat, 11 Nov 2017 00:42:25 +0800 Subject: [PATCH 5/5] Set date in ChangeLog --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 46e0d345..69d8872b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -* 2017-11-??: Version 1.2.1 +* 2017-11-11: Version 1.2.1 * Handle more I/O error cases. Also, when an I/O error does occur, never stop listening (with servers), and never exit (when running the built-in event loop).