From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D7E5415800B for ; Wed, 5 Apr 2023 09:14:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B454DE07D0; Wed, 5 Apr 2023 09:14:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B5A3E07D0 for ; Wed, 5 Apr 2023 09:14:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70DB9340E9F for ; Wed, 5 Apr 2023 09:14:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BAE37A19 for ; Wed, 5 Apr 2023 09:14:24 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1680686052.cce314ad5ff63b3848b4c360d00d0b1272f2c703.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/hiredis/files/, dev-python/hiredis/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/hiredis/Manifest dev-python/hiredis/files/hiredis-2.0.0-CVE-2021-32765.patch dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch dev-python/hiredis/hiredis-2.0.0-r2.ebuild dev-python/hiredis/metadata.xml X-VCS-Directories: dev-python/hiredis/files/ dev-python/hiredis/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: cce314ad5ff63b3848b4c360d00d0b1272f2c703 X-VCS-Branch: master Date: Wed, 5 Apr 2023 09:14:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dad93db9-f03b-4081-9a4e-f5ae3d3f622c X-Archives-Hash: 4b867a3b7641e7d43aa145431080afda commit: cce314ad5ff63b3848b4c360d00d0b1272f2c703 Author: Michał Górny gentoo org> AuthorDate: Wed Apr 5 09:06:36 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Apr 5 09:14:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cce314ad dev-python/hiredis: Remove old Signed-off-by: Michał Górny gentoo.org> dev-python/hiredis/Manifest | 1 - .../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/metadata.xml | 3 -- 5 files changed, 90 deletions(-) diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest index bf1b5ba11125..cd80c0be9b4b 100644 --- a/dev-python/hiredis/Manifest +++ b/dev-python/hiredis/Manifest @@ -1,2 +1 @@ -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 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/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 -