gentoo auto-resync : 02:07:2023 - 22:04:01

5 files changed, 194 insertions, 26 deletions

diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index c0972d877322..52768d450a8a 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,6 +1,8 @@
 AUX fail2ban-0.11.2-adjust-apache-logs-paths.patch 893 BLAKE2B 5b80b81488a5245d9d9d15a1b0205a1d86f132e3faa5ea3e5cf91d55082b2d264e558dca4b7fbe62f643601b3315ac31cae387c433c2d90b670965abfa744f87 SHA512 dddff4858431170f5a24daab2d3cedcdcd7a1194b8ecbbcd794dfe00dcaee4af410afef102d3a25f86f541267d7be63e3e1d239c879e95d20cef9f0dacdcdc4c
 AUX fail2ban-1.0.2-configreader-warning.patch 844 BLAKE2B 3dca580b50c7fa425765ee28fd07d033e738e81ac08f1b66a9b328c7fdf24227c0dca81927e61933c3c3d0c7b6895aed797642f15b449bb6485c8bef6c2315a7 SHA512 119f6b06c099f1dd147859408714fdfe3c73e254ad0d4bf04e535a1f6cbaf08ba368f3e616df792579528e5b6e26bd1be5408258a807d7e2ba36020b211d8e9e
+AUX fail2ban-1.0.2-umask-tests.patch 1329 BLAKE2B a7535b515e5d3be56d6e842b34e37cc6786338c1874827ff82c58251ecab63917b54d3c1de6fb4047112deade46195c168b5783922dec8895a13f7751f2c64a7 SHA512 bfffcaa54e74c34e87f4a1205573ac9fb8a66dbcc8534f9b42574be699e21ee92ce153204a7dfc63aedfe319a34d9ac3e656ff29cc054fcaf3b4709b0d56b24b
 DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb
-EBUILD fail2ban-1.0.2-r1.ebuild 3721 BLAKE2B 91d110536739b2844f4d643e2a817caeab74d4a5062cc4ffa720eb643d8badc0275163914f940b9c9ff6ebf894e6f73e743765b798417f85767bfe2730f0b62a SHA512 c329269e3f1f6703deb4cd9f7a06acb8790816708fc97e4e7ddaa8cf274e3ae82daf27948e76812405d040044ca9111a0d0f92e1a6ad1edf1c75a820e5ed7d17
-EBUILD fail2ban-9999.ebuild 3682 BLAKE2B ef42c66e102750ccfe920c23d2922b2b0de0b9ab9978fbaabdaf84a9f4632a329aa4ae81cc483ce75bd1aa9171b89312dbde9ed931c1fd134b7ba0224375ec25 SHA512 aed88a4f56effb9c1c26470f1c5b46057ae7b442718f7aca9305746eaaeb75142b258cb08fdf93b93408912966f77462f1a4053460435e7f1d9a7ac54173c7a4
+EBUILD fail2ban-1.0.2-r1.ebuild 3839 BLAKE2B 2572d9be0e3a2d91d36b9f74770ce1c24e9e5eb202b8b47d88876b671b70bba7ba5c7de9aa5a3eafcbc1f5dc53a81934651ca84fac984dc887c2194a3169a8db SHA512 0069f52eb4c975ff6751f47113da4c75ab3370a23c4c197ff3e32b92462adac3d87eb12e94657cd12e1c23931b9b30a43296c286daad641dd82d59bf9dbcf398
+EBUILD fail2ban-1.0.2-r2.ebuild 3537 BLAKE2B 5c5e847fa74f7c9004836025f0a71ecf48b8c4370efb05e000132b9f9100302c26680d5d4cbeb4afa7c72ec72a39c476aa3016d7a8c93f69f0389396b625a7e9 SHA512 6163f4258473c9f022ce9ed3b63c57c5763b947fe59936a20aad765a6dd9a0cafb5491e8f602a144aa70e2a31f668001d7a506723fbc09da9ef73469339764de
+EBUILD fail2ban-9999.ebuild 3431 BLAKE2B 7bd8120426746e7f2acb9608c89395b3a09abb70023b862a365cd20cc4cfeaf1157251de54b2c3e50b850ad693d876fa0f6109b77c91f787f34fb0744034f4dc SHA512 52117c1727109e4b279dc42e6efaf3fc76d2836fb1222a0641bba8bc6ef3fa7e92cfa3a3ca239f3dd48ab17b827f4166ca536246fa5b36da3104ff492afdfe3f
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
index a1d63c65afee..9372d37e5fb4 100644
--- a/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 
 inherit bash-completion-r1 distutils-r1 systemd tmpfiles
 
@@ -57,13 +57,15 @@ python_compile() {
 }
 
 python_test() {
+	# Skip testRepairDb for bug #907348 (didn't always fail..)
 	bin/fail2ban-testcases \
 		--no-network \
 		--no-gamin \
+		--ignore databasetestcase.DatabaseTest.testRepairDb \
 		--verbosity=4 || die "Tests failed with ${EPYTHON}"
 
 	# Workaround for bug #790251
-	rm -r fail2ban.egg-info || die
+	rm -rf fail2ban.egg-info || die
 }
 
 python_install_all() {
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..a440fa2f6374
--- /dev/null
+++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r2.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_SINGLE_IMPL=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 systemd tmpfiles
+
+DESCRIPTION="Scans log files and bans IPs that show malicious signs"
+HOMEPAGE="https://www.fail2ban.org/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/fail2ban/fail2ban"
+	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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="selinux systemd"
+
+RDEPEND="
+	virtual/logger
+	virtual/mta
+	selinux? ( sec-policy/selinux-fail2ban )
+	systemd? (
+		$(python_gen_cond_dep '
+			dev-python/python-systemd[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+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() {
+	distutils-r1_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
+}
+
+python_compile() {
+	./fail2ban-2to3 || die
+	distutils-r1_python_compile
+}
+
+python_test() {
+	# Skip testRepairDb for bug #907348 (didn't always fail..)
+	bin/fail2ban-testcases \
+		--no-network \
+		--no-gamin \
+		--ignore databasetestcase.DatabaseTest.testRepairDb \
+		--verbosity=4 || die "Tests failed with ${EPYTHON}"
+
+	# Workaround for bug #790251
+	rm -rf fail2ban.egg-info || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
+
+	newconfd files/fail2ban-openrc.conf ${PN}
+
+	# These two are placed in the ${BUILD_DIR} after being "built"
+	# in install_scripts().
+	newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}"
+	systemd_dounit "${BUILD_DIR}/${PN}.service"
+
+	dotmpfiles files/${PN}-tmpfiles.conf
+
+	doman man/*.{1,5}
+
+	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
+	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
+	insinto /etc/logrotate.d
+	newins files/${PN}-logrotate ${PN}
+
+	keepdir /var/lib/${PN}
+
+	newbashcomp files/bash-completion ${PN}-client
+	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
+}
+
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.7"
+	previous_less_than_0_7=$?
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}-tmpfiles.conf
+
+	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"
+		elog "files before restarting Fail2Ban!"
+		elog
+		elog "Fail2Ban is not installed under /usr/lib anymore. The"
+		elog "new location is under /usr/share."
+		elog
+		elog "You are upgrading from version 0.6.x, please see:"
+		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
+	fi
+
+	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
+		elog "If you want to use ${PN}'s persistent database, then reinstall"
+		elog "dev-lang/python with USE=sqlite. If you do not use the"
+		elog "persistent database feature, then you should set"
+		elog "dbfile = :memory: in fail2ban.conf accordingly."
+	fi
+}
diff --git a/net-analyzer/fail2ban/fail2ban-9999.ebuild b/net-analyzer/fail2ban/fail2ban-9999.ebuild
index ed94d18e70a8..b657eb644f4a 100644
--- a/net-analyzer/fail2ban/fail2ban-9999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-9999.ebuild
@@ -4,7 +4,8 @@
 EAPI=8
 
 DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{9..11} )
+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}]
+		')
 	)
 "
 
@@ -40,6 +39,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
 )
 
 python_prepare_all() {
@@ -50,19 +50,15 @@ python_prepare_all() {
 		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
 }
 
-python_compile() {
-	./fail2ban-2to3 || die
-	distutils-r1_python_compile
-}
-
 python_test() {
+	# Skip testRepairDb for bug #907348 (didn't always fail..)
 	bin/fail2ban-testcases \
 		--no-network \
-		--no-gamin \
+		--ignore databasetestcase.DatabaseTest.testRepairDb \
 		--verbosity=4 || die "Tests failed with ${EPYTHON}"
 
 	# Workaround for bug #790251
-	rm -r fail2ban.egg-info || die
+	rm -rf fail2ban.egg-info || die
 }
 
 python_install_all() {
@@ -100,7 +96,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 +109,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 +120,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
 }
diff --git a/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch b/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch
new file mode 100644
index 000000000000..8feca43412ec
--- /dev/null
+++ b/net-analyzer/fail2ban/files/fail2ban-1.0.2-umask-tests.patch
@@ -0,0 +1,45 @@
+Avoid corrupting umask permanently in the testdir because of fail2ban/server/server.py::start.
+
+In particular:
+* https://bugs.gentoo.org/659010#c11
+* https://bugs.gentoo.org/790251#c10
+* https://bugs.gentoo.org/907350
+
+But see also the many dupes.
+--- a/fail2ban/tests/fail2banclienttestcase.py
++++ b/fail2ban/tests/fail2banclienttestcase.py
+@@ -23,6 +23,7 @@ __author__ = "Serg Brester"
+ __copyright__ = "Copyright (c) 2014- Serg G. Brester (sebres), 2008- Fail2Ban Contributors"
+ __license__ = "GPL"
+ 
++import atexit
+ import fileinput
+ import os
+ import re
+@@ -40,6 +41,14 @@ from ..client.fail2bancmdline import Fail2banCmdLine
+ from ..client.fail2banclient import exec_command_line as _exec_client, CSocket, VisualWait
+ from ..client.fail2banserver import Fail2banServer, exec_command_line as _exec_server
+ from .. import protocol
++
++def current_umask():
++	tmp = os.umask(0o022)
++	os.umask(tmp)
++	return tmp
++
++old_umask = current_umask()
++
+ from ..server import server
+ from ..server.mytime import MyTime
+ from ..server.utils import Utils
+@@ -48,6 +57,11 @@ from .utils import LogCaptureTestCase, logSys as DefLogSys, with_tmpdir, shutil,
+ 
+ from ..helpers import getLogger
+ 
++def restore_umask():
++	os.umask(old_umask)
++
++atexit.register(restore_umask)
++
+ # Gets the instance of the logger.
+ logSys = getLogger(__name__)
+