From: Evan Hunt <each@isc.org>
Date: Fri, 3 May 2013 22:09:18 +0000 (-0700)
Subject: [v9_9] add product description
X-Git-Tag: v9.9.3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1bb835fbc469368117363a8fd2c6f68d0122a599;p=thirdparty%2Fbind9.git

[v9_9] add product description

3568.	[cleanup]	Add a product description line to the version file,
			to be reported by named -v/-V. [RT #33366]
(cherry picked from commit af9f195c9e128fc9cc5912498b8f7f26f07887c3)
---

diff --git a/CHANGES b/CHANGES
index 8f9b953318c..d055448dcc5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3568.	[cleanup]	Add a product description line to the version file,
+			to be reported by named -v/-V. [RT #33366]
+
 3567.	[bug]		Silence clang static analyzer warnings. [RT #33365]
 
 3563.	[contrib]	zone2sqlite failed with some table names. [RT #33375]
diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index 19bdb8e9f3a..68941357037 100644
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -23,6 +23,8 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_PRODUCT@
 
+@BIND9_DESCRIPTION@
+
 @BIND9_SRCID@
 
 @BIND9_CONFIGARGS@
@@ -119,6 +121,7 @@ main.@O@: main.c
 	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
 		-DVERSION=\"${VERSION}\" \
 		-DPRODUCT=\"${PRODUCT}\" \
+		-DDESCRIPTION=\"${DESCRIPTION}\" \
 		-DSRCID=\"${SRCID}\" \
 		-DCONFIGARGS="\"${CONFIGARGS}\"" \
 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index b7c78b31b18..cbc14d8b72d 100644
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -68,6 +68,7 @@ EXTERN isc_socketmgr_t *	ns_g_socketmgr		INIT(NULL);
 EXTERN cfg_parser_t *		ns_g_parser		INIT(NULL);
 EXTERN const char *		ns_g_version		INIT(VERSION);
 EXTERN const char *		ns_g_product		INIT(PRODUCT);
+EXTERN const char *		ns_g_description	INIT(DESCRIPTION);
 EXTERN const char *		ns_g_srcid		INIT(SRCID);
 EXTERN const char *		ns_g_configargs		INIT(CONFIGARGS);
 EXTERN in_port_t		ns_g_port		INIT(0);
diff --git a/bin/named/main.c b/bin/named/main.c
index e3c269baea0..a5467249082 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -540,11 +540,17 @@ parse_command_line(int argc, char *argv[]) {
 			ns_g_username = isc_commandline_argument;
 			break;
 		case 'v':
-			printf("%s %s\n", ns_g_product, ns_g_version);
+			printf("%s %s", ns_g_product, ns_g_version);
+			if (*ns_g_description != 0)
+				printf(" %s", ns_g_description);
+			printf("\n");
 			exit(0);
 		case 'V':
-			printf("%s %s <id:%s> built with %s\n", ns_g_product,
-			       ns_g_version, ns_g_srcid, ns_g_configargs);
+			printf("%s %s", ns_g_product, ns_g_version);
+			if (*ns_g_description != 0)
+				printf(" %s", ns_g_description);
+			printf(" <id:%s> built with %s\n", ns_g_srcid,
+				ns_g_configargs);
 #ifdef OPENSSL
 			printf("using OpenSSL version: %s\n",
 			       OPENSSL_VERSION_TEXT);
diff --git a/configure b/configure
index 446176abe35..726ee6c24b8 100755
--- a/configure
+++ b/configure
@@ -1169,6 +1169,7 @@ SO
 BIND9_CONFIGARGS
 BIND9_SRCID
 BIND9_VERSION
+BIND9_DESCRIPTION
 BIND9_PRODUCT
 BIND9_BIND9_BUILDINCLUDE
 BIND9_LWRES_BUILDINCLUDE
@@ -19517,6 +19518,8 @@ BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 . $srcdir/version
 BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 
+BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
+
 BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 
 
diff --git a/configure.in b/configure.in
index b17fdcf3b4a..8e543d85fdd 100644
--- a/configure.in
+++ b/configure.in
@@ -3344,6 +3344,8 @@ BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 . $srcdir/version
 BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 AC_SUBST(BIND9_PRODUCT)
+BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
+AC_SUBST(BIND9_DESCRIPTION)
 BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
 AC_SUBST(BIND9_VERSION)
 
diff --git a/version b/version
index 9020249e81e..e8b24e5e5ef 100644
--- a/version
+++ b/version
@@ -4,6 +4,7 @@
 # configure.
 #
 PRODUCT=BIND
+DESCRIPTION=
 MAJORVER=9
 MINORVER=9
 PATCHVER=3