diff --git a/backport-CVE-2021-41496.patch b/backport-CVE-2021-41496.patch deleted file mode 100644 index fe7ae45af05e291cc80521b71d7fc06c74cd111e..0000000000000000000000000000000000000000 --- a/backport-CVE-2021-41496.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 271010f1037150e95017f803f4214b8861e528f2 Mon Sep 17 00:00:00 2001 -From: Warren Weckesser -Date: Mon, 20 Dec 2021 10:35:31 -0500 -Subject: [PATCH] BUG: f2py: Simplify creation of an exception message. Closes - gh-19000. - ---- - numpy/f2py/src/fortranobject.c | 28 +++++++++++++--------------- - 1 file changed, 13 insertions(+), 15 deletions(-) - -diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c -index 4a981bf..d323878 100644 ---- a/numpy/f2py/src/fortranobject.c -+++ b/numpy/f2py/src/fortranobject.c -@@ -595,14 +595,14 @@ static int check_and_fix_dimensions(const PyArrayObject* arr, - npy_intp *dims); - - static int --count_negative_dimensions(const int rank, -- const npy_intp *dims) { -- int i=0,r=0; -- while (i 0) { -- int i; -- strcpy(mess, "failed to create intent(cache|hide)|optional array" -- "-- must have defined dimensions but got ("); -- for(i=0;i= 0) { -+ PyErr_Format(PyExc_ValueError, -+ "failed to create intent(cache|hide)|optional array" -+ " -- must have defined dimensions, but dims[%d] = %" -+ NPY_INTP_FMT, i, dims[i]); - return NULL; - } - arr = (PyArrayObject *) --- -2.27.0 - diff --git a/numpy-1.21.4.zip b/numpy-1.22.1.zip similarity index 72% rename from numpy-1.21.4.zip rename to numpy-1.22.1.zip index f3fcd3e53c08166bb9bb3391f37f2779a69d879f..ad62496e0a3bf6b41e2b0cc9211a48bf3eb58d85 100644 Binary files a/numpy-1.21.4.zip and b/numpy-1.22.1.zip differ diff --git a/numpy.spec b/numpy.spec index 906f1b7479d011f9a8fa534d5bc9aec03a6475aa..4416e7cd30ecc9dd919bc2971111e323e79d6811 100644 --- a/numpy.spec +++ b/numpy.spec @@ -1,21 +1,19 @@ %global modname numpy Name: numpy -Version: 1.21.4 -Release: 2 +Version: 1.22.1 +Release: 1 Epoch: 1 Summary: A fast multidimensional array facility for Python License: ASL 2.0 URL: http://www.numpy.org/ -Source0: https://files.pythonhosted.org/packages/fb/48/b0708ebd7718a8933f0d3937513ef8ef2f4f04529f1f66ca86d873043921/numpy-1.21.4.zip +Source0: https://files.pythonhosted.org/packages/0a/c8/a62767a6b374a0dfb02d2a0456e5f56a372cdd1689dbc6ffb6bf1ddedbc0/numpy-1.22.1.zip BuildRequires: openblas-devel -BuildRequires: lapack-devel gcc-gfortran +BuildRequires: lapack-devel gcc-gfortran gcc-g++ BuildRequires: python3-Cython >= 0.29.24 -Patch0: backport-CVE-2021-41496.patch - %description NumPy is the fundamental package for scientific computing with Python. It contains among other things: a powerful N-dimensional array object @@ -54,7 +52,7 @@ Provides: python3-f2py = %{version}-%{release} This package includes a version of f2py that works properly with NumPy. %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-%{version} rm numpy/distutils/command/__init__.py && touch numpy/distutils/command/__init__.py @@ -104,6 +102,9 @@ popd &> /dev/null %changelog +* Wed Jan 26 2022 renhongxun - 1.22.1-1 +- upgrade version to 1.21.1 + * Tue Jan 04 2022 yuanxin - 1.21.4-2 - fix CVE-2021-41496