tags 420980 + patch
thanks
Hi,
Attached is the diff for my john 1.6-40.2 NMU.
--
| Lucas Nussbaum
| [EMAIL PROTECTED] http://www.lucas-nussbaum.net/ |
| jabber: [EMAIL PROTECTED] GPG: 1024D/023B3F4F |
diff -u john-1.6/debian/changelog john-1.6/debian/changelog
--- john-1.6/debian/changelog
+++ john-1.6/debian/changelog
@@ -1,3 +1,11 @@
+john (1.6-40.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Applied patch from Thiemo Seufer to replace CLK_TCK by CLOCKS_PER_SEC.
+ Fixes FTBFS (Closes: #420980).
+
+ -- Lucas Nussbaum <[EMAIL PROTECTED]> Sat, 12 Jan 2008 22:11:08 +0100
+
john (1.6-40.1) unstable; urgency=high
* Non-maintainer upload.
only in patch2:
unchanged:
--- john-1.6.orig/src/signals.c
+++ john-1.6/src/signals.c
@@ -217,7 +217,7 @@
{
#if !OS_TIMER
signal(SIGALRM, sig_handle_timer);
- sig_timer_emu_init(TIMER_INTERVAL * CLK_TCK);
+ sig_timer_emu_init(TIMER_INTERVAL * CLOCKS_PER_SEC);
#else
struct sigaction sa;
struct itimerval it;
only in patch2:
unchanged:
--- john-1.6.orig/src/best.c
+++ john-1.6/src/best.c
@@ -56,7 +56,7 @@
fprintf(stderr, "FAILED\n");
} else {
virtual = (unsigned long)
- (results.count * CLK_TCK * 10 / results.virtual);
+ (results.count * CLOCKS_PER_SEC * 10 / results.virtual);
benchmark_cps(results.count, results.real, s_real);
benchmark_cps(results.count, results.virtual, s_virtual);
only in patch2:
unchanged:
--- john-1.6.orig/src/status.h
+++ john-1.6/src/status.h
@@ -50,8 +50,8 @@
* Returns the elapsed time in seconds.
*
* Currently this does not support running for more than 248 days total
- * (assuming CLK_TCK is 100). However, this should survive uptimes of the
- * box we are running on of more than 248 days.
+ * (assuming CLOCKS_PER_SEC is 100). However, this should survive uptimes
+ * of the box we are running on of more than 248 days.
*/
extern unsigned int status_get_time();
only in patch2:
unchanged:
--- john-1.6.orig/src/bench.c
+++ john-1.6/src/bench.c
@@ -103,7 +103,7 @@
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 * CLOCKS_PER_SEC);
#endif
start_real = times(&buf);
@@ -144,8 +144,8 @@
{
unsigned long cps_hi, cps_lo;
- cps_hi = count * CLK_TCK / time;
- cps_lo = count * ((unsigned ARCH_WORD)CLK_TCK * 10) / time % 10;
+ cps_hi = count * CLOCKS_PER_SEC / time;
+ cps_lo = count * ((unsigned ARCH_WORD)CLOCKS_PER_SEC * 10) / time % 10;
sprintf(buffer, cps_hi < 100 ? "%lu.%lu" : "%lu", cps_hi, cps_lo);
}
only in patch2:
unchanged:
--- john-1.6.orig/src/status.c
+++ john-1.6/src/status.c
@@ -35,7 +35,7 @@
if (!status_restored_time)
memset(&status, 0, sizeof(status));
status.start_time =
- get_time() - status_restored_time * CLK_TCK;
+ get_time() - status_restored_time * CLOCKS_PER_SEC;
}
status_get_progress = get_progress;
@@ -48,7 +48,7 @@
unsigned int status_get_time()
{
- return (get_time() - status.start_time) / CLK_TCK;
+ return (get_time() - status.start_time) / CLOCKS_PER_SEC;
}
static char *status_get_cps(char *buffer)
