summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt/johntheripper-jumbo/files')
-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
-rw-r--r--app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch111
4 files changed, 0 insertions, 200 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;
diff --git a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch b/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
deleted file mode 100644
index 2306bb018f36..000000000000
--- a/app-crypt/johntheripper-jumbo/files/johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-https://github.com/openwall/john/pull/4908
-https://bugs.gentoo.org/763828
-
-From 7a843229dff28cf0851fe3130c74b38dfaf38411 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 3 Dec 2021 03:40:00 +0000
-Subject: [PATCH 1/2] configure: check for 'strings' and respect $STRINGS
- variable
-
-It's possible to want a ${CHOST}-prefixed copy of strings,
-so add a check for 'strings' in configure.ac and respect
-$STRINGS within jtr_asm_magic.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/configure.ac | 1 +
- src/m4/jtr_asm_magic.m4 | 2 +-
- 3 files changed, 98 insertions(+), 2 deletions(-)
-
-diff --git a/src/configure.ac b/src/configure.ac
-index 53b6a62592..98b28be202 100644
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -346,6 +346,7 @@ AS_IF([test -z "$AS"], [AS="$CC"])
- AS_IF([test -z "$LD"], [LD="$CC"])
- AS_IF([test -z "$AR"], [AC_CHECK_TOOL([AR], [ar])])
- AS_IF([test -z "$STRIP"], [AC_CHECK_TOOL([STRIP], [strip])])
-+AS_IF([test -z "$STRINGS"], [AC_CHECK_TOOL([STRINGS], [strings])])
-
- dnl Check if we have this at all
- PKG_PROG_PKG_CONFIG
-diff --git a/src/m4/jtr_asm_magic.m4 b/src/m4/jtr_asm_magic.m4
-index 469a944589..162736d855 100644
---- a/src/m4/jtr_asm_magic.m4
-+++ b/src/m4/jtr_asm_magic.m4
-@@ -19,7 +19,7 @@ EXTRA_AS_FLAGS=
- AC_MSG_CHECKING([for extra ASFLAGS])
- CC="$CC_BACKUP"
- CFLAGS="$CFLAGS -O0"
--AS_IF([echo "int long_ident;" > conftest.c && ${CC} -c conftest.c && strings - conftest.${OBJEXT} | ${GREP} _long_ident > conftest.out],
-+AS_IF([echo "int long_ident;" > conftest.c && ${CC} -c conftest.c && ${STRINGS} - conftest.${OBJEXT} | ${GREP} _long_ident > conftest.out],
- [JTR_LIST_ADD(EXTRA_AS_FLAGS, [-DUNDERSCORES])])
-
- AC_LINK_IFELSE([AC_LANG_SOURCE(
-
-From 8c43ed0c2f7fdb793978d90306d6f6a118122e39 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 3 Dec 2021 03:46:44 +0000
-Subject: [PATCH 2/2] configure: fix bashisms
-
-'==' isn't recognised by POSIX-compliant shells, so let's use = too.
-
-No functional change.
-
-Signed-off-by: Sam James <sam@gentoo.org>
----
- src/configure.ac | 8 ++++----
- src/m4/jtr_utility_macros.m4 | 4 ++--
- 3 files changed, 12 insertions(+), 12 deletions(-)
-
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -339,7 +339,7 @@ AC_CACHE_SAVE
- AC_PATH_PROG([SORT], [sort])
- AC_PATH_PROG([FIND], [find])
- AC_PATH_PROG([PERL], [perl])
--if test "x$PERL" == x ; then
-+if test "x$PERL" = x ; then
- AC_MSG_FAILURE([No perl executable found])
- fi
- AS_IF([test -z "$AS"], [AS="$CC"])
-@@ -370,7 +370,7 @@ dnl to succeeed.
- dnl
- if ( test -e ../run/john.pot ) ; then
- AC_MSG_CHECKING([if potcheck.pl succeeds])
--if test "x$PERL" == x ; then
-+if test "x$PERL" = x ; then
- AC_MSG_RESULT([no Perl (unable to check)])
- else
- $PERL ../run/potcheck.pl -validate < ../run/john.pot
-@@ -677,10 +677,10 @@ if test "x$enable_rexgen" != xno ; then
- AC_MSG_RESULT([TOO old. Rexgen not usable!]))]
- )]
- )
-- if test "x$using_rexgen" == "xyes" ; then
-+ if test "x$using_rexgen" = "xyes" ; then
- AC_DEFINE(HAVE_LIBREXGEN,1,[Define to 1 if you have the `rexgen' library (-lrexgen).])
- else
-- if test "x$enable_rexgen" == "xyes" ; then
-+ if test "x$enable_rexgen" = "xyes" ; then
- AC_MSG_FAILURE([rexgen not installed, or unusable version])
- fi
- fi
-diff --git a/src/m4/jtr_utility_macros.m4 b/src/m4/jtr_utility_macros.m4
-index 33501eeb71..6b5c58e2b7 100644
---- a/src/m4/jtr_utility_macros.m4
-+++ b/src/m4/jtr_utility_macros.m4
-@@ -189,11 +189,11 @@ dnl will be xno, xyes, xauto, etc. forced_fail_msg is a message that
- dnl will be output, and the script will abort, IF forced is xyes which
- dnl means the user used --enable-foobar
- AC_DEFUN([JTR_MSG_RESULT_FAILIF_FORCED], [
-- if test "$1" == xyes; then
-+ if test "$1" = xyes; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
-- if test "$2" == xyes; then
-+ if test "$2" = xyes; then
- AC_MSG_FAILURE([$3])
- fi
- fi