rpms/john/FC-6 john-1.6-pointer.patch,NONE,1.1 john.spec,1.9,1.10

[Gavin Henry (ghenry)]

Author: ghenry

Update of /cvs/extras/rpms/john/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9734

Modified Files:
	john.spec 
Added Files:
	john-1.6-pointer.patch 
Log Message:
Add pointer patch and rebuild for x86_64 etc.

john-1.6-pointer.patch:

--- NEW FILE john-1.6-pointer.patch ---
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 <stdio.h>
+#include <stdlib.h>
 
 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



Index: john.spec
===================================================================
RCS file: /cvs/extras/rpms/john/FC-6/john.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- john.spec	9 Oct 2006 08:32:32 -0000	1.9
+++ john.spec	5 Dec 2006 09:37:41 -0000	1.10
@@ -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 @@
 %prep
 %setup -q
 %patch0 -p2 -b .orig
+%patch1 -p2 -b .orig
 chmod 644 doc/*
 
 %build
@@ -55,6 +57,9 @@
 %{_datadir}/%{name}
 
 %changelog
+* Tue Dec 05 2006 Gavin Henry <ghenry at suretecsystems.com> - 1.6-6
+- pointer patch for bug #164251
+
 * Mon Oct 09 2006 Jeremy Katz <katzj at redhat.com> - 1.6-5
 - FC6 Rebuild