From 13d58898c57d038688ca906a44615caffcf66265 Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 22 Nov 2013 13:26:31 +1100
Subject: [PATCH] 3675.   [misc]          Provide a place for third parties to
 add version                         information for their extensions in the
 version                         file by setting the EXTENSIONS variable.

(cherry picked from commit fd63f3110fe9a20d6188bc30ebf4b44595bac8ee)
---
 CHANGES      | 4 ++++
 configure    | 2 +-
 configure.in | 2 +-
 util/kit.sh  | 3 ++-
 version      | 1 +
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGES b/CHANGES
index 04e6cb044d..df5797735b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+3675.	[misc]		Provide a place for third parties to add version
+			information for their extensions in the version
+			file by setting the EXTENSIONS variable.
+
 3674.	[bug]		RPZ zeroed ttls if the query type was '*'. [RT #35026]
 
 3672.	[func]		Local address can now be specified when using
diff --git a/configure b/configure
index ec4900ae3f..d9de9091e8 100755
--- a/configure
+++ b/configure
@@ -19673,7 +19673,7 @@ BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 
 BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
 
-BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}"
+BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}"
 
 
 BIND9_SRCID="SRCID=unset"
diff --git a/configure.in b/configure.in
index 190f906675..6e2822b656 100644
--- a/configure.in
+++ b/configure.in
@@ -3400,7 +3400,7 @@ 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}"
+BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}"
 AC_SUBST(BIND9_VERSION)
 
 BIND9_SRCID="SRCID=unset"
diff --git a/util/kit.sh b/util/kit.sh
index 6c6d7f3ed4..5c4cd91886 100644
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -109,7 +109,7 @@ then
     esac
 fi
 
-version=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}
+version=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASETYPE}${RELEASEVER}${EXTENSIONS}
 
 echo "building release kit for BIND version $version, hold on..."
 
@@ -142,6 +142,7 @@ MINORVER=$MINORVER
 PATCHVER=$PATCHVER
 RELEASETYPE=$RELEASETYPE
 RELEASEVER=$RELEASEVER
+EXTENSIONS=$EXTENSIONS
 EOF
 fi
 
diff --git a/version b/version
index 65a96deb48..8b0b8976ef 100644
--- a/version
+++ b/version
@@ -10,3 +10,4 @@ MINORVER=9
 PATCHVER=4
 RELEASETYPE=
 RELEASEVER=
+EXTENSIONS=