From a6f25f9d25e88355acbb59afa6595b20d178fe64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Mon, 18 Nov 2019 21:51:36 +0100 Subject: [PATCH 1/3] Provide GeoIP2 library version in version Libmaxmind does not provide any version macro for link time version. Print at least runtime version library used, if linked. (cherry picked from commit e6d7384c0d08dc56af6ed0c902ba2baf87f58119) --- bin/named/main.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/named/main.c b/bin/named/main.c index 1827ac4b32..3a8b7d2cdb 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -57,6 +57,9 @@ #include #endif +#ifdef HAVE_GEOIP2 +#include +#endif /* * Defining NS_MAIN provides storage declarations (rather than extern) @@ -493,6 +496,11 @@ printversion(bool verbose) { printf("compiled with zlib version: %s\n", ZLIB_VERSION); printf("linked to zlib version: %s\n", zlibVersion()); #endif +#if defined(HAVE_GEOIP2) + /* Unfortunately, no version define on link time */ + printf("linked to maxminddb version: %s\n", + MMDB_lib_version()); +#endif #ifdef ISC_PLATFORM_USETHREADS printf("threads support is enabled\n"); #else From a9a39eb5b534cc8ca75c5af8c8b6b84987d2cc51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= Date: Mon, 18 Nov 2019 22:14:20 +0100 Subject: [PATCH 2/3] Include protobuf-c version Include used version of protobuf-c in version info, both link time and runtime version is available. (cherry picked from commit 85f3476894c6fa913bfc333b243b56d832f25848) --- bin/named/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bin/named/main.c b/bin/named/main.c index 3a8b7d2cdb..c9fc3cc351 100644 --- a/bin/named/main.c +++ b/bin/named/main.c @@ -501,6 +501,12 @@ printversion(bool verbose) { printf("linked to maxminddb version: %s\n", MMDB_lib_version()); #endif +#if defined(HAVE_DNSTAP) + printf("compiled with protobuf-c version: %s\n", + PROTOBUF_C_VERSION); + printf("linked to protobuf-c version: %s\n", + protobuf_c_version()); +#endif #ifdef ISC_PLATFORM_USETHREADS printf("threads support is enabled\n"); #else From b437561cc4d3c725a8bbef0496bc1a4682490a15 Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Wed, 18 Dec 2019 10:57:25 +1100 Subject: [PATCH 3/3] add CHANGES (cherry picked from commit 2f2bc03b2d4bdb984e21b8969e6fa6a3af48225d) --- CHANGES | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGES b/CHANGES index 9a7ee65481..ace40d7a0f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +5337. [func] 'named -V' now reports maxminddb and protobuf-c + versions. [GL !2686] + --- 9.11.14 released --- 5330. [bug] 'configure --without-python' was ineffective if