3675. [misc] Provide a place for third parties to add version

                        information for their extensions in the version
                        file by setting the EXTENSIONS variable.

diff --git a/CHANGES b/CHANGES
index 2d827b9e1e34a049953fee199717e558a44ffe72..0d5779f469518052f541839c891c5d71128248dc 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.
+
        --- 9.10.0a1 released ---
 
 3674.  [bug]           RPZ zeroed ttls if the query type was '*'. [RT #35026]

diff --git a/configure b/configure
index 6d354156828d03eb9450088a77046f0343122e37..94b7006dec48fc7f55e0d28e1873e95dc4f1c8b8 100755 (executable)
--- a/configure
+++ b/configure
@@ -19970,7 +19970,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_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
 

diff --git a/configure.in b/configure.in
index 1b7a17dd953dc2e0236c333c37f06c396b82377a..ab80032f8e84c5721eaf0b94a65009e26d3e9de0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3483,7 +3483,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_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
 AC_SUBST(BIND9_MAJOR)

diff --git a/util/kit.sh b/util/kit.sh
index 6c6d7f3ed43b6df95d277082017822868898b7ce..5c4cd91886704cac72fa0ce67a858e406448fb0e 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 971844fa030eff890241dabc93bf9452d7e1de05..00fa0207c18046f5c32a8f3fac67e88fc2337a57 100644 (file)
--- a/version
+++ b/version
@@ -10,3 +10,4 @@ MINORVER=10
 PATCHVER=0
 RELEASETYPE=a
 RELEASEVER=1
+EXTENSIONS=