* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/files/
@ 2016-07-07 7:47 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2016-07-07 7:47 UTC (permalink / raw
To: gentoo-commits
commit: 7c886e1756e0e6031f839dcd8ec5c727853fc85d
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Jul 3 17:14:00 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jul 7 07:18:36 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c886e17
app-crypt/johntheripper: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/1826
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
...theripper-1.7.9-jumbo-5-NT-performance-02.patch | 31 ----------------------
1 file changed, 31 deletions(-)
diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch b/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
deleted file mode 100644
index 6066cb8..0000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.9-jumbo-5-NT-performance-02.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/src/NT_fmt_plug.c b/src/NT_fmt_plug.c
-index eb52e3d..411a45b 100644
---- a/src/NT_fmt_plug.c
-+++ b/src/NT_fmt_plug.c
-@@ -652,7 +652,7 @@ static inline void set_key_helper(unsigned int * keybuffer,
- for(; key[md4_size]; i += xBuf, md4_size++)
- {
- unsigned int temp;
-- if ((temp = key[++md4_size]))
-+ if ((temp = key[++md4_size]) && md4_size < PLAINTEXT_LENGTH)
- {
- keybuffer[i] = key[md4_size-1] | (temp << 16);
- }
-@@ -704,7 +704,7 @@ static inline void set_key_helper_utf8(unsigned int * keybuffer, unsigned int xB
- const UTF8 * source, unsigned int lenStoreOffset, unsigned int *lastlen)
- {
- unsigned int *target = keybuffer;
-- unsigned int *targetEnd = &keybuffer[xBuf * ((PLAINTEXT_LENGTH + 1) >> 1)];
-+ unsigned int *targetEnd = &keybuffer[xBuf * (PLAINTEXT_LENGTH >> 1)];
- UTF32 chl, chh = 0x80;
- unsigned int outlen = 0;
-
-@@ -844,7 +844,7 @@ static inline void set_key_helper_encoding(unsigned int * keybuffer,
- i = 0;
- for(md4_size = 0; key[md4_size]; i += xBuf, md4_size++)
- {
-- if ((temp = CP_to_Unicode[key[++md4_size]]))
-+ if ((temp = CP_to_Unicode[key[++md4_size]]) && md4_size < PLAINTEXT_LENGTH)
- keybuffer[i] = CP_to_Unicode[key[md4_size-1]] | (temp << 16);
- else {
- keybuffer[i] = CP_to_Unicode[key[md4_size-1]] | 0x800000;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/files/
@ 2019-06-06 20:33 Andreas Sturmlechner
0 siblings, 0 replies; 2+ messages in thread
From: Andreas Sturmlechner @ 2019-06-06 20:33 UTC (permalink / raw
To: gentoo-commits
commit: 2c95e38ec54cc00b694db04bf87329c2517dd91d
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Jun 6 18:11:00 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 20:33:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c95e38e
app-crypt/johntheripper: remove unused patch(es)
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12209
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../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 deletions(-)
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
deleted file mode 100644
index 5600f3cc17e..00000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-mkdir-sandbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 4b6637a29d8..00000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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
deleted file mode 100644
index 1b85914ed4f..00000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.9-clang.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index c28ec21a0ae..00000000000
--- a/app-crypt/johntheripper/files/johntheripper-1.7.9-ppc-compile-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-06 20:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-06 20:33 [gentoo-commits] repo/gentoo:master commit in: app-crypt/johntheripper/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2016-07-07 7:47 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox