Hello community,
here is the log from the commit of package john for openSUSE:Factory
checked in at Wed Dec 2 13:10:39 CET 2009.
--------
--- john/john.changes 2008-09-09 19:51:46.000000000 +0200
+++ /mounts/work_src_done/STABLE/john/john.changes 2009-09-29 00:23:35.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Sep 28 23:59:28 CEST 2009 - lrupp@suse.de
+
+- update to 1.7.3.4:
+ + "make check" has been implemented
+ + The "--test" option will now take an optional argument - the
+ duration of each benchmark in seconds
+ + Some very minor bugs that did not affect normal operation have
+ been fixed.
+ + Some unimportant compiler warnings have been fixed, a source code
+ comment has been made more verbose and more complete.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
john-1.7.3.1.tar.bz2
New:
----
john-1.7.3.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ john.spec ++++++
--- /var/tmp/diff_new_pack.1GSv9Q/_old 2009-12-02 13:09:59.000000000 +0100
+++ /var/tmp/diff_new_pack.1GSv9Q/_new 2009-12-02 13:09:59.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package john (Version 1.7.3.1)
+# spec file for package john (Version 1.7.3.4)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,10 +20,9 @@
Name: john
Url: http://www.openwall.com/john/
-License: GPL v2 or later
+License: GPLv2+
Group: Productivity/Security
-AutoReqProv: on
-Version: 1.7.3.1
+Version: 1.7.3.4
Release: 1
Summary: Detects Weak Passwords
Source: %{name}-%{version}.tar.bz2
@@ -88,7 +87,12 @@
fi
export TARGET
pushd src
-make $TARGET %{cflags}
+make clean $TARGET %{cflags}
+popd
+
+%check
+pushd src
+make check
popd
%install
@@ -101,7 +105,7 @@
install -m 644 -p %{SOURCE2} %buildroot%_mandir/man8/
%clean
-#rm -rf $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
++++++ john-1.7.3.1.tar.bz2 -> john-1.7.3.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/john-1.7.3.1/doc/CHANGES new/john-1.7.3.4/doc/CHANGES
--- old/john-1.7.3.1/doc/CHANGES 2008-07-18 03:53:05.000000000 +0200
+++ new/john-1.7.3.4/doc/CHANGES 2009-09-14 04:18:20.000000000 +0200
@@ -1,3 +1,15 @@
+The following changes have been made between John 1.7.3.1 and 1.7.3.4:
+
+* "make check" has been implemented (for Unix-like systems only).
+* The "--test" option will now take an optional argument - the duration of each
+benchmark in seconds.
+* Section .note.GNU-stack has been added to all assembly files to avoid the
+stack area unnecessarily being made executable on Linux systems that use this
+mechanism.
+* Some very minor bugs that did not affect normal operation have been fixed.
+* Some unimportant compiler warnings have been fixed, a source code comment has
+been made more verbose and more complete.
+
The following changes have been made between John 1.7.3 and 1.7.3.1:
* Corrected the x86 assembly files for building on Mac OS X.
@@ -41,7 +53,7 @@
* Bonus: "Keyboard" cracker included in the default john.conf (john.ini)
that will try sequences of adjacent keys on a keyboard as passwords.
-The following major changes have been made since John 1.6:
+The following changes have been made between John 1.6 and 1.7:
* Bitslice DES code for x86 with MMX: more than twice faster than older
non-bitslice MMX code.
@@ -66,4 +78,4 @@
* Bug and portability fixes, and new bugs.
* Bonus: "Strip" cracker included in the default john.conf (john.ini).
-$Owl: Owl/packages/john/john/doc/CHANGES,v 1.27 2008/07/18 01:53:05 solar Exp $
+$Owl: Owl/packages/john/john/doc/CHANGES,v 1.32 2009/09/14 02:18:20 solar Exp $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/john-1.7.3.1/doc/OPTIONS new/john-1.7.3.4/doc/OPTIONS
--- old/john-1.7.3.1/doc/OPTIONS 2008-07-18 03:45:41.000000000 +0200
+++ new/john-1.7.3.4/doc/OPTIONS 2009-09-09 06:50:14.000000000 +0200
@@ -93,10 +93,11 @@
cracking to see what John did so far; to get the most up to date
information, first send a SIGHUP to the appropriate "john" process.
---test perform a benchmark
+--test[=TIME] run tests and benchmarks for TIME seconds each
-Benchmarks all of the compiled in hashing algorithms and tests them
-for proper operation.
+Tests all of the compiled in hashing algorithms for proper operation and
+benchmarks them. The "--format" option can be used to restrict this to
+a specific algorithm.
--users=[-]LOGIN|UID[,..] [do not] load this (these) user(s)
@@ -181,4 +182,4 @@
A shell script to send mail to all the users who got weak passwords.
You should edit the message inside the script before using it.
-$Owl: Owl/packages/john/john/doc/OPTIONS,v 1.4 2008/07/18 01:45:41 solar Exp $
+$Owl: Owl/packages/john/john/doc/OPTIONS,v 1.5 2009/09/09 04:50:14 solar Exp $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/john-1.7.3.1/run/john.conf new/john-1.7.3.4/run/john.conf
--- old/john-1.7.3.1/run/john.conf 2008-03-31 07:22:29.000000000 +0200
+++ new/john-1.7.3.4/run/john.conf 2009-09-09 07:02:46.000000000 +0200
@@ -802,6 +802,7 @@
if (++last < maxlength) { // Next length?
id[last] = lastid = 0;
word[last] = c0;
+ word[last + 1] = 0;
} else // We're done
word = 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/john-1.7.3.1/src/alpha.S new/john-1.7.3.4/src/alpha.S
--- old/john-1.7.3.1/src/alpha.S 2002-04-10 16:13:25.000000000 +0200
+++ new/john-1.7.3.4/src/alpha.S 2009-09-09 07:10:54.000000000 +0200
@@ -318,3 +318,7 @@
.space 128
.comm DES_KS_table, (8 * 128 * 16 * 8), 128
+
+#if defined(__ELF__) && defined(__linux__)
+.section .note.GNU-stack,"",@progbits
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/john-1.7.3.1/src/bench.c new/john-1.7.3.4/src/bench.c
--- old/john-1.7.3.1/src/bench.c 2006-02-27 10:58:30.000000000 +0100
+++ new/john-1.7.3.4/src/bench.c 2009-09-09 06:10:40.000000000 +0200
@@ -1,6 +1,6 @@
/*
* This file is part of John the Ripper password cracker,
- * Copyright (c) 1996-2001,2003,2004,2006 by Solar Designer
+ * Copyright (c) 1996-2001,2003,2004,2006,2008,2009 by Solar Designer
*/
#ifdef __ultrix__
@@ -43,6 +43,8 @@
#endif
}
+unsigned int benchmark_time = BENCHMARK_TIME;
+
static volatile int bench_running;
static void bench_handle_timer(int signum)
@@ -139,11 +141,19 @@
bench_running = 1;
signal(SIGALRM, bench_handle_timer);
+/* Cap it at a sane value to hopefully avoid integer overflows below */
+ if (benchmark_time > 3600)
+ benchmark_time = 3600;
+
+/* In the future, "zero time" may mean self-tests without benchmarks */
+ if (!benchmark_time)
+ benchmark_time = 1;
+
#if OS_TIMER
- it.it_value.tv_sec = BENCHMARK_TIME;
+ it.it_value.tv_sec = benchmark_time;
if (setitimer(ITIMER_REAL, &it, NULL)) pexit("setitimer");
#else
- sig_timer_emu_init(BENCHMARK_TIME * clk_tck);
+ sig_timer_emu_init(benchmark_time * clk_tck);
#endif
start_real = times(&buf);
@@ -205,13 +215,15 @@
}
}
-void benchmark_all(void)
+int benchmark_all(void)
{
struct fmt_main *format;
char *result, *msg_1, *msg_m;
struct bench_results results_1, results_m;
char s_real[64], s_virtual[64];
+ unsigned int total, failed;
+ total = failed = 0;
if ((format = fmt_list))
do {
printf("Benchmarking: %s%s [%s]... ",
@@ -236,16 +248,20 @@
msg_1 = "Long";
}
+ total++;
+
if ((result = benchmark_format(format,
format->params.salt_size ? BENCHMARK_MANY : 1,
&results_m))) {
puts(result);
+ failed++;
continue;
}
if (msg_1)
if ((result = benchmark_format(format, 1, &results_1))) {
puts(result);
+ failed++;
continue;
}
@@ -276,4 +292,9 @@
msg_1, s_real);
#endif
} while ((format = format->next) && !event_abort);
+
+ if (failed && total > 1 && !event_abort)
+ printf("%u out of %u tests have FAILED\n", failed, total);
+
+ return failed || event_abort;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/john-1.7.3.1/src/bench.h new/john-1.7.3.4/src/bench.h
--- old/john-1.7.3.1/src/bench.h 2006-02-27 10:58:30.000000000 +0100
+++ new/john-1.7.3.4/src/bench.h 2009-09-09 06:09:56.000000000 +0200
@@ -1,6 +1,6 @@
/*
* This file is part of John the Ripper password cracker,
- * Copyright (c) 1996-99,2006 by Solar Designer
+ * Copyright (c) 1996-99,2006,2009 by Solar Designer
*/
/*
@@ -38,8 +38,13 @@
extern void clk_tck_init(void);
/*
+ * Benchmark time in seconds (per cracking algorithm).
+ */
+extern unsigned int benchmark_time;
+
+/*
* Benchmarks the supplied cracking algorithm. Returns NULL on success,
- * an error message if the self test fails or there are no test vectors
+ * an error message if the self-test fails or there are no test vectors
* for this algorithm, or an empty string if aborted.
*/
extern char *benchmark_format(struct fmt_main *format, int salts,
@@ -53,8 +58,9 @@
/*
* Benchmarks all the registered cracking algorithms and prints the results
- * to stdout.
+ * to stdout. Returns zero on success, non-zero if any tests failed or were
+ * aborted.
*/
-extern void benchmark_all(void);
+extern int benchmark_all(void);
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/john-1.7.3.1/src/charset.c new/john-1.7.3.4/src/charset.c
--- old/john-1.7.3.1/src/charset.c 2008-01-28 19:13:07.000000000 +0100
+++ new/john-1.7.3.4/src/charset.c 2009-07-25 21:00:14.000000000 +0200
@@ -372,7 +372,7 @@
fflush(file);
if (!ferror(file) && !fseek(file, 0, SEEK_SET)) {
- strcpy(header->version, CHARSET_V);
+ strncpy(header->version, CHARSET_V, sizeof(header->version));
header->min = CHARSET_MIN;
header->max = CHARSET_MAX;
header->length = CHARSET_LENGTH;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/john-1.7.3.1/src/john.c new/john-1.7.3.4/src/john.c
--- old/john-1.7.3.1/src/john.c 2006-05-08 16:49:28.000000000 +0200
+++ new/john-1.7.3.4/src/john.c 2009-09-09 06:38:56.000000000 +0200
@@ -1,6 +1,6 @@
/*
* This file is part of John the Ripper password cracker,
- * Copyright (c) 1996-2004,2006 by Solar Designer
+ * Copyright (c) 1996-2004,2006,2009 by Solar Designer
*/
#include