Drop downstream python3.11 patch, upstream went with a different fix

i9ce
Orion Poplawski 2 years ago
parent 1c3fb52316
commit 1cb769fd25

@ -1,21 +0,0 @@
Index: fail2ban-1.0.1/fail2ban/tests/actiontestcase.py
===================================================================
--- 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:
- self.assertRaisesRegexp(ValueError, r"properties contain self referencing definitions",
+ self.assertRaisesRegex(ValueError, r"properties contain self referencing definitions",
lambda: self.__action.replaceTag("<a><b>",
self.__action._properties, conditional="family=inet4")
)
# remore self-referencing in props:
delattr(self.__action, 'ac')
# produce self-referencing query except:
- self.assertRaisesRegexp(ValueError, r"possible self referencing definitions in query",
+ self.assertRaisesRegex(ValueError, r"possible self referencing definitions in query",
lambda: self.__action.replaceTag("<x"*30+">"*30,
self.__action._properties, conditional="family=inet6")
)

@ -1,6 +1,6 @@
Name: fail2ban
Version: 1.0.2
Release: 4%{?dist}
Release: 5%{?dist}
Summary: Daemon to ban hosts that cause multiple authentication errors
License: GPLv2+
@ -27,8 +27,6 @@ Source6: Makefile
# https://bugzilla.redhat.com/show_bug.cgi?id=1379141
# https://bugzilla.redhat.com/show_bug.cgi?id=1573185
Patch0: fail2ban-partof.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2034205
Patch1: fail2ban-python311.patch
# Patch for dovecot jail eating 100% CPU
#Patch2: https://github.com/fail2ban/fail2ban/commit/ca2b94c5229bd474f612b57b67d796252a4aab7a.patch
# Remove warning about allowipv6 from startup
@ -424,6 +422,9 @@ fi
%changelog
* Tue Apr 04 2023 Orion Poplawski <orion@nwra.com> - 1.0.2-5
- Drop downstream python3.11 patch, upstream went with a different fix
* Sun Apr 02 2023 Todd Zullinger <tmz@pobox.com> - 1.0.2-4
- verify upstream source signature

Loading…
Cancel
Save