+++ /dev/null
-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
+++ /dev/null
---- 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"
+++ /dev/null
-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)
- {