From b2d348b3108ec36e940d07c6dad70b477f51be09 Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Wed, 19 Jan 2022 15:20:58 +0100 Subject: [PATCH] fail2ban: update to 0.11.2_3. --- srcpkgs/fail2ban/patches/python3.10.diff | 61 ++++++++++++++++++++++++ srcpkgs/fail2ban/template | 2 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/fail2ban/patches/python3.10.diff diff --git a/srcpkgs/fail2ban/patches/python3.10.diff b/srcpkgs/fail2ban/patches/python3.10.diff new file mode 100644 index 000000000000..4f24fff30517 --- /dev/null +++ b/srcpkgs/fail2ban/patches/python3.10.diff @@ -0,0 +1,61 @@ +diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml +index 7a1d31df3d..262448c2da 100644 +--- a/.github/workflows/main.yml ++++ b/.github/workflows/main.yml +@@ -22,7 +22,7 @@ jobs: + runs-on: ubuntu-20.04 + strategy: + matrix: +- python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3] ++ python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, 3.10, pypy2, pypy3] + fail-fast: false + # Steps represent a sequence of tasks that will be executed as part of the job + steps: +diff --git a/fail2ban/server/action.py b/fail2ban/server/action.py +index 3bc48fe046..f0f1e6f59a 100644 +--- a/fail2ban/server/action.py ++++ b/fail2ban/server/action.py +@@ -30,7 +30,10 @@ + 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 +diff --git a/fail2ban/server/actions.py b/fail2ban/server/actions.py +index b7b95b445a..897d907c1a 100644 +--- a/fail2ban/server/actions.py ++++ b/fail2ban/server/actions.py +@@ -28,7 +28,10 @@ + 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: +diff --git a/fail2ban/server/jails.py b/fail2ban/server/jails.py +index 972a8c4bd2..27e12ddf65 100644 +--- a/fail2ban/server/jails.py ++++ b/fail2ban/server/jails.py +@@ -22,7 +22,10 @@ + __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 diff --git a/srcpkgs/fail2ban/template b/srcpkgs/fail2ban/template index 0498ef9672af..686ddb8dd0e3 100644 --- a/srcpkgs/fail2ban/template +++ b/srcpkgs/fail2ban/template @@ -1,7 +1,7 @@ # Template file for 'fail2ban' pkgname=fail2ban version=0.11.2 -revision=2 +revision=3 build_style=python3-module hostmakedepends="pkg-config python3" depends="python3"