release-1.34.2 (#903)

CMakeLists.txt

@@ -12,7 +12,7 @@ INCLUDE (CheckCSourceCompiles)
 INCLUDE (CheckStructHasMember)
 INCLUDE (CheckLibraryExists)
 
-PROJECT (c-ares LANGUAGES C VERSION "1.34.1" )
+PROJECT (c-ares LANGUAGES C VERSION "1.34.2" )
 
 # Set this version before release
 SET (CARES_VERSION "${PROJECT_VERSION}")

RELEASE-NOTES.md

@@ -1,4 +1,10 @@
-## c-ares version 1.34.1 - Octover 9 2024
+## c-ares version 1.34.2 - October 15 2024
+
+This release contains a fix for downstream packages detecting the c-ares
+version based on the contents of the header file rather than the
+distributed pkgconf or cmake files.
+
+## c-ares version 1.34.1 - October 9 2024
 
 This release fixes a packaging issue.
 

configure.ac

@@ -2,7 +2,7 @@ dnl Copyright (C) The c-ares project and its contributors
 dnl SPDX-License-Identifier: MIT
 AC_PREREQ([2.69])
 
-AC_INIT([c-ares], [1.34.1],
+AC_INIT([c-ares], [1.34.2],
   [c-ares mailing list: http://lists.haxx.se/listinfo/c-ares])
 
 CARES_VERSION_INFO="21:1:19"

include/ares_version.h

@@ -32,20 +32,16 @@
 
 #define ARES_VERSION_MAJOR 1
 #define ARES_VERSION_MINOR 34
-#define ARES_VERSION_PATCH 1
+#define ARES_VERSION_PATCH 2
+#define ARES_VERSION_STR "1.34.2"
+
+/* NOTE: We cannot make the version string a C preprocessor stringify operation
+ *       due to assumptions made by integrators that aren't properly using
+ *       pkgconf or cmake and are doing their own detection based on parsing
+ *       this header */
 
 #define ARES_VERSION                                        \
   ((ARES_VERSION_MAJOR << 16) | (ARES_VERSION_MINOR << 8) | \
    (ARES_VERSION_PATCH))
 
-
-/* Need a level of indirection due to argument prescan to stringify a macro
- * value. */
-#define ARES_STRINGIFY_PRE(s) #s
-#define ARES_STRINGIFY(s)     ARES_STRINGIFY_PRE(s)
-
-#define ARES_VERSION_STR             \
-  ARES_STRINGIFY(ARES_VERSION_MAJOR) \
-  "." ARES_STRINGIFY(ARES_VERSION_MINOR) "." ARES_STRINGIFY(ARES_VERSION_PATCH)
-
 #endif