From owner-dev-commits-ports-all@freebsd.org Thu Aug 12 14:46:23 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D149166D879; Thu, 12 Aug 2021 14:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GlqJH5LWnz4sf1; Thu, 12 Aug 2021 14:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9F98724B43; Thu, 12 Aug 2021 14:46:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17CEkNZk032134; Thu, 12 Aug 2021 14:46:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17CEkNBS032133; Thu, 12 Aug 2021 14:46:23 GMT (envelope-from git) Date: Thu, 12 Aug 2021 14:46:23 GMT Message-Id: <202108121446.17CEkNBS032133@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: e8d866428c99 - main - security/py-fail2ban: Add upstream patches to fix runtime error with Python 3.10 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8d866428c99ca6838a6a112cb16fd5df1e2cffc Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 Aug 2021 14:46:23 -0000 The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=e8d866428c99ca6838a6a112cb16fd5df1e2cffc commit e8d866428c99ca6838a6a112cb16fd5df1e2cffc Author: Yasuhiro Kimura AuthorDate: 2021-08-12 03:37:43 +0000 Commit: Neel Chauhan CommitDate: 2021-08-12 14:45:04 +0000 security/py-fail2ban: Add upstream patches to fix runtime error with Python 3.10 PR: 257784 Approved by: theis AT gmx DOT at (maintainer) --- security/py-fail2ban/Makefile | 2 +- .../files/patch-fail2ban_server_action.py | 30 ++++++++++++++++++++++ .../files/patch-fail2ban_server_actions.py | 28 ++++++++++++++++++++ .../files/patch-fail2ban_server_jails.py | 28 ++++++++++++++++++++ 4 files changed, 87 insertions(+), 1 deletion(-) diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile index cea038fdbc63..884231380fb3 100644 --- a/security/py-fail2ban/Makefile +++ b/security/py-fail2ban/Makefile @@ -1,6 +1,6 @@ PORTNAME= fail2ban PORTVERSION= 0.11.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-fail2ban/files/patch-fail2ban_server_action.py b/security/py-fail2ban/files/patch-fail2ban_server_action.py new file mode 100644 index 000000000000..eed4bbc6d84d --- /dev/null +++ b/security/py-fail2ban/files/patch-fail2ban_server_action.py @@ -0,0 +1,30 @@ +From 2b6bb2c1bed8f7009631e8f8c306fa3160324a49 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +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 + diff --git a/security/py-fail2ban/files/patch-fail2ban_server_actions.py b/security/py-fail2ban/files/patch-fail2ban_server_actions.py new file mode 100644 index 000000000000..bdbf5ab2f18e --- /dev/null +++ b/security/py-fail2ban/files/patch-fail2ban_server_actions.py @@ -0,0 +1,28 @@ +From 42dee38ad2ac5c3f23bdf297d824022923270dd9 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +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 + diff --git a/security/py-fail2ban/files/patch-fail2ban_server_jails.py b/security/py-fail2ban/files/patch-fail2ban_server_jails.py new file mode 100644 index 000000000000..c299687b992a --- /dev/null +++ b/security/py-fail2ban/files/patch-fail2ban_server_jails.py @@ -0,0 +1,28 @@ +From 9f1d1f4fbd0804695a976beb191f2c49a2739834 Mon Sep 17 00:00:00 2001 +From: "Sergey G. Brester" +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 +