diff --git a/0001-add-loongarch-architecture-support.patch b/0001-add-loongarch-architecture-support.patch deleted file mode 100644 index 7b55bc1..0000000 --- a/0001-add-loongarch-architecture-support.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ca19adc35b02cff09844228f2562b1d1522e2fe4 Mon Sep 17 00:00:00 2001 -From: wang--ge -Date: Mon, 25 Apr 2022 09:49:00 +0800 -Subject: [PATCH] add loongarch architecture support - ---- - numpy/core/include/numpy/npy_cpu.h | 3 +++ - numpy/core/include/numpy/npy_endian.h | 1 + - 2 files changed, 4 insertions(+) - -diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h -index bc1fad7..e975b01 100644 ---- a/numpy/core/include/numpy/npy_cpu.h -+++ b/numpy/core/include/numpy/npy_cpu.h -@@ -18,6 +18,7 @@ - * NPY_CPU_ARCEL - * NPY_CPU_ARCEB - * NPY_CPU_RISCV64 -+ * NPY_CPU_LOONGARCH - * NPY_CPU_WASM - */ - #ifndef _NPY_CPUARCH_H_ -@@ -103,6 +104,8 @@ - #define NPY_CPU_ARCEB - #elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 - #define NPY_CPU_RISCV64 -+#elif defined(__loongarch__) -+ #define NPY_CPU_LOONGARCH - #elif defined(__EMSCRIPTEN__) - /* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */ - #define NPY_CPU_WASM -diff --git a/numpy/core/include/numpy/npy_endian.h b/numpy/core/include/numpy/npy_endian.h -index aa367a0..82609ed 100644 ---- a/numpy/core/include/numpy/npy_endian.h -+++ b/numpy/core/include/numpy/npy_endian.h -@@ -49,6 +49,7 @@ - || defined(NPY_CPU_PPC64LE) \ - || defined(NPY_CPU_ARCEL) \ - || defined(NPY_CPU_RISCV64) \ -+ || defined(NPY_CPU_LOONGARCH) \ - || defined(NPY_CPU_WASM) - #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN - #elif defined(NPY_CPU_PPC) \ --- -2.27.0 - diff --git a/backport-CVE-2021-34141.patch b/backport-CVE-2021-34141.patch deleted file mode 100644 index de0b385..0000000 --- a/backport-CVE-2021-34141.patch +++ /dev/null @@ -1,144 +0,0 @@ -From eeef9d4646103c3b1afd3085f1393f2b3f9575b2 Mon Sep 17 00:00:00 2001 -From: NectDz <54990613+NectDz@users.noreply.github.com> -Date: Tue, 10 Aug 2021 18:00:35 -0500 -Subject: [PATCH] DEP: Remove deprecated numeric style dtype strings (#19539) - -Finishes the deprecation, and effectively closes gh-18993 - -* Insecure String Comparison - -* Finished Deprecations - -* Breaks numpy types - -* Removed elements in dep_tps - -* Delete Typecode Comment - -* Deleted for loop - -* Fixed 80 characters or more issue - -* Expired Release Note - -* Updated Release Note - -* Update numpy/core/numerictypes.py - -* Update numpy/core/tests/test_deprecations.py - -Co-authored-by: Sebastian Berg ---- - doc/release/upcoming_changes/19539.expired.rst | 2 ++ - numpy/core/_type_aliases.py | 9 --------- - numpy/core/src/multiarray/descriptor.c | 16 ---------------- - numpy/core/tests/test_deprecations.py | 15 --------------- - numpy/core/tests/test_dtype.py | 9 ++++++--- - 5 files changed, 8 insertions(+), 43 deletions(-) - create mode 100644 doc/release/upcoming_changes/19539.expired.rst - -diff --git a/doc/release/upcoming_changes/19539.expired.rst b/doc/release/upcoming_changes/19539.expired.rst -new file mode 100644 -index 0000000..6e94f17 ---- /dev/null -+++ b/doc/release/upcoming_changes/19539.expired.rst -@@ -0,0 +1,2 @@ -+* Using the strings ``"Bytes0"``, ``"Datetime64"``, ``"Str0"``, ``"Uint32"``, -+ and ``"Uint64"`` as a dtype will now raise a ``TypeError``. -\ No newline at end of file -diff --git a/numpy/core/_type_aliases.py b/numpy/core/_type_aliases.py -index 67addef..3765a0d 100644 ---- a/numpy/core/_type_aliases.py -+++ b/numpy/core/_type_aliases.py -@@ -115,15 +115,6 @@ def _add_aliases(): - # add forward, reverse, and string mapping to numarray - sctypeDict[char] = info.type - -- # Add deprecated numeric-style type aliases manually, at some point -- # we may want to deprecate the lower case "bytes0" version as well. -- for name in ["Bytes0", "Datetime64", "Str0", "Uint32", "Uint64"]: -- if english_lower(name) not in allTypes: -- # Only one of Uint32 or Uint64, aliases of `np.uintp`, was (and is) defined, note that this -- # is not UInt32/UInt64 (capital i), which is removed. -- continue -- allTypes[name] = allTypes[english_lower(name)] -- sctypeDict[name] = sctypeDict[english_lower(name)] - - _add_aliases() - -diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c -index 50964da..90453e3 100644 ---- a/numpy/core/src/multiarray/descriptor.c -+++ b/numpy/core/src/multiarray/descriptor.c -@@ -1723,22 +1723,6 @@ _convert_from_str(PyObject *obj, int align) - goto fail; - } - -- /* Check for a deprecated Numeric-style typecode */ -- /* `Uint` has deliberately weird uppercasing */ -- char *dep_tps[] = {"Bytes", "Datetime64", "Str", "Uint"}; -- int ndep_tps = sizeof(dep_tps) / sizeof(dep_tps[0]); -- for (int i = 0; i < ndep_tps; ++i) { -- char *dep_tp = dep_tps[i]; -- -- if (strncmp(type, dep_tp, strlen(dep_tp)) == 0) { -- /* Deprecated 2020-06-09, NumPy 1.20 */ -- if (DEPRECATE("Numeric-style type codes are " -- "deprecated and will result in " -- "an error in the future.") < 0) { -- goto fail; -- } -- } -- } - /* - * Probably only ever dispatches to `_convert_from_type`, but who - * knows what users are injecting into `np.typeDict`. -diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py -index 42e632e..44a3ed7 100644 ---- a/numpy/core/tests/test_deprecations.py -+++ b/numpy/core/tests/test_deprecations.py -@@ -314,21 +314,6 @@ def test_insufficient_width_negative(self): - self.assert_deprecated(np.binary_repr, args=args, kwargs=kwargs) - - --class TestNumericStyleTypecodes(_DeprecationTestCase): -- """ -- Most numeric style typecodes were previously deprecated (and removed) -- in 1.20. This also deprecates the remaining ones. -- """ -- # 2020-06-09, NumPy 1.20 -- def test_all_dtypes(self): -- deprecated_types = ['Bytes0', 'Datetime64', 'Str0'] -- # Depending on intp size, either Uint32 or Uint64 is defined: -- deprecated_types.append(f"U{np.dtype(np.intp).name}") -- for dt in deprecated_types: -- self.assert_deprecated(np.dtype, exceptions=(TypeError,), -- args=(dt,)) -- -- - class TestDTypeAttributeIsDTypeDeprecation(_DeprecationTestCase): - # Deprecated 2021-01-05, NumPy 1.21 - message = r".*`.dtype` attribute" -diff --git a/numpy/core/tests/test_dtype.py b/numpy/core/tests/test_dtype.py -index 4f52268..23269f0 100644 ---- a/numpy/core/tests/test_dtype.py -+++ b/numpy/core/tests/test_dtype.py -@@ -109,9 +109,12 @@ def test_richcompare_invalid_dtype_comparison(self, operation): - operation(np.dtype(np.int32), 7) - - @pytest.mark.parametrize("dtype", -- ['Bool', 'Complex32', 'Complex64', 'Float16', 'Float32', 'Float64', -- 'Int8', 'Int16', 'Int32', 'Int64', 'Object0', 'Timedelta64', -- 'UInt8', 'UInt16', 'UInt32', 'UInt64', 'Void0', -+ ['Bool', 'Bytes0', 'Complex32', 'Complex64', -+ 'Datetime64', 'Float16', 'Float32', 'Float64', -+ 'Int8', 'Int16', 'Int32', 'Int64', -+ 'Object0', 'Str0', 'Timedelta64', -+ 'UInt8', 'UInt16', 'Uint32', 'UInt32', -+ 'Uint64', 'UInt64', 'Void0', - "Float128", "Complex128"]) - def test_numeric_style_types_are_invalid(self, dtype): - with assert_raises(TypeError): --- -1.8.3.1 - diff --git a/backport-CVE-2021-41495.patch b/backport-CVE-2021-41495.patch deleted file mode 100644 index a6bb897..0000000 --- a/backport-CVE-2021-41495.patch +++ /dev/null @@ -1,461 +0,0 @@ -From ac87f071f5fcf05b6a28bcf4ba7eb965daa6959a Mon Sep 17 00:00:00 2001 -From: Matti Picus -Date: Wed, 2 Feb 2022 22:46:17 +0200 -Subject: [PATCH] ENH: review return values for PyArray_DescrNew (#20960) - -* ENH: review return value from PyArray_DescrNew* calls - -* BUG: remove unused variable - -* BUG: typo - -* Update numpy/core/src/multiarray/methods.c - -Co-authored-by: Sebastian Berg - -* Update numpy/core/src/multiarray/methods.c - -Co-authored-by: Sebastian Berg - -* Update numpy/core/src/multiarray/getset.c - -Co-authored-by: Sebastian Berg - -* Update numpy/core/src/multiarray/methods.c - -Co-authored-by: Sebastian Berg - -* fixes from review - -* Update numpy/core/src/umath/ufunc_type_resolution.c - -Co-authored-by: Sebastian Berg - -* move check to internal function - -* remove check - -* Remove unnecessary dealloc - -The dealloc is now part of the Py_DECREF(ret) and handled there. -Doing it here would decref it twice. - -* MAINT: Remove custom error message (and small cleanup) - -It is probably not good to call PyObject_GetIter() if dtype is NULL -and an error is already in progress... -(If we check for it, lets try to do it right.) - -* Fixup DescrNewFromType - -`DescrNewFromType` cannot fail in most cases, but if it does, -DescrNew does not accept NULL as input. - -Co-authored-by: Sebastian Berg ---- - numpy/core/src/multiarray/_multiarray_tests.c.src | 4 +-- - numpy/core/src/multiarray/arrayobject.c | 3 +++ - numpy/core/src/multiarray/buffer.c | 6 +++++ - numpy/core/src/multiarray/ctors.c | 24 +++++++++++++++++- - numpy/core/src/multiarray/descriptor.c | 30 +++++++++++++++++------ - numpy/core/src/multiarray/dtypemeta.c | 8 ++++++ - numpy/core/src/multiarray/getset.c | 13 ++++++---- - numpy/core/src/multiarray/methods.c | 16 ++++++++++++ - numpy/core/src/multiarray/nditer_constr.c | 11 ++++----- - numpy/core/src/multiarray/scalarapi.c | 3 +++ - numpy/core/src/multiarray/scalartypes.c.src | 10 +++++--- - 11 files changed, 103 insertions(+), 25 deletions(-) - -diff --git a/numpy/core/src/multiarray/_multiarray_tests.c.src b/numpy/core/src/multiarray/_multiarray_tests.c.src -index 3693762..fd7c1d0 100644 ---- a/numpy/core/src/multiarray/_multiarray_tests.c.src -+++ b/numpy/core/src/multiarray/_multiarray_tests.c.src -@@ -643,14 +643,12 @@ static PyObject * - fromstring_null_term_c_api(PyObject *dummy, PyObject *byte_obj) - { - char *string; -- PyArray_Descr *descr; - - string = PyBytes_AsString(byte_obj); - if (string == NULL) { - return NULL; - } -- descr = PyArray_DescrNewFromType(NPY_FLOAT64); -- return PyArray_FromString(string, -1, descr, -1, " "); -+ return PyArray_FromString(string, -1, NULL, -1, " "); - } - - -diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c -index 3f080d9..4c20fc1 100644 ---- a/numpy/core/src/multiarray/arrayobject.c -+++ b/numpy/core/src/multiarray/arrayobject.c -@@ -986,6 +986,9 @@ _strings_richcompare(PyArrayObject *self, PyArrayObject *other, int cmp_op, - if (PyArray_TYPE(self) == NPY_STRING && - PyArray_DESCR(other)->type_num == NPY_UNICODE) { - PyArray_Descr* unicode = PyArray_DescrNew(PyArray_DESCR(other)); -+ if (unicode == NULL) { -+ return NULL; -+ } - unicode->elsize = PyArray_DESCR(self)->elsize << 2; - new = PyArray_FromAny((PyObject *)self, unicode, - 0, 0, 0, NULL); -diff --git a/numpy/core/src/multiarray/buffer.c b/numpy/core/src/multiarray/buffer.c -index d10122c..d14f87a 100644 ---- a/numpy/core/src/multiarray/buffer.c -+++ b/numpy/core/src/multiarray/buffer.c -@@ -1048,12 +1048,18 @@ _descriptor_from_pep3118_format_fast(char const *s, PyObject **result) - } - - descr = PyArray_DescrFromType(type_num); -+ if (descr == NULL) { -+ return 0; -+ } - if (byte_order == '=') { - *result = (PyObject*)descr; - } - else { - *result = (PyObject*)PyArray_DescrNewByteorder(descr, byte_order); - Py_DECREF(descr); -+ if (result == NULL) { -+ return 0; -+ } - } - - return 1; -diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c -index 7b7f977..6991bba 100644 ---- a/numpy/core/src/multiarray/ctors.c -+++ b/numpy/core/src/multiarray/ctors.c -@@ -668,6 +668,9 @@ PyArray_NewFromDescr_int( - PyArrayObject_fields *fa; - npy_intp nbytes; - -+ if (descr == NULL) { -+ return NULL; -+ } - if (nd > NPY_MAXDIMS || nd < 0) { - PyErr_Format(PyExc_ValueError, - "number of dimensions must be within [0, %d]", NPY_MAXDIMS); -@@ -1137,6 +1140,9 @@ PyArray_New( - return NULL; - } - PyArray_DESCR_REPLACE(descr); -+ if (descr == NULL) { -+ return NULL; -+ } - descr->elsize = itemsize; - } - new = PyArray_NewFromDescr(subtype, descr, nd, dims, strides, -@@ -1162,6 +1168,9 @@ _dtype_from_buffer_3118(PyObject *memoryview) - * terminate. - */ - descr = PyArray_DescrNewFromType(NPY_STRING); -+ if (descr == NULL) { -+ return NULL; -+ } - descr->elsize = view->itemsize; - } - return descr; -@@ -3559,6 +3568,10 @@ PyArray_FromFile(FILE *fp, PyArray_Descr *dtype, npy_intp num, char *sep) - PyArrayObject *ret; - size_t nread = 0; - -+ if (dtype == NULL) { -+ return NULL; -+ } -+ - if (PyDataType_REFCHK(dtype)) { - PyErr_SetString(PyExc_ValueError, - "Cannot read into object array"); -@@ -3626,6 +3639,9 @@ PyArray_FromBuffer(PyObject *buf, PyArray_Descr *type, - int itemsize; - int writeable = 1; - -+ if (type == NULL) { -+ return NULL; -+ } - - if (PyDataType_REFCHK(type)) { - PyErr_SetString(PyExc_ValueError, -@@ -3833,14 +3849,20 @@ NPY_NO_EXPORT PyObject * - PyArray_FromIter(PyObject *obj, PyArray_Descr *dtype, npy_intp count) - { - PyObject *value; -- PyObject *iter = PyObject_GetIter(obj); -+ PyObject *iter = NULL; - PyArrayObject *ret = NULL; - npy_intp i, elsize, elcount; - char *item, *new_data; - -+ if (dtype == NULL) { -+ return NULL; -+ } -+ -+ iter = PyObject_GetIter(obj); - if (iter == NULL) { - goto done; - } -+ - if (PyDataType_ISUNSIZED(dtype)) { - PyErr_SetString(PyExc_ValueError, - "Must specify length when using variable-size data-type."); -diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c -index 0c53905..a5cb6a9 100644 ---- a/numpy/core/src/multiarray/descriptor.c -+++ b/numpy/core/src/multiarray/descriptor.c -@@ -1381,6 +1381,9 @@ PyArray_DescrNewFromType(int type_num) - PyArray_Descr *new; - - old = PyArray_DescrFromType(type_num); -+ if (old == NULL) { -+ return NULL; -+ } - new = PyArray_DescrNew(old); - Py_DECREF(old); - return new; -@@ -2341,7 +2344,7 @@ arraydescr_new(PyTypeObject *subtype, - } - - PyObject *odescr, *metadata=NULL; -- PyArray_Descr *descr, *conv; -+ PyArray_Descr *conv; - npy_bool align = NPY_FALSE; - npy_bool copy = NPY_FALSE; - npy_bool copied = NPY_FALSE; -@@ -2363,9 +2366,10 @@ arraydescr_new(PyTypeObject *subtype, - - /* Get a new copy of it unless it's already a copy */ - if (copy && conv->fields == Py_None) { -- descr = PyArray_DescrNew(conv); -- Py_DECREF(conv); -- conv = descr; -+ PyArray_DESCR_REPLACE(conv); -+ if (conv == NULL) { -+ return NULL; -+ } - copied = NPY_TRUE; - } - -@@ -2375,10 +2379,11 @@ arraydescr_new(PyTypeObject *subtype, - * underlying dictionary - */ - if (!copied) { -+ PyArray_DESCR_REPLACE(conv); -+ if (conv == NULL) { -+ return NULL; -+ } - copied = NPY_TRUE; -- descr = PyArray_DescrNew(conv); -- Py_DECREF(conv); -- conv = descr; - } - if ((conv->metadata != NULL)) { - /* -@@ -3047,6 +3052,9 @@ PyArray_DescrNewByteorder(PyArray_Descr *self, char newendian) - char endian; - - new = PyArray_DescrNew(self); -+ if (new == NULL) { -+ return NULL; -+ } - endian = new->byteorder; - if (endian != NPY_IGNORE) { - if (newendian == NPY_SWAP) { -@@ -3073,6 +3081,10 @@ PyArray_DescrNewByteorder(PyArray_Descr *self, char newendian) - int len, i; - - newfields = PyDict_New(); -+ if (newfields == NULL) { -+ Py_DECREF(new); -+ return NULL; -+ } - /* make new dictionary with replaced PyArray_Descr Objects */ - while (PyDict_Next(self->fields, &pos, &key, &value)) { - if (NPY_TITLE_KEY(key, value)) { -@@ -3114,6 +3126,10 @@ PyArray_DescrNewByteorder(PyArray_Descr *self, char newendian) - Py_DECREF(new->subarray->base); - new->subarray->base = PyArray_DescrNewByteorder( - self->subarray->base, newendian); -+ if (new->subarray->base == NULL) { -+ Py_DECREF(new); -+ return NULL; -+ } - } - return new; - } -diff --git a/numpy/core/src/multiarray/dtypemeta.c b/numpy/core/src/multiarray/dtypemeta.c -index cd489d5..53f38e8 100644 ---- a/numpy/core/src/multiarray/dtypemeta.c -+++ b/numpy/core/src/multiarray/dtypemeta.c -@@ -153,6 +153,9 @@ string_discover_descr_from_pyobject( - "string to large to store inside array."); - } - PyArray_Descr *res = PyArray_DescrNewFromType(cls->type_num); -+ if (res == NULL) { -+ return NULL; -+ } - res->elsize = (int)itemsize; - return res; - } -@@ -171,10 +174,15 @@ void_discover_descr_from_pyobject( - } - if (PyBytes_Check(obj)) { - PyArray_Descr *descr = PyArray_DescrNewFromType(NPY_VOID); -+ if (descr == NULL) { -+ return NULL; -+ } - Py_ssize_t itemsize = PyBytes_Size(obj); - if (itemsize > NPY_MAX_INT) { - PyErr_SetString(PyExc_TypeError, - "byte-like to large to store inside array."); -+ Py_DECREF(descr); -+ return NULL; - } - descr->elsize = (int)itemsize; - return descr; -diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c -index a4f972b..d640684 100644 ---- a/numpy/core/src/multiarray/getset.c -+++ b/numpy/core/src/multiarray/getset.c -@@ -698,15 +698,18 @@ _get_part(PyArrayObject *self, int imag) - - } - type = PyArray_DescrFromType(float_type_num); -+ if (type == NULL) { -+ return NULL; -+ } - - offset = (imag ? type->elsize : 0); - - if (!PyArray_ISNBO(PyArray_DESCR(self)->byteorder)) { -- PyArray_Descr *new; -- new = PyArray_DescrNew(type); -- new->byteorder = PyArray_DESCR(self)->byteorder; -- Py_DECREF(type); -- type = new; -+ Py_SETREF(type, PyArray_DescrNew(type)); -+ if (type == NULL) { -+ return NULL; -+ } -+ type->byteorder = PyArray_DESCR(self)->byteorder; - } - ret = (PyArrayObject *)PyArray_NewFromDescrAndBase( - Py_TYPE(self), -diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c -index 33f78df..2edbc23 100644 ---- a/numpy/core/src/multiarray/methods.c -+++ b/numpy/core/src/multiarray/methods.c -@@ -1337,6 +1337,10 @@ array_sort(PyArrayObject *self, - return NULL; - } - newd = PyArray_DescrNew(saved); -+ if (newd == NULL) { -+ Py_DECREF(new_name); -+ return NULL; -+ } - Py_DECREF(newd->names); - newd->names = new_name; - ((PyArrayObject_fields *)self)->descr = newd; -@@ -1462,6 +1466,10 @@ array_argsort(PyArrayObject *self, - return NULL; - } - newd = PyArray_DescrNew(saved); -+ if (newd == NULL) { -+ Py_DECREF(new_name); -+ return NULL; -+ } - Py_DECREF(newd->names); - newd->names = new_name; - ((PyArrayObject_fields *)self)->descr = newd; -@@ -1519,6 +1527,10 @@ array_argpartition(PyArrayObject *self, - return NULL; - } - newd = PyArray_DescrNew(saved); -+ if (newd == NULL) { -+ Py_DECREF(new_name); -+ return NULL; -+ } - Py_DECREF(newd->names); - newd->names = new_name; - ((PyArrayObject_fields *)self)->descr = newd; -@@ -2150,6 +2161,10 @@ array_setstate(PyArrayObject *self, PyObject *args) - } - else { - fa->descr = PyArray_DescrNew(typecode); -+ if (fa->descr == NULL) { -+ Py_DECREF(rawdata); -+ return NULL; -+ } - if (PyArray_DESCR(self)->byteorder == NPY_BIG) { - PyArray_DESCR(self)->byteorder = NPY_LITTLE; - } -diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c -index 0b9717a..f82a962 100644 ---- a/numpy/core/src/multiarray/nditer_constr.c -+++ b/numpy/core/src/multiarray/nditer_constr.c -@@ -1128,13 +1128,12 @@ npyiter_prepare_one_operand(PyArrayObject **op, - if (op_flags & NPY_ITER_NBO) { - /* Check byte order */ - if (!PyArray_ISNBO((*op_dtype)->byteorder)) { -- PyArray_Descr *nbo_dtype; -- - /* Replace with a new descr which is in native byte order */ -- nbo_dtype = PyArray_DescrNewByteorder(*op_dtype, NPY_NATIVE); -- Py_DECREF(*op_dtype); -- *op_dtype = nbo_dtype; -- -+ Py_SETREF(*op_dtype, -+ PyArray_DescrNewByteorder(*op_dtype, NPY_NATIVE)); -+ if (*op_dtype == NULL) { -+ return 0; -+ } - NPY_IT_DBG_PRINT("Iterator: Setting NPY_OP_ITFLAG_CAST " - "because of NPY_ITER_NBO\n"); - /* Indicate that byte order or alignment needs fixing */ -diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c -index 564352f..edbe595 100644 ---- a/numpy/core/src/multiarray/scalarapi.c -+++ b/numpy/core/src/multiarray/scalarapi.c -@@ -625,6 +625,9 @@ PyArray_DescrFromScalar(PyObject *sc) - } - if (PyDataType_ISUNSIZED(descr)) { - PyArray_DESCR_REPLACE(descr); -+ if (descr == NULL) { -+ return NULL; -+ } - type_num = descr->type_num; - if (type_num == NPY_STRING) { - descr->elsize = PyBytes_GET_SIZE(sc); -diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src -index 9077618..af98145 100644 ---- a/numpy/core/src/multiarray/scalartypes.c.src -+++ b/numpy/core/src/multiarray/scalartypes.c.src -@@ -3212,12 +3212,16 @@ void_arrtype_new(PyTypeObject *type, PyObject *args, PyObject *kwds) - } - ((PyVoidScalarObject *)ret)->obval = destptr; - Py_SET_SIZE((PyVoidScalarObject *)ret, (int) memu); -- ((PyVoidScalarObject *)ret)->descr = -- PyArray_DescrNewFromType(NPY_VOID); -- ((PyVoidScalarObject *)ret)->descr->elsize = (int) memu; - ((PyVoidScalarObject *)ret)->flags = NPY_ARRAY_BEHAVED | - NPY_ARRAY_OWNDATA; - ((PyVoidScalarObject *)ret)->base = NULL; -+ ((PyVoidScalarObject *)ret)->descr = -+ PyArray_DescrNewFromType(NPY_VOID); -+ if (((PyVoidScalarObject *)ret)->descr == NULL) { -+ Py_DECREF(ret); -+ return NULL; -+ } -+ ((PyVoidScalarObject *)ret)->descr->elsize = (int) memu; - return ret; - } - --- -1.8.3.1 - ---- a/numpy/core/src/multiarray/arrayobject.c -+++ b/numpy/core/src/multiarray/arrayobject.c --- -1.8.3.1 - diff --git a/backport-CVE-2021-41496.patch b/backport-CVE-2021-41496.patch deleted file mode 100644 index fe7ae45..0000000 --- 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.24.3.tar.gz similarity index 56% rename from numpy-1.21.4.zip rename to numpy-1.24.3.tar.gz index f3fcd3e..ecc0537 100644 Binary files a/numpy-1.21.4.zip and b/numpy-1.24.3.tar.gz differ diff --git a/numpy.spec b/numpy.spec index 90f39dc..ab31413 100644 --- a/numpy.spec +++ b/numpy.spec @@ -1,23 +1,18 @@ %global modname numpy Name: numpy -Version: 1.21.4 -Release: 6 +Version: 1.24.3 +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/2c/d4/590ae7df5044465cc9fa2db152ae12468694d62d952b1528ecff328ef7fc/numpy-1.24.3.tar.gz BuildRequires: openblas-devel BuildRequires: lapack-devel gcc-gfortran -BuildRequires: python3-Cython >= 0.29.24 chrpath - -Patch0: backport-CVE-2021-41496.patch -Patch1: backport-CVE-2021-41495.patch -Patch2: backport-CVE-2021-34141.patch -Patch3: 0001-add-loongarch-architecture-support.patch +BuildRequires: python3-Cython >= 0.29.24 chrpath gcc-c++ %description NumPy is the fundamental package for scientific computing with Python. It contains among other things: @@ -111,6 +106,9 @@ popd &> /dev/null %changelog +* Wed Jul 19 2023 xu_ping <707078654@qq.com> - 1:1.24.3-1 +- Upgrade to 1.24.3 + * Fri Feb 17 2023 wulei - 1:1.21.4-6 - Delete rpath