gentoo auto-resync : 24:02:2023 - 21:49:24

4 files changed, 84 insertions, 2 deletions

diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 7d148277c098..0db2b873411c 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,5 +1,8 @@
 AUX hiredis-2.0.0-CVE-2021-32765.patch 923 BLAKE2B ea62b3f4ca1ea622ea9eed89af3ee267b0e5355093c872e582346130c3107e6cd109b8a266c68b79c00440f550f3a73c3c1c12d3cb3cd3c61fd22289532d5349 SHA512 7ad798620f7cfd62aad7d73568410f04001edd70ea2a3cfe26242b309f4dafb44dd78e9de399a050e12164ebbe8160ed324f594ec4d1cf44b5a7b5b70d27d9b3
 AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
+AUX hiredis-2.2.2-system-libs.patch 1421 BLAKE2B d10de294e0e15ec1b816505c852b0e82140874bd3f1434515ecd69d04236efcc8fbf24f6b261db138979d1547892bf71e1c3c5e74317ef43c3597b379c03231e SHA512 dcc64f1a83cfe5c956c65c1bf1f9ef31b3c66e393d0dcec342f9f8cd6265a41309a03ddae7d86fa85806a05dac7bb89d29a3b7ebb955d62409fbb719e7c8004a
 DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
-EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B d50f1a59a9a056880cbc51a5b5bdf22ce735b5262d460494c108fef131e5971a900e91242e6fc98a3e8589b967eb6af3de00b10d77c31bc74cb1b195de710b11 SHA512 91c458497cfd29ef0dd1a51ee7667ad9bfbe094f46210dd39644b8ef03b9046dfc1e68a36e24c0594c2f356abbe94f0ded05074806546ad22016083caa121d0f
+DIST hiredis-2.2.2.tar.gz 84086 BLAKE2B f8a3b3baceb1b68d87202fe1fdd954d1e2a3320dab93acbe2d6f86a462ca18814c41416f84b8ba306a7c9af18560375e6523025c3b81f3c92e89620c68ed6a7e SHA512 abb6883af0d186f0ada10ebb2128cc31c8e84273b75de762097489b25a28ed4442bf33a9c088152843aadfcb4daaae6ff65a21cf0e5d8a07a60a7e3fac1ab855
+EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B 431f260350264549e704c43257e0cadabdd5b0736c0fcf1e7fc1533de191b7dbd390b7f80f076b7e162b05319881ab956f7e33ac84e710d006d8e5711f050c37 SHA512 b934178ce581f3dba577e69d0dbbf368a76830179fb1f525f4661274ccb715ed590880225be992f52f991ec6edc2a13c48a241f6199a8a74f466ead5d8e6f4cf
+EBUILD hiredis-2.2.2.ebuild 604 BLAKE2B 430cfc9a02a0c2620268ce2636d35c1a5afaa29f44cc08c58a115e1a728abf4ecd13186b9108cd6c56ab9a3d77e3acf76ac3f9cd49482daeaaf77e888d26c5a0 SHA512 16ec93824f16aea8f2ac2ddda8642815e70f2508bb688b69252ddbd823118fb7592f44b99c981671501c3fe12eab65209e863c66cfdc89d70ef2ba700699627f
 MISC metadata.xml 590 BLAKE2B 546eb7e337de194c605799553964c62f4376e0b28588b7b8f7e1d22d82bb347c7dbff99d1dc947c24491c045b506aa3965e9a1bfbfcb97741d5a0c7e075576f0 SHA512 76b32faa707c7bcca41b1018c58e9782283e707865a8b99926f0f6060f915cbd4ea6b35da1a906385b5925d714ec3bd4f587f1065b01a826d8a6a3764af92a87
diff --git a/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch b/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch
new file mode 100644
index 000000000000..67f6a5650f66
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-2.2.2-system-libs.patch
@@ -0,0 +1,53 @@
+--- hiredis-2.2.2.orig/setup.py
++++ hiredis-2.2.2/setup.py
+@@ -18,8 +18,7 @@
+ 
+ 
+ def get_sources():
+-    hiredis_sources = ("alloc", "async", "hiredis", "net", "read", "sds", "sockcompat")
+-    return sorted(glob.glob("src/*.c") + ["vendor/hiredis/%s.c" % src for src in hiredis_sources])
++    return sorted(glob.glob("src/*.c"))
+ 
+ 
+ def get_linker_args():
+@@ -38,17 +37,16 @@
+ 
+ def get_libraries():
+     if 'win32' in sys.platform:
+-        return ["ws2_32", ]
++        return ["ws2_32", "hiredis"]
+     else:
+-        return []
++        return ["hiredis"]
+ 
+ 
+ ext = Extension("hiredis.hiredis",
+                 sources=get_sources(),
+                 extra_compile_args=get_compiler_args(),
+                 extra_link_args=get_linker_args(),
+-                libraries=get_libraries(),
+-                include_dirs=["vendor"])
++                libraries=get_libraries())
+ 
+ setup(
+     name="hiredis",
+--- hiredis-2.2.2.orig/src/pack.c
++++ hiredis-2.2.2/src/pack.c
+@@ -16,7 +16,7 @@
+ extern sds sdsnewlen(const void *init, size_t initlen);
+ #endif
+ 
+-#include <hiredis/sdsalloc.h>
++#include <hiredis/sds.h>
+ 
+ PyObject *
+ pack_command(PyObject *cmd)
+@@ -32,7 +32,7 @@
+     }
+ 
+     Py_ssize_t tokens_number = PyTuple_Size(cmd);
+-    sds *tokens = s_malloc(sizeof(sds) * tokens_number);
++    sds *tokens = sds_malloc(sizeof(sds) * tokens_number);
+     if (tokens == NULL)
+     {
+         return PyErr_NoMemory();
diff --git a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
index 6714e80ba795..5e6e08f77029 100644
--- a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
+++ b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} pypy3 )
 inherit distutils-r1
diff --git a/dev-python/hiredis/hiredis-2.2.2.ebuild b/dev-python/hiredis/hiredis-2.2.2.ebuild
new file mode 100644
index 000000000000..c92b75861004
--- /dev/null
+++ b/dev-python/hiredis/hiredis-2.2.2.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/redis/hiredis-py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="system-libs"
+
+DEPEND="system-libs? ( >=dev-libs/hiredis-1.0.0:= )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use system-libs && PATCHES+=(
+		"${FILESDIR}"/${P}-system-libs.patch
+	)
+	default
+}