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 4c08b51b18bec98853824dfc4497153d6cbed719..0bcb6ef3235828e471afac30a56a47f7c1725af2 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 a98780efc528133dfba96708cf520b40940ab1a9..920825390daff1c13363af726f144241636c5dfe 100755 (executable)
--- a/configure
+++ b/configure
@@ -19325,7 +19325,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 49c8a9b9f85f0d60e32634f7c93e8c85725e8083..21dad41e2e5fa6f134a4a03c73f21bfdca17034d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3267,7 +3267,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 da3c9ea6ef3d6ee82f1abd89eb51a75baff6338f..322edfc5f2da982894cbf3fb425a766080716051 100644 (file)
--- a/version
+++ b/version
@@ -10,3 +10,4 @@ MINORVER=8
 PATCHVER=6
 RELEASETYPE=
 RELEASEVER=
+EXTENSIONS=