From 28161d642a38efd68f9377b11f5dd1bf0a6ebc8b Mon Sep 17 00:00:00 2001
From: Cameron Dunn <88673576+cameron-dunn-sublime@users.noreply.github.com>
Date: Thu, 23 Dec 2021 13:31:29 -0800
Subject: [PATCH] Use a specific version of JTR (#13)

* Twice we've seen a build w/ JTR apparently unstable.
  * It's unclear if this is a build issue, or a result of grabbing
a bad version (as we were just grabbing the repo head).
  * This ensures we grab the same commit, so if we continue to see
issues we can go from there.
  * There are no even halfway recent tags so the commit is arbitrary.
* Also changes the repo from magnumripper/JohnTheRipper to openwall/john
as that's where the old repo forwards to.
* And grab a single commit to speed things up (239 MB -> 140 ish MB).
---
 build/python/backend/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/python/backend/Dockerfile b/build/python/backend/Dockerfile
index cfb7f07f..dfb5d374 100644
--- a/build/python/backend/Dockerfile
+++ b/build/python/backend/Dockerfile
@@ -78,7 +78,9 @@ RUN apt-get -qq update && \
 # Install JTR
 RUN apt-get -qq update \
   && apt-get install -qq --no-install-recommends -y git python build-essential ca-certificates libssl-dev zlib1g-dev yasm libgmp-dev libpcap-dev libbz2-dev libgomp1
-RUN git clone https://github.com/magnumripper/JohnTheRipper.git /jtr \
+# The maintainer isn't big on releases or tags so grab an arbitrary, but consistent, commit.
+# Additionally jump through some extra hoops to get the single commit to save some download time.
+RUN mkdir jtr && cd jtr && git init && git remote add origin https://github.com/openwall/john.git && git fetch --depth 1 origin b5c10480f56ff1b5d76c6cbdaf9c817582ee2228 && git reset --hard FETCH_HEAD \
   && rm -rf /jtr/.git \
   && cd /jtr/src \
   && ./configure \