From f102c0ff21166e5995f3f0200a2ff0eae6c4cba9 Mon Sep 17 00:00:00 2001
From: Dave Love <loveshack@fedoraproject.org>
Date: Sep 11 2019 12:15:23 +0000
Subject: - Patch to avoid popen (security)

- Replace patch1 with upstream change

---

diff --git a/blis-no-ompsimd.patch b/blis-no-ompsimd.patch
deleted file mode 100644
index 672d1c2..0000000
--- a/blis-no-ompsimd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- blis-0.6.0/configure~	2019-06-03 23:37:19.000000000 +0000
-+++ blis-0.6.0/configure	2019-08-17 15:36:05.422423009 +0000
-@@ -2529,7 +2529,7 @@
- 	has_memkind=$(has_libmemkind)
- 
- 	# Try to determine whether the chosen compiler supports #pragma omp simd.
--	pragma_omp_simd=$(has_pragma_omp_simd)
-+	pragma_omp_simd=no #$(has_pragma_omp_simd)
- 
- 
- 	# -- Prepare variables for subsitution into template files -----------------
diff --git a/blis.spec b/blis.spec
index bbadc32..ccb5a94 100644
--- a/blis.spec
+++ b/blis.spec
@@ -20,7 +20,7 @@
 
 Name:		blis
 Version:	0.6.0
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	BLAS-like Library Instantiation Software Framework
 License:	BSD
 URL:		https://github.com/flame/blis
@@ -29,10 +29,10 @@ Source0:	https://github.com/flame/blis/archive/%commit/%name-%shortcommit.tar.gz
 %else
 Source0:	https://github.com/flame/blis/archive/%version/%name-%version.tar.gz
 %endif
-# The simd pragma is a pessimization with gcc, since it avoids fma,
-# and gcc versions which support the pragma will vectorize the loops
-# anyway.
-Patch1:		blis-no-ompsimd.patch
+# Don't stop the simd pragma generating FMA
+Patch1:		blis-Use-funsafe-math-optimizations-and-ffp-contract-fast.patch
+# Don't use popen on arm (possible security issue)
+Patch2:		blis-Reimplemented-bli_cpuid_query-for-ARM.patch
 BuildRequires:	perl
 BuildRequires:	%{?dts6:devtoolset-8-binutils devtoolset-8-}gcc
 BuildRequires:	/usr/bin/python3 gcc-gfortran chrpath
@@ -374,6 +374,10 @@ export LD_LIBRARY_PATH=`pwd`/serial/lib
 %{macrosdir}/macros.blis-srpm
 
 %changelog
+* Wed Sep 11 2019 Dave love <loveshack@fedoraproject.org> - 0.6.0-4
+- Patch to avoid popen (security)
+- Replace patch1 with upstream change
+
 * Sat Aug 17 2019 Dave love <loveshack@fedoraproject.org> - 0.6.0-3
 - Patch out use of simd pragma
 - Use devtoolset-8, not -6 on el6/7