fail2ban: 0.11.2 -> 1.0.1

3 files changed, 24 insertions, 29 deletions

diff --git a/fail2ban/.footprint b/fail2ban/.footprint
index 9910c716c..ef8a9a097 100644
--- a/fail2ban/.footprint
+++ b/fail2ban/.footprint
@@ -2,14 +2,13 @@ drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/fail2ban/
 drwxr-xr-x	root/root	etc/fail2ban/action.d/
 drwxr-xr-x	root/root	etc/fail2ban/action.d/__pycache__/
--rw-r--r--	root/root	etc/fail2ban/action.d/__pycache__/badips.cpython-310.pyc
 -rw-r--r--	root/root	etc/fail2ban/action.d/__pycache__/smtp.cpython-310.pyc
 -rw-rw-r--	root/root	etc/fail2ban/action.d/abuseipdb.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/apf.conf
--rw-rw-r--	root/root	etc/fail2ban/action.d/badips.conf
--rw-rw-r--	root/root	etc/fail2ban/action.d/badips.py
+-rw-rw-r--	root/root	etc/fail2ban/action.d/apprise.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/blocklist_de.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/bsd-ipfw.conf
+-rw-rw-r--	root/root	etc/fail2ban/action.d/cloudflare-token.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/cloudflare.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/complain.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/dshield.conf
@@ -26,15 +25,16 @@ drwxr-xr-x	root/root	etc/fail2ban/action.d/__pycache__/
 -rw-rw-r--	root/root	etc/fail2ban/action.d/ipfilter.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/ipfw.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-allports.conf
--rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-common.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-ipset-proto4.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-ipset-proto6-allports.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-ipset-proto6.conf
+-rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-ipset.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-multiport-log.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-multiport.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-new.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables-xt_recent-echo.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/iptables.conf
+-rw-rw-r--	root/root	etc/fail2ban/action.d/ipthreat.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/mail-buffered.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/mail-whois-common.conf
 -rw-rw-r--	root/root	etc/fail2ban/action.d/mail-whois-lines.conf
@@ -116,10 +116,13 @@ drwxr-xr-x	root/root	etc/fail2ban/filter.d/ignorecommands/
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/lighttpd-auth.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/mongodb-auth.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/monit.conf
+-rw-rw-r--	root/root	etc/fail2ban/filter.d/monitorix.conf
+-rw-rw-r--	root/root	etc/fail2ban/filter.d/mssql-auth.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/murmur.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/mysqld-auth.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/nagios.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/named-refused.conf
+-rw-rw-r--	root/root	etc/fail2ban/filter.d/nginx-bad-request.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/nginx-botsearch.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/nginx-http-auth.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/nginx-limit-req.conf
@@ -138,6 +141,7 @@ drwxr-xr-x	root/root	etc/fail2ban/filter.d/ignorecommands/
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/qmail.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/recidive.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/roundcube-auth.conf
+-rw-rw-r--	root/root	etc/fail2ban/filter.d/scanlogd.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/screensharingd.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/selinux-common.conf
 -rw-rw-r--	root/root	etc/fail2ban/filter.d/selinux-ssh.conf
@@ -180,11 +184,11 @@ lrwxrwxrwx	root/root	usr/bin/fail2ban-python -> /usr/bin/python3
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/python3.10/
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/
-drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/fail2ban-0.11.2-py3.10.egg-info/
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban-0.11.2-py3.10.egg-info/PKG-INFO
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban-0.11.2-py3.10.egg-info/SOURCES.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban-0.11.2-py3.10.egg-info/dependency_links.txt
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban-0.11.2-py3.10.egg-info/top_level.txt
+drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/fail2ban-1.0.1-py3.10.egg-info/
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban-1.0.1-py3.10.egg-info/PKG-INFO
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban-1.0.1-py3.10.egg-info/SOURCES.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban-1.0.1-py3.10.egg-info/dependency_links.txt
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban-1.0.1-py3.10.egg-info/top_level.txt
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/fail2ban/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/fail2ban/__pycache__/
@@ -311,10 +315,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/__init__.py
 drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/__pycache__/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/__pycache__/__init__.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/__pycache__/test_badips.cpython-310.pyc
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/__pycache__/test_smtp.cpython-310.pyc
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/test_badips.py
--rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/test_badips.py.bak
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/action_d/test_smtp.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/actionstestcase.py
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/actiontestcase.py
@@ -440,10 +441,13 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/lighttpd-auth
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/mongodb-auth
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/monit
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/monitorix
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/mssql-auth
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/murmur
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/mysqld-auth
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/nagios
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/named-refused
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/nginx-bad-request
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/nginx-botsearch
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/nginx-http-auth
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/nginx-limit-req
@@ -462,6 +466,7 @@ drwxr-xr-x	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/qmail
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/recidive
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/roundcube-auth
+-rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/scanlogd
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/screensharingd
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/selinux-ssh
 -rw-r--r--	root/root	usr/lib/python3.10/site-packages/fail2ban/tests/files/logs/sendmail-auth
diff --git a/fail2ban/.signature b/fail2ban/.signature
index 177c18869..ba84b3d6b 100644
--- a/fail2ban/.signature
+++ b/fail2ban/.signature
@@ -1,10 +1,7 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3w4aZtkGv1mttJZKo6aIchqoF2RrX3+rRDfJgNiJE+Znh5pj1VrZAVVEHrxgFBd5UjmR2fJ/d5qpL8D7VzLdKwM=
-SHA256 (Pkgfile) = 35b52f717c1fca04a84a96c4aa682e07996de9ba987a139464638d76d068b40b
-SHA256 (.footprint) = 85cf15dda6dc534fb8597faf25f0415442cc4fec866bd38e21a6ed98d33fed9f
-SHA256 (fail2ban-0.11.2.tar.gz) = 383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+RWSagIOpLGJF38n4fUBXqHJbEw99Sr/P7LpbyUV4czF4uUlnlURutj16TRY2GBmhPWoQ2iJlkJsjJbk4qdM2uAhc/cKM5NGRtwU=
+SHA256 (Pkgfile) = 7eadaf25b2e7c285f2b7116896f23155c205628d727de17519f1b2e56ef8cfd9
+SHA256 (.footprint) = 37752521e0e9fd6f05e97299e814129e752ed1f65ac758c0f4971c337f757305
+SHA256 (fail2ban-1.0.1.tar.gz) = 62b54679ebae81ac57f32c5e27aba9f2494ec5bafd45a0fd68e7a27fd448e5ac
 SHA256 (fail2ban.rc) = 2ce3ca9c641dcaa29028909b4f9a2d7f22533ac9d3be9aba45a8362fcb4e36b0
 SHA256 (paths-crux.conf) = 41e6c077c568d7e2fe600e893aa70d7912dcd0316a88f5a695f5ff0d558c8f82
-SHA256 (fail2ban-0.11.2_CVE-2021-32749.patch) = 11270fb30913ae5ce4ee18f95d0425e2dc03f8f3aef7bb6827b4ad2f7cdd8be6
-SHA256 (gh-3020.patch) = 9403dbfccc2073f80f9f6a9cca99b74cf9f11c4a39e3e62aa6c0678d76cf48a6
-SHA256 (2to3.patch) = dc3d255658943214f82114b11c6696d0e5253bc164c6c5034e4ecd5d852ed425
diff --git a/fail2ban/Pkgfile b/fail2ban/Pkgfile
index 6ca95fac3..3673d4c67 100644
--- a/fail2ban/Pkgfile
+++ b/fail2ban/Pkgfile
@@ -4,21 +4,14 @@
 # Depends on: python3-setuptools
 
 name=fail2ban
-version=0.11.2
-release=3
+version=1.0.1
+release=1
 source=(https://github.com/fail2ban/$name/archive/$version/$name-$version.tar.gz
-  fail2ban.rc paths-crux.conf
-  fail2ban-0.11.2_CVE-2021-32749.patch
-  gh-3020.patch
-  2to3.patch)
+  fail2ban.rc paths-crux.conf)
 
 build() {
   cd $name-$version
 
-  patch -Np1 -i $SRC/fail2ban-0.11.2_CVE-2021-32749.patch
-  patch -Np1 -i $SRC/2to3.patch
-  patch -Np1 -i $SRC/gh-3020.patch
-
   ./fail2ban-2to3
   /usr/bin/python3 setup.py build
   /usr/bin/python3 setup.py install --root=$PKG --prefix=/usr --skip-build