CLK_TCK to CLOCKS_PER_SEC bug #126102 refers.

(Portage version: 2.1_pre7-r5)

5 files changed, 123 insertions, 14 deletions

diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 1b67001a8a33..718e8d151914 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/johntheripper
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.36 2006/01/14 09:13:34 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.37 2006/04/11 20:43:24 dragonheart Exp $
+
+  11 Apr 2006; Daniel Black <dragonheart@gentoo.org> +files/clk_tck.patch,
+  johntheripper-1.6.40.ebuild:
+  CLK_TCK to CLOCKS_PER_SEC bug #126102 refers. Thanks to Michael Terepeta and
+  Mikko Tiihonen
 
   14 Jan 2006; Daniel Black <dragonheart@gentoo.org>
   johntheripper-1.6-r3.ebuild:
diff --git a/app-crypt/johntheripper/Manifest b/app-crypt/johntheripper/Manifest
index ea9a28c520fc..767a44aa87f3 100644
--- a/app-crypt/johntheripper/Manifest
+++ b/app-crypt/johntheripper/Manifest
@@ -1,19 +1,30 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 87c0d587e533cd8a20b37f3b5026ab9f ChangeLog 7253
+RMD160 e943468c2f8990b79e81c794e4541db075d71632 ChangeLog 7253
+SHA256 db95114e2be7034f96a8c8b5d37ffa1edb0fcf167a20908a7e654e6132a6c480 ChangeLog 7253
+MD5 686dc0787082b89b5eb11489e71e4474 files/clk_tck.patch 2864
+RMD160 ffcc335bdff4c609574472e3a947d482e123b13e files/clk_tck.patch 2864
+SHA256 57921f1d742e3a42dd1d9b74f70c2d54b78155bc68bf33cad5ffc241f770f7f8 files/clk_tck.patch 2864
 MD5 2a2c77e0b8b4692a9e20de4d68983071 files/digest-johntheripper-1.6 123
+RMD160 87fb56f0f93f91e3fcd63884bdf02e661b55cf79 files/digest-johntheripper-1.6 123
+SHA256 83d8b6f7e4f6408338ae400a22b8e6c5019fbf220d0c642353ea8113db48245b files/digest-johntheripper-1.6 123
 MD5 dd34c8d2b730b0a8ae9eec5582698fc2 files/digest-johntheripper-1.6-r3 126
-MD5 d9ceb6148f478e763e8e358aa324e71a files/digest-johntheripper-1.6.40 152
+RMD160 f63babf1f4691a7bab339500ceaec3f342b0ddad files/digest-johntheripper-1.6-r3 126
+SHA256 a69b037e98e69ab1babc6546e4eb4d88f67f92262cd1a77027604a4277d53af3 files/digest-johntheripper-1.6-r3 126
+MD5 4780ee0f7c3f0ea092133667f7b7bf48 files/digest-johntheripper-1.6.40 548
+RMD160 c57518be35c160a39511b57f59a90860eed2cf64 files/digest-johntheripper-1.6.40 548
+SHA256 7ce5546f48a6e3746583d713f9781b46f6d23c9f8d30e6d46d042a9bd99c6db4 files/digest-johntheripper-1.6.40 548
 MD5 647f92814e453cb358ef2d0df669f026 files/john-ntlm.skey.patch 1168
+RMD160 7c52da1f85e4bebfcc7d183dcbf2ee94f2a9b84e files/john-ntlm.skey.patch 1168
+SHA256 bb0b60717f16810106a1dc3e26f0abdfd5becde8ede39d4120de6beb3fb1f794 files/john-ntlm.skey.patch 1168
 MD5 c2397a54695976b1b2071df0701986a6 johntheripper-1.6-r3.ebuild 3017
-MD5 b21277490b290bb6cbbfd82c53a136d2 johntheripper-1.6.40.ebuild 3376
+RMD160 06eecffd51dd76708dd99882719bfe4b27932d05 johntheripper-1.6-r3.ebuild 3017
+SHA256 a4ad767c85699d599463cbad8b9656dacf78d31753d1fe0aec5ebd5d84b7ab14 johntheripper-1.6-r3.ebuild 3017
+MD5 23a49f6f2396ff882a2889b08d24bd58 johntheripper-1.6.40.ebuild 3410
+RMD160 26619451e02eaf03460580384ae68eb8cdd3c81d johntheripper-1.6.40.ebuild 3410
+SHA256 f5656322a110bd64f2bd7db8f8c53bcc391cdd2f78c59900a41450bba4c0cd0a johntheripper-1.6.40.ebuild 3410
 MD5 c5ce19f2b06dcc439b8a854a95b9b1e1 johntheripper-1.6.ebuild 1477
+RMD160 0d7d8fdb290e75ba79795d0b9e42b285fb38fab3 johntheripper-1.6.ebuild 1477
+SHA256 024f3a6c96ba8e38ef40fbfa232a03b90cbcb22729a4311a40fbdb27a46f0b6d johntheripper-1.6.ebuild 1477
 MD5 1da04b916dc5d18f323ec583c17a7208 metadata.xml 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDyNAemdTrptrqvGERAl90AJ4k3yXqRae54Q97zAfLRILLJsaRXQCfV3Of
-M64Y71GlsPbzAzLWWKnq70s=
-=W2JD
------END PGP SIGNATURE-----
+RMD160 4812e9c62c33ad724e0c8b1efd02dbd7de6fe9d6 metadata.xml 259
+SHA256 57fc5e4177fcff4246f112f412880daba075e4041251478551aa7f06f97686e8 metadata.xml 259
diff --git a/app-crypt/johntheripper/files/clk_tck.patch b/app-crypt/johntheripper/files/clk_tck.patch
new file mode 100644
index 000000000000..42767756a63c
--- /dev/null
+++ b/app-crypt/johntheripper/files/clk_tck.patch
@@ -0,0 +1,88 @@
+diff -ruN john-1.6.40-before/src/bench.c john-1.6.40/src/bench.c
+--- john-1.6.40-before/src/bench.c	2004-11-09 14:13:03.000000000 +0100
++++ john-1.6.40/src/bench.c	2006-03-13 23:15:56.000000000 +0100
+@@ -127,7 +127,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);
+@@ -174,7 +174,7 @@
+ 	int64 tmp;
+ 
+ 	tmp.lo = count; tmp.hi = 0;
+-	mul64by32(&tmp, CLK_TCK);
++	mul64by32(&tmp, CLOCKS_PER_SEC);
+ 	cps_hi = div64by32lo(&tmp, time);
+ 
+ 	if (cps_hi >= 1000000)
+diff -ruN john-1.6.40-before/src/idle.c john-1.6.40/src/idle.c
+--- john-1.6.40-before/src/idle.c	2001-07-26 16:56:25.000000000 +0200
++++ john-1.6.40/src/idle.c	2006-03-13 23:16:09.000000000 +0100
+@@ -68,7 +68,7 @@
+ 	current = times(&buf);
+ 	if (!last_adj) last_adj = current;
+ 
+-	if (current - last_adj >= CLK_TCK) {
++	if (current - last_adj >= CLOCKS_PER_SEC) {
+ 		calls_per_tick = calls_since_adj / (current - last_adj);
+ 		calls_since_adj = 0;
+ 		last_adj = current;
+@@ -79,6 +79,6 @@
+ 		last_check = current;
+ 		sched_yield();
+ 		current = times(&buf);
+-	} while (current - last_check > 1 && current - last_adj < CLK_TCK);
++	} while (current - last_check > 1 && current - last_adj < CLOCKS_PER_SEC);
+ #endif
+ }
+diff -ruN john-1.6.40-before/src/status.c john-1.6.40/src/status.c
+--- john-1.6.40-before/src/status.c	2004-11-09 13:54:21.000000000 +0100
++++ john-1.6.40/src/status.c	2006-03-13 23:16:20.000000000 +0100
+@@ -58,9 +58,9 @@
+ 	if (status.crypts.hi != saved_hi) {
+ 		ticks = get_time() - status.start_time;
+ 		if (ticks > ((clock_t)1 << (sizeof(clock_t) * 8 - 2))) {
+-			time = ticks / CLK_TCK;
++			time = ticks / CLOCKS_PER_SEC;
+ 			status_restored_time += time;
+-			status.start_time += (clock_t)time * CLK_TCK;
++			status.start_time += (clock_t)time * CLOCKS_PER_SEC;
+ 		}
+ 	}
+ }
+@@ -68,7 +68,7 @@
+ unsigned int status_get_time(void)
+ {
+ 	return status_restored_time +
+-		(get_time() - status.start_time) / CLK_TCK;
++		(get_time() - status.start_time) / CLOCKS_PER_SEC;
+ }
+ 
+ static char *status_get_cps(char *buffer)
+@@ -85,11 +85,11 @@
+ 	if (use_ticks)
+ 		time = ticks;
+ 	else
+-		time = status_restored_time + ticks / CLK_TCK;
++		time = status_restored_time + ticks / CLOCKS_PER_SEC;
+ 	if (!time) time = 1;
+ 
+ 	cps = status.crypts;
+-	if (use_ticks) mul64by32(&cps, CLK_TCK);
++	if (use_ticks) mul64by32(&cps, CLOCKS_PER_SEC);
+ 	div64by32(&cps, time);
+ 
+ 	if (cps.hi || cps.lo >= 1000000000)
+@@ -102,7 +102,7 @@
+ 		sprintf(buffer, "%u", cps.lo);
+ 	else {
+ 		tmp = status.crypts;
+-		if (use_ticks) mul64by32(&tmp, CLK_TCK);
++		if (use_ticks) mul64by32(&tmp, CLOCKS_PER_SEC);
+ 		mul64by32(&tmp, 100);
+ 		cps_100 = div64by32lo(&tmp, time) % 100;
+ 		sprintf(buffer, "%u.%02u", cps.lo, cps_100);
diff --git a/app-crypt/johntheripper/files/digest-johntheripper-1.6.40 b/app-crypt/johntheripper/files/digest-johntheripper-1.6.40
index 2373d8b83a03..6e185b564fdb 100644
--- a/app-crypt/johntheripper/files/digest-johntheripper-1.6.40
+++ b/app-crypt/johntheripper/files/digest-johntheripper-1.6.40
@@ -1,2 +1,6 @@
 MD5 e707f3708e5741bb470b2dc8129cb901 john-1.6.40-banquise-to-bigpatch-17.patch.bz2 58732
+RMD160 119079dc28a3140394ada0b456c5cd80e7a028ef john-1.6.40-banquise-to-bigpatch-17.patch.bz2 58732
+SHA256 d291bfb57deafa4baa753cbd8108e341f589e16d7129c84fd4d41aa6ac230f03 john-1.6.40-banquise-to-bigpatch-17.patch.bz2 58732
 MD5 507916220812c5834136d378a13e48a0 john-1.6.40.tar.gz 797220
+RMD160 b54e41eec65a9c185731b2e137fb155ae2eb348b john-1.6.40.tar.gz 797220
+SHA256 087fc7b4651dab0d57d6a6f8c0715b1f65646ccaeaf5a9698cb0b635ac219b6d john-1.6.40.tar.gz 797220
diff --git a/app-crypt/johntheripper/johntheripper-1.6.40.ebuild b/app-crypt/johntheripper/johntheripper-1.6.40.ebuild
index e2cb490af5c7..767e4c0ce634 100644
--- a/app-crypt/johntheripper/johntheripper-1.6.40.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.6.40.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.40.ebuild,v 1.3 2006/01/14 07:22:31 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.6.40.ebuild,v 1.4 2006/04/11 20:43:25 dragonheart Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}"
 src_unpack() {
 	unpack ${A}
 	epatch ${MY_PBASE}-banquise-to-bigpatch-17.patch
+	epatch ${FILESDIR}/clk_tck.patch
 	sed -i -e "s|^CFLAGS.*|CFLAGS= -c -Wall ${CFLAGS}|" \
 		-e 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' "${MY_PBASE}"/src/Makefile
 }