Orion Poplawski
2 years ago
parent
af8f467d8f
commit
bbf821b2c0
@ -1,214 +0,0 @@
|
||||
From 659cd9223bb9a04cc50986a3b371e22e2bac9a91 Mon Sep 17 00:00:00 2001
|
||||
From: hsk17 <hsk17@mail.de>
|
||||
Date: Tue, 29 Nov 2022 12:11:59 +0100
|
||||
Subject: [PATCH 1/3] upstream configreader patch
|
||||
|
||||
Signed-off-by: hsk17 <hsk17@mail.de>
|
||||
---
|
||||
.../fail2ban-1.0.2-configreader-warning.patch | 23 +++++++++++++++++++
|
||||
1 file changed, 23 insertions(+)
|
||||
create mode 100644 net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch
|
||||
|
||||
diff --git a/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch b/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch
|
||||
new file mode 100644
|
||||
index 0000000000000..74f2739708ae7
|
||||
--- /dev/null
|
||||
+++ b/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch
|
||||
@@ -0,0 +1,23 @@
|
||||
+From 432e7e1e93936f09e349e80d94254e5f43d0cc8a Mon Sep 17 00:00:00 2001
|
||||
+From: "Sergey G. Brester" <serg.brester@sebres.de>
|
||||
+Date: Mon, 28 Nov 2022 13:21:15 +0100
|
||||
+Subject: [PATCH] no warning if no config value but default (debug message now)
|
||||
+
|
||||
+closes #3420
|
||||
+---
|
||||
+ fail2ban/client/configreader.py | 2 +-
|
||||
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
+
|
||||
+diff --git a/fail2ban/client/configreader.py b/fail2ban/client/configreader.py
|
||||
+index 1b5a56a27c..c7f965ce52 100644
|
||||
+--- a/fail2ban/client/configreader.py
|
||||
++++ b/fail2ban/client/configreader.py
|
||||
+@@ -277,7 +277,7 @@ def getOptions(self, sec, options, pOptions=None, shouldExist=False, convert=Tru
|
||||
+ # TODO: validate error handling here.
|
||||
+ except NoOptionError:
|
||||
+ if not optvalue is None:
|
||||
+- logSys.warning("'%s' not defined in '%s'. Using default one: %r"
|
||||
++ logSys.debug("'%s' not defined in '%s'. Using default one: %r"
|
||||
+ % (optname, sec, optvalue))
|
||||
+ values[optname] = optvalue
|
||||
+ # elif logSys.getEffectiveLevel() <= logLevel:
|
||||
|
||||
From 79a59ae91ece23711370af79dc820a801b05e56b Mon Sep 17 00:00:00 2001
|
||||
From: hsk17 <hsk17@mail.de>
|
||||
Date: Tue, 29 Nov 2022 12:13:05 +0100
|
||||
Subject: [PATCH 2/3] rev bump to add upstream configreader patch
|
||||
|
||||
Signed-off-by: hsk17 <hsk17@mail.de>
|
||||
---
|
||||
.../fail2ban/fail2ban-1.0.2-r1.ebuild | 134 ++++++++++++++++++
|
||||
1 file changed, 134 insertions(+)
|
||||
create mode 100644 net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
|
||||
|
||||
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
|
||||
new file mode 100644
|
||||
index 0000000000000..64532f55baf31
|
||||
--- /dev/null
|
||||
+++ b/net-analyzer/fail2ban/fail2ban-1.0.2-r1.ebuild
|
||||
@@ -0,0 +1,134 @@
|
||||
+# Copyright 1999-2022 Gentoo Authors
|
||||
+# Distributed under the terms of the GNU General Public License v2
|
||||
+
|
||||
+EAPI=8
|
||||
+
|
||||
+DISTUTILS_SINGLE_IMPL=1
|
||||
+PYTHON_COMPAT=( python3_{8..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 ppc ppc64 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}]
|
||||
+ sys-apps/systemd[python(-),${PYTHON_USEDEP}]
|
||||
+ )' 'python*' )
|
||||
+ )
|
||||
+"
|
||||
+
|
||||
+DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
|
||||
+
|
||||
+PATCHES=(
|
||||
+ "${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.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() {
|
||||
+ bin/fail2ban-testcases \
|
||||
+ --no-network \
|
||||
+ --no-gamin \
|
||||
+ --verbosity=4 || die "Tests failed with ${EPYTHON}"
|
||||
+
|
||||
+ # Workaround for bug #790251
|
||||
+ rm -r 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 && ! 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"
|
||||
+ 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
|
||||
+
|
||||
+ 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
|
||||
+}
|
||||
|
||||
From ab30bb72cf1cdb0ccd717c417c10eae82381d6d7 Mon Sep 17 00:00:00 2001
|
||||
From: hsk17 <hsk17@mail.de>
|
||||
Date: Tue, 27 Dec 2022 16:08:43 +0100
|
||||
Subject: [PATCH 3/3] Update fail2ban-1.0.2-configreader-warning.patch
|
||||
|
||||
Signed-off-by: hsk17 <hsk17@mail.de>
|
||||
---
|
||||
.../fail2ban/files/fail2ban-1.0.2-configreader-warning.patch | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch b/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch
|
||||
index 74f2739708ae7..b53e604572cfd 100644
|
||||
--- a/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch
|
||||
+++ b/net-analyzer/fail2ban/files/fail2ban-1.0.2-configreader-warning.patch
|
||||
@@ -1,3 +1,6 @@
|
||||
+
|
||||
+https://github.com/fail2ban/fail2ban/commit/432e7e1
|
||||
+
|
||||
From 432e7e1e93936f09e349e80d94254e5f43d0cc8a Mon Sep 17 00:00:00 2001
|
||||
From: "Sergey G. Brester" <serg.brester@sebres.de>
|
||||
Date: Mon, 28 Nov 2022 13:21:15 +0100
|
||||
@ -0,0 +1,23 @@
|
||||
From 432e7e1e93936f09e349e80d94254e5f43d0cc8a Mon Sep 17 00:00:00 2001
|
||||
From: "Sergey G. Brester" <serg.brester@sebres.de>
|
||||
Date: Mon, 28 Nov 2022 13:21:15 +0100
|
||||
Subject: [PATCH] no warning if no config value but default (debug message now)
|
||||
|
||||
closes #3420
|
||||
---
|
||||
fail2ban/client/configreader.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/fail2ban/client/configreader.py b/fail2ban/client/configreader.py
|
||||
index 1b5a56a27c..c7f965ce52 100644
|
||||
--- a/fail2ban/client/configreader.py
|
||||
+++ b/fail2ban/client/configreader.py
|
||||
@@ -277,7 +277,7 @@ def getOptions(self, sec, options, pOptions=None, shouldExist=False, convert=Tru
|
||||
# TODO: validate error handling here.
|
||||
except NoOptionError:
|
||||
if not optvalue is None:
|
||||
- logSys.warning("'%s' not defined in '%s'. Using default one: %r"
|
||||
+ logSys.debug("'%s' not defined in '%s'. Using default one: %r"
|
||||
% (optname, sec, optvalue))
|
||||
values[optname] = optvalue
|
||||
# elif logSys.getEffectiveLevel() <= logLevel:
|
||||
Loading…
Reference in new issue