CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 
 if (POLICY CMP0075)
   cmake_policy(SET CMP0075 NEW)
@@ -13,7 +13,7 @@ endif ()
 
 set(PACKAGE "getdns")
 set(PACKAGE_NAME "getdns")
-set(PACKAGE_VERSION "1.7.3")
+set(PACKAGE_VERSION "1.7.1")
 set(PACKAGE_BUGREPORT "team@getdnsapi.net")
 set(PACKAGE_URL "https://getdnsapi.net")
 
@@ -25,7 +25,7 @@ set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}${RELEASE_CANDIDATE}")
 set(PACKAGE_TARNAME "${PACKAGE}-${PACKAGE_VERSION}${RELEASE_CANDIDATE}")
 
 set(GETDNS_VERSION "${PACKAGE_VERSION}${RELEASE_CANDIDATE}")
-set(GETDNS_NUMERIC_VERSION 0x01070200)
+set(GETDNS_NUMERIC_VERSION 0x01070100)
 set(API_VERSION "December 2015")
 set(API_NUMERIC_VERSION 0x07df0c00)
 
@@ -262,7 +262,6 @@ check_include_file(inttypes.h HAVE_INTTYPES_H)
 check_include_file(limits.h HAVE_LIMITS_H)
 check_include_file(sys/limits.h HAVE_SYS_LIMITS_H)
 check_include_file(stdarg.h HAVE_STDARG_H)
-check_include_file(stddef.h HAVE_STDDEF_H)
 check_include_file(stdint.h HAVE_STDINT_H)
 check_include_file(stdio.h HAVE_STDIO_H)
 check_include_file(stdlib.h HAVE_STDLIB_H)

ChangeLog

@@ -1,16 +1,3 @@
-* 2023-??-??: Version 1.7.4
-  * Issue #536: Broken trust anchor files are silently ignored
-    Thanks Stéphane Bortzmeyer
-
-* 2022-12-22: Version 1.7.3
-  * PR #532: Increase CMake required version 3.5 -> 3.20, because we
-    need cmake_path for Absolute paths in pkg-config (See Issue #517)
-    Thanks Gabriel Ganne
-  * Updated to Stubby 0.4.3 quickfix release
-
-* 2022-08-19: Version 1.7.2
-  * Updated to Stubby 0.4.2 quickfix release
-
 * 2022-08-19: Version 1.7.1
   * Always send the `dot` ALPN when using DoT
   * Strengthen version determination for Libidn2 during cmake processing

cmake/include/cmakeconfig.h.in

@@ -15,7 +15,6 @@
 #cmakedefine HAVE_LIMITS_H      1
 #cmakedefine HAVE_SYS_LIMITS_H  1
 #cmakedefine HAVE_STDARG_H      1
-#cmakedefine HAVE_STDDEF_H      1
 #cmakedefine HAVE_STDINT_H      1
 #cmakedefine HAVE_STDIO_H       1
 #cmakedefine HAVE_STDLIB_H      1
@@ -242,10 +241,6 @@
 #  define FD_SETSIZE 1024
 # endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /* the version of the windows API enabled */
 # ifndef WINVER
 #  define WINVER 0x0600 // 0x0502
@@ -312,11 +307,12 @@ extern "C" {
 #include <string.h>
 #endif
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
+#ifdef __cplusplus
+extern "C" {
 #endif
 
-#ifdef HAVE_STDDEF_H
+#if STDC_HEADERS
+#include <stdlib.h>
 #include <stddef.h>
 #endif
 

cmake/modules/FindLibuv.cmake

@@ -52,7 +52,7 @@ else ()
     "${LIBUV_DIR}/lib"
   )
   
-  if (LIBUV_INCLUDE_DIR AND LIBUV_LIBRARIES)
+  if (LIBUV_INCLUDE_DIR AND LIBUV_LIBRARY)
     if (NOT TARGET Libuv::Libuv)
       add_library(Libuv::Libuv UNKNOWN IMPORTED)
       set_target_properties(Libuv::Libuv PROPERTIES

src/convert.c

@@ -529,10 +529,8 @@ _getdns_fp2rr_list(struct mem_funcs *mf,
 	else while (r == GETDNS_RETURN_GOOD && !feof(in)) {
 		len = GLDNS_RR_BUF_SIZE;
 		dname_len = 0;
-		if (gldns_fp2wire_rr_buf(in, rr, &len, &dname_len, &pst)) {
-			r = GETDNS_RETURN_GENERIC_ERROR;
+		if (gldns_fp2wire_rr_buf(in, rr, &len, &dname_len, &pst))
 			break;
-		}
 		if (dname_len && dname_len < sizeof(pst.prev_rr)) {
 			memcpy(pst.prev_rr, rr, dname_len);
 			pst.prev_rr_len = dname_len;

stubby

@@ -1 +1 @@
-Subproject commit b53867d1ec467822dbd9e1a0ad6598f84a9f5ed7
+Subproject commit 212e78d424f50d093be8a908042542c30ff570b2