mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
dev-python/protobuf: Backport upstream crash fix
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
33
dev-python/protobuf/files/protobuf-6.32.1-crash.patch
Normal file
33
dev-python/protobuf/files/protobuf-6.32.1-crash.patch
Normal file
@@ -0,0 +1,33 @@
|
||||
From d57d2708b371bda5e7212b0eca63091fa2d7ab42 Mon Sep 17 00:00:00 2001
|
||||
From: Oleh Prypin <oprypin@google.com>
|
||||
Date: Mon, 15 Sep 2025 13:31:08 -0700
|
||||
Subject: [PATCH] Fix a crash that happens during shutdown due to looking up
|
||||
modules in the cache
|
||||
|
||||
The crash happens only since Python 3.13. Conveniently, Python 3.13 introduces a function to check if the interpreter is shutting down at the moment.
|
||||
|
||||
There was a related issue https://github.com/protocolbuffers/protobuf/issues/22067 and related commit https://github.com/protocolbuffers/protobuf/commit/87de6f795f794f207c19ea5c887328fcbe35d518
|
||||
but it appears that the fix was incomplete. What actually causes a crash during shutdown is using `PyState_FindModule`, and `PyUpb_ModuleState_MaybeGet` still calls that anyway.
|
||||
|
||||
PiperOrigin-RevId: 807361381
|
||||
---
|
||||
python/protobuf.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/python/protobuf.c b/python/protobuf.c
|
||||
index ff6bf7c0d6654..a86fcaaf82e67 100644
|
||||
--- a/python/protobuf.c
|
||||
+++ b/python/protobuf.c
|
||||
@@ -58,6 +58,12 @@ static struct PyModuleDef module_def = {PyModuleDef_HEAD_INIT,
|
||||
// -----------------------------------------------------------------------------
|
||||
|
||||
PyUpb_ModuleState* PyUpb_ModuleState_MaybeGet(void) {
|
||||
+#if PY_VERSION_HEX >= 0x030D0000 // >= 3.13
|
||||
+ /* Calling `PyState_FindModule` during interpreter shutdown causes a crash. */
|
||||
+ if (Py_IsFinalizing()) {
|
||||
+ return NULL;
|
||||
+ }
|
||||
+#endif
|
||||
PyObject* module = PyState_FindModule(&module_def);
|
||||
return module ? PyModule_GetState(module) : NULL;
|
||||
}
|
||||
159
dev-python/protobuf/protobuf-6.32.1-r1.ebuild
Normal file
159
dev-python/protobuf/protobuf-6.32.1-r1.ebuild
Normal file
@@ -0,0 +1,159 @@
|
||||
# Copyright 2008-2025 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
# Default implementation currently is upb, which doesn't match dev-libs/protobuf
|
||||
# https://github.com/protocolbuffers/protobuf/blob/main/python/README.md#implementation-backends
|
||||
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{11..14} )
|
||||
|
||||
inherit distutils-r1 pypi
|
||||
|
||||
GH_PV=$(ver_cut 2-3)
|
||||
GH_P=${PN}-${GH_PV}
|
||||
|
||||
DESCRIPTION="Google's Protocol Buffers - Python bindings"
|
||||
HOMEPAGE="
|
||||
https://protobuf.dev/
|
||||
https://pypi.org/project/protobuf/
|
||||
"
|
||||
# Rename sdist to avoid conflicts with dev-libs/protobuf
|
||||
SRC_URI="
|
||||
$(pypi_sdist_url) -> ${P}.py.tar.gz
|
||||
test? (
|
||||
https://github.com/protocolbuffers/protobuf/archive/v${GH_PV}.tar.gz
|
||||
-> ${GH_P}.gh.tar.gz
|
||||
)
|
||||
"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0/$(ver_cut 1-3)"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
|
||||
|
||||
# need protobuf compiler
|
||||
BDEPEND="
|
||||
test? (
|
||||
dev-libs/protobuf
|
||||
dev-python/absl-py[${PYTHON_USEDEP}]
|
||||
dev-python/numpy[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
EPYTEST_PLUGINS=()
|
||||
EPYTEST_XDIST=1
|
||||
distutils_enable_tests pytest
|
||||
|
||||
src_unpack() {
|
||||
unpack "${P}.py.tar.gz"
|
||||
|
||||
if use test; then
|
||||
mkdir "${WORKDIR}/test" || die
|
||||
cd "${WORKDIR}/test" || die
|
||||
unpack "${GH_P}.gh.tar.gz"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
local PATCHES=(
|
||||
# https://github.com/protocolbuffers/protobuf/commit/d57d2708b371bda5e7212b0eca63091fa2d7ab42
|
||||
# potentially fixes https://github.com/protocolbuffers/protobuf/issues/22067
|
||||
"${FILESDIR}/${P}-crash.patch"
|
||||
)
|
||||
|
||||
distutils-r1_src_prepare
|
||||
|
||||
# strip old-style namespace
|
||||
rm google/__init__.py || die
|
||||
}
|
||||
|
||||
python_test() {
|
||||
local EPYTEST_DESELECT=()
|
||||
local EPYTEST_IGNORE=(
|
||||
# TODO: figure out how to build the pybind11 test extension
|
||||
google/protobuf/internal/recursive_message_pybind11_test.py
|
||||
)
|
||||
|
||||
case ${EPYTHON} in
|
||||
python3.11)
|
||||
EPYTEST_IGNORE+=(
|
||||
# syntax error...
|
||||
google/protobuf/internal/json_format_test.py
|
||||
)
|
||||
;;
|
||||
python3.14*)
|
||||
EPYTEST_DESELECT+=(
|
||||
# exception message mismatch
|
||||
google/protobuf/internal/json_format_test.py::JsonFormatTest::testInvalidTimestamp
|
||||
google/protobuf/internal/well_known_types_test.py::TimeUtilTest::testInvalidTimestamp
|
||||
)
|
||||
;;
|
||||
esac
|
||||
|
||||
cp -r "${BUILD_DIR}"/{install,test} || die
|
||||
local -x PATH="${BUILD_DIR}/test${EPREFIX}/usr/bin:${PATH}"
|
||||
cd "${BUILD_DIR}/test$(python_get_sitedir)" || die
|
||||
|
||||
# copy test files from the source tree
|
||||
cp -r "${WORKDIR}/test/${GH_P}/python/google/protobuf/internal/." \
|
||||
google/protobuf/internal/ || die
|
||||
# link the test data for text_format_test.py
|
||||
# (it traverses directories upwards until to finds src/google...)
|
||||
ln -s "${WORKDIR}/test/${GH_P}/src" ../src || die
|
||||
|
||||
# compile test-related protobufs
|
||||
local test_protos=(
|
||||
# from src
|
||||
any_test.proto
|
||||
map_proto2_unittest.proto
|
||||
map_unittest.proto
|
||||
unittest.proto
|
||||
unittest_custom_options.proto
|
||||
unittest_delimited.proto
|
||||
unittest_delimited_import.proto
|
||||
unittest_features.proto
|
||||
unittest_import.proto
|
||||
unittest_import_public.proto
|
||||
unittest_legacy_features.proto
|
||||
unittest_mset.proto
|
||||
unittest_mset_wire_format.proto
|
||||
unittest_no_field_presence.proto
|
||||
unittest_no_generic_services.proto
|
||||
unittest_proto3.proto
|
||||
unittest_proto3_arena.proto
|
||||
unittest_proto3_extensions.proto
|
||||
unittest_retention.proto
|
||||
util/json_format.proto
|
||||
util/json_format_proto3.proto
|
||||
# from python
|
||||
internal/descriptor_pool_test1.proto
|
||||
internal/descriptor_pool_test2.proto
|
||||
internal/factory_test1.proto
|
||||
internal/factory_test2.proto
|
||||
internal/file_options_test.proto
|
||||
internal/import_test_package/import_public.proto
|
||||
internal/import_test_package/import_public_nested.proto
|
||||
internal/import_test_package/inner.proto
|
||||
internal/import_test_package/outer.proto
|
||||
internal/message_set_extensions.proto
|
||||
internal/missing_enum_values.proto
|
||||
internal/more_extensions.proto
|
||||
internal/more_messages.proto
|
||||
internal/no_package.proto
|
||||
internal/packed_field_test.proto
|
||||
internal/self_recursive.proto
|
||||
internal/test_bad_identifiers.proto
|
||||
internal/test_proto2.proto
|
||||
internal/test_proto3_optional.proto
|
||||
internal/well_known_types_test.proto
|
||||
)
|
||||
local proto
|
||||
for proto in "${test_protos[@]}"; do
|
||||
protoc --python_out=. -I"${WORKDIR}/test/${GH_P}/src" -I. \
|
||||
"google/protobuf/${proto}" || die
|
||||
done
|
||||
|
||||
epytest
|
||||
}
|
||||
Reference in New Issue
Block a user