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,10 @@
+john (1.6-40ubuntu2) edgy; urgency=low
+
+  * Add 'debian/patches/20_sysconf_clk_tck.patch' to fix FTBFS
+    (Closes Ubuntu #65831).
+
+ -- Kees Cook <kees@ubuntu.com>  Fri, 13 Oct 2006 09:34:11 -0700
+
 john (1.6-40ubuntu1) edgy; urgency=low
 
   * Merge from debian unstable.
only in patch2:
unchanged:
--- john-1.6.orig/debian/patches/20_sysconf_clk_tck.patch
+++ john-1.6/debian/patches/20_sysconf_clk_tck.patch
@@ -0,0 +1,100 @@
+diff -Nur john-1.6/src/bench.c john-1.6.new/src/bench.c
+--- john-1.6/src/bench.c	2000-04-01 02:21:43.000000000 -0800
++++ john-1.6.new/src/bench.c	2006-10-13 09:36:47.906521852 -0700
+@@ -9,6 +9,7 @@
+ #include <time.h>
+ #include <sys/time.h>
+ #include <sys/times.h>
++#include <unistd.h>
+ 
+ #include "times.h"
+ 
+@@ -103,7 +104,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 * sysconf(_SC_CLK_TCK));
+ #endif
+ 
+ 	start_real = times(&buf);
+@@ -144,8 +145,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 * sysconf(_SC_CLK_TCK) / time;
++	cps_lo = count * ((unsigned ARCH_WORD)sysconf(_SC_CLK_TCK) * 10) / time % 10;
+ 
+ 	sprintf(buffer, cps_hi < 100 ? "%lu.%lu" : "%lu", cps_hi, cps_lo);
+ }
+diff -Nur john-1.6/src/best.c john-1.6.new/src/best.c
+--- john-1.6/src/best.c	2000-04-01 02:21:43.000000000 -0800
++++ john-1.6.new/src/best.c	2006-10-13 09:37:01.859218512 -0700
+@@ -9,6 +9,7 @@
+ 
+ #include <stdio.h>
+ #include <time.h>
++#include <unistd.h>
+ 
+ #include "params.h"
+ #include "common.h"
+@@ -56,7 +57,7 @@
+ 		fprintf(stderr, "FAILED\n");
+ 	} else {
+ 		virtual = (unsigned long)
+-			(results.count * CLK_TCK * 10 / results.virtual);
++			(results.count * sysconf(_SC_CLK_TCK) * 10 / results.virtual);
+ 
+ 		benchmark_cps(results.count, results.real, s_real);
+ 		benchmark_cps(results.count, results.virtual, s_virtual);
+diff -Nur john-1.6/src/signals.c john-1.6.new/src/signals.c
+--- john-1.6/src/signals.c	2000-04-01 02:21:43.000000000 -0800
++++ john-1.6.new/src/signals.c	2006-10-13 09:37:35.480897303 -0700
+@@ -9,6 +9,7 @@
+ #include <signal.h>
+ #include <sys/time.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ #ifdef __DJGPP__
+ #include <dos.h>
+@@ -217,7 +218,7 @@
+ {
+ #if !OS_TIMER
+ 	signal(SIGALRM, sig_handle_timer);
+-	sig_timer_emu_init(TIMER_INTERVAL * CLK_TCK);
++	sig_timer_emu_init(TIMER_INTERVAL * sysconf(_SC_CLK_TCK));
+ #else
+ 	struct sigaction sa;
+ 	struct itimerval it;
+diff -Nur john-1.6/src/status.c john-1.6.new/src/status.c
+--- john-1.6/src/status.c	2000-04-01 02:21:43.000000000 -0800
++++ john-1.6.new/src/status.c	2006-10-13 09:38:00.130128134 -0700
+@@ -7,6 +7,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <sys/times.h>
++#include <unistd.h>
+ 
+ #include "times.h"
+ 
+@@ -35,7 +36,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 * sysconf(_SC_CLK_TCK);
+ 	}
+ 
+ 	status_get_progress = get_progress;
+@@ -48,7 +49,7 @@
+ 
+ unsigned int status_get_time()
+ {
+-	return (get_time() - status.start_time) / CLK_TCK;
++	return (get_time() - status.start_time) / sysconf(_SC_CLK_TCK);
+ }
+ 
+ static char *status_get_cps(char *buffer)