Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-hiredis for openSUSE:Factory
checked in at 2022-01-03 10:49:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-hiredis (Old)
and /work/SRC/openSUSE:Factory/.python-hiredis.new.1896 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-hiredis"
Mon Jan 3 10:49:27 2022 rev:6 rq:943349 version:1.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-hiredis/python-hiredis.changes
2021-03-03 18:35:55.751416503 +0100
+++ /work/SRC/openSUSE:Factory/.python-hiredis.new.1896/python-hiredis.changes
2022-01-03 10:50:02.547594762 +0100
@@ -7,0 +8,2 @@
+- Add bump_hiredis_0.14.1.patch to allow using more recent (and
+ without some CVEs) version of hiredis.
@@ -14 +16,2 @@
- * BUGFIX: READEME.md has UTF-8 characters, setup.py will fail on systems
where the locale is not UTF-8. (see #89)
+ * BUGFIX: READEME.md has UTF-8 characters, setup.py will fail on
+ systems where the locale is not UTF-8. (see #89)
Old:
----
v1.1.0.tar.gz
New:
----
bump_hiredis_0.14.1.patch
hiredis-py-1.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-hiredis.spec ++++++
--- /var/tmp/diff_new_pack.sLUbRm/_old 2022-01-03 10:50:03.347595069 +0100
+++ /var/tmp/diff_new_pack.sLUbRm/_new 2022-01-03 10:50:03.351595070 +0100
@@ -17,16 +17,22 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
+%define modname hiredis-py
Name: python-hiredis
Version: 1.1.0
Release: 0
Summary: Python wrapper for hiredis
License: BSD-3-Clause
URL: https://github.com/redis/hiredis-py
-Source: https://github.com/redis/hiredis-py/archive/v%{version}.tar.gz
+Source:
https://github.com/redis/%{modname}/archive/v%{version}.tar.gz#/%{modname}-%{version}.tar.gz
Patch0: 0001-Use-system-libhiredis.patch
+# PATCH-FIX-UPSTREAM drop-vendor-sources.patch gh#redis/hiredis-py#90
[email protected]
+# Allow to use platform hiredis libs on build
Patch2: drop-vendor-sources.patch
-Patch3: hiredis1.patch
+# PATCH-FIX-UPSTREAM bump_hiredis_0.14.1.patch gh#redis/hiredis-py#95
[email protected]
+# Use more recent version of hiredis.
+Patch3: bump_hiredis_0.14.1.patch
+Patch4: hiredis1.patch
BuildRequires: %{python_module devel}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -51,7 +57,7 @@
%check
%python_exec setup.py build_ext --inplace
export PYTHONPATH=%{buildroot}%{$python_sitearch}
-%python_exec test.py -v
+%python_exec test.py
%files %{python_files}
%license COPYING
++++++ 0001-Use-system-libhiredis.patch ++++++
--- /var/tmp/diff_new_pack.sLUbRm/_old 2022-01-03 10:50:03.403595090 +0100
+++ /var/tmp/diff_new_pack.sLUbRm/_new 2022-01-03 10:50:03.403595090 +0100
@@ -12,10 +12,8 @@
setup.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
-Index: hiredis-py-1.0.0/setup.py
-===================================================================
---- hiredis-py-1.0.0.orig/setup.py
-+++ hiredis-py-1.0.0/setup.py
+--- a/setup.py
++++ b/setup.py
@@ -13,7 +13,8 @@ def version():
ext = Extension("hiredis.hiredis",
sources=sorted(glob.glob("src/*.c") +
++++++ bump_hiredis_0.14.1.patch ++++++
>From 638cd0d1909616afa44ce534cd5dd77f91edf295 Mon Sep 17 00:00:00 2001
From: Guy Korland <[email protected]>
Date: Wed, 18 Mar 2020 11:53:41 +0200
Subject: [PATCH 1/3] upgrade hiredis to 0.14.1
---
vendor/hiredis | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/reader.c
+++ b/src/reader.c
@@ -169,7 +169,7 @@ redisReplyObjectFunctions hiredis_Object
static void Reader_dealloc(hiredis_ReaderObject *self) {
// we don't need to free self->encoding as the buffer is managed by Python
// https://docs.python.org/3/c-api/arg.html#strings-and-buffers
- redisReplyReaderFree(self->reader);
+ redisReaderFree(self->reader);
Py_XDECREF(self->protocolErrorClass);
Py_XDECREF(self->replyErrorClass);
@@ -293,7 +293,7 @@ static PyObject *Reader_feed(hiredis_Rea
goto error;
}
- redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
+ redisReaderFeed(self->reader, (char *)buf.buf + off, len);
PyBuffer_Release(&buf);
Py_RETURN_NONE;
@@ -312,8 +312,8 @@ static PyObject *Reader_gets(hiredis_Rea
return NULL;
}
- if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
- errstr = redisReplyReaderGetError(self->reader);
+ if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
+ errstr = redisReaderGetError(self->reader);
/* protocolErrorClass might be a callable. call it, then use it's type
*/
err = createError(self->protocolErrorClass, errstr, strlen(errstr));
if (err != NULL) {
++++++ drop-vendor-sources.patch ++++++
--- /var/tmp/diff_new_pack.sLUbRm/_old 2022-01-03 10:50:03.431595100 +0100
+++ /var/tmp/diff_new_pack.sLUbRm/_new 2022-01-03 10:50:03.435595102 +0100
@@ -1,7 +1,9 @@
-Index: hiredis-py-1.0.0/setup.py
-===================================================================
---- hiredis-py-1.0.0.orig/setup.py
-+++ hiredis-py-1.0.0/setup.py
+---
+ setup.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/setup.py
++++ b/setup.py
@@ -11,8 +11,7 @@ def version():
return module.__version__
++++++ hiredis1.patch ++++++
--- /var/tmp/diff_new_pack.sLUbRm/_old 2022-01-03 10:50:03.447595107 +0100
+++ /var/tmp/diff_new_pack.sLUbRm/_new 2022-01-03 10:50:03.451595108 +0100
@@ -4,16 +4,12 @@
Subject: [PATCH] Bump hiredis from 0.13.3 to 1.0.0
---
- setup.py | 2 +-
- src/reader.c | 64 +++++++++++++++++++++++++++++++++++++++++++-------
- test/reader.py | 36 ++++++++++++++++++++++++++++
- vendor/hiredis | 2 +-
- 4 files changed, 93 insertions(+), 11 deletions(-)
+ src/reader.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
+ test/reader.py | 36 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 87 insertions(+), 5 deletions(-)
-Index: hiredis-py-1.1.0/src/reader.c
-===================================================================
---- hiredis-py-1.1.0.orig/src/reader.c
-+++ hiredis-py-1.1.0/src/reader.c
+--- a/src/reader.c
++++ b/src/reader.c
@@ -69,8 +69,26 @@ static void *tryParentize(const redisRea
PyObject *parent;
if (task && task->parent) {
@@ -74,7 +70,7 @@
return tryParentize(task, obj);
}
-@@ -148,28 +180,42 @@ static void *createIntegerObject(const r
+@@ -148,21 +180,35 @@ static void *createIntegerObject(const r
return tryParentize(task, obj);
}
@@ -111,38 +107,8 @@
freeObject // void (*freeObject)(void*);
};
- static void Reader_dealloc(hiredis_ReaderObject *self) {
- // we don't need to free self->encoding as the buffer is managed by Python
- // https://docs.python.org/3/c-api/arg.html#strings-and-buffers
-- redisReplyReaderFree(self->reader);
-+ redisReaderFree(self->reader);
- Py_XDECREF(self->protocolErrorClass);
- Py_XDECREF(self->replyErrorClass);
-
-@@ -293,7 +339,7 @@ static PyObject *Reader_feed(hiredis_Rea
- goto error;
- }
-
-- redisReplyReaderFeed(self->reader, (char *)buf.buf + off, len);
-+ redisReaderFeed(self->reader, (char *)buf.buf + off, len);
- PyBuffer_Release(&buf);
- Py_RETURN_NONE;
-
-@@ -312,8 +358,8 @@ static PyObject *Reader_gets(hiredis_Rea
- return NULL;
- }
-
-- if (redisReplyReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
-- errstr = redisReplyReaderGetError(self->reader);
-+ if (redisReaderGetReply(self->reader, (void**)&obj) == REDIS_ERR) {
-+ errstr = redisReaderGetError(self->reader);
- /* protocolErrorClass might be a callable. call it, then use it's
type */
- err = createError(self->protocolErrorClass, errstr, strlen(errstr));
- if (err != NULL) {
-Index: hiredis-py-1.1.0/test/reader.py
-===================================================================
---- hiredis-py-1.1.0.orig/test/reader.py
-+++ hiredis-py-1.1.0/test/reader.py
+--- a/test/reader.py
++++ b/test/reader.py
@@ -118,6 +118,42 @@ class ReaderTest(TestCase):
self.reader.feed((":%d\r\n" % value).encode("ascii"))
self.assertEquals(value, self.reply())
