diff options
Diffstat (limited to 'dev-python/protobuf-python')
-rw-r--r-- | dev-python/protobuf-python/Manifest | 13 | ||||
-rw-r--r-- | dev-python/protobuf-python/files/protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch | 42 | ||||
-rw-r--r-- | dev-python/protobuf-python/metadata.xml | 4 | ||||
-rw-r--r-- | dev-python/protobuf-python/protobuf-python-3.18.2.ebuild (renamed from dev-python/protobuf-python/protobuf-python-3.16.0.ebuild) | 7 | ||||
-rw-r--r-- | dev-python/protobuf-python/protobuf-python-3.19.1.ebuild | 4 | ||||
-rw-r--r-- | dev-python/protobuf-python/protobuf-python-3.19.3.ebuild | 64 | ||||
-rw-r--r-- | dev-python/protobuf-python/protobuf-python-9999.ebuild | 4 |
7 files changed, 122 insertions, 16 deletions
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest index ea841500fc07..b61bf245af7a 100644 --- a/dev-python/protobuf-python/Manifest +++ b/dev-python/protobuf-python/Manifest @@ -1,16 +1,19 @@ AUX protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 888 BLAKE2B 25d486e8ccd60753f372fb708bb66ef2dd6358cf088f84ea58d4fe6889bc31276930bb5d8fb5538b5a25d621959cf197ce9cd9d27299df05109432197c32c2ff SHA512 4ed96d0608146e268d717709d7d00272b306ce78dc91d715d35d0901a545dd58873ff40f903b42d46362deeef6bdeb0c2a34225f7c3fb4798d352e54fdf8c344 +AUX protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 1743 BLAKE2B c21d80a6cd218068d2a910ccd12c314810bd2eb679b59f79ba8d4d694948841d0fd8a56e921fed6f347ae9235f33903d79a038e8ae8659ea65bb59dbf7d7d9ea SHA512 7822b826d62585c48acebf04083546a3ebf8f6570854da8bddac3cc40554e71eaf57e9579c314ada33cf5bd0837cae23a3ef1057e44f6234d1d4a591c8036678 AUX protobuf-python-3.19.1-google.protobuf.pyext._message.PyUnknownFieldRef.patch 883 BLAKE2B 94a9a2b41aca33be4439d7f1ad951d66126c42b04a36da0bcba40032377573ff6fc6cff6dd222b6921357ef1a4dffeee8131d124b3ce7f6322b6a8579eeeba97 SHA512 2641531a4c57f5a9f12f536a4a9418776f791062bab6802b19ab212c0dcc6dec3276ed94cbdbf73c2893fbcd4082df4740e09620a7e0db5f79ef4535dde88fb7 -DIST protobuf-3.16.0.tar.gz 5299781 BLAKE2B 9ace02a6038c31b7393671fb2ccd6a4866a3f8b7d87d2bc8371f49d65b9180f10792ca2430a83449dfa7d785a1244dac23c20756414c9d1e7c7e871a8038b123 SHA512 0191e5a6a23d03f691e883e259f6d06a0ac8eef427455bc7d1cc70b6f0ed260e4ad8f360c836fd4bdc95ec0ca314c887cbf7acbcda60e03cdfe69e4cd275bff5 DIST protobuf-3.17.0.tar.gz 5185780 BLAKE2B a168619df72cdf097c7ddfd50aca96a2101bf73e7c1c842c020e6ee08a853db8674a86ca999b7706da3dd21d4d3d2159241c93232efc693701962f3a54a382e9 SHA512 36ed2de641849ce01531ff1207f62a0748f811519c40622a119a17a1e709864382de81481fb58f374a025948971c48416e7e6de9c00512a78633c7a8a3aa3a36 DIST protobuf-3.17.1.tar.gz 5192666 BLAKE2B 7f912db7e0835aaa42628fcf564a5666e2cbfa021bb35638a5eec53c3c457f1e747225dea54f732b7239a1520febca9bc20c824b1938f100796caa3ac2133bc1 SHA512 5a18aa3c1dab040dc6d22310a8503241081106acf7ca89079d7b416533d7c2cdd47719dc9023e6bc26969f0f1c796550260a04034a403c69752f6a3a7a651bb8 DIST protobuf-3.17.2.tar.gz 5192779 BLAKE2B 97f9561848e70b8d26ebcc7fc4fa8da51c4b8267efbe1d2d386c2785308e7ba7edc05f1b3863c274dc8838866d58b58509606d72c51a22b956d1d528584c4c95 SHA512 b3e7ad50ed772668df70a3a20ad1af13a5e82f23b109e4fecd34e6a74947bed300963c9f084907fbfafe28fc18365cde7df1975e2ff9538d2f5a3d2b458bca98 DIST protobuf-3.17.3.tar.gz 5235236 BLAKE2B 2495e678c8f9436d4e5a30ccee8b6226125d418ac7ecf7df20b078a1a16c221cbccab7d846dcd56a90220c106617fa75c410a21b62612fedec378cd7e8571350 SHA512 b4030b4474cc5fb5a62501200725dd488e6e66e3ced4ed12ab4ee029fcfed305e92ec966adafbdd343afffd186908163849422b95eaa500e7e741ac325d01d12 +DIST protobuf-3.18.2.tar.gz 5272935 BLAKE2B f65caa4483d3ff4186f9ea388e2a9ef232ab758cfda846cfb5993df1f991e4574e63a33b175dd00c72f61c0a23ed12d3c62eb658cd397bf43b805c41fb34c47e SHA512 8ca613fdeefcbd93e866fab65effc38aa8508060aa3de0109dbead68f2e27eb22ad0a8aea10c8b4c3e9de181d62185c93b369fb5abf96de02a170f2e5c27e0cd DIST protobuf-3.19.1.tar.gz 5291573 BLAKE2B a34f1a7cf99ecb6cb8a26bc858de6273bfd26aa9be1e89e48c16cb5df0f1e9576479344c8250017238dbac0d0c4ac33001125b5fc622cb64ed6b91023198b03a SHA512 f1271f5159a7be363a5f60ce4921dfea68a8468d66808330bacaeaa1cb7f652d045ab080b5d82816a6fd4e6d7d7fe79aaa6c8d66d81692721d36ce3bbf619f31 -EBUILD protobuf-python-3.16.0.ebuild 1588 BLAKE2B f76b36f7e0fa22da7cd828502983f321c088dddd513004ca17b15984ebdba47745d079a727ece997881dbaaf072746e80adadbc594ae813ef52fe9e4610df085 SHA512 6377c4b561b6b7f3f74f4358c6f02509bfa5bac1be0092e4556f54a6309a9d7358b43f76cd6373c79ade95a45ee92abb5d29ff426955e607d57a516a3c79f076 +DIST protobuf-3.19.3.tar.gz 5293258 BLAKE2B c05b70ffca97f7166ea6a511a36907eed125edf1ebf17f908718221d9b851be84dfb2b1b39973f2faf35f6ade630e6ba4f9e8b91b8fbc922c5db97079323ee6e SHA512 1c003e7cbc8eae6a038f46e688b401ee202ba47f502561e909df79770f6e8b7daf3dc1ccc727e31bfb5b52cd04cb4fef7d2d2a28d650c13f396872ad4aa076c6 EBUILD protobuf-python-3.17.0.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a EBUILD protobuf-python-3.17.1.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a EBUILD protobuf-python-3.17.2.ebuild 1588 BLAKE2B 2713999209d8023c81c31fad84a43bde1d0e2be979144cc0d8a3a2b12603f9e5f365822f64a53b2ac883db2fdb3a3de880a0bf829d59e99c1d01c922409c37c4 SHA512 74fdd813b45fc1cb5ed076f994af3a6f216f72188a0be278593ff67210b1be57927e7ed7ea97b62b168fb323d0fd43d702fa02a242d532e180f528e661e6ce4a EBUILD protobuf-python-3.17.3.ebuild 1590 BLAKE2B da38acf037037e66d3cf3617a7f0d1d0e1b098d687af56c0f5895b5652ac1b7de7f9f6d96c75badb55ce39836f2a269bcd347bd0f0070deaf14a412528507873 SHA512 be48b980da93dc834fdc965285ef8c6c3960f42ded9f3dc1eba3bedb0ac545d82f526a13dcb8cf4c1fd85bce5e405701cf039009094c7ffde4ce788c2f90bbda -EBUILD protobuf-python-3.19.1.ebuild 1318 BLAKE2B f76108b0a67b910c7ef700f74c08c09c74db3daacb40ac6310eb47d19b573147d0ecb1617bee515b3374d31808a7125d229e47286d2fd729eac3d4fcbc3e4b06 SHA512 87bdc237ccfbdf69c0162299e43efcf8208d9187f43fe64e516dc322b634a0a11a0a4a93ae4dbf997c287505a6bfde221456ea3c824b13b5448e0bbaebae7468 -EBUILD protobuf-python-9999.ebuild 1486 BLAKE2B e818f4912e36e6e5856bf2b63c8a1df097f5a8abba8446d3af583121fc8ff202e12c69a59a9d1b4e9c63995718d53c1c2ccd244695f5a5ea08901dca8a96a3ea SHA512 4f7e001787d503fe2515b9a65674138a8e63bb8701158e7e194711d66a063d0bc1403d2c3d4702470e690c50f38b9c7cea3c3b67a90e4dad3d82951142459d24 -MISC metadata.xml 554 BLAKE2B 4925e8ba9bd7e444a719fbd4b126ba72f714ee3df0c51ede4791c95ef9bba32e8b1f5bca816adfe48c83cdc46f5c7f750737a16a74110c0e5d2eb345eb01effd SHA512 09182eaebbb02f7cb440ff6caeaf2bf273abd8feef6318184580be2b3c4e272d6de48d1316af2c9362376737b59e7e9131ef595284e1b2369caee5124ae56b15 +EBUILD protobuf-python-3.18.2.ebuild 1560 BLAKE2B 29b0256da534a7e227c5774baa96620cab2fa4c07bd9fd5fd6863af60ddcd0155d8c07fc86d8faa573b93cec5393122ca4cc5747d3a348d5b139d41d214ecde4 SHA512 42141261e06f520b7d9b042754a57f3b41ef551a71abd33d4ad6048042eb28609a1c717617ae09965ede3cf3cab74aa0d1125b5f33988ec821b170126dce1035 +EBUILD protobuf-python-3.19.1.ebuild 1318 BLAKE2B 46c19c957576572ff28ac263f42af62d06c93943dd8222a97cea0b34b075ad4f53fe2b6673d7e55e8bc3a7445de45064cc21f6c83e6b666d3973ac226cbff70c SHA512 a703eb011a4213b53cd7871bb1065a765af68663be0a4d216a0276d395b4516ef7a392aa329987d2af4b2d7c7e622c29c72904efc8fb0d4a05991beb2c0f652e +EBUILD protobuf-python-3.19.3.ebuild 1560 BLAKE2B dd958ffc430620321333f02a018831247cd08d64e01069ad390ecff2f1422554f6a25c8e148941ea58cf276666437c2c2c0e5464635b852176b2f6add3f5e71c SHA512 2ed37bf94f235cbed32cd63dec1e2d9cb2c7a7937274f93a8bf34328e2ad13dd302fe5aa5178a1a43e4077096aa29157952c52faded9f5576f7786742bb4fee1 +EBUILD protobuf-python-9999.ebuild 1361 BLAKE2B 3eff9b195b3b375f4208a634c70bc900b12af2563aba12248c288e463ca9e35246ea88c2303cd0e3f08e18a21bd8800fdc9e4456cde35d3934bce9c384eca685 SHA512 60996706e6895fe4e1cb107f4d2e506bd0d3a026a84466ae6a3a2d28beeb6d03001274e8e02f304b490d93d442f2c74bf3383c42a5d66c88341cd7223081477f +MISC metadata.xml 548 BLAKE2B 2468487e12d536d67daebf5b7a21cd63a9c4af321a8979132e63d9b8394bf577e347f891326c73bfa6907e82ca355ea0d4ec40a37bb297db0da1e55a62b6ef33 SHA512 c0c2556fbf8821f3a75ed344daa59b4fc355029f96efb8f9784f54c819916adeb46b2c5d8c2e8d405dc58395c2f18b30cda69c6d406948a066bd1d78a55df80b diff --git a/dev-python/protobuf-python/files/protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch b/dev-python/protobuf-python/files/protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch new file mode 100644 index 000000000000..a9e23feea148 --- /dev/null +++ b/dev-python/protobuf-python/files/protobuf-python-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch @@ -0,0 +1,42 @@ +From 387c9e58987c54b72e66c14b34c98297086cd812 Mon Sep 17 00:00:00 2001 +From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> +Date: Fri, 28 Jan 2022 15:32:43 +0800 +Subject: [PATCH] protobuf-python-3.19.0: + google.protobuf.pyext._message.PyUnknownFieldRef + +Prevent integer overflow for unknown fields. + +https://github.com/protocolbuffers/protobuf/issues/6205 +https://github.com/protocolbuffers/protobuf/pull/7016 +https://github.com/protocolbuffers/protobuf/commit/5100be2b7746391c2724e2793e1428c36b63c98b + +Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> +Signed-off-by: Yixun Lan <dlan@gentoo.org> +--- + python/google/protobuf/pyext/unknown_fields.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/python/google/protobuf/pyext/unknown_fields.cc b/python/google/protobuf/pyext/unknown_fields.cc +index 6d919b3..37e6eae 100644 +--- a/python/google/protobuf/pyext/unknown_fields.cc ++++ b/python/google/protobuf/pyext/unknown_fields.cc +@@ -275,13 +275,13 @@ static PyObject* GetData(PyUnknownFieldRef* self, void *closure) { + PyObject* data = NULL; + switch (field->type()) { + case UnknownField::TYPE_VARINT: +- data = PyLong_FromLong(field->varint()); ++ data = PyLong_FromUnsignedLongLong(field->varint()); + break; + case UnknownField::TYPE_FIXED32: +- data = PyLong_FromLong(field->fixed32()); ++ data = PyLong_FromUnsignedLong(field->fixed32()); + break; + case UnknownField::TYPE_FIXED64: +- data = PyLong_FromLong(field->fixed64()); ++ data = PyLong_FromUnsignedLongLong(field->fixed64()); + break; + case UnknownField::TYPE_LENGTH_DELIMITED: + data = PyBytes_FromStringAndSize(field->length_delimited().data(), +-- +2.34.1 + diff --git a/dev-python/protobuf-python/metadata.xml b/dev-python/protobuf-python/metadata.xml index 9a6f066d8d62..7fc9e27ef82d 100644 --- a/dev-python/protobuf-python/metadata.xml +++ b/dev-python/protobuf-python/metadata.xml @@ -6,8 +6,8 @@ <name>Arfrever Frehtes Taifersar Arahesis</name> </maintainer> <maintainer type="project"> - <email>python@gentoo.org</email> - <name>Python</name> + <email>cjk@gentoo.org</email> + <name>Cjk</name> </maintainer> <slots> <subslots>Soname version number of Protobuf</subslots> diff --git a/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.18.2.ebuild index fbe4535581f8..4e76735372f8 100644 --- a/dev-python/protobuf-python/protobuf-python-3.16.0.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.18.2.ebuild @@ -1,9 +1,8 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_SETUPTOOLS="bdepend" inherit distutils-r1 @@ -23,8 +22,8 @@ else fi LICENSE="BSD" -SLOT="0/27" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +SLOT="0/29" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 -hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" IUSE="" BDEPEND="${PYTHON_DEPS} diff --git a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild index 59042ff20bce..dde21f3e4e2e 100644 --- a/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild +++ b/dev-python/protobuf-python/protobuf-python-3.19.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,7 +23,7 @@ HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/pro LICENSE="BSD" SLOT="0/30" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +KEYWORDS="~alpha amd64 arm ~arm64 -hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" BDEPEND="${PYTHON_DEPS} ~dev-libs/protobuf-${PV} diff --git a/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild new file mode 100644 index 000000000000..877714b41eff --- /dev/null +++ b/dev-python/protobuf-python/protobuf-python-3.19.3.ebuild @@ -0,0 +1,64 @@ +# Copyright 2008-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 + +if [[ "${PV}" == "9999" ]]; then + inherit git-r3 + + EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf" + EGIT_SUBMODULES=() +fi + +DESCRIPTION="Google's Protocol Buffers - Python bindings" +HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf" +if [[ "${PV}" == "9999" ]]; then + SRC_URI="" +else + SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz" +fi + +LICENSE="BSD" +SLOT="0/30" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="" + +BDEPEND="${PYTHON_DEPS} + ~dev-libs/protobuf-${PV} + dev-python/namespace-google[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}]" +DEPEND="${PYTHON_DEPS} + ~dev-libs/protobuf-${PV}" +RDEPEND="${BDEPEND}" + +S="${WORKDIR}/protobuf-${PV}/python" + +if [[ "${PV}" == "9999" ]]; then + EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}" +fi + +python_prepare_all() { + pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die + eapply "${FILESDIR}/${PN}-3.19.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" + eapply_user + popd > /dev/null || die + + distutils-r1_python_prepare_all +} + +python_configure_all() { + mydistutilsargs=(--cpp_implementation) +} + +python_test() { + esetup.py test +} + +python_install_all() { + distutils-r1_python_install_all + + find "${ED}" -name "*.pth" -type f -delete || die +} diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild index 33658c216b0b..6eb7e579382a 100644 --- a/dev-python/protobuf-python/protobuf-python-9999.ebuild +++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild @@ -1,9 +1,8 @@ -# Copyright 2008-2021 Gentoo Authors +# Copyright 2008-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" PYTHON_COMPAT=( python3_{8..10} ) -DISTUTILS_USE_SETUPTOOLS="bdepend" inherit distutils-r1 @@ -43,7 +42,6 @@ fi python_prepare_all() { pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die - eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch" eapply_user popd > /dev/null || die |