From ad77dc19e91d2c023f80e11e8974536d80e3a743 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 5 Apr 2023 11:25:00 +0100 Subject: gentoo auto-resync : 05:04:2023 - 11:25:00 --- dev-python/hiredis/Manifest | 8 ++--- .../files/hiredis-2.0.0-CVE-2021-32765.patch | 36 ---------------------- .../hiredis/files/hiredis-2.0.0-system-libs.patch | 14 --------- dev-python/hiredis/hiredis-2.0.0-r2.ebuild | 36 ---------------------- dev-python/hiredis/hiredis-2.2.2-r1.ebuild | 2 +- dev-python/hiredis/metadata.xml | 3 -- 6 files changed, 3 insertions(+), 96 deletions(-) delete mode 100644 dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch delete mode 100644 dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch delete mode 100644 dev-python/hiredis/hiredis-2.0.0-r2.ebuild (limited to 'dev-python/hiredis') diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest index c62ebc2f67b2..62f3f872434a 100644 --- a/dev-python/hiredis/Manifest +++ b/dev-python/hiredis/Manifest @@ -1,8 +1,4 @@ -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 DIST hiredis-2.2.2.gh.tar.gz 18010 BLAKE2B 67ab7c3f0667d3cf33abea58fbe37bcc28beb569f6f3da966f191d00965faa5a835a286172179d6f33f4e0fa81743fa345829f04d9d89350ab1394cc0c168147 SHA512 8a42df63911000cd119da33e7fea25fa1a5244a86016818bcb6c6e12c042b12b00b7272633d85dcf921fd2eba67145e3258c64689be799a0f59766e541139120 -EBUILD hiredis-2.0.0-r2.ebuild 825 BLAKE2B 431f260350264549e704c43257e0cadabdd5b0736c0fcf1e7fc1533de191b7dbd390b7f80f076b7e162b05319881ab956f7e33ac84e710d006d8e5711f050c37 SHA512 b934178ce581f3dba577e69d0dbbf368a76830179fb1f525f4661274ccb715ed590880225be992f52f991ec6edc2a13c48a241f6199a8a74f466ead5d8e6f4cf -EBUILD hiredis-2.2.2-r1.ebuild 726 BLAKE2B 9c2c86b79dd6a318aedff5cf718e640b47cb8f31bde8e02cd8bcb36d651175123a0af187686713e07ba42bc043d2771b2dde42274a9cfb877f42b54a7e19eaae SHA512 079d5dee64da6aef64c182d54e4144fc069f8be768e85e55269a0bc1f14ef2f836d0a69153a230eb7247fea5afdd85ead9f976b057fc5302b06172647958e4ca -MISC metadata.xml 590 BLAKE2B 546eb7e337de194c605799553964c62f4376e0b28588b7b8f7e1d22d82bb347c7dbff99d1dc947c24491c045b506aa3965e9a1bfbfcb97741d5a0c7e075576f0 SHA512 76b32faa707c7bcca41b1018c58e9782283e707865a8b99926f0f6060f915cbd4ea6b35da1a906385b5925d714ec3bd4f587f1065b01a826d8a6a3764af92a87 +EBUILD hiredis-2.2.2-r1.ebuild 722 BLAKE2B 7cfd1470a2623abec05c383f27d9d40d825b87138559875ada4f2e867883fa987deb19efc773453b1b70e9464a0f97ec2a4da12d66c858c77cc2469b3349191e SHA512 6b05c836d300b713d06d93397e99e63940d1bb257e5f55e4f0c6b8d370977feaae6c0da783f7cf3f21d5402ccf49b1f7fdff20fa1dba3345a8bb5df3a9d4bd1f +MISC metadata.xml 493 BLAKE2B 9ea63c09baa3e95097afce5edb30a2e1f358eedcc41fbd6f66492e3701bce65fa91e83c236d69b39ddde17f3d92401ca39ec70fbe12b6bc74dcde3e6e2495490 SHA512 42cc38851c3ffaddeb32aefed35551a444fdd1e9463dfca2f320a184445567174b44de84981dbd4613029abfcef28a69208bbb2857811308667cb54102357c83 diff --git a/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch b/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch deleted file mode 100644 index ad1bb80ac0de..000000000000 --- a/dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/vendor/hiredis/alloc.c -+++ b/vendor/hiredis/alloc.c -@@ -68,6 +68,10 @@ void *hi_malloc(size_t size) { - } - - void *hi_calloc(size_t nmemb, size_t size) { -+ /* Overflow check as the user can specify any arbitrary allocator */ -+ if (SIZE_MAX / size < nmemb) -+ return NULL; -+ - return hiredisAllocFns.callocFn(nmemb, size); - } - -diff --git a/alloc.h b/alloc.h -index 34a05f4..771f9fe 100644 ---- a/vendor/hiredis/alloc.h -+++ b/vendor/hiredis/alloc.h -@@ -32,6 +32,7 @@ - #define HIREDIS_ALLOC_H - - #include /* for size_t */ -+#include - - #ifdef __cplusplus - extern "C" { -@@ -59,6 +60,10 @@ static inline void *hi_malloc(size_t size) { - } - - static inline void *hi_calloc(size_t nmemb, size_t size) { -+ /* Overflow check as the user can specify any arbitrary allocator */ -+ if (SIZE_MAX / size < nmemb) -+ return NULL; -+ - return hiredisAllocFns.callocFn(nmemb, size); - } - diff --git a/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch b/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch deleted file mode 100644 index 74f14cdc00b4..000000000000 --- a/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- hiredis-2.0.0/setup.py -+++ hiredis-2.0.0/setup.py -@@ -11,9 +11,8 @@ - return module.__version__ - - ext = Extension("hiredis.hiredis", -- sources=sorted(glob.glob("src/*.c") + -- ["vendor/hiredis/%s.c" % src for src in ("alloc", "read", "sds")]), -- include_dirs=["vendor"]) -+ sources=sorted(glob.glob("src/*.c")), -+ libraries=["hiredis"]) - - setup( - name="hiredis", diff --git a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild b/dev-python/hiredis/hiredis-2.0.0-r2.ebuild deleted file mode 100644 index 5e6e08f77029..000000000000 --- a/dev-python/hiredis/hiredis-2.0.0-r2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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}" - -PATCHES=( - "${FILESDIR}"/${P}-CVE-2021-32765.patch -) - -src_prepare() { - use system-libs && PATCHES+=( - "${FILESDIR}"/${P}-system-libs.patch - ) - sed -i -e 's:description-file:description_file:' setup.cfg || die - default -} - -python_test() { - cd test || die - "${EPYTHON}" -m unittest -v reader.ReaderTest || die "tests failed" -} diff --git a/dev-python/hiredis/hiredis-2.2.2-r1.ebuild b/dev-python/hiredis/hiredis-2.2.2-r1.ebuild index 504ba13a0426..08c9c7246286 100644 --- a/dev-python/hiredis/hiredis-2.2.2-r1.ebuild +++ b/dev-python/hiredis/hiredis-2.2.2-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/redis/hiredis-py/archive/refs/tags/v${PV}.tar.gz -> LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="" DEPEND=">=dev-libs/hiredis-1.0.0:=" diff --git a/dev-python/hiredis/metadata.xml b/dev-python/hiredis/metadata.xml index 260530157e29..3f8f3a47818f 100644 --- a/dev-python/hiredis/metadata.xml +++ b/dev-python/hiredis/metadata.xml @@ -13,7 +13,4 @@ hiredis redis/hiredis-py - - Use dev-libs/hiredis from system - -- cgit v1.2.3