Date: Sunday, June 2, 2019 @ 23:02:25 Author: anthraxx Revision: 476671
upgpkg: john 1.9.0.jumbo1-1 Deleted: john/trunk/fix-32bit.patch john/trunk/fix-i686-openmp.patch john/trunk/gcc5.patch john/trunk/john.install john/trunk/params.h.patch -----------------------+ fix-32bit.patch | 24 ---------------- fix-i686-openmp.patch | 69 ------------------------------------------------ gcc5.patch | 63 ------------------------------------------- john.install | 9 ------ params.h.patch | 17 ----------- 5 files changed, 182 deletions(-) Deleted: fix-32bit.patch =================================================================== --- fix-32bit.patch 2019-06-02 23:01:37 UTC (rev 476670) +++ fix-32bit.patch 2019-06-02 23:02:25 UTC (rev 476671) @@ -1,24 +0,0 @@ -From 480e95b0e449863be3e1a5b0bc634a67df28b618 Mon Sep 17 00:00:00 2001 -From: Solar <[email protected]> -Date: Thu, 18 Dec 2014 21:24:01 +0100 -Subject: [PATCH] Fix a bug in truecrypt for non-x86 archs. Closes #912. - ---- - src/truecrypt_fmt_plug.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/truecrypt_fmt_plug.c b/src/truecrypt_fmt_plug.c -index 1c95c39..8cef85e 100644 ---- a/src/truecrypt_fmt_plug.c -+++ b/src/truecrypt_fmt_plug.c -@@ -310,8 +310,8 @@ static int crypt_all(int *pcount, struct db_salt *salt) - pbkdf2_sha512_sse((const unsigned char **)pin, lens, psalt->salt, 64, psalt->num_iterations, &(x.poutc), sizeof(key), 0); - } - #else -- if (is_sha512) -- pbkdf2_sha512((const unsigned char*)key_buffer[i], strlen(key_buffer[i]), psalt->salt, 64, num_iterations, key, sizeof(key), 0); -+ if (psalt->hash_type == IS_SHA512) -+ pbkdf2_sha512((const unsigned char*)key_buffer[i], strlen((char*)key_buffer[i]), psalt->salt, 64, psalt->num_iterations, key, sizeof(key), 0); - #endif - else if (psalt->hash_type == IS_RIPEMD160) - pbkdf2_ripemd160(key_buffer[i], strlen((char*)(key_buffer[i])), psalt->salt, 64, psalt->num_iterations, key, sizeof(key), 0); Deleted: fix-i686-openmp.patch =================================================================== --- fix-i686-openmp.patch 2019-06-02 23:01:37 UTC (rev 476670) +++ fix-i686-openmp.patch 2019-06-02 23:02:25 UTC (rev 476671) @@ -1,69 +0,0 @@ -From 70d2140adda533680aec3c0cb0e828a868fafa68 Mon Sep 17 00:00:00 2001 -From: jfoug <[email protected]> -Date: Fri, 28 Nov 2014 06:43:27 -0600 -Subject: [PATCH] crypt: problems with #defines and strdup - ---- - src/c3_fmt.c | 35 ++++++++++++++++++++++------------- - 1 file changed, 22 insertions(+), 13 deletions(-) - -diff --git a/src/c3_fmt.c b/src/c3_fmt.c -index d1c694e..0fe867f 100644 ---- a/src/c3_fmt.c -+++ b/src/c3_fmt.c -@@ -17,6 +17,28 @@ - - #if HAVE_CRYPT - -+/* if this comes after the #define crap below, there are often -+ * problems with strdup or other things not being defined. We -+ * move this block of includes to above the _XOPEN_* defines -+ */ -+#if STRING_WITH_STRINGS -+#include <string.h> -+#include <strings.h> -+#elif HAVE_STRING_H -+#include <string.h> -+#elif HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#if !AC_BUILT -+#include <string.h> -+#ifndef _MSC_VER -+#include <strings.h> -+#endif -+#undef _XOPEN_VERSION -+#undef _XOPEN_SOURCE -+#undef _XOPEN_SOURCE_EXTENDED -+#undef _GNU_SOURCE -+ - #define _XOPEN_SOURCE 4 /* for crypt(3) */ - #define _XOPEN_SOURCE_EXTENDED 1 /* for OpenBSD */ - #define _XOPEN_VERSION 4 -@@ -24,11 +46,6 @@ - #define _GNU_SOURCE 1 /* for crypt_r(3) */ - #include <stdio.h> - --#if !AC_BUILT --#include <string.h> --#ifndef _MSC_VER --#include <strings.h> --#endif - #ifdef __CYGWIN__ - #include <crypt.h> - #endif -@@ -41,14 +58,6 @@ - #endif - #endif - --#if STRING_WITH_STRINGS --#include <string.h> --#include <strings.h> --#elif HAVE_STRING_H --#include <string.h> --#elif HAVE_STRINGS_H --#include <strings.h> --#endif - #if HAVE_CRYPT_H - #include <crypt.h> - #endif Deleted: gcc5.patch =================================================================== --- gcc5.patch 2019-06-02 23:01:37 UTC (rev 476670) +++ gcc5.patch 2019-06-02 23:02:25 UTC (rev 476671) @@ -1,63 +0,0 @@ -From e2e868db3e153b3f959e119a51703d4afb99c624 Mon Sep 17 00:00:00 2001 -From: magnum <[email protected]> -Date: Wed, 13 May 2015 12:05:00 +0200 -Subject: [PATCH] Add another solution to #1093. This make it possible to build - using gcc 5 without --std=gnu89 (although I kept the latter for now). See - also #1250. - ---- - src/DES_bs_b.c | 3 +++ - src/MD5_std.c | 12 ++++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/src/DES_bs_b.c b/src/DES_bs_b.c -index 306b4e4..18c9235 100644 ---- a/src/DES_bs_b.c -+++ b/src/DES_bs_b.c -@@ -1272,6 +1272,9 @@ static MAYBE_INLINE void DES_bs_finalize_keys(void) - #endif - - #if DES_bs_mt -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE void DES_bs_set_salt_for_thread(int t, unsigned int salt) - #else - void DES_bs_set_salt(ARCH_WORD salt) -diff --git a/src/MD5_std.c b/src/MD5_std.c -index 6bdcd35..1eec9b4 100644 ---- a/src/MD5_std.c -+++ b/src/MD5_std.c -@@ -496,9 +496,15 @@ extern void MD5_body(MD5_word x[15], MD5_word out[4]); - #if MD5_std_mt - #define MD5_body(x, out) \ - MD5_body_for_thread(t, x, out) -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE_BODY void MD5_body_for_thread(int t, - MD5_word x[15], MD5_word out[4]) - #else -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4]) - #endif - { -@@ -595,10 +601,16 @@ MAYBE_INLINE_BODY void MD5_body(MD5_word x[15], MD5_word out[4]) - #if MD5_std_mt - #define MD5_body(x0, x1, out0, out1) \ - MD5_body_for_thread(t, x0, x1, out0, out1) -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE_BODY void MD5_body_for_thread(int t, - MD5_word x0[15], MD5_word x1[15], - MD5_word out0[4], MD5_word out1[4]) - #else -+#if __GNUC__ >= 5 -+extern -+#endif - MAYBE_INLINE_BODY void MD5_body(MD5_word x0[15], MD5_word x1[15], - MD5_word out0[4], MD5_word out1[4]) - #endif Deleted: john.install =================================================================== --- john.install 2019-06-02 23:01:37 UTC (rev 476670) +++ john.install 2019-06-02 23:02:25 UTC (rev 476671) @@ -1,9 +0,0 @@ -post_install() { - touch /etc/john/john.local.conf 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -# vim: ts=2 sw=2 et: Deleted: params.h.patch =================================================================== --- params.h.patch 2019-06-02 23:01:37 UTC (rev 476670) +++ params.h.patch 2019-06-02 23:02:25 UTC (rev 476671) @@ -1,17 +0,0 @@ ---- src/params.h 2014-12-18 15:14:33.000000000 +0000 -+++ src/params.h 2015-01-03 13:49:57.994775328 +0000 -@@ -135,8 +135,12 @@ - /* - * File names. - */ --#define CFG_FULL_NAME "$JOHN/john.conf" --#define CFG_ALT_NAME "$JOHN/john.ini" -+#ifndef CFG_FULL_NAME -+#define CFG_FULL_NAME "$JOHN/john.conf" -+#endif -+#ifndef CFG_ALT_NAME -+#define CFG_ALT_NAME "$JOHN/john.ini" -+#endif - #if JOHN_SYSTEMWIDE - #define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf" - #define CFG_PRIVATE_ALT_NAME JOHN_PRIVATE_HOME "/john.ini"
