Skip to content

Commit

Permalink
maint: update 'sandbox' configuration patch
Browse files Browse the repository at this point in the history
The location of binaries within the snap package has changed.

Signed-off-by: Claudio André <[email protected]>
  • Loading branch information
claudioandre-br committed May 23, 2024
1 parent 67b913c commit 1ff1b56
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions patches/Handle-self-confined-system-wide-build.patch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 5c8522ff234ce7012484c52576c4ce156327b180 Mon Sep 17 00:00:00 2001
From a323a4bd1e72eea54b14291f409e8772bd9b7902 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claudio=20Andr=C3=A9?= <[email protected]>
Date: Sat, 15 Dec 2018 23:35:51 -0200
Subject: [PATCH] Handle self confined system wide build.
Expand All @@ -9,10 +9,10 @@ Subject: [PATCH] Handle self confined system wide build.
2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/listconf.c b/src/listconf.c
index d33e993f0..bd2e403a4 100644
index 319288ca7b..cc958100b9 100644
--- a/src/listconf.c
+++ b/src/listconf.c
@@ -151,6 +151,18 @@ static void listconf_list_build_info(void)
@@ -155,6 +155,18 @@ static void listconf_list_build_info(void)
SIMD_PARA_SHA256, SIMD_PARA_SHA512);
#endif
#if JOHN_SYSTEMWIDE
Expand All @@ -32,29 +32,29 @@ index d33e993f0..bd2e403a4 100644
puts("System-wide home: " JOHN_SYSTEMWIDE_HOME);
puts("Private home: " JOHN_PRIVATE_HOME);
diff --git a/src/params.h b/src/params.h
index 83afed9eb..fa7d43f58 100644
index 74726debd1..711b13dd21 100644
--- a/src/params.h
+++ b/src/params.h
@@ -106,10 +106,18 @@
@@ -104,10 +104,18 @@

#if JOHN_SYSTEMWIDE
#ifndef JOHN_SYSTEMWIDE_EXEC /* please refer to the notes above */
-#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john"
+#if defined(_SNAP)
+#define JOHN_SYSTEMWIDE_EXEC "/snap/john-the-ripper/current/run"
+#define JOHN_SYSTEMWIDE_EXEC "/snap/john-the-ripper/current/bin"
+#else
+#define JOHN_SYSTEMWIDE_EXEC "/app/bin"
+#endif
#endif
#ifndef JOHN_SYSTEMWIDE_HOME
-#define JOHN_SYSTEMWIDE_HOME "/usr/share/john"
+#if defined(_SNAP)
+#define JOHN_SYSTEMWIDE_HOME "/snap/john-the-ripper/current/run"
+#define JOHN_SYSTEMWIDE_HOME "/snap/john-the-ripper/current/bin"
+#else
+#define JOHN_SYSTEMWIDE_HOME "/app/bin"
+#endif
#endif
#define JOHN_PRIVATE_HOME "~/.john"
#endif
--
2.39.2
2.43.0
2 changes: 1 addition & 1 deletion requirements.hash
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ dbb14cb56af2895d5cf5aced0d39fbc5aa20c5ac690430a4baebc17bdb6e5e2b ./helper.sh
e1a7e9691bfaba3398eb28ac724a79df5e76f66d243c97f142b2aa415b9bc27f ./package_version.sh
508aa12b1fa9bce92ef494c4d8a24cd68f6ee8d7c008c05c2d5e55a9d788b046 ./run_tests.sh
5e4629cce7b4552876dc308a659e878b1b196df60327df50f462ec899d6d28ed ./show_info.sh
aab7868a06d5a06745a234907f4e26cbe794610fe14198674d595a638529e7bd ./Handle-self-confined-system-wide-build.patch
11aa0fb376310c49eb5c915f5db2c066d2e8b35950e8a6b604d75104994ec04f ./Handle-self-confined-system-wide-build.patch
1f93d80dd97a5450c6e36759148d2767e29bbf987c078d5e5089b702e77aece5 ./Remove-peflags-from-the-default-target.patch

0 comments on commit 1ff1b56

Please sign in to comment.