orion pushed to rpms/fail2ban (epel8). "Add upstream patch to remove
warning about allowipv6 (bz#2160781)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:04 UTC
From af8f467d8f11ec0f313acf6978cd72d81b899d70 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Mar 30 2023 16:24:26 +0000
Subject: Add upstream patch to remove warning about allowipv6 (bz#2160781)
---
diff --git a/28473.patch b/28473.patch
new file mode 100644
index 0000000..3b315cf
--- /dev/null
+++ b/28473.patch
@@ -0,0 +1,214 @@
+From 659cd9223bb9a04cc50986a3b371e22e2bac9a91 Mon Sep 17 00:00:00 2001
+From: hsk17 <hsk17(a)mail.de>
+Date: Tue, 29 Nov 2022 12:11:59 +0100
+Subject: [PATCH 1/3] upstream configreader patch
+
+Signed-off-by: hsk17 <hsk17(a)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(a)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(a)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(a)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(a)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(a)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(a)sebres.de>
+ Date: Mon, 28 Nov 2022 13:21:15 +0100
diff --git a/fail2ban.spec b/fail2ban.spec
index 4814fb2..759fb73 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,6 +1,6 @@
Name: fail2ban
Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Daemon to ban hosts that cause multiple authentication errors
License: GPLv2+
@@ -20,6 +20,8 @@ Patch0: fail2ban-partof.patch
Patch1: fail2ban-python311.patch
# Patch for dovecot jail eating 100% CPU
#Patch2: https://github.com/fail2ban/fail2ban/commit/ca2b94c5229bd474f612b57b67d79...
+# Remove warning about allowipv6 from startup
+Patch2: https://patch-diff.githubusercontent.com/raw/gentoo/gentoo/pull/28473.patch
BuildArch: noarch
@@ -409,6 +411,9 @@ fi
%changelog
+* Thu Mar 30 2023 Orion Poplawski <orion(a)nwra.com> - 1.0.2-3
+- Add upstream patch to remove warning about allowipv6 (bz#2160781)
+
* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
https://src.fedoraproject.org/rpms/fail2ban/c/af8f467d8f11ec0f313acf6978c...
1Â year
orion pushed to rpms/fail2ban (epel8). "Refresh patch to apply to archive."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:04 UTC
From b0713d488e7d9d82d87e570ea82e2e4be441e5df Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Nov 02 2022 17:30:15 +0000
Subject: Refresh patch to apply to archive.
---
diff --git a/ca2b94c5229bd474f612b57b67d796252a4aab7a.patch b/ca2b94c5229bd474f612b57b67d796252a4aab7a.patch
index a00358f..02a9ae5 100644
--- a/ca2b94c5229bd474f612b57b67d796252a4aab7a.patch
+++ b/ca2b94c5229bd474f612b57b67d796252a4aab7a.patch
@@ -13,25 +13,10 @@ Subject: [PATCH] fixes gh-3370: resolve extremely long search by repeated
fail2ban/tests/files/logs/dovecot | 22 ++++++++++++++++++++++
3 files changed, 31 insertions(+), 3 deletions(-)
-diff --git a/ChangeLog b/ChangeLog
-index fc4beade6e..04401ea866 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -11,6 +11,10 @@ ver. 1.0.2-dev-1 (20??/??/??) - development nightly edition
- -----------
-
- ### Fixes
-+* `filter.d/dovecot.conf`:
-+ - fixes regression introduced in gh-3210: resolve extremely long search by repeated apply of non-greedy RE-part
-+ with following branches (it may be extremely slow up to infinite search depending on message), gh-3370
-+ - fixes regression and matches new format in aggressive mode too (amend to gh-3210)
-
- ### New Features and Enhancements
-
-diff --git a/config/filter.d/dovecot.conf b/config/filter.d/dovecot.conf
-index 0415ecb40a..dc3ebbcd42 100644
---- a/config/filter.d/dovecot.conf
-+++ b/config/filter.d/dovecot.conf
+Index: fail2ban-1.0.1/config/filter.d/dovecot.conf
+===================================================================
+--- fail2ban-1.0.1.orig/config/filter.d/dovecot.conf
++++ fail2ban-1.0.1/config/filter.d/dovecot.conf
@@ -7,19 +7,21 @@ before = common.conf
[Definition]
@@ -57,11 +42,11 @@ index 0415ecb40a..dc3ebbcd42 100644
mdre-normal =
-diff --git a/fail2ban/tests/files/logs/dovecot b/fail2ban/tests/files/logs/dovecot
-index 75934c37bb..0e33296129 100644
---- a/fail2ban/tests/files/logs/dovecot
-+++ b/fail2ban/tests/files/logs/dovecot
-@@ -115,6 +115,17 @@ Aug 28 06:38:51 s166-62-100-187 dovecot: imap-login: Disconnected (auth failed,
+Index: fail2ban-1.0.1/fail2ban/tests/files/logs/dovecot
+===================================================================
+--- fail2ban-1.0.1.orig/fail2ban/tests/files/logs/dovecot
++++ fail2ban-1.0.1/fail2ban/tests/files/logs/dovecot
+@@ -115,6 +115,17 @@ Aug 28 06:38:51 s166-62-100-187 dovecot:
# failJSON: { "time": "2004-08-28T06:38:52", "match": true , "host": "192.0.2.4", "desc": "open parenthesis in optional part between Disconnected and (auth failed ...), gh-3210" }
Aug 28 06:38:52 s166-62-100-187 dovecot: imap-login: Disconnected: Connection closed: read(size=1003) failed: Connection reset by peer (auth failed, 1 attempts in 0 secs): user=<test(a)example.com>, rip=192.0.2.4, lip=127.0.0.19, session=<Lsz0Oo7WXti3b7xe>
@@ -79,7 +64,7 @@ index 75934c37bb..0e33296129 100644
# failJSON: { "time": "2004-08-29T03:17:18", "match": true , "host": "192.0.2.133" }
Aug 29 03:17:18 server dovecot: submission-login: Client has quit the connection (auth failed, 1 attempts in 2 secs): user=<user1>, method=LOGIN, rip=192.0.2.133, lip=0.0.0.0
# failJSON: { "time": "2004-08-29T03:53:52", "match": true , "host": "192.0.2.169" }
-@@ -128,6 +139,17 @@ Aug 29 15:33:53 server dovecot: managesieve-login: Disconnected: Too many invali
+@@ -128,6 +139,17 @@ Aug 29 15:33:53 server dovecot: managesi
# filterOptions: [{"mode": "aggressive"}]
diff --git a/fail2ban-python311.patch b/fail2ban-python311.patch
index bd5d050..8a89af7 100644
--- a/fail2ban-python311.patch
+++ b/fail2ban-python311.patch
@@ -1,8 +1,8 @@
-Index: fail2ban-0.11.2/fail2ban/tests/actiontestcase.py
+Index: fail2ban-1.0.1/fail2ban/tests/actiontestcase.py
===================================================================
---- fail2ban-0.11.2.orig/fail2ban/tests/actiontestcase.py
-+++ fail2ban-0.11.2/fail2ban/tests/actiontestcase.py
-@@ -244,14 +244,14 @@ class CommandActionTest(LogCaptureTestCa
+--- fail2ban-1.0.1.orig/fail2ban/tests/actiontestcase.py
++++ fail2ban-1.0.1/fail2ban/tests/actiontestcase.py
+@@ -242,14 +242,14 @@ class CommandActionTest(LogCaptureTestCa
setattr(self.__action, 'ab', "<ac>")
setattr(self.__action, 'x?family=inet6', "")
# produce self-referencing properties except:
https://src.fedoraproject.org/rpms/fail2ban/c/b0713d488e7d9d82d87e570ea82...
1Â year
orion pushed to rpms/fail2ban (epel8). "Require /usr/bin/mail
instead of mailx"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:03 UTC
From cc4f0a773da4af30f0e0e3bbbedd2fa0f2301347 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Jan 28 2022 03:45:23 +0000
Subject: Require /usr/bin/mail instead of mailx
---
diff --git a/fail2ban.spec b/fail2ban.spec
index 224a893..79c2608 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,6 +1,6 @@
Name: fail2ban
Version: 0.11.2
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Daemon to ban hosts that cause multiple authentication errors
License: GPLv2+
@@ -162,7 +162,7 @@ This package contains Fail2Ban's testscases and scripts.
%package mail
Summary: Mail actions for Fail2Ban
Requires: %{name}-server = %{version}-%{release}
-Requires: mailx
+Requires: /usr/bin/mail
%description mail
This package installs Fail2Ban's mail actions. These are an alternative
@@ -407,6 +407,9 @@ fi
%changelog
+* Fri Jan 28 2022 Orion Poplawski <orion(a)nwra.com> - 0.11.2-11
+- Require /usr/bin/mail instead of mailx
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.11.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
https://src.fedoraproject.org/rpms/fail2ban/c/cc4f0a773da4af30f0e0e3bbbed...
1Â year
orion pushed to rpms/fail2ban (epel8). "Use the proper patch"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:04 UTC
From bbf821b2c08ce258874d24cf16de616aba3cdfd6 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Mar 30 2023 16:35:16 +0000
Subject: Use the proper patch
---
diff --git a/28473.patch b/28473.patch
deleted file mode 100644
index 3b315cf..0000000
--- a/28473.patch
+++ /dev/null
@@ -1,214 +0,0 @@
-From 659cd9223bb9a04cc50986a3b371e22e2bac9a91 Mon Sep 17 00:00:00 2001
-From: hsk17 <hsk17(a)mail.de>
-Date: Tue, 29 Nov 2022 12:11:59 +0100
-Subject: [PATCH 1/3] upstream configreader patch
-
-Signed-off-by: hsk17 <hsk17(a)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(a)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(a)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(a)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(a)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(a)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(a)sebres.de>
- Date: Mon, 28 Nov 2022 13:21:15 +0100
diff --git a/432e7e1e93936f09e349e80d94254e5f43d0cc8a.patch b/432e7e1e93936f09e349e80d94254e5f43d0cc8a.patch
new file mode 100644
index 0000000..74f2739
--- /dev/null
+++ b/432e7e1e93936f09e349e80d94254e5f43d0cc8a.patch
@@ -0,0 +1,23 @@
+From 432e7e1e93936f09e349e80d94254e5f43d0cc8a Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester(a)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:
diff --git a/fail2ban.spec b/fail2ban.spec
index 759fb73..266ad11 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -21,7 +21,7 @@ Patch1: fail2ban-python311.patch
# Patch for dovecot jail eating 100% CPU
#Patch2: https://github.com/fail2ban/fail2ban/commit/ca2b94c5229bd474f612b57b67d79...
# Remove warning about allowipv6 from startup
-Patch2: https://patch-diff.githubusercontent.com/raw/gentoo/gentoo/pull/28473.patch
+Patch2: https://github.com/fail2ban/fail2ban/commit/432e7e1e93936f09e349e80d94254...
BuildArch: noarch
https://src.fedoraproject.org/rpms/fail2ban/c/bbf821b2c08ce258874d24cf16d...
1Â year
orion pushed to rpms/fail2ban (epel8). "Update selinux policy for
Fedora 34+"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:03 UTC
From 8bdb66c558605fa5f129e5dcab1a57fdebd50316 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Jun 06 2021 11:59:35 +0000
Subject: Update selinux policy for Fedora 34+
---
diff --git a/fail2ban.spec b/fail2ban.spec
index fa9cfd6..7c15cc2 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,6 +1,6 @@
Name: fail2ban
Version: 0.11.2
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Daemon to ban hosts that cause multiple authentication errors
License: GPLv2+
@@ -397,9 +397,12 @@ fi
%changelog
-* Sun Jun 06 2021 Richard Shaw <hobbes1069(a)gmail.com> - 0.11.2-5
+* Sun Jun 06 2021 Richard Shaw <hobbes1069(a)gmail.com> - 0.11.2-6
- Update selinux policy for Fedora 34+
+* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 0.11.2-5
+- Rebuilt for Python 3.10
+
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek(a)in.waw.pl> - 0.11.2-4
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
https://src.fedoraproject.org/rpms/fail2ban/c/8bdb66c558605fa5f129e5dcab1...
1Â year
orion pushed to rpms/fail2ban (epel8). "Add patch to deal with a new
century in tests (2021)."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:03 UTC
From 029795b77a9a05bf829bb9270d479a5190856a37 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Jan 06 2021 13:18:15 +0000
Subject: Add patch to deal with a new century in tests (2021).
---
diff --git a/fail2ban.spec b/fail2ban.spec
index 92dc81e..1eb8397 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,6 +1,6 @@
Name: fail2ban
Version: 0.11.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Daemon to ban hosts that cause multiple authentication errors
License: GPLv2+
@@ -393,6 +393,9 @@ fi
%changelog
+* Wed Jan 06 2021 Richard Shaw <hobbes1069(a)gmail.com> - 0.11.2-2
+- Add patch to deal with a new century in tests (2021).
+
* Tue Nov 24 2020 Richard Shaw <hobbes1069(a)gmail.com> - 0.11.2-1
- Update to 0.11.2.
https://src.fedoraproject.org/rpms/fail2ban/c/029795b77a9a05bf829bb9270d4...
1Â year
orion pushed to rpms/fail2ban (epel8). "Merge branch 'rawhide' into epel8"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:04 UTC
From 4ddcc9cedd89c9e3d97319e265974e199a507ee9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion(a)nwra.com>
Date: Mar 30 2023 16:24:44 +0000
Subject: Merge branch 'rawhide' into epel8
---
diff --git a/28473.patch b/28473.patch
new file mode 100644
index 0000000..3b315cf
--- /dev/null
+++ b/28473.patch
@@ -0,0 +1,214 @@
+From 659cd9223bb9a04cc50986a3b371e22e2bac9a91 Mon Sep 17 00:00:00 2001
+From: hsk17 <hsk17(a)mail.de>
+Date: Tue, 29 Nov 2022 12:11:59 +0100
+Subject: [PATCH 1/3] upstream configreader patch
+
+Signed-off-by: hsk17 <hsk17(a)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(a)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(a)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(a)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(a)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(a)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(a)sebres.de>
+ Date: Mon, 28 Nov 2022 13:21:15 +0100
diff --git a/fail2ban.spec b/fail2ban.spec
index 4814fb2..759fb73 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,6 +1,6 @@
Name: fail2ban
Version: 1.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Daemon to ban hosts that cause multiple authentication errors
License: GPLv2+
@@ -20,6 +20,8 @@ Patch0: fail2ban-partof.patch
Patch1: fail2ban-python311.patch
# Patch for dovecot jail eating 100% CPU
#Patch2: https://github.com/fail2ban/fail2ban/commit/ca2b94c5229bd474f612b57b67d79...
+# Remove warning about allowipv6 from startup
+Patch2: https://patch-diff.githubusercontent.com/raw/gentoo/gentoo/pull/28473.patch
BuildArch: noarch
@@ -409,6 +411,9 @@ fi
%changelog
+* Thu Mar 30 2023 Orion Poplawski <orion(a)nwra.com> - 1.0.2-3
+- Add upstream patch to remove warning about allowipv6 (bz#2160781)
+
* Thu Jan 19 2023 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
https://src.fedoraproject.org/rpms/fail2ban/c/4ddcc9cedd89c9e3d97319e2659...
1Â year
orion pushed to rpms/fail2ban (epel8). "Rename rpmlint configuration file."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:03 UTC
From 7c6041466e555fb07a3e1da12fb95925e49f7d76 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Jun 28 2021 12:53:55 +0000
Subject: Rename rpmlint configuration file.
---
diff --git a/.rpmlint b/.rpmlint
deleted file mode 100644
index 05ddcce..0000000
--- a/.rpmlint
+++ /dev/null
@@ -1,8 +0,0 @@
-from Config import *
-addFilter("incoherent-logrotate-file /etc/logrotate.d/fail2ban");
-addFilter("macro-in-comment %{(name|version|release)}");
-addFilter("spelling-error .* (tcp|sendmail|shorewall|sshd)");
-# Tests
-addFilter("hidden-file-or-dir .*fail2ban/tests/files/config/apache.*/\.htpasswd");
-addFilter("htaccess-file-error .*fail2ban/tests/files/config/apache.*/\.htaccess");
-addFilter("zero-length .*fail2ban/tests/files/files/");
diff --git a/fail2ban.rpmlintrc b/fail2ban.rpmlintrc
new file mode 100644
index 0000000..05ddcce
--- /dev/null
+++ b/fail2ban.rpmlintrc
@@ -0,0 +1,8 @@
+from Config import *
+addFilter("incoherent-logrotate-file /etc/logrotate.d/fail2ban");
+addFilter("macro-in-comment %{(name|version|release)}");
+addFilter("spelling-error .* (tcp|sendmail|shorewall|sshd)");
+# Tests
+addFilter("hidden-file-or-dir .*fail2ban/tests/files/config/apache.*/\.htpasswd");
+addFilter("htaccess-file-error .*fail2ban/tests/files/config/apache.*/\.htaccess");
+addFilter("zero-length .*fail2ban/tests/files/files/");
https://src.fedoraproject.org/rpms/fail2ban/c/7c6041466e555fb07a3e1da12fb...
1Â year