Author: glen Date: Fri Nov 5 11:21:53 2010 GMT Module: packages Tag: HEAD ---- Log message: - add optflags patch, cosmetics
---- Files affected: packages/john: john.spec (1.59 -> 1.60) , optflags.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/john/john.spec diff -u packages/john/john.spec:1.59 packages/john/john.spec:1.60 --- packages/john/john.spec:1.59 Thu Nov 4 11:11:17 2010 +++ packages/john/john.spec Fri Nov 5 12:21:48 2010 @@ -2,8 +2,8 @@ # # Conditional build: %bcond_with jumbopatch # This patch integrates lots of contributed - # patches adding support for over 30 - # of additional hash types, and more. + # patches adding support for over 30 + # of additional hash types, and more. %ifarch i586 i686 athlon pentium2 pentium3 pentium4 %define do_mmx 1 @@ -27,10 +27,11 @@ Source0: http://www.openwall.com/john/g/%{name}-%{version}.tar.bz2 # Source0-md5: 321ac0793f1aa4f0603b33a393133756 Patch0: %{name}-mailer.patch -%{?with_jumbopatch:Patch1: http://www.openwall.com/john/contrib/john-%{version}-jumbo-2.diff.gz} +Patch1: optflags.patch +%{?with_jumbopatch:Patch1: http://www.openwall.com/john/contrib/%{name}-%{version}-jumbo-2.diff.gz} URL: http://www.openwall.com/john/ +%{?with_jumbopatch:BuildRequires: openssl-devel >= 0.9.7} BuildRequires: rpmbuild(macros) >= 1.213 -%{?with_jumbopatch:BuildRequires: openssl-devel >= 0.9.7} Requires: words BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -56,62 +57,57 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %{?with_jumbopatch:%patch1 -p1} +rm -f doc/INSTALL + %build cd src %if %{do_mmxfb} %{__make} linux-x86-any \ - CFLAGS="-c -Wall -fomit-frame-pointer %{rpmcflags} -DJOHN_SYSTEMWIDE=1" \ - CC="%{__cc}" + CC="%{__cc}" \ + OPTFLAGS="%{rpmcflags} -DJOHN_SYSTEMWIDE=1" mv ../run/john ../run/john-non-mmx %{__make} clean %endif +TARG=generic %ifarch %{ix86} %if %{do_mmx} TARG=linux-x86-mmx %else TARG=linux-x86-any %endif -%else - %ifarch alpha - TARG=linux-alpha - %else - %ifarch sparc sparcv9 - TARG=linux-sparc - %else - %ifarch %{x8664} - TARG=linux-x86-64 - %else - TARG=generic - %endif - %endif - %endif +%endif +%ifarch alpha + TARG=linux-alpha +%endif +%ifarch sparc sparcv9 + TARG=linux-sparc +%endif +%ifarch %{x8664} + TARG=linux-x86-64 %endif %{__make} $TARG \ - CFLAGS="-c -Wall -fomit-frame-pointer %{rpmcflags} -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\"%{_libdir}/john\\\" %{?optmmxfb}" \ - CC="%{__cc}" + CC="%{__cc}" \ + OPTFLAGS="%{rpmcflags} -DJOHN_SYSTEMWIDE=1 -DJOHN_SYSTEMWIDE_EXEC=\\\"%{_libdir}/john\\\" %{?optmmxfb}" %install rm -rf $RPM_BUILD_ROOT - install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/john} -install run/{*.conf,*.chr,*.lst} $RPM_BUILD_ROOT%{_datadir}/john -install run/john $RPM_BUILD_ROOT%{_bindir} +cp -a run/{*.conf,*.chr,*.lst} $RPM_BUILD_ROOT%{_datadir}/john +install -p run/john $RPM_BUILD_ROOT%{_bindir} %if %{do_mmxfb} install -d $RPM_BUILD_ROOT%{_libdir}/john -install run/john-non-mmx $RPM_BUILD_ROOT%{_libdir}/john +install -p run/john-non-mmx $RPM_BUILD_ROOT%{_libdir}/john %endif -rm -f doc/INSTALL - -cd $RPM_BUILD_ROOT%{_bindir} -ln -sf john unafs -ln -sf john unique -ln -sf john unshadow +ln -sf john $RPM_BUILD_ROOT%{_bindir}/unafs +ln -sf john $RPM_BUILD_ROOT%{_bindir}/unique +ln -sf john $RPM_BUILD_ROOT%{_bindir}/unshadow %clean rm -rf $RPM_BUILD_ROOT @@ -119,7 +115,10 @@ %files %defattr(644,root,root,755) %doc doc/* run/mailer -%attr(755,root,root) %{_bindir}/* +%attr(755,root,root) %{_bindir}/john +%attr(755,root,root) %{_bindir}/unafs +%attr(755,root,root) %{_bindir}/unique +%attr(755,root,root) %{_bindir}/unshadow %if %{do_mmxfb} %dir %{_libdir}/john %attr(755,root,root) %{_libdir}/john/john-non-mmx @@ -132,6 +131,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.60 2010/11/05 11:21:48 glen +- add optflags patch, cosmetics + Revision 1.59 2010/11/04 10:11:17 glen - up to 1.7.6 @@ -249,10 +251,10 @@ - massive attack s/pld.org.pl/pld-linux.org/ Revision 1.22 2002/11/27 21:10:39 juandon -- new %%doc +- new %doc Revision 1.21 2002/11/02 22:43:48 wolf -- %%__cc +- %__cc Revision 1.20 2002/04/27 14:15:31 blues - description improved @@ -262,23 +264,23 @@ - cosmetics and INSTALL removed Revision 1.18 2002/04/25 16:39:40 arturs -fixed a small typo +- fixed a small typo Revision 1.17 2002/02/22 23:29:05 kloczek - removed all Group fields translations (our rpm now can handle translating Group field using gettext). Revision 1.16 2002/01/18 02:13:27 kloczek -perl -pi -e "s/[email protected]/[email protected]/" +- perl -pi -e "s/[email protected]/[email protected]/" Revision 1.15 2001/06/04 14:44:21 baggins - typo Revision 1.14 2001/05/22 09:06:26 wiget -switch to new conditional builds macros (bcond_on_ -> _with_/bcond_off_ -> _without_); no release changes only simple s/// perfored +- switch to new conditional builds macros (bcond_on_ -> _with_/bcond_off_ -> _without_); no release changes only simple s/// perfored Revision 1.13 2001/04/30 16:05:20 kloczek -- added using %%{rpmcflags} macro. +- added using %{rpmcflags} macro. Revision 1.12 2001/02/16 00:33:49 qboosh - /usr/dict/linux.words -> /usr/share/dict/words (in config) @@ -309,14 +311,3 @@ Revision 1.6 1999/07/12 23:06:00 kloczek - added using CVS keywords in %changelog (for automating them). - -* Mon Apr 26 1999 Michał Kuratczyk <[email protected]> - [1.6-3] -- gzipping documentation instead bzipping -- sloted BuildRoot into PLD standard - -* Wed Dec 09 1998 Arkadiusz Miśkiewicz <[email protected]> -- added ini patch. - -* Sun Oct 06 1998 Arkadiusz Miśkiewicz <[email protected]> -- initial rpm release. ================================================================ Index: packages/john/optflags.patch diff -u /dev/null packages/john/optflags.patch:1.1 --- /dev/null Fri Nov 5 12:21:53 2010 +++ packages/john/optflags.patch Fri Nov 5 12:21:48 2010 @@ -0,0 +1,16 @@ +--- john-1.7.6/src/Makefile~ 2010-06-14 00:12:37.000000000 +0300 ++++ john-1.7.6/src/Makefile 2010-11-05 13:09:41.713609665 +0200 +@@ -19,11 +19,12 @@ + #OMPFLAGS = -fopenmp + # Sun Studio with OpenMP (set the OMP_NUM_THREADS env var at runtime) + #OMPFLAGS = -xopenmp +-CFLAGS = -c -Wall -O2 -fomit-frame-pointer $(OMPFLAGS) ++CFLAGS = -c $(OPTFLAGS) -fomit-frame-pointer $(OMPFLAGS) + ASFLAGS = -c $(OMPFLAGS) + LDFLAGS = -s $(OMPFLAGS) + OPT_NORMAL = -funroll-loops + OPT_INLINE = -finline-functions ++OPTFLAGS = -Wall -O2 + + JOHN_OBJS = \ + DES_fmt.o DES_std.o DES_bs.o DES_bs_b.o \ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/john/john.spec?r1=1.59&r2=1.60&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
