diff --git a/backport-BUG-fix-a-minor-refcounting-issue-in-Py_FindObjects.patch b/backport-BUG-fix-a-minor-refcounting-issue-in-Py_FindObjects.patch deleted file mode 100644 index 2cf335a97063584396cff816e9fcf78000a0de75..0000000000000000000000000000000000000000 --- a/backport-BUG-fix-a-minor-refcounting-issue-in-Py_FindObjects.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9b6521198c4f31d3f9cb525e581bea8e3e77f0a2 Mon Sep 17 00:00:00 2001 -From: Ralf Gommers -Date: Mon, 13 Jun 2022 20:12:00 +0200 -Subject: [PATCH] BUG: fix a minor refcounting issue in `Py_FindObjects` - -Closes gh-16235 - -Note: also change `Py_XDECREF`s for start/end variables to `Py_DECREF`, -because it's already checked higher up that those variables are not -NULL. - -Reference: https://github.com/scipy/scipy/pull/16397/commits/9b6521198c4f31d3f9cb525e581bea8e3e77f0a2 -Conflict: NA ---- - scipy/ndimage/src/nd_image.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/scipy/ndimage/src/nd_image.c b/scipy/ndimage/src/nd_image.c -index 8dfa21ea2..11d176a30 100644 ---- a/scipy/ndimage/src/nd_image.c -+++ b/scipy/ndimage/src/nd_image.c -@@ -885,7 +885,7 @@ static PyObject *Py_FindObjects(PyObject *obj, PyObject *args) - npy_intp idx = - PyArray_NDIM(input) > 0 ? 2 * PyArray_NDIM(input) * ii : ii; - if (regions[idx] >= 0) { -- PyObject *tuple = PyTuple_New(PyArray_NDIM(input)); -+ tuple = PyTuple_New(PyArray_NDIM(input)); - if (!tuple) { - PyErr_NoMemory(); - goto exit; -@@ -903,8 +903,8 @@ static PyObject *Py_FindObjects(PyObject *obj, PyObject *args) - PyErr_NoMemory(); - goto exit; - } -- Py_XDECREF(start); -- Py_XDECREF(end); -+ Py_DECREF(start); -+ Py_DECREF(end); - start = end = NULL; - PyTuple_SetItem(tuple, jj, slc); - slc = NULL; --- -2.33.0 - diff --git a/backport-BUG-fix-small-refcount-issue-in-ndimage._ctest.patch b/backport-BUG-fix-small-refcount-issue-in-ndimage._ctest.patch deleted file mode 100644 index 93f1a737dec514aed5d64c4eb54a9ad53abaeb66..0000000000000000000000000000000000000000 --- a/backport-BUG-fix-small-refcount-issue-in-ndimage._ctest.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 133b92679ab23e0fa4a6f3b6e45f493312531024 Mon Sep 17 00:00:00 2001 -From: Ralf Gommers -Date: Mon, 13 Jun 2022 20:20:06 +0200 -Subject: [PATCH] BUG: fix small refcount issue in `ndimage._ctest` - -Note that this is only test code, so it wasn't a real-world problem. - -Closes gh-16236 - -Reference: https://github.com/scipy/scipy/pull/16397/commits/133b92679ab23e0fa4a6f3b6e45f493312531024 -Conflict: NA ---- - scipy/ndimage/src/_ctest.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/scipy/ndimage/src/_ctest.c b/scipy/ndimage/src/_ctest.c -index fe8ce676e..f84ba064a 100644 ---- a/scipy/ndimage/src/_ctest.c -+++ b/scipy/ndimage/src/_ctest.c -@@ -93,6 +93,8 @@ py_filter2d(PyObject *obj, PyObject *args) - goto error; - } - callback_data[i] = PyFloat_AsDouble(item); -+ Py_DECREF(item); -+ item = NULL; - if (PyErr_Occurred()) goto error; - } - --- -2.33.0 - diff --git a/backport-BUG-fix-use-after-free-bug-in-Py_FindObject.patch b/backport-BUG-fix-use-after-free-bug-in-Py_FindObject.patch deleted file mode 100644 index 1bc41c9ee40636f1dfbed9bea6858c1c4e60ea0e..0000000000000000000000000000000000000000 --- a/backport-BUG-fix-use-after-free-bug-in-Py_FindObject.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 2ecef38c8629e9a27613e646c4f01b5c0a0a566f Mon Sep 17 00:00:00 2001 -From: Py_FindObjects -Date: Tue, 28 Nov 2023 17:33:35 +0800 -Subject: [PATCH] MAINT: Fix use-after-free bug in Py_FindObject - ---- - scipy/ndimage/src/nd_image.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/scipy/ndimage/src/nd_image.c b/scipy/ndimage/src/nd_image.c -index 9f3aed3..d9fcc57 100644 ---- a/scipy/ndimage/src/nd_image.c -+++ b/scipy/ndimage/src/nd_image.c -@@ -928,7 +928,6 @@ static PyObject *Py_FindObjects(PyObject *obj, PyObject *args) - Py_XDECREF(slc); - free(regions); - if (PyErr_Occurred()) { -- Py_XDECREF(result); - return NULL; - } else { - return result; --- -2.27.0 - \ No newline at end of file diff --git a/scipy-1.6.2.tar.gz b/scipy-1.9.3.tar.gz similarity index 57% rename from scipy-1.6.2.tar.gz rename to scipy-1.9.3.tar.gz index 0785b679766aa7f0ad73e9b8b2b2843fee1faccd..d4bcccf21c76bacd8e5315a8fb0faa4d5394520f 100644 Binary files a/scipy-1.6.2.tar.gz and b/scipy-1.9.3.tar.gz differ diff --git a/scipy.spec b/scipy.spec index f1faa6ce42b048abcf0598d84c466920c27f1a48..e8bb91a401778f3f595b9b4d02830f80e623d5e4 100644 --- a/scipy.spec +++ b/scipy.spec @@ -1,20 +1,17 @@ %global py_setup_args config_fc --fcompiler=gnu95 --noarch %global debug_package %{nil} Name: scipy -Version: 1.6.2 -Release: 3 +Version: 1.9.3 +Release: 1 Summary: A Python-based ecosystem of open-source software for mathematics, science, and engineering License: Qhull and Apache-2.0 URL: https://www.scipy.org -Source0: https://github.com/scipy/scipy/releases/download/v%{version}/scipy-%{version}.tar.gz - -Patch1: backport-BUG-fix-a-minor-refcounting-issue-in-Py_FindObjects.patch -Patch2: backport-BUG-fix-small-refcount-issue-in-ndimage._ctest.patch -Patch3: backport-BUG-fix-use-after-free-bug-in-Py_FindObject.patch +Source0: https://files.pythonhosted.org/packages/0a/2e/44795c6398e24e45fa0bb61c3e98de1cfea567b1b51efd3751e2f7ff9720/scipy-%{version}.tar.gz BuildRequires: python3-devel python3-numpy >= 1.8.2 python3-numpy-f2py BuildRequires: gcc-c++ openblas-devel gcc-gfortran chrpath BuildRequires: pybind11-devel python3-pybind11 python3-Cython +BuildRequires: python3-pythran %description SciPy (pronounced "Sigh Pie") is open-source software for mathematics, science, and engineering. @@ -36,7 +33,7 @@ Requires: python3 python3-numpy python3 package for scipy %prep -%autosetup -n %{name}-%{version} -p1 +%autosetup -n %{name}-%{version} cat > site.cfg << EOF [amd] @@ -102,6 +99,9 @@ echo "%{_libdir}/%{name}" >> $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.c %config(noreplace) /etc/ld.so.conf.d/* %changelog +* Sun Apr 28 2024 OpenStack_SIG - 1.9.3-1 +- Upgrade package to version 1.9.3 + * Fri Dec 22 2023 xuyuchao - 1.6.2-3 - Type:CVE - CVE:CVE-2023-29824