rpms/john/devel .cvsignore, 1.2, 1.3 john.spec, 1.9, 1.10 sources, 1.2, 1.3 john-1.6-rh.patch, 1.1, NONE

[Till Maas (till)]

Author: till

Update of /cvs/extras/rpms/john/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17732

Modified Files:
	.cvsignore john.spec sources 
Removed Files:
	john-1.6-rh.patch 
Log Message:
new version, some cleanup and compiling now with mmx and fallback
for non-mmx machines



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/john/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:38:27 -0000	1.2
+++ .cvsignore	10 Jan 2007 14:14:31 -0000	1.3
@@ -1 +1 @@
-john-1.6.tar.gz
+john-1.7.0.2.tar.bz2


Index: john.spec
===================================================================
RCS file: /cvs/extras/rpms/john/devel/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	10 Jan 2007 14:14:31 -0000	1.10
@@ -1,13 +1,14 @@
 Summary:          John the Ripper password cracker
 Name:             john
-Version:          1.6
-Release:          5%{?dist} 
+Version:          1.7.0.2
+Release:          1%{?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
+Source0:          http://www.openwall.com/john/f/john-%{version}.tar.bz2
+#Patch1:           http://www.openwall.com/john/contrib/john-1.7-all-4.diff.gz
+#Patch2:           http://www.openwall.com/john/contrib/john-1.7.2-all-2.diff.gz
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -17,27 +18,54 @@
 
 %prep
 %setup -q
-%patch0 -p2 -b .orig
-chmod 644 doc/*
+#%patch2 -p0 -b .jumbo
+chmod 0644 doc/*
+rm doc/INSTALL
+sed -i 's#\$JOHN/john.conf#%{_sysconfdir}/john.conf#' src/params.h
+cp -a src src-mmx
 
 %build
+
+%define target_non_mmx generic
+%define target_mmx "%{nil}"
+
 %ifarch %{ix86}
-make -C src linux-x86-any-elf
-# TODO: Find a nice way to determine if these are better choices.
-#make -C src linux-x86-mmx-elf
-#make -C src linux-x86-k6-elf
-%else
-make -C src generic
+%define target_non_mmx linux-x86-any
+%define target_mmx linux-x86-mmx
+%endif
+%ifarch x86_64
+%define target_non_mmx linux-x86-64
+%define target_mmx linux-x86-64-mmx
+%endif
+%ifarch ppc
+%define target_non_mmx linux-ppc32
+%endif
+
+export CFLAGS="-c ${RPM_OPT_FLAGS} -DJOHN_SYSTEMWIDE=1"
+
+make -C src %{target_non_mmx} CFLAGS="${CFLAGS}" LDFLAGS=""
+
+%if "%{target_mmx}" != "%{nil}"
+mv run/john run/john-non-mmx
+
+CFLAGS="${CFLAGS} -DCPU_FALLBACK=1"
+LDFLAGS="${CFLAGS}"
+
+make -C src-mmx %{target_mmx}  CFLAGS="${CFLAGS}" LDFLAGS=""
 %endif
 
 %install
 rm -rf %{buildroot}
 install -d 755 %{buildroot}%{_sysconfdir}
 install -d 755 %{buildroot}%{_bindir}
-install -d 755 %{buildroot}%{_datadir}/%{name}
+install -d 755 %{buildroot}%{_datadir}/john
 install -m 755 run/{john,mailer} %{buildroot}%{_bindir}
-install -m 644 run/{*.chr,password.lst} %{buildroot}%{_datadir}/%{name}
-install -m 644 run/john.ini %{buildroot}%{_sysconfdir}
+install -m 644 run/{*.chr,password.lst} %{buildroot}%{_datadir}/john
+install -m 644 run/john.conf %{buildroot}%{_sysconfdir}
+%if "⅜{target_mmx}" != "%{nil}"
+install -d 755 %{buildroot}%{_libexecdir}/john
+install -m 755 run/john-non-mmx %{buildroot}%{_libexecdir}/john/
+%endif
 pushd %{buildroot}%{_bindir}
 ln -s john unafs
 ln -s john unique
@@ -48,13 +76,21 @@
 rm -rf %{buildroot}
 
 %files
-%defattr(-, root, root, -)
+%defattr(-,root,root,-)
 %doc doc/*
-%config(noreplace) %{_sysconfdir}/john.ini
+%config(noreplace) %{_sysconfdir}/john.conf
 %{_bindir}/*
-%{_datadir}/%{name}
+%{_datadir}/john
+%if "⅜{target_mmx}" != "%{nil}"
+%{_libexecdir}/john/
+%endif
 
 %changelog
+* Tue Jan 01 2007 Till Maas <opensource till name> - 1.7.0.2-1
+- prevent stripping in Makefile to get non-empty debuginfo
+- version bump
+- build mmx and fallback version
+
 * Mon Oct 09 2006 Jeremy Katz <katzj at redhat.com> - 1.6-5
 - FC6 Rebuild
 
@@ -66,7 +102,7 @@
 
 * Fri Apr 25 2003 Marius Johndal <mariuslj at ifi.uio.no> 0:1.6-0.fdr.2
 - Added epoch.
-- Modified makefile patch to honour %optflags.
+- Modified makefile patch to honour %%optflags.
 - setup -q.
 - Added full URL of source.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/john/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:38:27 -0000	1.2
+++ sources	10 Jan 2007 14:14:31 -0000	1.3
@@ -1 +1 @@
-aae782f160041b2bdc624b0a84054e32  john-1.6.tar.gz
+0a87dca1f149493fc087ea8a8b6ae5d5  john-1.7.0.2.tar.bz2


--- john-1.6-rh.patch DELETED ---