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 fd63f3110f)
This commit is contained in:
Mark Andrews 2013-11-22 13:26:31 +11:00
parent 14122dd06b
commit 13d58898c5
5 changed files with 9 additions and 3 deletions

View file

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

2
configure vendored
View file

@ -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"

View file

@ -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"

View file

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

View file

@ -10,3 +10,4 @@ MINORVER=9
PATCHVER=4
RELEASETYPE=
RELEASEVER=
EXTENSIONS=