[rt31494] add gitID to kit.sh generated tarballs

diff --git a/bin/named/Makefile.in b/bin/named/Makefile.in
index d2b07822c55c50e9a950e62daa80c966fc3aa407..41522571980c1c4fd2ca24dc5ad22b380e743b80 100644 (file)
--- a/bin/named/Makefile.in
+++ b/bin/named/Makefile.in
@@ -21,6 +21,8 @@ top_srcdir =  @top_srcdir@
 
 @BIND9_VERSION@
 
+@BIND9_SRCID@
+
 @BIND9_CONFIGARGS@
 
 @BIND9_MAKE_INCLUDES@
@@ -114,6 +116,7 @@ MANOBJS =   ${MANPAGES} ${HTMLPAGES}
 main.@O@: main.c
        ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
                -DVERSION=\"${VERSION}\" \
+               -DSRCID=\"${SRCID}\" \
                -DCONFIGARGS="\"${CONFIGARGS}\"" \
                -DNS_LOCALSTATEDIR=\"${localstatedir}\" \
                -DNS_SYSCONFDIR=\"${sysconfdir}\" -c ${srcdir}/main.c
@@ -124,6 +127,7 @@ bind.keys.h: ${top_srcdir}/bind.keys ${srcdir}/bindkeys.pl
 config.@O@: config.c bind.keys.h
        ${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
                -DVERSION=\"${VERSION}\" \
+               -DSRCID=\"${SRCID}\" \
                -DNS_LOCALSTATEDIR=\"${localstatedir}\" \
                -DNS_SYSCONFDIR=\"${sysconfdir}\" \
                -c ${srcdir}/config.c

diff --git a/bin/named/include/named/globals.h b/bin/named/include/named/globals.h
index 8197f5544909f6ec670eb07720d682f4428e5e6c..ed94ec60687c27df6369537199b84d812c6d25c9 100644 (file)
--- a/bin/named/include/named/globals.h
+++ b/bin/named/include/named/globals.h
@@ -67,6 +67,7 @@ EXTERN isc_timermgr_t *               ns_g_timermgr           INIT(NULL);
 EXTERN isc_socketmgr_t *       ns_g_socketmgr          INIT(NULL);
 EXTERN cfg_parser_t *          ns_g_parser             INIT(NULL);
 EXTERN const char *            ns_g_version            INIT(VERSION);
+EXTERN const char *            ns_g_srcid              INIT(SRCID);
 EXTERN const char *            ns_g_configargs         INIT(CONFIGARGS);
 EXTERN in_port_t               ns_g_port               INIT(0);
 EXTERN in_port_t               lwresd_g_listenport     INIT(0);

diff --git a/bin/named/main.c b/bin/named/main.c
index 3c8c08fec22625581aeb69381cdd2d1d0d77d98f..07ac9bc6cc43a2fc949d65eab916cb88e9a6be05 100644 (file)
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -551,8 +551,8 @@ parse_command_line(int argc, char *argv[]) {
                        printf("BIND %s\n", ns_g_version);
                        exit(0);
                case 'V':
-                       printf("BIND %s built with %s\n", ns_g_version,
-                               ns_g_configargs);
+                       printf("BIND %s <id:%s> built with %s\n",
+                              ns_g_version, ns_g_srcid, ns_g_configargs);
 #ifdef OPENSSL
                        printf("using OpenSSL version: %s\n",
                               OPENSSL_VERSION_TEXT);
@@ -1056,9 +1056,9 @@ main(int argc, char *argv[]) {
         */
        strlcat(version,
 #if defined(NO_VERSION_DATE) || !defined(__DATE__)
-               "named version: BIND " VERSION,
+               "named version: BIND " VERSION " <" SRCID ">",
 #else
-               "named version: BIND " VERSION " (" __DATE__ ")",
+               "named version: BIND " VERSION " <" SRCID "> (" __DATE__ ")",
 #endif
                sizeof(version));
        result = isc_file_progname(*argv, program_name, sizeof(program_name));

diff --git a/configure.in b/configure.in
index 69a84f14d0a75fd45a4a37ba680cd102d74ef87f..ae37c7d1358b28170dfbfedfc79e1bdde218da32 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3288,6 +3288,13 @@ AC_SUBST(BIND9_VERSION)
 BIND9_MAJOR="MAJOR=${MAJORVER}.${MINORVER}"
 AC_SUBST(BIND9_MAJOR)
 
+BIND9_SRCID="SRCID=unset"
+if test -f $srcdir/srcid; then
+       . $srcdir/srcid
+       BIND9_SRCID="SRCID=$SRCID"
+fi
+AC_SUBST(BIND9_SRCID)
+
 if test -z "$ac_configure_args"; then
        BIND9_CONFIGARGS="defaults"
 else

diff --git a/util/kit.sh b/util/kit.sh
index aeddef911a8f433eb3215af26a6327f10d62b5ac..da19b8946ee544c973e0dfc2098e0464870f9a17 100644 (file)
--- a/util/kit.sh
+++ b/util/kit.sh
@@ -122,6 +122,7 @@ test ! -d $topdir || {
 mkdir $topdir || exit 1
 
 git archive --format=tar $remote $tag | ( cd $topdir; tar xf -)
+shorthash=`git ls-remote $remote $tag | cut -c1-8`
 
 cd $topdir || exit 1
 
@@ -156,6 +157,9 @@ find util -depth -type d -print | xargs rmdir 2>/dev/null
 # Remove all .gitignore files
 find . -name .gitignore -print | xargs rm
 
+# populate srcid file
+echo "SRCID=$shorthash" > srcid
+
 # The following files should be executable.
 chmod +x configure install-sh mkinstalldirs bin/tests/system/ifconfig.sh
 # Fix up releases with libbind.