commit 8165090b27aea01870cf354c26380c81a95b57e7 Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Sun Jul 21 13:26:48 2013 +0200
- disable some inlining on x8664 john.spec | 4 ++++ no-inline.patch | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) --- diff --git a/john.spec b/john.spec index 756e804..710f012 100644 --- a/john.spec +++ b/john.spec @@ -45,6 +45,7 @@ Patch1: optflags.patch Patch2: http://www.openwall.com/john/g/%{name}-1.7.9-jumbo-7.diff.gz # Patch2-md5: b953fcb7f743eeeb5f938a28c352b8ef Patch3: %{name}-jumbo-optflags.patch +Patch4: no-inline.patch URL: http://www.openwall.com/john/ %{?with_jumbopatch:BuildRequires: openssl-devel >= 0.9.7} BuildRequires: rpmbuild(macros) >= 1.213 @@ -87,6 +88,9 @@ Windows NT/2000/XP LM, a także kilka innych przy użyciu łat. %{!?with_jumbopatch:%patch1 -p1} %{?with_jumbopatch:%patch2 -p1} %{?with_jumbopatch:%patch3 -p1} +%ifarch %{x8664} +%patch4 -p1 +%endif %{__rm} doc/INSTALL diff --git a/no-inline.patch b/no-inline.patch new file mode 100644 index 0000000..b327479 --- /dev/null +++ b/no-inline.patch @@ -0,0 +1,38 @@ +--- john-1.7.9/src/MD5_std.c~ 2013-07-21 13:22:20.285649779 +0200 ++++ john-1.7.9/src/MD5_std.c 2013-07-21 13:22:44.392541796 +0200 +@@ -472,12 +472,14 @@ + /* + * x86-64 implies a fairly recent CPU, so presumably its L1 instruction cache + * is large enough. +- */ + #ifdef __x86_64__ + #define MAYBE_INLINE_BODY MAYBE_INLINE + #else ++ */ + #define MAYBE_INLINE_BODY ++/* + #endif ++ */ + + #if !MD5_X2 + +--- john-1.7.9/src/lotus5_fmt_plug.c~ 2013-07-21 13:25:04.637186087 +0200 ++++ john-1.7.9/src/lotus5_fmt_plug.c 2013-07-21 13:25:41.664198855 +0200 +@@ -155,7 +155,7 @@ + /*Beginning of private functions*/ + /* Takes the plaintext password and generates the second row of our + * working matrix for the final call to the mixing function*/ +-void MAYBE_INLINE ++void + lotus_transform_password (unsigned char *i1, unsigned char *o1, + unsigned char *i2, unsigned char *o2) + { +@@ -173,7 +173,7 @@ + } + + /* The mixing function: perturbs the first three rows of the matrix*/ +-void MAYBE_INLINE lotus_mix (unsigned char *m1, unsigned char *m2) ++void lotus_mix (unsigned char *m1, unsigned char *m2) + { + int i, j; + unsigned char p1, p2; ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/john.git/commitdiff/8165090b27aea01870cf354c26380c81a95b57e7 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit