diff --git a/john-1.6-pointer.patch b/john-1.6-pointer.patch new file mode 100644 index 0000000..7a9e1c7 --- /dev/null +++ b/john-1.6-pointer.patch @@ -0,0 +1,38 @@ +Endast i john-1.6.hacked/run: john.pot +Endast i john-1.6.hacked/run: restore +diff -ru john-1.6/src/detect.c john-1.6.hacked/src/detect.c +--- john-1.6/src/detect.c 1998-12-03 01:29:50.000000000 +0100 ++++ john-1.6.hacked/src/detect.c 2005-07-26 10:50:09.000000000 +0200 +@@ -8,6 +8,7 @@ + */ + + #include ++#include + + int main(int argc, char **argv) + { +@@ -32,11 +33,7 @@ + "#define ARCH_LITTLE_ENDIAN\t\t%d\n" + "#define ARCH_INT_GT_32\t\t\t%d\n" + "#define ARCH_ALLOWS_UNALIGNED\t\t0\n" +-#ifdef __alpha__ +-"#define ARCH_INDEX\t\t\tunsigned long\n" +-#else +-"#define ARCH_INDEX\t\t\tunsigned int\n" +-#endif ++"#define ARCH_INDEX\t\t\tunsigned %s\n" + "\n" + #ifdef OS_TIMER + "#define OS_TIMER\t\t\t1\n" +@@ -58,7 +55,8 @@ + (int)(sizeof(long) * 8), + (int)(sizeof(long) * 8), + (int)(*(char *)&value), +- (sizeof(int) > 4) ? 1 : 0); ++ (sizeof(int) > 4) ? 1 : 0, ++ sizeof(void*) == sizeof(long) ? "long" : "int"); + + puts( + "#define CPU_DETECT\t\t\t0\n"); +Endast i john-1.6.hacked/src: .detect.c.swp + diff --git a/john.spec b/john.spec index 8d8577c..fa11990 100644 --- a/john.spec +++ b/john.spec @@ -1,13 +1,14 @@ Summary: John the Ripper password cracker Name: john Version: 1.6 -Release: 5%{?dist} +Release: 6%{?dist} URL: http://www.openwall.com/john License: GPL Group: Applications/System Source0: http://www.openwall.com/john/dl/john-1.6.tar.gz Patch0: john-1.6-rh.patch +Patch0: john-1.6-pointer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description @@ -18,6 +19,7 @@ supported as well. %prep %setup -q %patch0 -p2 -b .orig +%patch1 -p2 -b .orig chmod 644 doc/* %build @@ -55,6 +57,9 @@ rm -rf %{buildroot} %{_datadir}/%{name} %changelog +* Tue Dec 05 2006 Gavin Henry - 1.6-6 +- pointer patch for bug #164251 + * Mon Oct 09 2006 Jeremy Katz - 1.6-5 - FC6 Rebuild