From 36b7fab057be39f8e714821cd48f6c1693ee1b40 Mon Sep 17 00:00:00 2001 From: Dane Smith Date: Sun, 18 Jul 2010 15:42:00 -0400 Subject: New johntheripper ebuild. Working. --- app-crypt/johntheripper/Manifest | 19 +++ .../files/johntheripper-1.7.2-mkdir-sandbox.patch | 12 ++ .../files/johntheripper-1.7.2-params.h.patch | 15 ++ .../files/johntheripper-1.7.2-sha1-memset.patch | 13 ++ .../files/johntheripper-1.7.2-stackdef-2.S.patch | 10 ++ .../files/johntheripper-1.7.2-stackdef.S.patch | 72 ++++++++++ .../files/johntheripper-1.7.2-stripping.patch | 28 ++++ .../johntheripper-1.7.3.1-all-5-stackdef.S.patch | 21 +++ .../files/johntheripper-1.7.3.1-cflags.patch | 68 +++++++++ .../johntheripper-1.7.3.1-mkdir-sandbox.patch | 12 ++ .../files/johntheripper-1.7.3.1-params.h.patch | 15 ++ .../files/johntheripper-1.7.3.1-stackdef.S.patch | 66 +++++++++ .../files/johntheripper-1.7.6-cflags.patch | 83 +++++++++++ .../files/johntheripper-1.7.6-mkdir-sandbox.patch | 12 ++ app-crypt/johntheripper/johntheripper-1.7.6.ebuild | 152 +++++++++++++++++++++ 15 files changed, 598 insertions(+) create mode 100644 app-crypt/johntheripper/Manifest create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch 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.3.1-params.h.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.6-cflags.patch create mode 100644 app-crypt/johntheripper/files/johntheripper-1.7.6-mkdir-sandbox.patch create mode 100644 app-crypt/johntheripper/johntheripper-1.7.6.ebuild (limited to 'app-crypt') diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest new file mode 100644 index 0000000..bb850a8 --- /dev/null +++ b/app-crypt/johntheripper/Manifest @@ -0,0 +1,19 @@ +AUX johntheripper-1.7.2-mkdir-sandbox.patch 554 RMD160 2dfa6d0e912d15ac6205ea89450a0a43c90e563b SHA1 5cd63044c33774f795f32184c486b88df9bb6fc1 SHA256 ced75f4476fc2fe412f630083a5be1102fbbd5ceafc2f34d703cccefdc03e588 +AUX johntheripper-1.7.2-params.h.patch 526 RMD160 f32582a6bfb5a4a2c8b1813d81dfd065d7f46cbf SHA1 030450dafbbc613aff20fd28e230bd35ecf05cd3 SHA256 fc050acd68ce5f7f79312c0dc54a110c92f074c908ec32394baaf0b172b7d611 +AUX johntheripper-1.7.2-sha1-memset.patch 388 RMD160 71190df1e84e543eef49e95391596280d01b3601 SHA1 ec901d34075b32d515993a1918089e29084d234f SHA256 eb5a126c521b34dea476deccf4afe20816ccc861b41910dda7dd5e3625f75028 +AUX johntheripper-1.7.2-stackdef-2.S.patch 363 RMD160 dfb0912bcff9ded13a50ccc153448423c0f00831 SHA1 ea3b75eb936adc98ebfe41650f608173b6b272f9 SHA256 9ce4d1e7ee1440208a7b8ed48fd4270c558772df10d3b2bb8ecaffc26152a073 +AUX johntheripper-1.7.2-stackdef.S.patch 1845 RMD160 947aa7be3186c13f87b35e2bbd1bd63f28c5e1a9 SHA1 705a85daf7a65b9b0908b638144c4eaae2ee7316 SHA256 952f076de0eef22db086864ca95e84aab16eb5fcb7035cb3d9c23340b3e2311f +AUX johntheripper-1.7.2-stripping.patch 840 RMD160 9001329b0fcda4ed244c746cdd6dc2d5bde9ae94 SHA1 e60f41af985f12a431b9c272e3964d166d552782 SHA256 e2b989facd64aa1634de13df5a76c3c5579ad90d75a4af63f68b5ad970eca0b8 +AUX johntheripper-1.7.3.1-all-5-stackdef.S.patch 668 RMD160 77560c448ab9586cb51da3009ce25b0babab9c9e SHA1 2d7e3c97405e793193378577149fd0ef311b20e7 SHA256 b307f7c76f0baa2441e53da4f0db9c90fdaef06f3f7b34080513d518ba8b5890 +AUX johntheripper-1.7.3.1-cflags.patch 2215 RMD160 86e02a71dad29cdb59190b3e5fa6bdb8aa476a72 SHA1 9e346f2e7886ea405e937185bb897096d7c98308 SHA256 b734db5141aed15574c8e2f8e9b476cb17fd2f7753c7cf7d6695b8d4b7cb10e0 +AUX johntheripper-1.7.3.1-mkdir-sandbox.patch 562 RMD160 10fa90b61b07aa902bd88d14eed38be2b66573bf SHA1 1f4520d3e339b853dc480cd6e3a4956aa878a15f SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0 +AUX johntheripper-1.7.3.1-params.h.patch 532 RMD160 9b386fcfa4ecee56aae79822189b04de7bdb7c02 SHA1 2b6392d51fa8edd6f1c8c261d4318863e64f44fb SHA256 60ed06e59e9f355a15056ce52fe5066679262395a6e21e70614b1b8c44e35523 +AUX johntheripper-1.7.3.1-stackdef.S.patch 2112 RMD160 bbf978098ff017700f05d024071a912ed8d8d3bc SHA1 c457fa3c6f8a7de7e877754b593c167579c87d36 SHA256 bceb69e26e4bace6f12eeccdbe00e2c589bd22b0f6421c0468dcfd7e344e12ca +AUX johntheripper-1.7.6-cflags.patch 2927 RMD160 76bf59d4938ef618b49a19f7067c5e9ba8d24146 SHA1 f2cb76ef4ba742d7fb02c4a1fca1717a932bf93c SHA256 0490311893ec85b4ca9fed1cce39341378959fed307b012f29adf11789a444ae +AUX johntheripper-1.7.6-mkdir-sandbox.patch 562 RMD160 10fa90b61b07aa902bd88d14eed38be2b66573bf SHA1 1f4520d3e339b853dc480cd6e3a4956aa878a15f SHA256 9bf9577ed74048b4df82bc6fcf546469e07c93d27de438dd3aa36b5b360b27f0 +DIST john-1.7.4.2-jumbo-3.diff.gz 189325 RMD160 4b1a1d48aba31dbe25b6e5a1de9c837203b30419 SHA1 369882a289d28e78b0917bf7b58ce6c486cb9b72 SHA256 cbb99ceb814c786500e61eacd6432fbcc6c69ec6b92218f29c851a9546b0d177 +DIST john-1.7.4.2.tar.gz 823747 RMD160 bf36f64921454ee593bf588dcffe7053e9cbf73a SHA1 954eedaa17868cce0ac507042407269bcea2c63b SHA256 ad1c10e63c8346d4319e156e30fdbbe3457eb44441bd40e93a64ae44f9be7329 +DIST john-1.7.6-jumbo-4.diff.gz 206601 RMD160 53ac2218ca33d458eb7250bce18a9e9af5a881d6 SHA1 ccef570680a8496618d359a42a101b331d40aeb7 SHA256 12760c528c3eabe0e429954745f016107c08ce936ed4be2e63d2a75c64717f3a +DIST john-1.7.6.tar.gz 832790 RMD160 294fa9a381b45df6fda6e537bc920e74c1d966b0 SHA1 da0b6298e6e045606d48880df045096e8bc87fcb SHA256 77e44d068d317648c41d3ac61b8ea1df18d5c7401083e7a4f6681816900c1a73 +EBUILD johntheripper-1.7.4.2.ebuild 3759 RMD160 0eb2655240783d1459269cbaccc8f1e7d7b8d7e1 SHA1 b697acf86453545a36101fc2e0425b256315f4de SHA256 4ea58d53c291cf488e717272decd61cc1ed30255de037337cae8a39ea321af88 +EBUILD johntheripper-1.7.6.ebuild 3776 RMD160 eeab2b88533667be723d0d774a019fdefaace8f2 SHA1 2d51b361878c3e50bc8605536400ac8ce628d1e3 SHA256 410b0a7631893824cd886fdf84c19fa31ece994503c9ab83d4cbdb7b7ba214b2 diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch new file mode 100644 index 0000000..7a15624 --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-mkdir-sandbox.patch @@ -0,0 +1,12 @@ +diff -urNp john-1.7.2.org/src/path.c john-1.7.2/src/path.c +--- john-1.7.2.org/src/path.c 2003-10-01 04:26:25.000000000 +0300 ++++ john-1.7.2/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.2-params.h.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch new file mode 100644 index 0000000..04d2201 --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-params.h.patch @@ -0,0 +1,15 @@ +Index: john-1.7.2/src/params.h +=================================================================== +--- john-1.7.2.orig/src/params.h ++++ john-1.7.2/src/params.h +@@ -101,8 +101,8 @@ + /* + * File names. + */ +-#define CFG_FULL_NAME "$JOHN/john.conf" +-#define CFG_ALT_NAME "$JOHN/john.ini" ++#define CFG_FULL_NAME "/etc/john/john.conf" ++#define CFG_ALT_NAME "/etc/john/john.ini" + #if JOHN_SYSTEMWIDE + #define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf" + #define CFG_PRIVATE_ALT_NAME JOHN_PRIVATE_HOME "/john.ini" diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch new file mode 100644 index 0000000..a713def --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-sha1-memset.patch @@ -0,0 +1,13 @@ +Index: src/rawSHA1_fmt.c +=================================================================== +--- src.orig/rawSHA1_fmt.c ++++ src/rawSHA1_fmt.c +@@ -100,7 +100,7 @@ static void rawsha1_set_key(char *key, i + if(index==0) + { + total_len = 0; +- memset(saved_key, 0, PLAINTEXT_LENGTH*MMX_COEF); ++ memset(saved_key, 0, sizeof(saved_key)); + } + len = strlen(key); + if(len>PLAINTEXT_LENGTH) diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch new file mode 100644 index 0000000..8ffb8d2 --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef-2.S.patch @@ -0,0 +1,10 @@ +diff -urNp john-1.7.2.org/src/sha1-mmx.S john-1.7.2/src/sha1-mmx.S +--- john-1.7.2.org/src/sha1-mmx.S 2007-07-19 18:57:26.000000000 +0300 ++++ john-1.7.2/src/sha1-mmx.S 2007-07-19 18:58:20.000000000 +0300 +@@ -558,3 +558,6 @@ endianity: + por tmp2, ctxd + por tmp4, ctxe + */ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch new file mode 100644 index 0000000..e1ed5ae --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-stackdef.S.patch @@ -0,0 +1,72 @@ +Index: john-1.7.2/src/alpha.S +=================================================================== +--- john-1.7.2.orig/src/alpha.S ++++ john-1.7.2/src/alpha.S +@@ -318,3 +318,7 @@ DES_KS_current: + .space 128 + + .comm DES_KS_table, (8 * 128 * 16 * 8), 128 ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +Index: john-1.7.2/src/sparc.S +=================================================================== +--- john-1.7.2.orig/src/sparc.S ++++ john-1.7.2/src/sparc.S +@@ -410,3 +410,7 @@ DES_count: + .common DES_KS_table, (8 * 128 * 16 * 8), 32 + + #endif ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +Index: john-1.7.2/src/x86-64.S +=================================================================== +--- john-1.7.2.orig/src/x86-64.S ++++ john-1.7.2/src/x86-64.S +@@ -1040,3 +1040,7 @@ DES_bs_crypt_LM_loop: + subl $1,rounds + jnz DES_bs_crypt_LM_loop + ret ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +Index: john-1.7.2/src/x86-mmx.S +=================================================================== +--- john-1.7.2.orig/src/x86-mmx.S ++++ john-1.7.2/src/x86-mmx.S +@@ -1302,3 +1302,7 @@ DES_bs_crypt_LM_loop: + emms + #endif + ret ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +Index: john-1.7.2/src/x86-sse.S +=================================================================== +--- john-1.7.2.orig/src/x86-sse.S ++++ john-1.7.2/src/x86-sse.S +@@ -1289,3 +1289,7 @@ DES_bs_crypt_LM_loop: + jnz DES_bs_crypt_LM_loop + popl %esi + ret ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +Index: john-1.7.2/src/x86.S +=================================================================== +--- john-1.7.2.orig/src/x86.S ++++ john-1.7.2/src/x86.S +@@ -1362,3 +1362,7 @@ CPU_detect_ret: + movzbl %al,%eax + popl %ebx + ret ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch new file mode 100644 index 0000000..8c1afb1 --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.2-stripping.patch @@ -0,0 +1,28 @@ +Index: john-1.7.2/src/Makefile +=================================================================== +--- john-1.7.2.orig/src/Makefile ++++ john-1.7.2/src/Makefile +@@ -718,23 +718,18 @@ john.com: john.asm + + ../run/john.exe: $(JOHN_OBJS) + $(LD) $(JOHN_OBJS) -lkernel32 -o ../run/john.exe +- strip ../run/john.exe + + ../run/unshadow.exe: symlink.c + $(CC) symlink.c -o ../run/unshadow.exe +- strip ../run/unshadow.exe + + ../run/unafs.exe: symlink.c + $(CC) symlink.c -o ../run/unafs.exe +- strip ../run/unafs.exe + + ../run/undrop.exe: symlink.c + $(CC) symlink.c -o ../run/undrop.exe +- strip ../run/undrop.exe + + ../run/unique.exe: symlink.c + $(CC) symlink.c -o ../run/unique.exe +- strip ../run/unique.exe + + # Inlining the S-boxes produces faster code, as long as they fit in the cache + # (that is, on RISC with at least 8 KB of L1 code cache). diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch new file mode 100644 index 0000000..1baced8 --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-all-5-stackdef.S.patch @@ -0,0 +1,21 @@ +diff -urpN john-1.7.3.1.orig/src/md5-mmx.S john-1.7.3.1/src/md5-mmx.S +--- john-1.7.3.1.orig/src/md5-mmx.S 2009-06-26 14:03:21.073960144 -0600 ++++ john-1.7.3.1/src/md5-mmx.S 2009-06-26 14:01:28.889959256 -0600 +@@ -306,3 +306,6 @@ mdfivemmx_noinit: + + ret + ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +diff -urpN john-1.7.3.1.orig/src/sha1-mmx.S john-1.7.3.1/src/sha1-mmx.S +--- john-1.7.3.1.orig/src/sha1-mmx.S 2009-06-26 14:03:21.093949076 -0600 ++++ john-1.7.3.1/src/sha1-mmx.S 2009-06-26 14:01:36.706958726 -0600 +@@ -558,3 +558,7 @@ endianity: + por tmp2, ctxd + por tmp4, ctxe + */ ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch new file mode 100644 index 0000000..8c3bc0f --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-cflags.patch @@ -0,0 +1,68 @@ +* this is an incomplete patch, adding CFLAGS to some targets that we use + without this patch, one can't configure john via defines + +--- src/Makefile ++++ src/Makefile +@@ -597,7 +597,7 @@ + $(LN) ppc32.h arch.h + $(MAKE) $(PROJ) \ + CC=cc \ +- CFLAGS="-c -qunroll=2 -qarch=ppc -qchars=signed" \ ++ CFLAGS="$(CFLAGS) -c -qunroll=2 -qarch=ppc -qchars=signed" \ + LDFLAGS="-s -lbsd" \ + OPT_NORMAL="-O2" \ + OPT_INLINE="-O3 -Q=99 -w" +@@ -626,7 +626,7 @@ + $(LN) ppc32alt.h arch.h + $(MAKE) $(PROJ) \ + JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \ +- 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" + +@@ -637,7 +637,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" + +@@ -646,7 +646,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" +@@ -656,7 +656,7 @@ + $(LN) ppc64alt.h arch.h + $(MAKE) $(PROJ) \ + JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \ +- 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" +@@ -664,7 +664,7 @@ + macosx-ppc64: + $(LN) ppc64.h arch.h + $(MAKE) $(PROJ) \ +- CFLAGS="-c -Wall -fomit-frame-pointer -m64" \ ++ CFLAGS="$(CFLAGS) -c -Wall -fomit-frame-pointer -m64" \ + LDFLAGS="$(LDFLAGS) -m64" \ + OPT_NORMAL="-fast" \ + OPT_INLINE="-fast -finline-limit=4000" +@@ -698,7 +698,7 @@ + $(MAKE) $(PROJ) \ + JOHN_OBJS="$(JOHN_OBJS) ppc-alti-macosx.o" \ + 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" 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 0000000..5600f3c --- /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.3.1-params.h.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-params.h.patch new file mode 100644 index 0000000..0f430df --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-params.h.patch @@ -0,0 +1,15 @@ +Index: john-1.7.3.1/src/params.h +=================================================================== +--- john-1.7.3.1.orig/src/params.h ++++ john-1.7.3.1/src/params.h +@@ -101,8 +101,8 @@ + /* + * File names. + */ +-#define CFG_FULL_NAME "$JOHN/john.conf" +-#define CFG_ALT_NAME "$JOHN/john.ini" ++#define CFG_FULL_NAME "/etc/john/john.conf" ++#define CFG_ALT_NAME "/etc/john/john.ini" + #if JOHN_SYSTEMWIDE + #define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf" + #define CFG_PRIVATE_ALT_NAME JOHN_PRIVATE_HOME "/john.ini" diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch new file mode 100644 index 0000000..8600b7d --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.3.1-stackdef.S.patch @@ -0,0 +1,66 @@ +diff -urpN john-1.7.3.1.orig/src/alpha.S john-1.7.3.1/src/alpha.S +--- john-1.7.3.1.orig/src/alpha.S 2002-04-10 08:13:25.000000000 -0600 ++++ john-1.7.3.1/src/alpha.S 2009-06-26 13:56:10.635952569 -0600 +@@ -318,3 +318,7 @@ DES_KS_current: + .space 128 + + .comm DES_KS_table, (8 * 128 * 16 * 8), 128 ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +diff -urpN john-1.7.3.1.orig/src/sparc.S john-1.7.3.1/src/sparc.S +--- john-1.7.3.1.orig/src/sparc.S 2002-04-10 08:13:25.000000000 -0600 ++++ john-1.7.3.1/src/sparc.S 2009-06-26 13:54:31.388950767 -0600 +@@ -410,3 +410,7 @@ DES_count: + .common DES_KS_table, (8 * 128 * 16 * 8), 32 + + #endif ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +diff -urpN john-1.7.3.1.orig/src/x86-64.S john-1.7.3.1/src/x86-64.S +--- john-1.7.3.1.orig/src/x86-64.S 2008-07-13 15:35:12.000000000 -0600 ++++ john-1.7.3.1/src/x86-64.S 2009-06-26 13:54:31.392950649 -0600 +@@ -1052,3 +1052,7 @@ DES_bs_crypt_LM_loop: + subl $1,rounds + jnz DES_bs_crypt_LM_loop + ret ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +diff -urpN john-1.7.3.1.orig/src/x86-mmx.S john-1.7.3.1/src/x86-mmx.S +--- john-1.7.3.1.orig/src/x86-mmx.S 2008-07-13 15:45:55.000000000 -0600 ++++ john-1.7.3.1/src/x86-mmx.S 2009-06-26 13:54:31.396971552 -0600 +@@ -1314,3 +1314,7 @@ DES_bs_crypt_LM_loop: + emms + #endif + ret ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +diff -urpN john-1.7.3.1.orig/src/x86.S john-1.7.3.1/src/x86.S +--- john-1.7.3.1.orig/src/x86.S 2008-07-07 12:30:36.000000000 -0600 ++++ john-1.7.3.1/src/x86.S 2009-06-26 13:54:31.404961468 -0600 +@@ -1366,3 +1366,7 @@ CPU_detect_ret: + movzbl %al,%eax + popl %ebx + ret ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#endif +diff -urpN john-1.7.3.1.orig/src/x86-sse.S john-1.7.3.1/src/x86-sse.S +--- john-1.7.3.1.orig/src/x86-sse.S 2008-07-13 15:44:58.000000000 -0600 ++++ john-1.7.3.1/src/x86-sse.S 2009-06-26 13:54:31.399949655 -0600 +@@ -1301,3 +1301,7 @@ DES_bs_crypt_LM_loop: + jnz DES_bs_crypt_LM_loop + popl %esi + ret ++ ++#ifdef __ELF__ ++.section .note.GNU-stack,"",@progbits ++#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 0000000..a5ff2ad --- /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="$(CLFAGS) -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="$(CLFAGS) -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="$(CLFAGS) -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="$(CLFAGS) -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="$(CLFAGS) -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="$(CLFAGS) -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="$(CLFAGS) -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="$(CLFAGS) -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="$(CLFAGS) -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.6-mkdir-sandbox.patch b/app-crypt/johntheripper/files/johntheripper-1.7.6-mkdir-sandbox.patch new file mode 100644 index 0000000..5600f3c --- /dev/null +++ b/app-crypt/johntheripper/files/johntheripper-1.7.6-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/johntheripper-1.7.6.ebuild b/app-crypt/johntheripper/johntheripper-1.7.6.ebuild new file mode 100644 index 0000000..557c456 --- /dev/null +++ b/app-crypt/johntheripper/johntheripper-1.7.6.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.4.2.ebuild,v 1.2 2010/07/07 15:56:50 ssuominen Exp $ + +EAPI="2" + +inherit eutils flag-o-matic toolchain-funcs pax-utils + +MY_PN="john" +MY_P="${MY_PN}-${PV}" + +JUMBO="jumbo-4" +#MPI="mpi10" + +DESCRIPTION="fast password cracker" +HOMEPAGE="http://www.openwall.com/john/" + +SRC_URI="http://www.openwall.com/john/g/${MY_P}.tar.gz + !minimal? ( http://www.openwall.com/john/contrib/${MY_P}-${JUMBO}.diff.gz )" +# mpi? ( ftp://ftp.openwall.com/john/contrib/mpi/2009-bindshell/${MY_P}-${MPI}.patch.gz ) + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="altivec custom-cflags -minimal mmx sse2" +#IUSE="altivec custom-cflags -minimal mmx -mpi sse2" + +# Seems a bit fussy with other MPI implementations. +RDEPEND="!minimal? ( >=dev-libs/openssl-0.9.7 )" +# mpi? ( sys-cluster/openmpi ) +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${MY_P}" + +get_target() { + if use x86; then + if use sse2; then + echo "linux-x86-sse2" + elif use mmx; then + echo "linux-x86-mmx" + else + echo "linux-x86-any" + fi + elif use alpha; then + echo "linux-alpha" + elif use sparc; then + echo "linux-sparc" + elif use amd64; then + echo "linux-x86-64" + elif use ppc64; then + if use altivec; then + echo "linux-ppc32-altivec" + else + echo "linux-ppc64" + fi + # linux-ppc64-altivec is slightly slower than linux-ppc32-altivec for most hash types. + # as per the Makefile comments + elif use ppc; then + if use altivec; then + echo "linux-ppc32-altivec" + else + echo "linux-ppc32" + fi + else + echo "generic" + fi +} + +src_prepare() { +# if use mpi; then +# epatch "${WORKDIR}/${MY_P}-${MPI}.patch" +# fi + if ! use minimal; then + epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff" + fi + local PATCHLIST="${PATCHLIST} 1.7.6-cflags 1.7.3.1-mkdir-sandbox" + + cd src + for p in ${PATCHLIST}; do + epatch "${FILESDIR}/${PN}-${p}.patch" + done + + if ! use minimal; then + sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" \ + -e "/LDFLAGS/s/-L[^ ]*//g" -e "/CFLAGS/s/-[IL][^ ]*//g" \ + -i Makefile || die "sed Makefile failed" + fi +} + +src_compile() { + use custom-cflags || strip-flags + append-flags -fPIC -fPIE \ + '-DJOHN_SYSTEMWIDE' \ + '-DJOHN_SYSTEMWIDE_HOME=\\\"/etc/john\\\"' \ + '-DJOHN_SYSTEMWIDE_EXEC=\\\"/usr/libexec/john\\\"' + gcc-specs-pie && append-ldflags -nopie + + CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) +# use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc + emake -C src/\ + CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \ + CFLAGS="-c -Wall ${CFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + OPT_NORMAL="" \ + $(get_target) || die "emake failed" +} + +src_test() { + cd run + if [[ -f "/etc/john/john.conf" || -f "/etc/john/john.ini" ]]; then + # This requires that MPI is actually 100% online on your system, which might not + # be the case, depending on which MPI implementation you are using. + #if use mpi; then + # mpirun -np 2 ./john --test || die 'self test failed' + #else + + ./john --test || die 'self test failed' + else + ewarn "selftest requires /etc/john/john.conf or /etc/john/john.ini" + fi +} + +src_install() { + # executables + dosbin run/john + newsbin run/mailer john-mailer + + pax-mark -m "${D}"/usr/sbin/john + + dosym john /usr/sbin/unafs + dosym john /usr/sbin/unique + dosym john /usr/sbin/unshadow + + # jumbo-patch additions + if ! use minimal; then + dosym john /usr/sbin/undrop + dosbin run/calc_stat + dosbin run/genmkvpwd + dosbin run/mkvcalcproba + insinto /etc/john + doins run/genincstats.rb run/stats + doins run/netscreen.py run/sap_prepare.pl + fi + + # config files + insinto /etc/john + doins run/john.conf + doins run/*.chr run/password.lst + + # documentation + dodoc doc/* +} -- cgit v1.2.3