diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-11-18 18:59:02 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-11-18 18:59:02 +0000 |
| commit | 1b07dd0a2cbe034321c613ee58a1f99a0df17995 (patch) | |
| tree | cb7abb08f5c9c7b7d5e79a0b69936696dccbd5c0 /dev-python/python-systemd | |
| parent | 0374a8491c853f9331b95ed2a38e688e4d2edce5 (diff) | |
gentoo auto-resync : 18:11:2022 - 18:59:02
Diffstat (limited to 'dev-python/python-systemd')
| -rw-r--r-- | dev-python/python-systemd/Manifest | 3 | ||||
| -rw-r--r-- | dev-python/python-systemd/files/python-systemd-234-fix-py3.10.patch | 46 | ||||
| -rw-r--r-- | dev-python/python-systemd/python-systemd-234-r2.ebuild | 39 |
3 files changed, 0 insertions, 88 deletions
diff --git a/dev-python/python-systemd/Manifest b/dev-python/python-systemd/Manifest index 50a0560ce79e..4f5029abb74c 100644 --- a/dev-python/python-systemd/Manifest +++ b/dev-python/python-systemd/Manifest @@ -1,6 +1,3 @@ -AUX python-systemd-234-fix-py3.10.patch 1539 BLAKE2B c41b20fea9165c62620c2b7262ddb0e331d24c2e950bcd0cf78c92d5f5f79804a9f0eb4a52a7203d353a6be297118e3b951823a973f9a99a8211efb5a31be458 SHA512 92a4497733efa551d9c966f39ba31bc9d3443ece6591f4d664c3732f01f10c928c07de13e2b9e65725f30fa18da7a4a9ee172e0b627d98e1d991c19b7762e2ab -DIST python-systemd-234.tar.gz 53900 BLAKE2B 2658ee7083036ed8259e5f4ad0714ea15227ee836ad34c7fbbdb55dd9df48751b8d9998350d789b4f47e78fe7b4a7134e12d637e5a6ebeb29a0b31e5a4575d91 SHA512 164e34ba46827711e9c6ff9ed58b2706d9a22abfc7001de030ed7d463d8ddf783eb5fee93b207c29950a3c566018cc3f1a21a549421cf3e05c1287b433367eb2 DIST python-systemd-235.gh.tar.gz 59858 BLAKE2B 8dbf112773dce4dfe9fb2b0e660a349481fa29c9532c5aa2d125e5bfc255b2408f63b5bd873b6fee9ebbad775ecfaf32497593b17052189797403fa31b05fd6f SHA512 f1286a477200cc7b4d2c44b43452da576e8e660925711466659795775bcee44796688e1ede6cc22e61cb5b03e631c396d22f9a133327ae1147506bce09bab47f -EBUILD python-systemd-234-r2.ebuild 865 BLAKE2B 8707e264d86df1a815c2b6d1d88c73717cb1066b7f7e11aa86679a18c769b487dab7e4f0bd14f2500d70dd51e5c916cf1fd9437b1524b2393492c1951ff8a1cd SHA512 88ab314e34907113fda7cf90f43bb921b46f01fcd517a428e0518caab541ba96abc44ac2bcb28b7ac053eaa17770718e48d0437df681b134cb48fd3ae792b432 EBUILD python-systemd-235.ebuild 817 BLAKE2B a95c97936f52ebbd4f763c7503ff0d6cfcd0f18d8850282cb089c55b3e54f01a30c0ae182beb5639c868c6dd2bf8dc661e769fd2da819b4655d4a22bff15d559 SHA512 89e1043d1150e80948513127e3973cceaf294f62808dc805d81bea5de28d5ef3c2010e1ab9c30f4703fa7c4b4458cb9f846d2a96d2fdfb8ca08dc84fb974411a MISC metadata.xml 359 BLAKE2B 458599dbb5364bdf58f0cabf3fe07f03f79a4cdfb3f707ef6db328c453e606b587e13fa3349e0e0c899a7b1655e558ccae00e6a9ea22146b9e68099e0ac1a981 SHA512 73e524d826bb08d80fbe3e643be5f08e39620ddb343006752729ea41e594ad13eb6241c30da78a58f67e6e5e3c51f567a9e761af498f882f1e23ce0308bfd690 diff --git a/dev-python/python-systemd/files/python-systemd-234-fix-py3.10.patch b/dev-python/python-systemd/files/python-systemd-234-fix-py3.10.patch deleted file mode 100644 index 52045b4475e1..000000000000 --- a/dev-python/python-systemd/files/python-systemd-234-fix-py3.10.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c71bbac357f0ac722e1bcb2edfa925b68cca23c9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> -Date: Thu, 12 Nov 2020 16:55:56 +0100 -Subject: [PATCH] reader: make PY_SSIZE_T_CLEAN - ---- - systemd/_reader.c | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/systemd/_reader.c b/systemd/_reader.c -index 8de7f6a..3b6a4d0 100644 ---- a/systemd/_reader.c -+++ b/systemd/_reader.c -@@ -18,7 +18,12 @@ - along with python-systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#define PY_SSIZE_T_CLEAN -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wredundant-decls" - #include <Python.h> -+#pragma GCC diagnostic pop -+ - #include <structmember.h> - #include <datetime.h> - #include <time.h> -@@ -710,11 +715,17 @@ PyDoc_STRVAR(Reader_add_match__doc__, - "Match is a string of the form \"FIELD=value\"."); - static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds) { - char *match; -- int match_len, r; -+ Py_ssize_t match_len; -+ int r; - if (!PyArg_ParseTuple(args, "s#:add_match", &match, &match_len)) - return NULL; - -- r = sd_journal_add_match(self->j, match, match_len); -+ if (match_len > INT_MAX) { -+ set_error(-ENOBUFS, NULL, NULL); -+ return NULL; -+ } -+ -+ r = sd_journal_add_match(self->j, match, (int) match_len); - if (set_error(r, NULL, "Invalid match") < 0) - return NULL; - diff --git a/dev-python/python-systemd/python-systemd-234-r2.ebuild b/dev-python/python-systemd/python-systemd-234-r2.ebuild deleted file mode 100644 index ec89a20eafc7..000000000000 --- a/dev-python/python-systemd/python-systemd-234-r2.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright 2015-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 - -DESCRIPTION="Python module for native access to the systemd facilities" -HOMEPAGE="https://github.com/systemd/python-systemd" -SRC_URI="https://github.com/systemd/python-systemd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~s390 sparc x86" - -DEPEND="sys-apps/systemd:0=" -RDEPEND="${DEPEND} - !sys-apps/systemd[python(-)] -" - -PATCHES=( - "${FILESDIR}"/${P}-fix-py3.10.patch -) - -distutils_enable_tests pytest - -python_compile() { - # https://bugs.gentoo.org/690316 - distutils-r1_python_compile -j1 -} - -python_test() { - unset NOTIFY_SOCKET - cd "${T}" || die - epytest --pyargs systemd -o cache_dir="${T}" -} |