Put the full commit id into VERSION.

* autogen.sh <find-version>: Also print the full commit id.
* configure.ac: Get the full commit id.  Add it to VERSION.
(BUILD_REVISION): Replace this ac_define by
(BUILD_COMMITID): this.
* src/version.c (cright_blurb): Use here.

3 files changed, 10 insertions, 5 deletions

diff --git a/autogen.sh b/autogen.sh
index e6efe33..85a763c 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -265,17 +265,19 @@ if [ "$myhost" = "find-version" ]; then
           fi
       fi
       [ -n "$tmp" ] && beta=yes
+      cid=$(git rev-parse --verify HEAD | tr -d '\n\r')
       rev=$(git rev-parse --short HEAD | tr -d '\n\r')
       rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
     else
       ingit=no
       beta=yes
       tmp="-unknown"
+      cid="0000000"
       rev="0000000"
       rvd="0"
     fi
 
-    echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:"
+    echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:$cid:"
     exit 0
 fi
 # **** end FIND VERSION ****
diff --git a/configure.ac b/configure.ac
index 069bb7c..c4a9213 100644
--- a/configure.ac
+++ b/configure.ac
@@ -41,7 +41,9 @@ m4_define([mym4_isbeta],       m4_argn(2, mym4_verslist))
 m4_define([mym4_version],      m4_argn(4, mym4_verslist))
 m4_define([mym4_revision],     m4_argn(7, mym4_verslist))
 m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
+m4_define([mym4_commitid],     m4_argn(9, mym4_verslist))
 m4_esyscmd([echo ]mym4_version[>VERSION])
+m4_esyscmd([echo ]mym4_commitid[>>VERSION])
 AC_INIT([mym4_package],[mym4_version],[https://bugs.gnupg.org])
 # LT Version numbers, remember to change them just *before* a release.
 #   (Code changed:			REVISION++)
@@ -716,8 +718,9 @@ AC_ARG_ENABLE(werror,
 #
 BUILD_REVISION="mym4_revision"
 AC_SUBST(BUILD_REVISION)
-AC_DEFINE_UNQUOTED(BUILD_REVISION, "$BUILD_REVISION",
-                   [GIT commit id revision used to build this package])
+BUILD_COMMITID="mym4_commitid"
+AC_DEFINE_UNQUOTED(BUILD_COMMITID, "$BUILD_COMMITID",
+                   [Git commit id used to build this package])
 
 changequote(,)dnl
 BUILD_VERSION=`echo "$PACKAGE_VERSION"|sed 's/\([0-9.]*\).*/\1./'`
diff --git a/src/version.c b/src/version.c
index 54177cc..6de090f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -39,9 +39,9 @@ cright_blurb (void)
   static const char blurb[] =
     "\n\n"
     "This is Libgpg-error " PACKAGE_VERSION " - A runtime library\n"
-    "Copyright 2001-2022 g10 Code GmbH\n"
+    "Copyright 2001-2024 g10 Code GmbH\n"
     "\n"
-    "(" BUILD_REVISION " " BUILD_TIMESTAMP ")\n"
+    "(" BUILD_COMMITID " " BUILD_TIMESTAMP ")\n"
     "\n\n";
   return blurb;
 }