From e6d7384c0d08dc56af6ed0c902ba2baf87f58119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
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.
---
 bin/named/main.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/bin/named/main.c b/bin/named/main.c
index f1c14c511d..e57ed1c60f 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -59,6 +59,10 @@
 #include <json_c_version.h>
 #endif /* HAVE_JSON_C */
 
+#ifdef HAVE_GEOIP2
+#include <maxminddb.h>
+#endif
+
 /*
  * Defining NAMED_MAIN provides storage declarations (rather than extern)
  * for variables in named/globals.h.
@@ -548,6 +552,11 @@ OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 or higher */
 	       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
 	printf("threads support is enabled\n\n");
 

From 85f3476894c6fa913bfc333b243b56d832f25848 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Men=C5=A1=C3=ADk?= <pemensik@redhat.com>
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.
---
 bin/named/main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/named/main.c b/bin/named/main.c
index e57ed1c60f..9d8e1aeedc 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -557,6 +557,12 @@ OPENSSL_VERSION_NUMBER >= 0x10100000L /* 1.1.0 or higher */
 	/* Unfortunately, no version define on link time */
 	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
 	printf("threads support is enabled\n\n");
 

From 2f2bc03b2d4bdb984e21b8969e6fa6a3af48225d Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Wed, 18 Dec 2019 10:57:25 +1100
Subject: [PATCH 3/3] add CHANGES

---
 CHANGES | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES b/CHANGES
index 9f44c824d7..279728f023 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5337.	[func]		'named -V' now reports maxminddb and protobuf-c
+			versions. [GL !2686]
+
 	--- 9.15.7 released ---
 
 5336.	[bug]		The TCP high-water statistic could report an