From c7f60e786395bd0077d55d920620cc08e9c0f017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claudio=20Andr=C3=A9?= <dev@claudioandre.slmail.me>
Date: Tue, 14 May 2024 16:55:26 -0300
Subject: [PATCH] deploy: save john (upstream) repository reference
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Save to the log information about the current john commit used by
the build process. Print and save for auditing.

Signed-off-by: Claudio André <dev@claudioandre.slmail.me>
---
 deploy/Windows-Delivery.yml | 4 ++++
 requirements.hash           | 2 +-
 scripts/helper.sh           | 9 ++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/deploy/Windows-Delivery.yml b/deploy/Windows-Delivery.yml
index 9e1dc74c..596317e4 100644
--- a/deploy/Windows-Delivery.yml
+++ b/deploy/Windows-Delivery.yml
@@ -126,6 +126,10 @@ steps:
       shell "echo 'libpcap=No' >> ../run/Defaults"
       shell "echo 'Other Optional Libraries=Yes' >> ../run/Defaults"
       shell "echo 'Regex, OpenMPI, Experimental Code, ZTEX=No' >> ../run/Defaults"
+      shell "echo '#' >> ../run/Defaults"
+      shell "echo '#   The john (upstream) repository reference' >> ../run/Defaults"
+      shell "echo '[Repository john]' >> ../run/Defaults"
+      shell "echo 'Commit=f9fedd238b0b1d69181c1fef033b85c787e96e57' >> ../run/Defaults"
 
       # Use symlink.c to produce a tiny john.exe that executes the best SIMD
       shell "make windows-tiny-link-to-john MAIN_NAME=$EXE_NAME "
diff --git a/requirements.hash b/requirements.hash
index 3c51d8e8..275ce9eb 100644
--- a/requirements.hash
+++ b/requirements.hash
@@ -1,6 +1,6 @@
 bc092ea2321580e3199003febacba83d8204a8590db5b24788632958ad3440bc  ./ci_controller.sh
 539ff1db5a1cee05533a1f431560be008239e1facf930fb4242bc21eeaf0920b  ./clean_package.sh
-0fb3d5f7c4271a102b1f14c859e127ed1db013f011cb9b48a46e357614831c93  ./helper.sh
+a718836493109ccd49750a79375dcd64ca7d0b4ba88d0786583eee8a26fac04f  ./helper.sh
 e1a7e9691bfaba3398eb28ac724a79df5e76f66d243c97f142b2aa415b9bc27f  ./package_version.sh
 6877e23f9225f4d80cbc98de68e37784817e0a9f96b0ca2831f62533bb15f80e  ./run_tests.sh
 5e4629cce7b4552876dc308a659e878b1b196df60327df50f462ec899d6d28ed  ./show_info.sh
diff --git a/scripts/helper.sh b/scripts/helper.sh
index dd39ce3b..3c6e4338 100755
--- a/scripts/helper.sh
+++ b/scripts/helper.sh
@@ -111,12 +111,19 @@ function do_release() {
 		cat <<-EOF >>../run/Defaults
 			#
 			#   The john-packages repository reference
-			[john-packages]
+			[Repository john-packages]
 			Commit="$(git ls-remote -q https://github.com/openwall/john-packages.git HEAD | cut -f1)"
 			Date="$(LANG=C date -u)"
 		EOF
 	fi
 
+	cat <<-EOF >>../run/Defaults
+		#
+		#   The john (upstream) repository reference
+		[Repository john]
+		Commit="f9fedd238b0b1d69181c1fef033b85c787e96e57"
+	EOF
+
 	cat <<-EOF >>../run/Defaults
 		#
 		#   Hashes of extra or external files used