Accepting request 498681 from home:bmwiedemann:branches:security

Add reproducible.patch to sort input files to make build reproducible
  (boo#1041090)

OBS-URL: https://build.opensuse.org/request/show/498681
OBS-URL: https://build.opensuse.org/package/show/security/john?expand=0&rev=51

john.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat May 27 15:44:54 UTC 2017 - bwiedemann@suse.com
+
+- Add reproducible.patch to sort input files to make build reproducible
+  (boo#1041090)
+
 -------------------------------------------------------------------
 Thu Dec  8 13:15:18 UTC 2016 - meissner@suse.com
 

john.spec

@@ -34,6 +34,8 @@ Source8:        %{jumboversion}.tar.bz2
 Source9:        %{jumboversion}.tar.bz2.sign
 Patch0:         john-1.7.9-powerpc_BE_need_rhash_u32_swap_copy.patch
 Patch1:         ppc64le.patch
+# PATCH-FIX-UPSTREAM https://github.com/magnumripper/JohnTheRipper/pull/2560
+Patch2:         reproducible.patch
 BuildRequires:  openssl-devel
 %if 0%{?suse_version} == 1110 
 BuildRequires:  xz
@@ -53,6 +55,7 @@ number of other hash types are supported as well.
 %prep
 %setup -q -a8
 %patch0 -p1
+%patch2 -p1
 cd %{jumboversion} && cp -a ./* ..
 cd ..
 rm -r %{jumboversion}

reproducible.patch

@@ -0,0 +1,13 @@
+Index: john-1.8.0/john-1.7.9-jumbo-7/src/Makefile
+===================================================================
+--- john-1.8.0.orig/john-1.7.9-jumbo-7/src/Makefile
++++ john-1.8.0/john-1.7.9-jumbo-7/src/Makefile
+@@ -72,7 +72,7 @@ OPT_INLINE = -Os -funroll-loops -finline
+ 
+ # Works with Solaris make, and GNU make
+ PLUGFORMATS_SRCS: sh =echo *_plug.c
+-PLUGFORMATS_SRCS += $(wildcard *_plug.c)
++PLUGFORMATS_SRCS += $(sort $(wildcard *_plug.c))
+ PLUGFORMATS_OBJS = $(PLUGFORMATS_SRCS:.c=.o)
+ 
+ JOHN_OBJS = \