gentoo auto-resync : 07:01:2024 - 06:54:33

2 files changed, 0 insertions, 112 deletions

diff --git a/app-crypt/johntheripper-jumbo/Manifest b/app-crypt/johntheripper-jumbo/Manifest
index ff6cc714276c..ea9c8e23a5b7 100644
--- a/app-crypt/johntheripper-jumbo/Manifest
+++ b/app-crypt/johntheripper-jumbo/Manifest
@@ -1,4 +1,3 @@
-AUX johntheripper-jumbo-1.9.0_p20211129-fix-bashism.patch 3933 BLAKE2B cd5d773615f4b239e857b430c35a905be7e0c8bfd83b037f43fe14799340aa6d3a02bf9f3f69c1e69a2b07a4038474c1fc57a8ab056db26fde5aa14b1842df18 SHA512 505cf695a001f22a74998a83eb79ce7b88882eb51a0864833e06bd9344dae36df629ffb6cdcdfaa019b3dfcfdedc8314a30b169d0d5b1f6976408adbaee49023
 DIST johntheripper-jumbo-1.9.0_p20230717.tar.gz 56772470 BLAKE2B 33295dc28d32852a6284adaadbbf9d9c852fb78e1dc673df5e67c31befb6921dbd6d29310ca7b3406e4b1259cca6e8d643292d73f4324262b038a1c6bc7ff51b SHA512 fd48a6bccf3f2be0d495aa8a635af73bc386c5815fdaa62259f2920724afa89e0e9743585c412e595486a0d2677f1ec43c43606471078ec0611d5c05b01853de
 DIST johntheripper-jumbo-1.9.0_p20240102.tar.gz 55727974 BLAKE2B 10238f549b8d1d52d7858d0a0df080ae1e92a7026b3b31f4e19d00c2bf06df5ad1fe298291d5421a0f685786fca2ad954a5ed3b2adc23d80464ec1966db9c968 SHA512 c66898d12799d88d42e6a930768e27b4110362b6384a47957ab61300b8254af051d3a2821e54f12a90ded8a20c855b8a2f044942dba1605447ae355e2f7ecbaf
 EBUILD johntheripper-jumbo-1.9.0_p20230717.ebuild 3576 BLAKE2B 99ce00187d1bb442286ef1c2ccfaeccd807b0701faa3a7d8972f69e09d64fb89ce9df5d1c777dc26920bce604f929ad3e04461a91af2875d370eb7721b974fbe SHA512 1c39ed394a1152cd220c8249342d99e08e7c3b324fa3a649d126909f4070752626d7d32328b01a82363e14edc1bd2709174d36daca627c251b5559252e56eb71
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