From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A7F5215800D for ; Sun, 2 Jul 2023 18:58:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D740AE086A; Sun, 2 Jul 2023 18:58:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BCA3EE086A for ; Sun, 2 Jul 2023 18:58:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6398A340DAD for ; Sun, 2 Jul 2023 18:58:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C299A7E for ; Sun, 2 Jul 2023 18:58:04 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1688324244.f65c46b3047702e8ea69f5ea0910b2cbab4fe9bc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/fail2ban/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/fail2ban/fail2ban-9999.ebuild X-VCS-Directories: net-analyzer/fail2ban/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f65c46b3047702e8ea69f5ea0910b2cbab4fe9bc X-VCS-Branch: master Date: Sun, 2 Jul 2023 18:58:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3595165d-dd79-407c-909b-6851ef243c2c X-Archives-Hash: de13280195397fba033df971f9ace4f0 commit: f65c46b3047702e8ea69f5ea0910b2cbab4fe9bc Author: Sam James gentoo org> AuthorDate: Sun Jul 2 18:38:04 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 2 18:57:24 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f65c46b3 net-analyzer/fail2ban: cleanup live Signed-off-by: Sam James gentoo.org> net-analyzer/fail2ban/fail2ban-9999.ebuild | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild index 4112631ff0a1..780f4c65a50a 100644 --- a/net-analyzer/fail2ban/fail2ban-9999.ebuild +++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild @@ -4,6 +4,7 @@ EAPI=8 DISTUTILS_SINGLE_IMPL=1 +DISUTILS_USE_PEP517=setuptools PYTHON_COMPAT=( python3_{10..11} ) inherit bash-completion-r1 distutils-r1 systemd tmpfiles @@ -29,10 +30,8 @@ RDEPEND=" selinux? ( sec-policy/selinux-fail2ban ) systemd? ( $(python_gen_cond_dep ' - || ( - dev-python/python-systemd[${PYTHON_USEDEP}] - sys-apps/systemd[python(-),${PYTHON_USEDEP}] - )' 'python*' ) + dev-python/python-systemd[${PYTHON_USEDEP}] + ') ) " @@ -50,15 +49,9 @@ python_prepare_all() { sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die } -python_compile() { - ./fail2ban-2to3 || die - distutils-r1_python_compile -} - python_test() { bin/fail2ban-testcases \ --no-network \ - --no-gamin \ --verbosity=4 || die "Tests failed with ${EPYTHON}" # Workaround for bug #790251 @@ -100,7 +93,7 @@ pkg_preinst() { pkg_postinst() { tmpfiles_process ${PN}-tmpfiles.conf - if [[ ${previous_less_than_0_7} = 0 ]] ; then + if [[ ${previous_less_than_0_7} == 0 ]] ; then elog elog "Configuration files are now in /etc/fail2ban/" elog "You probably have to manually update your configuration" @@ -113,10 +106,9 @@ pkg_postinst() { elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8" fi - if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then - elog "For most jail.conf configurations, it is recommended you install either" - elog "dev-python/pyinotify or app-admin/gamin (in order of preference)" - elog "to control how log file modifications are detected" + if ! has_version dev-python/pyinotify ; then + elog "For most jail.conf configurations, it is recommended you install" + elog "dev-python/pyinotify to control how log file modifications are detected" fi if ! has_version dev-lang/python[sqlite] ; then @@ -125,9 +117,4 @@ pkg_postinst() { elog "persistent database feature, then you should set" elog "dbfile = :memory: in fail2ban.conf accordingly." fi - - if has_version sys-apps/systemd[-python] ; then - elog "If you want to track logins through sys-apps/systemd's" - elog "journal backend, then reinstall sys-apps/systemd with USE=python" - fi }