From ae1877948654cb5a3418f67542d230ac8b868ab1 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Apr 09 2022 19:10:07 +0000 Subject: Update to 0.10.0. --- diff --git a/.gitignore b/.gitignore index 729deca..098295b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ py-radix-0.5.tar.gz /v0.9.3.tar.gz +/v0.10.0.tar.gz diff --git a/py-radix-0.5-memleak.patch b/py-radix-0.5-memleak.patch deleted file mode 100644 index 89e8f1d..0000000 --- a/py-radix-0.5-memleak.patch +++ /dev/null @@ -1,17 +0,0 @@ -With thanks to Debian bug 512830. Add patch by Alexander Sabourenkov -to fix memory leak. -Fedora patch originally taken from -http://ftp-stud.hs-esslingen.de/debian/pool/main/p/py-radix/py-radix_0.5-2.diff.gz - - -diff -u py-radix-0.5.orig/radix_python.c py-radix-0.5/radix_python.c ---- py-radix-0.5.orig/radix_python.c 2007-12-17 20:49:01.000000000 -0600 -+++ py-radix-0.5/radix_python.c 2009-10-23 09:03:50.000000000 -0500 -@@ -95,6 +95,7 @@ - Py_XDECREF(self->family); - Py_XDECREF(self->network); - Py_XDECREF(self->prefix); -+ Py_XDECREF(self->packed); - PyObject_Del(self); - } - diff --git a/py-radix.spec b/py-radix.spec index 91e0c18..9d0822e 100644 --- a/py-radix.spec +++ b/py-radix.spec @@ -1,7 +1,7 @@ Name: py-radix Summary: Radix tree data structure for Python -Version: 0.9.3 -Release: 23%{?dist} +Version: 0.10.0 +Release: 1%{?dist} URL: https://github.com/mjschultz/py-radix Source0: https://github.com/mjschultz/py-radix/archive/v%{version}.tar.gz @@ -65,6 +65,9 @@ touch inet_ntop.c strlcpy.c %{python3_sitearch}/radix* %changelog +* Sat Apr 09 2022 Kevin Fenzi - 0.10.0-1 +- Update to 0.10.0. + * Fri Jan 21 2022 Fedora Release Engineering - 0.9.3-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/py_ssize_t_clean.patch b/py_ssize_t_clean.patch index c95d7bd..d145812 100644 --- a/py_ssize_t_clean.patch +++ b/py_ssize_t_clean.patch @@ -1,5 +1,16 @@ +From b77a77dadfbcbaa0384d1b87728829bd1683937f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= +Date: Tue, 31 Aug 2021 00:58:25 +0200 +Subject: [PATCH] Define PY_SSIZE_T_CLEAN, use ssize_t as the index type (PEP + 353) + +Fixes https://github.com/mjschultz/py-radix/issues/54 +--- + radix/_radix.c | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + diff --git a/radix/_radix.c b/radix/_radix.c -index 1e7787f..4d544a2 100644 +index 5a1b88f..287e893 100644 --- a/radix/_radix.c +++ b/radix/_radix.c @@ -14,6 +14,7 @@ @@ -10,7 +21,7 @@ index 1e7787f..4d544a2 100644 #include "Python.h" #include "structmember.h" #include "_radix/radix.h" -@@ -257,7 +258,7 @@ Radix_dealloc(RadixObject *self) +@@ -256,7 +257,7 @@ Radix_dealloc(RadixObject *self) } static prefix_t @@ -19,66 +30,66 @@ index 1e7787f..4d544a2 100644 { prefix_t *old_prefix = prefix; const char *errmsg; -@@ -353,7 +354,7 @@ Radix_add(RadixObject *self, PyObject *args, PyObject *kw_args) +@@ -352,7 +353,7 @@ Radix_add(RadixObject *self, PyObject *args, PyObject *kw_args) char *addr = NULL, *packed = NULL; long prefixlen = -1; - int packlen = -1; + Py_ssize_t packlen = -1; - if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|sls#:add", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|zlz#:add", keywords, &addr, &prefixlen, &packed, &packlen)) -@@ -382,7 +383,7 @@ Radix_delete(RadixObject *self, PyObject *args, PyObject *kw_args) +@@ -381,7 +382,7 @@ Radix_delete(RadixObject *self, PyObject *args, PyObject *kw_args) char *addr = NULL, *packed = NULL; long prefixlen = -1; - int packlen = -1; + Py_ssize_t packlen = -1; - if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|sls#:delete", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|zlz#:delete", keywords, &addr, &prefixlen, &packed, &packlen)) -@@ -425,7 +426,7 @@ Radix_search_exact(RadixObject *self, PyObject *args, PyObject *kw_args) +@@ -424,7 +425,7 @@ Radix_search_exact(RadixObject *self, PyObject *args, PyObject *kw_args) char *addr = NULL, *packed = NULL; long prefixlen = -1; - int packlen = -1; + Py_ssize_t packlen = -1; - if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|sls#:search_exact", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|zlz#:search_exact", keywords, &addr, &prefixlen, &packed, &packlen)) -@@ -463,7 +464,7 @@ Radix_search_best(RadixObject *self, PyObject *args, PyObject *kw_args) +@@ -462,7 +463,7 @@ Radix_search_best(RadixObject *self, PyObject *args, PyObject *kw_args) char *addr = NULL, *packed = NULL; long prefixlen = -1; - int packlen = -1; + Py_ssize_t packlen = -1; - if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|sls#:search_best", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|zlz#:search_best", keywords, &addr, &prefixlen, &packed, &packlen)) -@@ -501,7 +502,7 @@ Radix_search_worst(RadixObject *self, PyObject *args, PyObject *kw_args) +@@ -500,7 +501,7 @@ Radix_search_worst(RadixObject *self, PyObject *args, PyObject *kw_args) char *addr = NULL, *packed = NULL; long prefixlen = -1; - int packlen = -1; + Py_ssize_t packlen = -1; - if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|sls#:search_worst", keywords, + if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|zlz#:search_worst", keywords, &addr, &prefixlen, &packed, &packlen)) -@@ -544,7 +545,7 @@ Radix_search_covered(RadixObject *self, PyObject *args, PyObject *kw_args) +@@ -543,7 +544,7 @@ Radix_search_covered(RadixObject *self, PyObject *args, PyObject *kw_args) char *addr = NULL, *packed = NULL; long prefixlen = -1; - int packlen = -1; + Py_ssize_t packlen = -1; - if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|sls#:search_covered", keywords, &addr, &prefixlen, &packed, &packlen)) + if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|zlz#:search_covered", keywords, &addr, &prefixlen, &packed, &packlen)) return NULL; -@@ -577,7 +578,7 @@ Radix_search_covering(RadixObject *self, PyObject *args, PyObject *kw_args) +@@ -576,7 +577,7 @@ Radix_search_covering(RadixObject *self, PyObject *args, PyObject *kw_args) char *addr = NULL, *packed = NULL; long prefixlen = -1; - int packlen = -1; + Py_ssize_t packlen = -1; - if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|sls#:search_covering", keywords, &addr, &prefixlen, &packed, &packlen)) { + if (!PyArg_ParseTupleAndKeywords(args, kw_args, "|zlz#:search_covering", keywords, &addr, &prefixlen, &packed, &packlen)) { return NULL; diff --git a/sources b/sources index c053aa0..14dba97 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c842ef19b05f7da30c2fd83beaf945f v0.9.3.tar.gz +SHA512 (v0.10.0.tar.gz) = b4b6a35aad76c19c2eaa5bff828cbec5182cc4074397d4b9e5c39ac76bd9045c86600ed52ac06632abac8a9e70d6e82aa9e741ab3eb92970453bb14acdba72ea