summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2022-10-04 12:37:40 +0200
committerConrad Kostecki <conikost@gentoo.org>2022-10-15 21:33:35 +0200
commit5e6b596b5f6793a380d94b684932444b04850dfb (patch)
tree741b3e265801f4b1eb9489cf57f79090cd571293 /app-crypt/johntheripper-jumbo
parentnet-fs/cvmfs: remove unused patch (diff)
downloadgentoo-5e6b596b5f6793a380d94b684932444b04850dfb.tar.gz
gentoo-5e6b596b5f6793a380d94b684932444b04850dfb.tar.bz2
gentoo-5e6b596b5f6793a380d94b684932444b04850dfb.zip
app-crypt/johntheripper-jumbo: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/27611 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'app-crypt/johntheripper-jumbo')
-rw-r--r--app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch24
-rw-r--r--app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch53
-rw-r--r--app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch12
3 files changed, 0 insertions, 89 deletions
diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
deleted file mode 100644
index a0a18158ce7e..000000000000
--- a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-fix-bashism.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://patch-diff.githubusercontent.com/raw/openwall/john/pull/4822.patch
-
-From dd9501341808fe19b9c5cd4f8f04edfc5f377077 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Wed, 22 Sep 2021 19:34:38 +0100
-Subject: [PATCH] configure.ac: avoid bashism in pkg-config check
-
-== is a Bashism and configure scripts need to work
-with a POSIX shell, so let's change to = (like in
-the other condition).
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -347,7 +347,7 @@ AS_IF([test -z "$STRIP"], [AC_CHECK_TOOL([STRIP], [strip])])
- dnl Check if we have this at all
- PKG_PROG_PKG_CONFIG
- AC_MSG_CHECKING([if pkg-config will be used])
--if test "x$PKG_CONFIG" = x || test "x$enable_pkg_config" == xno ; then
-+if test "x$PKG_CONFIG" = x || test "x$enable_pkg_config" = xno ; then
- JTR_MSG_RESULT_FAILIF_FORCED([xno], [x$enable_pkg_config], [pkg-config is NOT available])
- PKG_CONFIG=no
- else
-
diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch
deleted file mode 100644
index 2901c5bc4bd6..000000000000
--- a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-gcc11.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/786651
-https://github.com/openwall/john/commit/8152ac071bce1ebc98fac6bed962e90e9b92d8cf.patch
-
-From 8152ac071bce1ebc98fac6bed962e90e9b92d8cf Mon Sep 17 00:00:00 2001
-From: Ferry Huberts <ferry.huberts@pelagic.nl>
-Date: Tue, 9 Mar 2021 22:04:46 +0100
-Subject: [PATCH] Fix alignment compile errors on GCC 11
-
-Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
----
- src/blake2.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/blake2.h b/src/blake2.h
-index b05208117e..b4398f9e13 100644
---- a/src/blake2.h
-+++ b/src/blake2.h
-@@ -57,7 +57,7 @@ extern "C" {
- uint8_t personal[BLAKE2S_PERSONALBYTES]; // 32
- } blake2s_param;
-
-- JTR_ALIGN( 64 ) typedef struct __blake2s_state
-+ typedef struct JTR_ALIGN( 64 ) __blake2s_state
- {
- uint32_t h[8];
- uint32_t t[2];
-@@ -82,7 +82,7 @@ extern "C" {
- uint8_t personal[BLAKE2B_PERSONALBYTES]; // 64
- } blake2b_param;
-
-- JTR_ALIGN( 64 ) typedef struct __blake2b_state
-+ typedef struct JTR_ALIGN( 64 ) __blake2b_state
- {
- uint64_t h[8];
- uint64_t t[2];
-@@ -94,7 +94,7 @@ extern "C" {
- #if defined(JOHN_NO_SIMD) || (!defined(__SSE2__) && !defined(__SSE4_1__) && !defined(__XOP__))
- typedef struct __blake2sp_state
- #else
-- JTR_ALIGN( 64 ) typedef struct __blake2sp_state
-+ typedef struct JTR_ALIGN( 64 ) __blake2sp_state
- #endif
- {
- blake2s_state S[8][1];
-@@ -106,7 +106,7 @@ extern "C" {
- #if defined(JOHN_NO_SIMD) || (!defined(__SSE2__) && !defined(__SSE4_1__) && !defined(__XOP__))
- typedef struct __blake2bp_state
- #else
-- JTR_ALIGN( 64 ) typedef struct __blake2bp_state
-+ typedef struct JTR_ALIGN( 64 ) __blake2bp_state
- #endif
- {
- blake2b_state S[4][1];
diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch
deleted file mode 100644
index 6fe7693276be..000000000000
--- a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0-opencl-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/opencl_common.h 2020-08-03 15:49:20.000000000 +0100
-+++ b/src/opencl_common.h 2020-08-03 15:55:23.081101690 +0100
-@@ -81,6 +81,9 @@
-
- #ifndef CL_DEVICE_TOPOLOGY_AMD
- #define CL_DEVICE_TOPOLOGY_AMD 0x4037
-+#endif
-+
-+#ifndef CL_DEVICE_TOPOLOGY_TYPE_PCIE_AMD
- typedef union {
- struct {
- cl_uint type;