From 1e80e253f0253c3ea168c66d16689b613024d9ef Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 30 Oct 2020 02:57:54 +0100
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/numpy.git#abbb7845a426c2fcfdb59b975504c1304b632a4c
---
 .gitignore              |   1 +
 numpy-1.19.2-FIPS.patch | 135 ++++++++++++++++++++++++++++++++++++++++
 numpy.spec              |  10 ++-
 sources                 |   2 +-
 4 files changed, 146 insertions(+), 2 deletions(-)
 create mode 100644 numpy-1.19.2-FIPS.patch

diff --git a/.gitignore b/.gitignore
index 07a1934..7c485ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@ numpy-1.4.1.tar.gz
 /numpy-1.19.1.tar.gz
 /numpy-1.19.2.tar.gz
 /numpy-html.zip
+/numpy-1.19.3.tar.gz
diff --git a/numpy-1.19.2-FIPS.patch b/numpy-1.19.2-FIPS.patch
new file mode 100644
index 0000000..3768799
--- /dev/null
+++ b/numpy-1.19.2-FIPS.patch
@@ -0,0 +1,135 @@
+From f73d993bcb03701f4e9146005a65eb482689140a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
+Date: Mon, 26 Oct 2020 18:54:22 +0100
+Subject: [PATCH] TST: Make test suite work in FIPS (140-2) Mode
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Tests using MD5 algorithms fail in FIPS Mode because MD5 is not FIPS
+compliant.
+
+Mark usages of MD5 in test suite as not being used for security
+purposes to overcome that.
+
+Signed-off-by: Nikola Forró <nforro@redhat.com>
+---
+ numpy/core/tests/test_regression.py          |  2 +-
+ numpy/random/tests/test_generator_mt19937.py | 10 +++++-----
+ numpy/random/tests/test_random.py            |  4 ++--
+ numpy/random/tests/test_randomstate.py       |  6 +++---
+ 4 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
+index 2e731d4fa..4633174d9 100644
+--- a/numpy/core/tests/test_regression.py
++++ b/numpy/core/tests/test_regression.py
+@@ -1509,7 +1509,7 @@ class TestRegression:
+         from hashlib import md5
+ 
+         x = np.array([1, 2, 3], dtype=np.dtype('<i4'))
+-        assert_equal(md5(x).hexdigest(), '2a1dd1e1e59d0a384c26951e316cd7e6')
++        assert_equal(md5(x, usedforsecurity=False).hexdigest(), '2a1dd1e1e59d0a384c26951e316cd7e6')
+ 
+     def test_0d_string_scalar(self):
+         # Bug #1436; the following should succeed
+diff --git a/numpy/random/tests/test_generator_mt19937.py b/numpy/random/tests/test_generator_mt19937.py
+index 6be7d852b..9b166e3a2 100644
+--- a/numpy/random/tests/test_generator_mt19937.py
++++ b/numpy/random/tests/test_generator_mt19937.py
+@@ -507,14 +507,14 @@ class TestIntegers:
+                 val = random.integers(0, 6 - endpoint, size=1000, endpoint=endpoint,
+                                  dtype=dt).byteswap()
+ 
+-            res = hashlib.md5(val).hexdigest()
++            res = hashlib.md5(val, usedforsecurity=False).hexdigest()
+             assert_(tgt[np.dtype(dt).name] == res)
+ 
+         # bools do not depend on endianness
+         random = Generator(MT19937(1234))
+         val = random.integers(0, 2 - endpoint, size=1000, endpoint=endpoint,
+                          dtype=bool).view(np.int8)
+-        res = hashlib.md5(val).hexdigest()
++        res = hashlib.md5(val, usedforsecurity=False).hexdigest()
+         assert_(tgt[np.dtype(bool).name] == res)
+ 
+     def test_repeatability_broadcasting(self, endpoint):
+@@ -910,7 +910,7 @@ class TestRandomDist:
+         actual = random.choice(10000, 5000, replace=False)
+         if sys.byteorder != 'little':
+             actual = actual.byteswap()
+-        res = hashlib.md5(actual.view(np.int8)).hexdigest()
++        res = hashlib.md5(actual.view(np.int8), usedforsecurity=False).hexdigest()
+         assert_(choice_hash == res)
+ 
+     def test_bytes(self):
+@@ -2436,7 +2436,7 @@ def test_jumped(config):
+     key = mt19937.state["state"]["key"]
+     if sys.byteorder == 'big':
+         key = key.byteswap()
+-    md5 = hashlib.md5(key)
++    md5 = hashlib.md5(key, usedforsecurity=False)
+     assert mt19937.state["state"]["pos"] == config["initial"]["pos"]
+     assert md5.hexdigest() == config["initial"]["key_md5"]
+ 
+@@ -2444,7 +2444,7 @@ def test_jumped(config):
+     key = jumped.state["state"]["key"]
+     if sys.byteorder == 'big':
+         key = key.byteswap()
+-    md5 = hashlib.md5(key)
++    md5 = hashlib.md5(key, usedforsecurity=False)
+     assert jumped.state["state"]["pos"] == config["jumped"]["pos"]
+     assert md5.hexdigest() == config["jumped"]["key_md5"]
+ 
+diff --git a/numpy/random/tests/test_random.py b/numpy/random/tests/test_random.py
+index 276b5bc81..e49251af3 100644
+--- a/numpy/random/tests/test_random.py
++++ b/numpy/random/tests/test_random.py
+@@ -233,13 +233,13 @@ class TestRandint:
+             else:
+                 val = self.rfunc(0, 6, size=1000, dtype=dt).byteswap()
+ 
+-            res = hashlib.md5(val.view(np.int8)).hexdigest()
++            res = hashlib.md5(val.view(np.int8), usedforsecurity=False).hexdigest()
+             assert_(tgt[np.dtype(dt).name] == res)
+ 
+         # bools do not depend on endianness
+         np.random.seed(1234)
+         val = self.rfunc(0, 2, size=1000, dtype=bool).view(np.int8)
+-        res = hashlib.md5(val).hexdigest()
++        res = hashlib.md5(val, usedforsecurity=False).hexdigest()
+         assert_(tgt[np.dtype(bool).name] == res)
+ 
+     def test_int64_uint64_corner_case(self):
+diff --git a/numpy/random/tests/test_randomstate.py b/numpy/random/tests/test_randomstate.py
+index 23dbbed6a..aa53d9322 100644
+--- a/numpy/random/tests/test_randomstate.py
++++ b/numpy/random/tests/test_randomstate.py
+@@ -341,13 +341,13 @@ class TestRandint:
+             else:
+                 val = self.rfunc(0, 6, size=1000, dtype=dt).byteswap()
+ 
+-            res = hashlib.md5(val.view(np.int8)).hexdigest()
++            res = hashlib.md5(val.view(np.int8), usedforsecurity=False).hexdigest()
+             assert_(tgt[np.dtype(dt).name] == res)
+ 
+         # bools do not depend on endianness
+         random.seed(1234)
+         val = self.rfunc(0, 2, size=1000, dtype=bool).view(np.int8)
+-        res = hashlib.md5(val).hexdigest()
++        res = hashlib.md5(val, usedforsecurity=False).hexdigest()
+         assert_(tgt[np.dtype(bool).name] == res)
+ 
+     @pytest.mark.skipif(np.iinfo('l').max < 2**32,
+@@ -1987,7 +1987,7 @@ def test_integer_repeat(int_func):
+     val = f(*args, size=1000000)
+     if sys.byteorder != 'little':
+         val = val.byteswap()
+-    res = hashlib.md5(val.view(np.int8)).hexdigest()
++    res = hashlib.md5(val.view(np.int8), usedforsecurity=False).hexdigest()
+     assert_(res == md5)
+ 
+ 
+-- 
+2.26.2
+
diff --git a/numpy.spec b/numpy.spec
index 07efac8..760a473 100644
--- a/numpy.spec
+++ b/numpy.spec
@@ -19,7 +19,7 @@
 %global modname numpy
 
 Name:           numpy
-Version:        1.19.2
+Version:        1.19.3
 Release:        1%{?dist}
 Epoch:          1
 Summary:        A fast multidimensional array facility for Python
@@ -30,6 +30,8 @@ URL:            http://www.numpy.org/
 Source0:        https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        https://numpy.org/doc/1.19/numpy-html.zip
 
+Patch0:         numpy-1.19.2-FIPS.patch
+
 %description
 NumPy is a general-purpose array-processing package designed to
 efficiently manipulate large multi-dimensional arrays of arbitrary
@@ -192,6 +194,12 @@ python3 runtests.py
 
 
 %changelog
+* Thu Oct 29 2020 Gwyn Ciesla <gwync@protonmail.com> - 1:1.19.3-1
+- 1.19.3
+
+* Tue Oct 27 2020 Nikola Forró <nforro@redhat.com> - 1:1.19.2-2
+- Make test suite work in FIPS (140-2) Mode
+
 * Thu Sep 10 2020 Gwyn Ciesla <gwync@protonmail.com> - 1:1.19.2-1
 - 1.19.2
 
diff --git a/sources b/sources
index 1e1d177..4e3f228 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (numpy-1.19.2.tar.gz) = e4fe2ca46eaa921a38c04c6e5faab222d51e6cc1af494922815d521de8427d4c4f5f148258b2caf98e4152b9a04138d8ee1a00205fe74b79118c15ee4d4127a4
+SHA512 (numpy-1.19.3.tar.gz) = bd9d7aa778a0ef3f663783a09205b46267249e303066a6724bd7f3063c3f60bb3b0ddf5fd0f62a4ba1aa7a6ab830772a3097dc64cbd4c4c1e55ed8610575db7d
 SHA512 (numpy-html.zip) = 4a421636523424a0703290b6a0ba53b85a9a9e8a6256363e2481f1c02ae278825c09f2f13d39e99f8aae21f57a4978723f3fc690693520f8c3b45a5b4c5a38ab