From: ftpd <ftpd@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] fail2ban: update to 0.11.2_3.
Date: Wed, 19 Jan 2022 15:27:48 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35123@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 528 bytes --]
There is a new pull request by ftpd against master on the void-packages repository
https://github.com/ftpd/void-packages master
https://github.com/void-linux/void-packages/pull/35123
fail2ban: update to 0.11.2_3.
This minor change fixes fail2ban against python 3.10.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture, x86-glibc.
A patch file from https://github.com/void-linux/void-packages/pull/35123.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-35123.patch --]
[-- Type: text/x-diff, Size: 2954 bytes --]
From b2d348b3108ec36e940d07c6dad70b477f51be09 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
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"
next reply other threads:[~2022-01-19 14:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-19 14:27 ftpd [this message]
2022-01-19 17:10 ` Duncaen
2022-01-19 17:20 ` ftpd
2022-01-19 17:29 ` Duncaen
2022-01-19 17:49 ` ftpd
2022-01-19 17:51 ` fail2ban: update revision to 0.11.2_3 to make it work with python 3.10 ftpd
2022-01-20 9:46 ` [PR PATCH] [Updated] " ftpd
2022-01-20 9:50 ` [PR PATCH] [Updated] fail2ban: add patch for " ftpd
2022-01-20 9:53 ` ftpd
2022-01-20 10:01 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35123@inbox.vuxu.org \
--to=ftpd@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).