diff options
Diffstat (limited to 'dev-python/cbor2')
| -rw-r--r-- | dev-python/cbor2/Manifest | 7 | ||||
| -rw-r--r-- | dev-python/cbor2/cbor2-5.5.1.ebuild | 46 | ||||
| -rw-r--r-- | dev-python/cbor2/cbor2-5.6.1.ebuild | 51 | ||||
| -rw-r--r-- | dev-python/cbor2/cbor2-5.6.2.ebuild | 2 | ||||
| -rw-r--r-- | dev-python/cbor2/files/cbor2-5.6.1-cext.patch | 40 |
5 files changed, 2 insertions, 144 deletions
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest index 556fc93f22a7..4f25dd2f8e9f 100644 --- a/dev-python/cbor2/Manifest +++ b/dev-python/cbor2/Manifest @@ -1,8 +1,3 @@ -AUX cbor2-5.6.1-cext.patch 1256 BLAKE2B 183cc230018447f40b3bd47183e7079a12f083dec569e6f3e88102b0f1a15aba02ca1034091c685119a2b37cc4cdbd63c31b21382c1527d590b2c5ad19e2ccd4 SHA512 129a8ce4e8e2bddf9180e760002ffdd534f0a6b695027b150c7725aa83f7c40a065e214fa385da9a23faf2256b64e4705deaf49a6fe32e01e83ee9c006b3d394 -DIST cbor2-5.5.1.tar.gz 94221 BLAKE2B 651d229c9a4e5fda2ae61302f8bd72a165f15e008333525a301f2fc94dc81259698f4ae9b8c1f3a0b5fadffadd4d55f2ba4bf1445938a10342997bca64ceba31 SHA512 7878b997ae5bdf44cb04b7cef8445a94f11c1722819ea85073bd56f99976cf2c1c1180e72d9ae9cd7dd7d06a6aa55dc1cb3f919a869098a9feede210f8355fb4 -DIST cbor2-5.6.1.tar.gz 99268 BLAKE2B 95a310c6fea00f90ba512d836691ab8fb75ebb9f6b59ca0698b7f97d2c969d2f8809ed2717c48354812f309856a35873c96571194dd86c48a225696b27ec806f SHA512 9ddf2c3690780816ff50ff4ed371435ca45b597b706254c37c9f01d1f1a699892e2c945a72e69b5506a803c41692f399b58b4e32d9409a0197c677e537e656b2 DIST cbor2-5.6.2.tar.gz 100016 BLAKE2B a0a71f40f39ba86c545e5f8462af74e17b6851d350f0c9831be2ac414216437021150d0d7ddb481d62454d5ff73b99ccda7ae0676fd6d53b7e3228616fa0042d SHA512 da98aaf17b17b50bdfc4dbecc1e88e70ed6e99f26e9eb4124de0e92ea2d63f827cee3da83c9aeba1af386cf5a7e95d76be30c79b0a8fde7d53ee8c203b2119b9 -EBUILD cbor2-5.5.1.ebuild 1062 BLAKE2B 13d3865fb6e82044d578bc30b6328672b7636756fc9db0b0f854c4cdac1db3cf74962024b6169d2e197e1e350085afd90f429b5ec83bbaff0c6a364dab964287 SHA512 cb6c47496f474d46934aaa14941a49feef5768a932d6b7e3bb4e353cf0e8db000d55a72d604d2bdb0d819df031daf9bb39aa03b511e0f7275f2c4b8c3fcae8c9 -EBUILD cbor2-5.6.1.ebuild 1167 BLAKE2B 9263de4e221ed5f2baa53b5a6d8c110415ca6b2e087788198782d50063baa6c1861a55d9a2af2bb3f0f6852f5519fa72285694d292bdc9b917c26a211e437d0e SHA512 5341fe49a36b7e65e9d4973e256bcde6ee187cd94c9f00adcf2cc1cec9db3bd2943a3130a8e730cda5e0fae5fb7d4b66c7a008ebb3b632118300386e4990070b -EBUILD cbor2-5.6.2.ebuild 1067 BLAKE2B 586c29cf11f431785c107ebf4497e1620634584839d134b335822656d5af78601631f3f78881092789933c55899fdccbe55d3c8086c07dc779de1f1a2897bfb3 SHA512 d8aaa4c7ea558bb6ca33d61a32b73d3cb662309163a0a0cc477493c4ca2371e70c15f7bf7f6a107ef468aa76baac03fe83dd6598b407945edfab06fa5e75d72d +EBUILD cbor2-5.6.2.ebuild 1062 BLAKE2B f51df7b3cd4423e11a3d241cffcabf9d746d743eabf95f988a2f0dfb5734e6e0882a7218568f45490d5def020f6a7c6cea6f25256cd8627e1d5ebe12e191554a SHA512 3b582afaaeae41d444435087431535d2d1f14c33b9e6fd435e90ece13d87534f544d35bb240f8d54cf42cf8d698308850c2281f682c9fc5bbf24d6a8f2dfa5cc MISC metadata.xml 1036 BLAKE2B cae01cfe0040332893e0ca9e4c5da81bf13d9a76f83a3cc24a63b0309bea83ba2ada3aeea7980837316d92a5cc176a7925cff5c4468500f68d561dd14131dd55 SHA512 1f42c1ec255c7687e66fd350e3353cf2168f654075b710dab89f71e284691beba52def321ab471accc5eaef2df1bd3561150faee1f1dc3c739843e64c49f7f21 diff --git a/dev-python/cbor2/cbor2-5.5.1.ebuild b/dev-python/cbor2/cbor2-5.5.1.ebuild deleted file mode 100644 index d4f574904696..000000000000 --- a/dev-python/cbor2/cbor2-5.5.1.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support" -HOMEPAGE=" - https://github.com/agronholm/cbor2/ - https://pypi.org/project/cbor2/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" -IUSE="+native-extensions" - -BDEPEND=" - >=dev-python/setuptools-61[${PYTHON_USEDEP}] - >=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}] - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - # remove pytest-cov dep - sed -i -e "s/--cov//" pyproject.toml || die - distutils-r1_python_prepare_all -} - -python_compile() { - local -x CBOR2_BUILD_C_EXTENSION=1 - # pypy3 not supported upstream - if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then - CBOR2_BUILD_C_EXTENSION=0 - fi - distutils-r1_python_compile -} diff --git a/dev-python/cbor2/cbor2-5.6.1.ebuild b/dev-python/cbor2/cbor2-5.6.1.ebuild deleted file mode 100644 index 8c9260dafcb0..000000000000 --- a/dev-python/cbor2/cbor2-5.6.1.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_EXT=1 -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( pypy3 python3_{10..12} ) - -inherit distutils-r1 pypi - -DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support" -HOMEPAGE=" - https://github.com/agronholm/cbor2/ - https://pypi.org/project/cbor2/ -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="+native-extensions" - -BDEPEND=" - >=dev-python/setuptools-61[${PYTHON_USEDEP}] - >=dev-python/setuptools-scm-6.4[${PYTHON_USEDEP}] - test? ( - dev-python/hypothesis[${PYTHON_USEDEP}] - ) -" - -distutils_enable_tests pytest - -python_prepare_all() { - local PATCHES=( - # https://github.com/agronholm/cbor2/issues/213 - "${FILESDIR}/${P}-cext.patch" - ) - - # remove pytest-cov dep - sed -i -e "s/--cov//" pyproject.toml || die - distutils-r1_python_prepare_all -} - -python_compile() { - local -x CBOR2_BUILD_C_EXTENSION=1 - # pypy3 not supported upstream - if [[ ${EPYTHON} == pypy3 ]] || ! use native-extensions; then - CBOR2_BUILD_C_EXTENSION=0 - fi - distutils-r1_python_compile -} diff --git a/dev-python/cbor2/cbor2-5.6.2.ebuild b/dev-python/cbor2/cbor2-5.6.2.ebuild index 4d83e1c675b4..33573d3fc1ed 100644 --- a/dev-python/cbor2/cbor2-5.6.2.ebuild +++ b/dev-python/cbor2/cbor2-5.6.2.ebuild @@ -17,7 +17,7 @@ HOMEPAGE=" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~s390 ~sparc x86" IUSE="+native-extensions" BDEPEND=" diff --git a/dev-python/cbor2/files/cbor2-5.6.1-cext.patch b/dev-python/cbor2/files/cbor2-5.6.1-cext.patch deleted file mode 100644 index 1695038e4b42..000000000000 --- a/dev-python/cbor2/files/cbor2-5.6.1-cext.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4de6991ba29bf2290d7b9d83525eda7d021873df Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Alex=20Gr=C3=B6nholm?= <alex.gronholm@nextday.fi> -Date: Sat, 3 Feb 2024 13:03:38 +0200 -Subject: [PATCH] Check PyObject_Hash() return value for errors - -Fixes #213. ---- - docs/versionhistory.rst | 5 +++++ - source/tags.c | 2 ++ - 2 files changed, 7 insertions(+) - -diff --git a/docs/versionhistory.rst b/docs/versionhistory.rst -index 70948c5..c91cdd0 100644 ---- a/docs/versionhistory.rst -+++ b/docs/versionhistory.rst -@@ -5,6 +5,11 @@ Version history - - This library adheres to `Semantic Versioning <http://semver.org/>`_. - -+**UNRELEASED** -+ -+- Fixed ``__hash__()`` of the C version of the ``CBORTag`` type crashing when there's a recursive -+ reference cycle -+ - **5.6.1** (2024-02-01) - - - Fixed use-after-free in the decoder's C version when prematurely encountering the end of stream -diff --git a/source/tags.c b/source/tags.c -index b718f55..ceb0916 100644 ---- a/source/tags.c -+++ b/source/tags.c -@@ -182,6 +182,8 @@ CBORTag_hash(CBORTagObject *self) - goto exit; - - ret = PyObject_Hash(tmp); -+ if (ret == -1) -+ goto exit; - - // Remove id(self) from thread_locals.running_hashes - if (PySet_Discard(running_hashes, self_id) == -1) { |