From: Mark Andrews <marka@isc.org>
Date: Fri, 22 Nov 2013 02:26:31 +0000 (+1100)
Subject: 3675.   [misc]          Provide a place for third parties to add version
X-Git-Tag: v9.6-ESV-R11b1~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ba2a7b8a71dc6c29a0bcb34f0c2a432a1fc0681;p=thirdparty%2Fbind9.git

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)
---

diff --git a/CHANGES b/CHANGES
index d4977c81915..6b0a55dd223 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.
+
 3670.	[bug]		Address read after free in server side of
 			lwres_getrrsetbyname. [RT #29075]
 
diff --git a/configure b/configure
index 69e641dc575..8e5ec8f3f9a 100755
--- a/configure
+++ b/configure
@@ -18689,7 +18689,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 b84dbc189d1..47de89d41c7 100644
--- a/configure.in
+++ b/configure.in
@@ -2856,7 +2856,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 fa228c3ab55..3b3a3b5f481 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 5690f0de5cf..19c4cf14ac7 100644
--- a/version
+++ b/version
@@ -10,3 +10,4 @@ MINORVER=6
 PATCHVER=
 RELEASETYPE=-ESV
 RELEASEVER=-R10
+EXTENSIONS=