Commit 0e1dfb8f authored by Mark Andrews's avatar Mark Andrews

3634. [func] Report build-id in rndc status. Report build-id

                        when building from a git repository. [RT #20422]
parent 8e091f3d
3634. [func] Report build-id in rndc status. Report build-id
when building from a git repository. [RT #20422]
3633. [cleanup] Refactor OPT processing in named to make it easier 3633. [cleanup] Refactor OPT processing in named to make it easier
to support new EDNS options. [RT #34414] to support new EDNS options. [RT #34414]
......
...@@ -7752,7 +7752,7 @@ ns_server_status(ns_server_t *server, isc_buffer_t *text) { ...@@ -7752,7 +7752,7 @@ ns_server_status(ns_server_t *server, isc_buffer_t *text) {
n = snprintf((char *)isc_buffer_used(text), n = snprintf((char *)isc_buffer_used(text),
isc_buffer_availablelength(text), isc_buffer_availablelength(text),
"version: %s%s%s%s\n" "version: %s%s%s%s <id:%s>\n"
"boot time: %s\n" "boot time: %s\n"
"last configured: %s\n" "last configured: %s\n"
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
...@@ -7769,7 +7769,7 @@ ns_server_status(ns_server_t *server, isc_buffer_t *text) { ...@@ -7769,7 +7769,7 @@ ns_server_status(ns_server_t *server, isc_buffer_t *text) {
"recursive clients: %d/%d/%d\n" "recursive clients: %d/%d/%d\n"
"tcp clients: %d/%d\n" "tcp clients: %d/%d\n"
"server is up and running", "server is up and running",
ns_g_version, ob, alt, cb, ns_g_version, ob, alt, cb, ns_g_srcid,
boottime, configtime, boottime, configtime,
#ifdef ISC_PLATFORM_USETHREADS #ifdef ISC_PLATFORM_USETHREADS
ns_g_cpus_detected, ns_g_cpus, ns_g_udpdisp, ns_g_cpus_detected, ns_g_cpus, ns_g_udpdisp,
......
...@@ -19861,7 +19861,7 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes ...@@ -19861,7 +19861,7 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
. $srcdir/version . "$srcdir/version"
BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\"" BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\"" BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
...@@ -19872,12 +19872,15 @@ BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}" ...@@ -19872,12 +19872,15 @@ BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
BIND9_SRCID="SRCID=unset" BIND9_SRCID="SRCID=unset"
if test -f $srcdir/srcid; then if test -f "${srcdir}/srcid"; then
. $srcdir/srcid . "${srcdir}/srcid"
BIND9_SRCID="SRCID=$SRCID" BIND9_SRCID="SRCID=$SRCID"
elif test -d "${srcdir}/.git"; then
BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)`
fi fi
if test -z "$ac_configure_args"; then if test -z "$ac_configure_args"; then
BIND9_CONFIGARGS="defaults" BIND9_CONFIGARGS="defaults"
else else
...@@ -19891,28 +19894,28 @@ BIND9_CONFIGARGS="CONFIGARGS=${BIND9_CONFIGARGS}" ...@@ -19891,28 +19894,28 @@ BIND9_CONFIGARGS="CONFIGARGS=${BIND9_CONFIGARGS}"
LIBISC_API=$srcdir/lib/isc/api LIBISC_API="$srcdir/lib/isc/api"
LIBISCCC_API=$srcdir/lib/isccc/api LIBISCCC_API="$srcdir/lib/isccc/api"
LIBISCCFG_API=$srcdir/lib/isccfg/api LIBISCCFG_API="$srcdir/lib/isccfg/api"
LIBDNS_API=$srcdir/lib/dns/api LIBDNS_API="$srcdir/lib/dns/api"
LIBDNS_MAPAPI=$srcdir/lib/dns/mapapi LIBDNS_MAPAPI="$srcdir/lib/dns/mapapi"
LIBBIND9_API=$srcdir/lib/bind9/api LIBBIND9_API="$srcdir/lib/bind9/api"
LIBLWRES_API=$srcdir/lib/lwres/api LIBLWRES_API="$srcdir/lib/lwres/api"
LIBIRS_API=$srcdir/lib/irs/api LIBIRS_API="$srcdir/lib/irs/api"
# #
# Configure any DLZ drivers. # Configure any DLZ drivers.
...@@ -23232,7 +23235,7 @@ fi ...@@ -23232,7 +23235,7 @@ fi
/*) ;; /*) ;;
*) srcdir="../../$srcdir";; *) srcdir="../../$srcdir";;
esac esac
${SHELL} ${srcdir}${srcdir:+/unit/atf-src/}./configure MISSING=: --prefix $atfdir; ${SHELL} "${srcdir}${srcdir:+/unit/atf-src/}./configure" MISSING=: --prefix $atfdir;
) ;; ) ;;
"chmod":C) chmod a+x isc-config.sh doc/doxygen/doxygen-input-filter ;; "chmod":C) chmod a+x isc-config.sh doc/doxygen/doxygen-input-filter ;;
......
...@@ -3393,7 +3393,7 @@ if test "$atf" = yes; then ...@@ -3393,7 +3393,7 @@ if test "$atf" = yes; then
/*) ;; /*) ;;
*) srcdir="../../$srcdir";; *) srcdir="../../$srcdir";;
esac esac
${SHELL} ${srcdir}${srcdir:+/unit/atf-src/}./configure MISSING=: --prefix $atfdir; ${SHELL} "${srcdir}${srcdir:+/unit/atf-src/}./configure" MISSING=: --prefix $atfdir;
) ], ) ],
[atfdir=`pwd`/unit/atf]) [atfdir=`pwd`/unit/atf])
AC_MSG_RESULT(building ATF from bind9/unit/atf-src) AC_MSG_RESULT(building ATF from bind9/unit/atf-src)
...@@ -3451,7 +3451,7 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes ...@@ -3451,7 +3451,7 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
AC_SUBST_FILE(BIND9_MAKE_RULES) AC_SUBST_FILE(BIND9_MAKE_RULES)
BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
. $srcdir/version . "$srcdir/version"
BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\"" BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
AC_SUBST(BIND9_PRODUCT) AC_SUBST(BIND9_PRODUCT)
BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\"" BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
...@@ -3462,10 +3462,13 @@ BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}" ...@@ -3462,10 +3462,13 @@ BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
AC_SUBST(BIND9_MAJOR) AC_SUBST(BIND9_MAJOR)
BIND9_SRCID="SRCID=unset" BIND9_SRCID="SRCID=unset"
if test -f $srcdir/srcid; then if test -f "${srcdir}/srcid"; then
. $srcdir/srcid . "${srcdir}/srcid"
BIND9_SRCID="SRCID=$SRCID" BIND9_SRCID="SRCID=$SRCID"
elif test -d "${srcdir}/.git"; then
BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)`
fi fi
AC_SUBST(BIND9_SRCID) AC_SUBST(BIND9_SRCID)
if test -z "$ac_configure_args"; then if test -z "$ac_configure_args"; then
...@@ -3481,28 +3484,28 @@ BIND9_CONFIGARGS="CONFIGARGS=${BIND9_CONFIGARGS}" ...@@ -3481,28 +3484,28 @@ BIND9_CONFIGARGS="CONFIGARGS=${BIND9_CONFIGARGS}"
AC_SUBST(BIND9_CONFIGARGS) AC_SUBST(BIND9_CONFIGARGS)
AC_SUBST_FILE(LIBISC_API) AC_SUBST_FILE(LIBISC_API)
LIBISC_API=$srcdir/lib/isc/api LIBISC_API="$srcdir/lib/isc/api"
AC_SUBST_FILE(LIBISCCC_API) AC_SUBST_FILE(LIBISCCC_API)
LIBISCCC_API=$srcdir/lib/isccc/api LIBISCCC_API="$srcdir/lib/isccc/api"
AC_SUBST_FILE(LIBISCCFG_API) AC_SUBST_FILE(LIBISCCFG_API)
LIBISCCFG_API=$srcdir/lib/isccfg/api LIBISCCFG_API="$srcdir/lib/isccfg/api"
AC_SUBST_FILE(LIBDNS_API) AC_SUBST_FILE(LIBDNS_API)
LIBDNS_API=$srcdir/lib/dns/api LIBDNS_API="$srcdir/lib/dns/api"
AC_SUBST_FILE(LIBDNS_MAPAPI) AC_SUBST_FILE(LIBDNS_MAPAPI)
LIBDNS_MAPAPI=$srcdir/lib/dns/mapapi LIBDNS_MAPAPI="$srcdir/lib/dns/mapapi"
AC_SUBST_FILE(LIBBIND9_API) AC_SUBST_FILE(LIBBIND9_API)
LIBBIND9_API=$srcdir/lib/bind9/api LIBBIND9_API="$srcdir/lib/bind9/api"
AC_SUBST_FILE(LIBLWRES_API) AC_SUBST_FILE(LIBLWRES_API)
LIBLWRES_API=$srcdir/lib/lwres/api LIBLWRES_API="$srcdir/lib/lwres/api"
AC_SUBST_FILE(LIBIRS_API) AC_SUBST_FILE(LIBIRS_API)
LIBIRS_API=$srcdir/lib/irs/api LIBIRS_API="$srcdir/lib/irs/api"
# #
# Configure any DLZ drivers. # Configure any DLZ drivers.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment