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 d4977c8191598502c4462bc5a7caab3a83f717eb..6b0a55dd22303f750c517c3375601bd31ee2d3af 100644 (file)
--- 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 69e641dc5750b520c800976ece9f5a085ca637af..8e5ec8f3f9af744fb333a4ab3697368ba03c5b15 100755 (executable)
--- 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 b84dbc189d109f18d08f1c9494e8456c0d96d017..47de89d41c7afc7df5802a2a9819e1c58e667ddb 100644 (file)
--- 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 fa228c3ab55575e36f54d3c46455748a53edfae3..3b3a3b5f48130f13d3665f6d9b32d72cf6f3b3c9 100644 (file)
--- 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 5690f0de5cfbb38d976f5dc1bec7272c1136d6a4..19c4cf14ac72441825040048183d7912236c0649 100644 (file)
--- a/version
+++ b/version
@@ -10,3 +10,4 @@ MINORVER=6
 PATCHVER=
 RELEASETYPE=-ESV
 RELEASEVER=-R10
+EXTENSIONS=