Attachment #227128 for bug #257784

View | Details | Raw Unified | Return to bug 257784
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/security/py-fail2ban/Makefile (-1 / +1 lines)
1	PORTNAME= fail2ban	1	PORTNAME= fail2ban
2	PORTVERSION= 0.11.2	2	PORTVERSION= 0.11.2
3	PORTREVISION= 1	3	PORTREVISION= 2
4	CATEGORIES= security python	4	CATEGORIES= security python
5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	5	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
6		6




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





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





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


Return to bug 257784

Added Link Here

(-)b/security/py-fail2ban/files/patch-fail2ban_server_action.py (+30 lines)
1	From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001
2	From: "Sergey G. Brester" <serg.brester@sebres.de>
3	Date: Mon, 8 Feb 2021 17:19:24 +0100
4	Subject: [PATCH] follow bpo-37324: :ref:`collections-abstract-base-classes`
5	moved to the :mod:`collections.abc` module
6
7	(since 3.10-alpha.5 `MutableMapping` is missing in collections module)
8	---
9	fail2ban/server/action.py \| 5 ++++-
10	1 file changed, 4 insertions(+), 1 deletion(-)
11
12	diff --git fail2ban/server/action.py fail2ban/server/action.py
13	index 3bc48fe0..f0f1e6f5 100644
14	--- fail2ban/server/action.py
15	+++ fail2ban/server/action.py
16	@@ -30,7 +30,10 @@ import tempfile
17	import threading
18	import time
19	from abc import ABCMeta
20	-from collections import MutableMapping
21	+try:
22	+ from collections.abc import MutableMapping
23	+except ImportError:
24	+ from collections import MutableMapping
25
26	from .failregex import mapTag2Opt
27	from .ipdns import DNSUtils
28	--
29	2.32.0
30

Added Link Here

(-)b/security/py-fail2ban/files/patch-fail2ban_server_actions.py (+28 lines)
1	From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001
2	From: "Sergey G. Brester" <serg.brester@sebres.de>
3	Date: Mon, 8 Feb 2021 17:25:45 +0100
4	Subject: [PATCH] amend for `Mapping`
5
6	---
7	fail2ban/server/actions.py \| 5 ++++-
8	1 file changed, 4 insertions(+), 1 deletion(-)
9
10	diff --git fail2ban/server/actions.py fail2ban/server/actions.py
11	index b7b95b44..897d907c 100644
12	--- fail2ban/server/actions.py
13	+++ fail2ban/server/actions.py
14	@@ -28,7 +28,10 @@ import logging
15	import os
16	import sys
17	import time
18	-from collections import Mapping
19	+try:
20	+ from collections.abc import Mapping
21	+except ImportError:
22	+ from collections import Mapping
23	try:
24	from collections import OrderedDict
25	except ImportError:
26	--
27	2.32.0
28

Added Link Here

(-)b/security/py-fail2ban/files/patch-fail2ban_server_jails.py (-1 / +28 lines)
0	-	1	From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001
		2	From: "Sergey G. Brester" <serg.brester@sebres.de>
		3	Date: Mon, 8 Feb 2021 17:35:59 +0100
		4	Subject: [PATCH] amend for `Mapping` (jails)
		5
		6	---
		7	fail2ban/server/jails.py \| 5 ++++-
		8	1 file changed, 4 insertions(+), 1 deletion(-)
		9
		10	diff --git fail2ban/server/jails.py fail2ban/server/jails.py
		11	index 972a8c4b..27e12ddf 100644
		12	--- fail2ban/server/jails.py
		13	+++ fail2ban/server/jails.py
		14	@@ -22,7 +22,10 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2013- Yaroslav Halchenko"
		15	__license__ = "GPL"
		16
		17	from threading import Lock
		18	-from collections import Mapping
		19	+try:
		20	+ from collections.abc import Mapping
		21	+except ImportError:
		22	+ from collections import Mapping
		23
		24	from ..exceptions import DuplicateJailException, UnknownJailException
		25	from .jail import Jail
		26	--
		27	2.32.0
		28