From bf6d2a8eedbb927c6ac1f958ca2fa5c6c2ca136c Mon Sep 17 00:00:00 2001
From: DJ Lucas <dj@lucasit.com>
Date: Thu, 21 Sep 2017 00:34:41 -0500
Subject: [PATCH] Always add REVISION value to installed certdata.txt

---
 CHANGELOG | 1 +
 make-ca   | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index a0137ff..29b251c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 0.2      - Install source certdata.txt file
          - Provide -r/--rebuild option
          - Add -g/--get option to download using only s_client
+         - Always add REVISION value to installed certdata.txt
 0.1      - Check executable bit for CERTUTIL, KEYTOOL, and OPENSSL
          - Allow global configuration file
          - Use correct license text (MIT)
diff --git a/make-ca b/make-ca
index 571ea16..ed728ee 100644
--- a/make-ca
+++ b/make-ca
@@ -144,7 +144,7 @@ function get_args(){
       ;;
       -g | --get)
         if test "${REBUILD}" == "0" -a "${CERTDATAY}" == "0"; then
-          GET=1
+          GET="1"
           CERTDATA="${TEMPDIR}/certdatanew.txt"
           shift 1
         else
@@ -186,6 +186,7 @@ function get_args(){
       -r | --rebuild)
         if test "${CERTDATAY}" == "0" -a "${GET}" == "0"; then
           REBUILD="1"
+          FORCE="1"
           shift 1
         else
           echo "Error: ${1} cannot be used with the -C/--certdata or -g/--get switches."
@@ -422,6 +423,8 @@ if test "${VERSION}x" == "x"; then
   echo "Will run conversion unconditionally."
   sleep 2
   VERSION="$(date -u +%Y%m%d-%H%M)"
+  echo "#CVS_ID @# \$ RCSfile: certdata.txt \$ \$Revision: ${VERSION} \$ \$Date: \$" > "${WORKDIR}/certdata.txt"
+
 else
   if test "${FORCE}" == "1"; then
     echo "Output forced. Will run conversion unconditionally."
@@ -437,7 +440,7 @@ if test "${OLDVERSION}x" == "${VERSION}x"; then
   exit 0
 fi
 
-cp "${CERTDATA}" "${WORKDIR}/certdata.txt"
+cat "${CERTDATA}" >> "${WORKDIR}/certdata.txt"
 pushd "${WORKDIR}" > /dev/null
 
 if test "${WITH_NSS}" == "1"; then
@@ -785,7 +788,7 @@ popd > /dev/null
 
 # Install certdata.txt
 if test "${REBUILD}" == "0"; then
-  install -m644 "${CERTDATA}" "${DESTDIR}${SSLDIR}/certdata.txt"
+  install -m644 "${WORKDIR}/certdata.txt" "${DESTDIR}${SSLDIR}/certdata.txt"
 fi
 
 # Clean up the mess