commit: f0f6688522dd2809feccb3d691db98364b0919f0 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Mar 14 04:26:44 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Mar 14 04:51:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0f66885
net-analyzer/fail2ban: enable py3.12 Bug: https://bugs.gentoo.org/909998 Signed-off-by: Sam James <sam <AT> gentoo.org> ...ail2ban-9999.ebuild => fail2ban-1.0.2-r3.ebuild} | 21 ++++++++++++++++++--- net-analyzer/fail2ban/fail2ban-9999.ebuild | 21 +++++++++++++++++---- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild similarity index 86% copy from net-analyzer/fail2ban/fail2ban-9999.ebuild copy to net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild index d9a3b9fdb4da..a6c77a9edf1b 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 distutils-r1 systemd tmpfiles @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-2" @@ -24,6 +24,10 @@ SLOT="0" IUSE="selinux systemd" RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) @@ -39,6 +43,7 @@ DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) PATCHES=( "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch "${FILESDIR}"/${PN}-1.0.2-umask-tests.patch + "${FILESDIR}"/${P}-configreader-warning.patch ) python_prepare_all() { @@ -47,12 +52,22 @@ python_prepare_all() { # Replace /var/run with /run, but not in the top source directory find . -mindepth 2 -type f -exec \ sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die + + # Incompatible with Python 3.12 in 1.0.x, 9999 uses dev-python/aiosmtpd. + rm fail2ban/tests/action_d/test_smtp.py || die +} + +python_compile() { + ./fail2ban-2to3 || die + distutils-r1_python_compile } python_test() { # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 bin/fail2ban-testcases \ --no-network \ + --no-gamin \ --ignore databasetestcase.DatabaseTest.testRepairDb \ --verbosity=4 || die "Tests failed with ${EPYTHON}" diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild index d9a3b9fdb4da..f9f5b8721fff 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit bash-completion-r1 distutils-r1 systemd tmpfiles @@ -16,14 +16,19 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64" fi LICENSE="GPL-2" SLOT="0" -IUSE="selinux systemd" +IUSE="selinux systemd test" +RESTRICT="!test? ( test )" RDEPEND=" + $(python_gen_cond_dep ' + dev-python/pyasyncore[${PYTHON_USEDEP}] + dev-python/pyasynchat[${PYTHON_USEDEP}] + ' 3.12) virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) @@ -33,6 +38,13 @@ RDEPEND=" ') ) " +BDEPEND=" + test? ( + $(python_gen_cond_dep ' + dev-python/aiosmtpd[${PYTHON_USEDEP}] + ') + ) +" DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt ) @@ -51,6 +63,7 @@ python_prepare_all() { python_test() { # Skip testRepairDb for bug #907348 (didn't always fail..) + # https://github.com/fail2ban/fail2ban/issues/3586 bin/fail2ban-testcases \ --no-network \ --ignore databasetestcase.DatabaseTest.testRepairDb \
