| 1 |
commit: 2c95e38ec54cc00b694db04bf87329c2517dd91d |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jun 6 18:11:00 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 6 20:33:16 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c95e38e |
| 7 |
|
| 8 |
app-crypt/johntheripper: remove unused patch(es) |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/12209 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
.../johntheripper-1.7.3.1-mkdir-sandbox.patch | 12 ---- |
| 15 |
.../files/johntheripper-1.7.6-cflags.patch | 83 ---------------------- |
| 16 |
.../files/johntheripper-1.7.9-clang.patch | 15 ---- |
| 17 |
.../johntheripper-1.7.9-ppc-compile-fix.patch | 17 ----- |
| 18 |
4 files changed, 127 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
deleted file mode 100644 |
| 22 |
index 5600f3cc17e..00000000000 |
| 23 |
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,12 +0,0 @@ |
| 26 |
-diff -urNp john-1.7.3.1.org/src/path.c john-1.7.3.1/src/path.c |
| 27 |
---- john-1.7.3.1.org/src/path.c 2003-10-01 04:26:25.000000000 +0300 |
| 28 |
-+++ john-1.7.3.1/src/path.c 2007-11-10 15:53:23.000000000 +0200 |
| 29 |
-@@ -55,7 +55,7 @@ void path_init(char **argv) |
| 30 |
- #ifdef JOHN_PRIVATE_HOME |
| 31 |
- private = path_expand(JOHN_PRIVATE_HOME); |
| 32 |
- if (mkdir(private, S_IRUSR | S_IWUSR | S_IXUSR)) { |
| 33 |
-- if (errno != EEXIST) pexit("mkdir: %s", private); |
| 34 |
-+ if (errno != EEXIST && errno != EACCES) pexit("mkdir: %s", private); |
| 35 |
- } else |
| 36 |
- fprintf(stderr, "Created directory: %s\n", private); |
| 37 |
- #endif |
| 38 |
|
| 39 |
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch |
| 40 |
deleted file mode 100644 |
| 41 |
index 4b6637a29d8..00000000000 |
| 42 |
--- a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch |
| 43 |
+++ /dev/null |
| 44 |
@@ -1,83 +0,0 @@ |
| 45 |
---- Makefile 2010-07-18 15:27:51.000000000 -0400 |
| 46 |
-+++ Makefile.mine 2010-07-18 15:30:09.000000000 -0400 |
| 47 |
-@@ -629,7 +629,7 @@ |
| 48 |
- macosx-ppc32-altivec: |
| 49 |
- $(LN) ppc32alt.h arch.h |
| 50 |
- $(MAKE) $(PROJ) \ |
| 51 |
-- CFLAGS="-c -Wall -fomit-frame-pointer" \ |
| 52 |
-+ CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer" \ |
| 53 |
- OPT_NORMAL="-fast -mcpu=7450" \ |
| 54 |
- OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" |
| 55 |
- |
| 56 |
-@@ -638,7 +638,7 @@ |
| 57 |
- $(LN) ppc32alt.h arch.h |
| 58 |
- $(MAKE) $(PROJ) \ |
| 59 |
- ASFLAGS="$(ASFLAGS) -arch ppc" \ |
| 60 |
-- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ |
| 61 |
-+ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ |
| 62 |
- LDFLAGS="$(LDFLAGS) -arch ppc" \ |
| 63 |
- OPT_NORMAL="-fast -mcpu=7450" \ |
| 64 |
- OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" |
| 65 |
-@@ -650,7 +650,7 @@ |
| 66 |
- $(LN) ppc32.h arch.h |
| 67 |
- $(MAKE) $(PROJ) \ |
| 68 |
- CC=cc \ |
| 69 |
-- CFLAGS="-c -traditional-cpp" \ |
| 70 |
-+ CFLAGS="$(CFLAGS) -c -traditional-cpp" \ |
| 71 |
- OPT_NORMAL="-O2" \ |
| 72 |
- OPT_INLINE="-O3" |
| 73 |
- |
| 74 |
-@@ -658,7 +658,7 @@ |
| 75 |
- $(LN) ppc32.h arch.h |
| 76 |
- $(MAKE) $(PROJ) \ |
| 77 |
- ASFLAGS="$(ASFLAGS) -arch ppc" \ |
| 78 |
-- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ |
| 79 |
-+ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ |
| 80 |
- LDFLAGS="$(LDFLAGS) -arch ppc" \ |
| 81 |
- OPT_NORMAL="-O2" \ |
| 82 |
- OPT_INLINE="-O3 -finline-limit=4000" |
| 83 |
-@@ -667,7 +667,7 @@ |
| 84 |
- macosx-ppc64-altivec: |
| 85 |
- $(LN) ppc64alt.h arch.h |
| 86 |
- $(MAKE) $(PROJ) \ |
| 87 |
-- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \ |
| 88 |
-+ CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \ |
| 89 |
- LDFLAGS="$(LDFLAGS) -m64" \ |
| 90 |
- OPT_NORMAL="-fast" \ |
| 91 |
- OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec" |
| 92 |
-@@ -676,7 +676,7 @@ |
| 93 |
- $(LN) ppc64alt.h arch.h |
| 94 |
- $(MAKE) $(PROJ) \ |
| 95 |
- ASFLAGS="$(ASFLAGS) -arch ppc" \ |
| 96 |
-- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \ |
| 97 |
-+ CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \ |
| 98 |
- LDFLAGS="$(LDFLAGS) -arch ppc -m64" \ |
| 99 |
- OPT_NORMAL="-fast" \ |
| 100 |
- OPT_INLINE="-fast -finline-limit=4000 -faltivec -maltivec" |
| 101 |
-@@ -684,7 +684,7 @@ |
| 102 |
- macosx-ppc64: |
| 103 |
- $(LN) ppc64.h arch.h |
| 104 |
- $(MAKE) $(PROJ) \ |
| 105 |
-- CFLAGS="-c -m64 -Wall -fomit-frame-pointer" \ |
| 106 |
-+ CFLAGS="$(CFLAGS) -c -m64 -Wall -fomit-frame-pointer" \ |
| 107 |
- LDFLAGS="$(LDFLAGS) -m64" \ |
| 108 |
- OPT_NORMAL="-fast" \ |
| 109 |
- OPT_INLINE="-fast -finline-limit=4000" |
| 110 |
-@@ -693,7 +693,7 @@ |
| 111 |
- $(LN) ppc64.h arch.h |
| 112 |
- $(MAKE) $(PROJ) \ |
| 113 |
- ASFLAGS="$(ASFLAGS) -arch ppc" \ |
| 114 |
-- CFLAGS="-c -arch ppc -m64 -Wall -fomit-frame-pointer" \ |
| 115 |
-+ CFLAGS="$(CFLAGS) -c -arch ppc -m64 -Wall -fomit-frame-pointer" \ |
| 116 |
- LDFLAGS="$(LDFLAGS) -arch ppc -m64" \ |
| 117 |
- OPT_NORMAL="-fast" \ |
| 118 |
- OPT_INLINE="-fast -finline-limit=4000" |
| 119 |
-@@ -723,7 +723,7 @@ |
| 120 |
- $(LN) ppc32alt.h arch.h |
| 121 |
- $(MAKE) $(PROJ) \ |
| 122 |
- ASFLAGS="$(ASFLAGS) -arch ppc" \ |
| 123 |
-- CFLAGS="-c -Wall -arch ppc -fomit-frame-pointer" \ |
| 124 |
-+ CFLAGS="$(CFLAGS) -c -Wall -arch ppc -fomit-frame-pointer" \ |
| 125 |
- LDFLAGS="$(LDFLAGS) -arch ppc" \ |
| 126 |
- OPT_NORMAL="-fast -mcpu=7450" \ |
| 127 |
- OPT_INLINE="-fast -mcpu=7450 -finline-limit=4000 -faltivec -maltivec" |
| 128 |
|
| 129 |
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch |
| 130 |
deleted file mode 100644 |
| 131 |
index 1b85914ed4f..00000000000 |
| 132 |
--- a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch |
| 133 |
+++ /dev/null |
| 134 |
@@ -1,15 +0,0 @@ |
| 135 |
-Fix for building johntheripper with clang. |
| 136 |
- |
| 137 |
-https://bugs.gentoo.org/show_bug.cgi?id=554392 |
| 138 |
- |
| 139 |
---- john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c |
| 140 |
-+++ john-1.7.9-jumbo-7/src/rawSHA1_ng_fmt.c |
| 141 |
-@@ -530,7 +530,7 @@ |
| 142 |
- |
| 143 |
- #if defined(__SSE4_1__) |
| 144 |
- |
| 145 |
--# if !defined(__INTEL_COMPILER) |
| 146 |
-+# if !defined(__INTEL_COMPILER) && !defined(__clang__) |
| 147 |
- // This intrinsic is not always available in GCC, so define it here. |
| 148 |
- static inline int _mm_testz_si128 (__m128i __M, __m128i __V) |
| 149 |
- { |
| 150 |
|
| 151 |
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 |
| 152 |
deleted file mode 100644 |
| 153 |
index c28ec21a0ae..00000000000 |
| 154 |
--- a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch |
| 155 |
+++ /dev/null |
| 156 |
@@ -1,17 +0,0 @@ |
| 157 |
-diff -ru john-1.7.9.orig/src/gost_plug.c john-1.7.9/src/gost_plug.c |
| 158 |
---- john-1.7.9.orig/src/gost_plug.c 2013-01-20 16:15:45.464000001 +0000 |
| 159 |
-+++ john-1.7.9/src/gost_plug.c 2013-01-20 16:16:06.104000001 +0000 |
| 160 |
-@@ -531,7 +531,6 @@ |
| 161 |
- } |
| 162 |
- #endif |
| 163 |
- |
| 164 |
--#ifndef __GLIBC__ |
| 165 |
- void rhash_u32_swap_copy(void* to, int index, const void* from, size_t length) { |
| 166 |
- size_t i; |
| 167 |
- unsigned int *pO, *pI; |
| 168 |
-@@ -542,4 +541,3 @@ |
| 169 |
- *pO++ = bswap_32(*pI++); |
| 170 |
- } |
| 171 |
- } |
| 172 |
--#endif |
| 173 |
- |
Archives