From b22666d66755f9c36b7eb0a4502d6f1fd5176454 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Mon, 2 Oct 2017 16:34:12 +0200 Subject: [PATCH 1/3] Bump version --- configure.ac | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 1c1d6453..83715747 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.2.0], [users@getdnsapi.net], [], [https://getdnsapi.net]) +AC_INIT([getdns], [1.2.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, []) +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, [0x01020000]) +AC_SUBST(GETDNS_NUMERIC_VERSION, [0x010200C1]) 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" @@ -86,9 +86,10 @@ GETDNS_COMPILATION_COMMENT="AC_PACKAGE_NAME $GETDNS_VERSION configured on $CURRE # getdns-1.1.1 had libversion 6:1:0 # getdns-1.1.2 had libversion 7:0:1 # getdns-1.1.3 had libversion 7:1:1 -# getdns-1.2.0 has libversion 8:0:2 +# getdns-1.2.0 had libversion 8:0:2 +# getdns-1.2.1 will have libversion 8:1:2 # -GETDNS_LIBVERSION=8:0:2 +GETDNS_LIBVERSION=8:1:2 AC_SUBST(GETDNS_COMPILATION_COMMENT) AC_SUBST(GETDNS_LIBVERSION) From 3e221ebed587d303c0d7ebaca02430f94a80a51b Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Mon, 2 Oct 2017 16:36:07 +0200 Subject: [PATCH 2/3] Fix parallel make install's --- ChangeLog | 4 ++++ src/Makefile.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e6e66951..189c3da3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +* 2017-1?-??: Version 1.2.1 + * Fix Makefile dependencies for parallel install. + Thanks ilovezfs + * 2017-09-29: Version 1.2.0 * Bugfix of rc1: authentication of first query with TLS Thanks Travis Burtrum diff --git a/src/Makefile.in b/src/Makefile.in index 02b81f40..f77b7447 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -160,7 +160,7 @@ install-headers: getdns/getdns.h getdns/getdns_extra.h uninstall-headers: rm -rf $(DESTDIR)$(includedir)/getdns -install-libs: libgetdns.la +install-libs: libgetdns.la $(EXTENSION_LIBEVENT_LIB) $(EXTENSION_LIBUV_LIB) $(EXTENSION_LIBEV_LIB) $(INSTALL) -m 755 -d $(DESTDIR)$(libdir) $(LIBTOOL) --mode=install cp libgetdns.la $(DESTDIR)$(libdir) if test $(have_libevent) = 1 ; then $(LIBTOOL) --mode=install cp $(EXTENSION_LIBEVENT_LIB) $(DESTDIR)$(libdir) ; fi From ffc72ff2537dcab85a97b370df36514deb3e5de7 Mon Sep 17 00:00:00 2001 From: Willem Toorop Date: Tue, 3 Oct 2017 17:09:33 +0200 Subject: [PATCH 3/3] Rearrange includes for finding inet_ntop on Windows + make sure stubby is linked with initial LDFLAGS (i.e. static) as well --- configure.ac | 73 +++++++++++++++++++++++++++++---------------------- src/convert.c | 2 +- src/dict.c | 2 +- 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/configure.ac b/configure.ac index 1552bb39..ca8c6d81 100644 --- a/configure.ac +++ b/configure.ac @@ -1147,8 +1147,8 @@ AC_SUBST(INSTALL_STUBBY) AC_SUBST(UNINSTALL_STUBBY) AC_SUBST(STUBBY_XTRA_OBJS) -STUBBY_LDFLAGS="" STUBBY_LIBS="" +STUBBY_LDFLAGS="" if test $my_with_yaml = 1 then @@ -1156,8 +1156,8 @@ then then getdns_LIBS="$LIBS" getdns_LDFLAGS="$LDFLAGS" - LIBS="" - LDFLAGS="" + LIBS="$initial_LIBS" + LDFLAGS="$initial_LDFLAGS" fi AC_ARG_WITH(libyaml, AS_HELP_STRING([--with-libyaml=pathname], [path to libyaml (default: search /usr/local ..)]), @@ -1350,7 +1350,44 @@ AH_BOTTOM([ # ifndef FD_SETSIZE # define FD_SETSIZE 1024 # endif -# define PRIsz "Iu" + +/* the version of the windows API enabled */ +# ifndef WINVER +# define WINVER 0x0600 // 0x0502 +# endif +# ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0600 // 0x0502 +# endif +# ifdef HAVE_WS2TCPIP_H +# include +# endif + +# ifdef _MSC_VER +# if _MSC_VER >= 1800 +# define PRIsz "zu" +# else +# define PRIsz "Iu" +# endif +# else +# define PRIsz "Iu" +# endif + +# ifdef HAVE_WINSOCK2_H +# include +# endif + +# ifndef USE_WINSOCK +# define ARG_LL "%ll" +# else +# define ARG_LL "%I64" +# endif + +/* detect if we need to cast to unsigned int for FD_SET to avoid warnings */ +# ifdef HAVE_WINSOCK2_H +# define FD_SET_T (u_int) +# else +# define FD_SET_T +# endif /* Windows wants us to use _strdup instead of strdup */ # ifndef strdup @@ -1366,34 +1403,6 @@ AH_BOTTOM([ #include #include -/* the version of the windows API enabled */ -#ifndef WINVER -#define WINVER 0x0600 // 0x0502 -#endif -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 // 0x0502 -#endif -#ifdef HAVE_WINSOCK2_H -#include -#endif - -#ifdef HAVE_WS2TCPIP_H -#include -#endif - -#ifndef USE_WINSOCK -#define ARG_LL "%ll" -#else -#define ARG_LL "%I64" -#endif - -/* detect if we need to cast to unsigned int for FD_SET to avoid warnings */ -#ifdef HAVE_WINSOCK2_H -#define FD_SET_T (u_int) -#else -#define FD_SET_T -#endif - #ifdef __cplusplus extern "C" { #endif diff --git a/src/convert.c b/src/convert.c index d6289ecf..71f25491 100644 --- a/src/convert.c +++ b/src/convert.c @@ -32,10 +32,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include "config.h" #include #include #include -#include "config.h" #ifndef USE_WINSOCK #include #endif diff --git a/src/dict.c b/src/dict.c index d6986788..99e347ad 100644 --- a/src/dict.c +++ b/src/dict.c @@ -34,8 +34,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include "config.h" +#include #ifndef USE_WINSOCK #include #include