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

                        when building from a git repository. [RT #20422]

(cherry picked from commit 0e1dfb8ff5ac2cf1215691ffc32d7a0b76709721)

diff --git a/CHANGES b/CHANGES
index 56213fcedbb57524a42941cad8e5729d28eb5c65..379a99dfb12a6c2775d7951ec8cedc17ab1324d2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+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
                        to support new EDNS options. [RT #34414]
 

diff --git a/bin/named/server.c b/bin/named/server.c
index 318c70698384304fd22bd657d99a06a25934d735..cc1ad72ef42d1107d086bfa992de15cf52508d41 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -5369,7 +5369,7 @@ ns_server_status(ns_server_t *server, isc_buffer_t *text) {
 
        n = snprintf((char *)isc_buffer_used(text),
                     isc_buffer_availablelength(text),
-                    "version: %s%s%s%s\n"
+                    "version: %s%s%s%s <id:%s>\n"
 #ifdef ISC_PLATFORM_USETHREADS
                     "CPUs found: %u\n"
                     "worker threads: %u\n"
@@ -5383,7 +5383,7 @@ ns_server_status(ns_server_t *server, isc_buffer_t *text) {
                     "recursive clients: %d/%d/%d\n"
                     "tcp clients: %d/%d\n"
                     "server is up and running",
-                    ns_g_version, ob, alt, cb,
+                    ns_g_version, ob, alt, cb, ns_g_srcid,
 #ifdef ISC_PLATFORM_USETHREADS
                     ns_g_cpus_detected, ns_g_cpus,
 #endif

diff --git a/configure b/configure
index 1847e168130a598c281d54a9d8f9e439646889ad..d30cf01bbf06e8846c57f0d5f4422b3a805d593d 100755 (executable)
--- a/configure
+++ b/configure
@@ -18672,7 +18672,7 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
 
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
-. $srcdir/version
+. "$srcdir/version"
 BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 
 BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
@@ -18681,12 +18681,15 @@ BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASE
 
 
 BIND9_SRCID="SRCID=unset"
-if test -f $srcdir/srcid; then
-       . $srcdir/srcid
+if test -f "${srcdir}/srcid"; then
+       . "${srcdir}/srcid"
        BIND9_SRCID="SRCID=$SRCID"
+elif test -d "${srcdir}/.git"; then
+       BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)`
 fi
 
 
+
 if test -z "$ac_configure_args"; then
        BIND9_CONFIGARGS="defaults"
 else
@@ -18700,22 +18703,22 @@ 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"
 
 
-LIBBIND9_API=$srcdir/lib/bind9/api
+LIBBIND9_API="$srcdir/lib/bind9/api"
 
 
-LIBLWRES_API=$srcdir/lib/lwres/api
+LIBLWRES_API="$srcdir/lib/lwres/api"
 
 #
 # Configure any DLZ drivers.
@@ -21865,7 +21868,7 @@ fi
                 /*) ;;
                 *) srcdir="../../$srcdir";;
                 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 ;;
 

diff --git a/configure.in b/configure.in
index 8e9e28b6417082d22c39d8734fe5cd312ed12235..1d462efd20226e3ff00f148c750a00e5c0c06c50 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2791,7 +2791,7 @@ if test "$atf" = yes; then
                 /*) ;;
                 *) srcdir="../../$srcdir";;
                 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])
        AC_MSG_RESULT(building ATF from bind9/unit/atf-src)
@@ -2849,7 +2849,7 @@ BIND9_MAKE_INCLUDES=$BIND9_TOP_BUILDDIR/make/includes
 AC_SUBST_FILE(BIND9_MAKE_RULES)
 BIND9_MAKE_RULES=$BIND9_TOP_BUILDDIR/make/rules
 
-. $srcdir/version
+. "$srcdir/version"
 BIND9_PRODUCT="PRODUCT=\"${PRODUCT}\""
 AC_SUBST(BIND9_PRODUCT)
 BIND9_DESCRIPTION="DESCRIPTION=\"${DESCRIPTION}\""
@@ -2858,10 +2858,13 @@ BIND9_VERSION="VERSION=${MAJORVER}.${MINORVER}${PATCHVER:+.}${PATCHVER}${RELEASE
 AC_SUBST(BIND9_VERSION)
 
 BIND9_SRCID="SRCID=unset"
-if test -f $srcdir/srcid; then
-       . $srcdir/srcid
+if test -f "${srcdir}/srcid"; then
+       . "${srcdir}/srcid"
        BIND9_SRCID="SRCID=$SRCID"
+elif test -d "${srcdir}/.git"; then
+       BIND9_SRCID="SRCID="`(cd "${srcdir}";git log -n 1 --format=%h)`
 fi
+
 AC_SUBST(BIND9_SRCID)
 
 if test -z "$ac_configure_args"; then
@@ -2877,22 +2880,22 @@ BIND9_CONFIGARGS="CONFIGARGS=${BIND9_CONFIGARGS}"
 AC_SUBST(BIND9_CONFIGARGS)
 
 AC_SUBST_FILE(LIBISC_API)
-LIBISC_API=$srcdir/lib/isc/api
+LIBISC_API="$srcdir/lib/isc/api"
 
 AC_SUBST_FILE(LIBISCCC_API)
-LIBISCCC_API=$srcdir/lib/isccc/api
+LIBISCCC_API="$srcdir/lib/isccc/api"
 
 AC_SUBST_FILE(LIBISCCFG_API)
-LIBISCCFG_API=$srcdir/lib/isccfg/api
+LIBISCCFG_API="$srcdir/lib/isccfg/api"
 
 AC_SUBST_FILE(LIBDNS_API)
-LIBDNS_API=$srcdir/lib/dns/api
+LIBDNS_API="$srcdir/lib/dns/api"
 
 AC_SUBST_FILE(LIBBIND9_API)
-LIBBIND9_API=$srcdir/lib/bind9/api
+LIBBIND9_API="$srcdir/lib/bind9/api"
 
 AC_SUBST_FILE(LIBLWRES_API)
-LIBLWRES_API=$srcdir/lib/lwres/api
+LIBLWRES_API="$srcdir/lib/lwres/api"
 
 #
 # Configure any DLZ drivers.