From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- .../johntheripper-1.7.3.1-mkdir-sandbox.patch | 12 ++++ .../files/johntheripper-1.7.6-cflags.patch | 83 ++++++++++++++++++++++ .../files/johntheripper-1.7.9-clang.patch | 15 ++++ .../johntheripper-1.7.9-ppc-compile-fix.patch | 17 +++++ 4 files changed, 127 insertions(+) create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch (limited to 'app-crypt/johntheripper/files') diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch new file mode 100644 index 000000000000..5600f3cc17ec --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch @@ -0,0 +1,12 @@ +diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c +--- john-1.7.3.1.org/src/path.c 2003-10-01 04:26:25.000000000 +0300 ++++ john-1.7.3.1/src/path.c 2007-11-10 15:53:23.000000000 +0200 +@@ -55,7 +55,7 @@ void path_init(char **argv) + #ifdef JOHN_PRIVATE_HOME + private = path_expand(JOHN_PRIVATE_HOME); + if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) { +- if (errno != EEXIST) pexit("mkdir: %s", private); ++ if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private); + } else + fprintf(stderr, "Created directory: %s\n", private); + #endif diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch new file mode 100644 index 000000000000..4b6637a29d8f --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch @@ -0,0 +1,83 @@ +--- Makefile 2010-07-18 15:27:51.000000000 -0400 ++++ Makefile.mine 2010-07-18 15:30:09.000000000 -0400 +@@ -629,7 +629,7 @@ + macosx-ppc32-altivec: + $(LN) ppc32alt.h arch.h + $(MAKE) $(PROJ) \ +- CFLAGS="-c -Wall -fomit-frame-pointer" \ ++ CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \ + OPT_NORMAL="-fast -mcpu=7450" \ + OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" + +@@ -638,7 +638,7 @@ + $(LN) ppc32alt.h arch.h + $(MAKE) $(PROJ) \ + ASFLAGS="$(ASFLAGS) -arch ppc" \ +- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ ++ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ + LDFLAGS="$(LDFLAGS) -arch ppc" \ + OPT_NORMAL="-fast -mcpu=7450" \ + OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" +@@ -650,7 +650,7 @@ + $(LN) ppc32.h arch.h + $(MAKE) $(PROJ) \ + CC=cc \ +- CFLAGS="-c -traditional-cpp" \ ++ CFLAGS="$(CFLAGS) -c -traditional-cpp" \ + OPT_NORMAL="-O2" \ + OPT_INLINE="-O3" + +@@ -658,7 +658,7 @@ + $(LN) ppc32.h arch.h + $(MAKE) $(PROJ) \ + ASFLAGS="$(ASFLAGS) -arch ppc" \ +- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ ++ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ + LDFLAGS="$(LDFLAGS) -arch ppc" \ + OPT_NORMAL="-O2" \ + OPT_INLINE="-O3 -finline-limit=4000" +@@ -667,7 +667,7 @@ + macosx-ppc64-altivec: + $(LN) ppc64alt.h arch.h + $(MAKE) $(PROJ) \ +- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \ ++ CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \ + LDFLAGS="$(LDFLAGS) -m64" \ + OPT_NORMAL="-fast" \ + OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec" +@@ -676,7 +676,7 @@ + $(LN) ppc64alt.h arch.h + $(MAKE) $(PROJ) \ + ASFLAGS="$(ASFLAGS) -arch ppc" \ +- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \ ++ CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \ + LDFLAGS="$(LDFLAGS) -arch ppc -m64" \ + OPT_NORMAL="-fast" \ + OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec" +@@ -684,7 +684,7 @@ + macosx-ppc64: + $(LN) ppc64.h arch.h + $(MAKE) $(PROJ) \ +- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \ ++ CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \ + LDFLAGS="$(LDFLAGS) -m64" \ + OPT_NORMAL="-fast" \ + OPT_INLINE="-fast -finline-limit=4000" +@@ -693,7 +693,7 @@ + $(LN) ppc64.h arch.h + $(MAKE) $(PROJ) \ + ASFLAGS="$(ASFLAGS) -arch ppc" \ +- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \ ++ CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \ + LDFLAGS="$(LDFLAGS) -arch ppc -m64" \ + OPT_NORMAL="-fast" \ + OPT_INLINE="-fast -finline-limit=4000" +@@ -723,7 +723,7 @@ + $(LN) ppc32alt.h arch.h + $(MAKE) $(PROJ) \ + ASFLAGS="$(ASFLAGS) -arch ppc" \ +- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ ++ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ + LDFLAGS="$(LDFLAGS) -arch ppc" \ + OPT_NORMAL="-fast -mcpu=7450" \ + OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch new file mode 100644 index 000000000000..1b85914ed4ff --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch @@ -0,0 +1,15 @@ +Fix for building johntheripper with clang. + +https://bugs.gentoo.org/show_bug.cgi?id=554392 + +--- john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c ++++ john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c +@@ -530,7 +530,7 @@ + + #if defined(__SSE4_1__) + +-# if !defined(__INTEL_COMPILER) ++# if !defined(__INTEL_COMPILER) && !defined(__clang__) + // This intrinsic is not always available in GCC, so define it here. + static inline int _mm_testz_si128 (__m128i __M, __m128i __V) + { diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch new file mode 100644 index 000000000000..c28ec21a0ae8 --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch @@ -0,0 +1,17 @@ +diff -ru john-1.7.9.orig/src/gost_plug.c john-1.7.9/src/gost_plug.c +--- john-1.7.9.orig/src/gost_plug.c 2013-01-20 16:15:45.464000001 +0000 ++++ john-1.7.9/src/gost_plug.c 2013-01-20 16:16:06.104000001 +0000 +@@ -531,7 +531,6 @@ + } + #endif + +-#ifndef __GLIBC__ + void rhash_u32_swap_copy(void* to, int index, const void* from, size_t length) { + size_t i; + unsigned int *pO, *pI; +@@ -542,4 +541,3 @@ + *pO++ = bswap_32(*pI++); + } + } +-#endif + -- cgit v1.2.3