Default to repeatable and reproducible builds

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 "

deploy/flatpak/com.openwall.John.json

@@ -40,6 +40,10 @@
                 "mkdir -p /app/share/bash-completion/completions",
                 "cp ../run/john.*_completion /app/share/bash-completion/completions"
             ],
+            "secret-env": [
+                "JOHN_PACKAGES_COMMIT",
+                "JOHN_RELEASE_COMMIT"
+            ],
             "sources": [
                 {
                     "type": "git",

requirements.hash

@@ -1,6 +1,6 @@
 bc092ea2321580e3199003febacba83d8204a8590db5b24788632958ad3440bc  ./ci_controller.sh
 539ff1db5a1cee05533a1f431560be008239e1facf930fb4242bc21eeaf0920b  ./clean_package.sh
-0fb3d5f7c4271a102b1f14c859e127ed1db013f011cb9b48a46e357614831c93  ./helper.sh
+dbb14cb56af2895d5cf5aced0d39fbc5aa20c5ac690430a4baebc17bdb6e5e2b  ./helper.sh
 e1a7e9691bfaba3398eb28ac724a79df5e76f66d243c97f142b2aa415b9bc27f  ./package_version.sh
 6877e23f9225f4d80cbc98de68e37784817e0a9f96b0ca2831f62533bb15f80e  ./run_tests.sh
 5e4629cce7b4552876dc308a659e878b1b196df60327df50f462ec899d6d28ed  ./show_info.sh

scripts/helper.sh

@@ -108,22 +108,39 @@ function do_release() {
 	EOF
 
 	if [[ ${FLATPAK_BUILD-0} -ne 1 ]]; then
-		cat <<-EOF >>../run/Defaults
+		JOHN_PACKAGES_COMMIT="$(git ls-remote -q https://github.com/openwall/john-packages.git HEAD | cut -f1)"
+		JOHN_RELEASE_COMMIT="$(git ls-remote -q https://github.com/openwall/john-packages.git release | cut -f1)"
+	fi
+	{
+		cat <<-EOF
 			#
 			#   The john-packages repository reference
-			[john-packages]
-			Commit="$(git ls-remote -q https://github.com/openwall/john-packages.git HEAD | cut -f1)"
+			[Repository john-packages]
+			Commit="${JOHN_PACKAGES_COMMIT-Unknown}"
 			Date="$(LANG=C date -u)"
 		EOF
-	fi
 
-	cat <<-EOF >>../run/Defaults
-		#
-		#   Hashes of extra or external files used
-		[Extra Files]
-		$(cat requirements.hash)
-	EOF
+		cat <<-EOF
+			#
+			#   Temporary 'release' branch reference
+			[Repository john-packages, branch release]
+			Commit="${JOHN_RELEASE_COMMIT-Unknown}"
+		EOF
 
+		cat <<-EOF
+			#
+			#   The john (upstream) repository reference
+			[Repository john]
+			Commit="f9fedd238b0b1d69181c1fef033b85c787e96e57"
+		EOF
+
+		cat <<-EOF
+			#
+			#   Hashes of extra or external files used
+			[Extra Files]
+			$(cat requirements.hash)
+		EOF
+	} >>../run/Defaults
 	echo "-----------------------------------------------------------"
 	cat ../run/Defaults
 	echo "-----------------------------------------------------------"