cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

security/py-fail2ban: Add upstream patches to fix runtime error with Python 3.10

Browse Source 
PR:		257784
Approved by:	theis AT gmx DOT at (maintainer)
This commit is contained in:
Yasuhiro Kimura 2021-08-12 12:37:43 +09:00 committed by Neel Chauhan
parent d04985d352
commit e8d866428c
4 changed files with 87 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/py-fail2ban/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= fail2ban
PORTVERSION= 0.11.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= security python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

30
security/py-fail2ban/files/patch-fail2ban_server_action.py Normal file
View File

@ -0,0 +1,30 @@
From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
From: "Sergey G. Brester" <serg.brester@sebres.de>
Date: Mon, 8 Feb 2021 17:19:24 +0100
Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes`
moved to the :mod:`collections.abc` module
(since 3.10-alpha.5 `MutableMapping` is missing in collections module)
---
fail2ban/server/action.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git fail2ban/server/action.py fail2ban/server/action.py
index 3bc48fe0..f0f1e6f5 100644
--- fail2ban/server/action.py
+++ fail2ban/server/action.py
@@ -30,7 +30,10 @@ import tempfile
import threading
import time
from abc import ABCMeta
-from collections import MutableMapping
+try:
+ from collections.abc import MutableMapping
+except ImportError:
+ from collections import MutableMapping
from .failregex import mapTag2Opt
from .ipdns import DNSUtils
--
2.32.0

28
security/py-fail2ban/files/patch-fail2ban_server_actions.py Normal file
View File

@ -0,0 +1,28 @@
From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001
From: "Sergey G. Brester" <serg.brester@sebres.de>
Date: Mon, 8 Feb 2021 17:25:45 +0100
Subject: [PATCH] amend for `Mapping`
---
fail2ban/server/actions.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git fail2ban/server/actions.py fail2ban/server/actions.py
index b7b95b44..897d907c 100644
--- fail2ban/server/actions.py
+++ fail2ban/server/actions.py
@@ -28,7 +28,10 @@ import logging
import os
import sys
import time
-from collections import Mapping
+try:
+ from collections.abc import Mapping
+except ImportError:
+ from collections import Mapping
try:
from collections import OrderedDict
except ImportError:
--
2.32.0

28
security/py-fail2ban/files/patch-fail2ban_server_jails.py Normal file
View File

@ -0,0 +1,28 @@
From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001
From: "Sergey G. Brester" <serg.brester@sebres.de>
Date: Mon, 8 Feb 2021 17:35:59 +0100
Subject: [PATCH] amend for `Mapping` (jails)
---
fail2ban/server/jails.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git fail2ban/server/jails.py fail2ban/server/jails.py
index 972a8c4b..27e12ddf 100644
--- fail2ban/server/jails.py
+++ fail2ban/server/jails.py
@@ -22,7 +22,10 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2013- Yaroslav Halchenko"
__license__ = "GPL"
from threading import Lock
-from collections import Mapping
+try:
+ from collections.abc import Mapping
+except ImportError:
+ from collections import Mapping
from ..exceptions import DuplicateJailException, UnknownJailException
from .jail import Jail
--
2.32.0