Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update package patches #673

Merged
merged 1 commit into from
Dec 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions patches/Handle-self-confined-system-wide-build.patch
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
From a323a4bd1e72eea54b14291f409e8772bd9b7902 Mon Sep 17 00:00:00 2001
From a9decfba68ed95aa2884041675e1b0e2d2f9d905 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.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
src/listconf.c | 12 ++++++++++++
src/params.h | 12 ++++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/listconf.c b/src/listconf.c
index 319288ca7b..cc958100b9 100644
index 9f3abf285..76409c580 100644
--- a/src/listconf.c
+++ b/src/listconf.c
@@ -155,6 +155,18 @@ static void listconf_list_build_info(void)
SIMD_PARA_SHA256, SIMD_PARA_SHA512);
#endif
@@ -172,6 +172,18 @@ static void listconf_list_build_info(void)
"no");

#if JOHN_SYSTEMWIDE
+#if defined(_BOXED)
+{
Expand All @@ -32,7 +35,7 @@ index 319288ca7b..cc958100b9 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 74726debd1..711b13dd21 100644
index 74726debd..711b13dd2 100644
--- a/src/params.h
+++ b/src/params.h
@@ -104,10 +104,18 @@
Expand Down
17 changes: 10 additions & 7 deletions patches/Remove-peflags-from-the-default-target.patch
Original file line number Diff line number Diff line change
@@ -1,24 +1,27 @@
From 1ec450a35631b7c140dcbcb2f8be3fa62b037157 Mon Sep 17 00:00:00 2001
From 0059f318d4fe4c29b2aa143aeca0af64dbc56ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Claudio=20Andr=C3=A9?= <[email protected]>
Date: Tue, 2 Apr 2019 11:00:02 -0300
Date: Sun, 1 Dec 2024 08:18:34 -0300
Subject: [PATCH] Remove peflags from the default target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
src/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.in b/src/Makefile.in
index c6b47b5ff..587a32193 100644
index 7225b052f..38b36088f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -195,7 +195,7 @@ default:
JOHN_OBJS="$(JOHN_OBJS) @CC_ASM_OBJS@" \
AESNI_ARCH=@AESNI_ARCH@
@@ -194,7 +194,7 @@ default:
@$(MAKE) $(PROJ) \
JOHN_OBJS="$(JOHN_OBJS) @CC_ASM_OBJS@"

- @if [ "$(OS)" = "Windows_NT" ]; then \
+ @if [ "$(OS)" = "None-Windows_NT" ]; then \
$(MAKE) peflags; \
fi
@echo
--
2.39.2
2.43.0