[PR PATCH] Update fail2ban to newest stable

[PR PATCH] Update fail2ban to newest stable

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 811 bytes --]

There is a new pull request by MeganerdNL against master on the void-packages repository

https://github.com/MeganerdNL/void-packages fail2ban-update
https://github.com/void-linux/void-packages/pull/44787

Update fail2ban to newest stable
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-glibc

#### Why this was necessary
There are many changes in fail2ban recently, especially for Python 3.11 - which is standard Python 3 in Void Linux now. Solves some compile errors in often used jail configs.



A patch file from https://github.com/void-linux/void-packages/pull/44787.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fail2ban-update-44787.patch --]
[-- Type: text/x-diff, Size: 5234 bytes --]

From f381333e5101bbc433327cf25b7bf471bcf94b98 Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH] Update fail2ban to newest stable

---
 srcpkgs/fail2ban/files/fail2ban/run       |   2 +-
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 3 files changed, 4 insertions(+), 107 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/files/fail2ban/run b/srcpkgs/fail2ban/files/fail2ban/run
index c8cefb6a825d..cbc8beb2a6b9 100755
--- a/srcpkgs/fail2ban/files/fail2ban/run
+++ b/srcpkgs/fail2ban/files/fail2ban/run
@@ -2,4 +2,4 @@
 exec 2>&1
 mkdir -p /var/run/fail2ban
 
-exec fail2ban-server -f
+exec fail2ban-server -f >/dev/null 2>&1
diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-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 2/4] 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 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
-
-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 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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:
-
-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 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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 db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

Re: Update fail2ban to newest stable

[necrophcodr]

[-- Attachment #1: Type: text/plain, Size: 300 bytes --]

New comment by necrophcodr on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616639189

Comment:
@MeganerdNL You may want to read https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes on how to format commits.

Re: [PR REVIEW] Update fail2ban to newest stable

[necrophcodr]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New review comment by necrophcodr on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#discussion_r1249507523

Comment:
Be aware that this _may_ drop any errors or logging output happening from the server.

Re: [PR REVIEW] Update fail2ban to newest stable

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New review comment by mhmdanas on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#discussion_r1249513423

Comment:
What's the point of this change?

Re: [PR REVIEW] Update fail2ban to newest stable

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

New review comment by MeganerdNL on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#discussion_r1249516883

Comment:
> What's the point of this change?

It prevents the spamming the local login with messages every time you change something (Server OK and so on). I can remove it so users van add it themselves if it has other unwanted effects I'm not aware of.

Re: Update fail2ban to newest stable

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

New comment by MeganerdNL on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616657276

Comment:
> @MeganerdNL You may want to read https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#committing-your-changes on how to format commits.

Thanks. Sorry, I did read it, but thought using git only was ok too. 
If it's a requirement I will use it from now on.

Re: [PR REVIEW] Update fail2ban to newest stable

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 396 bytes --]

New review comment by MeganerdNL on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#discussion_r1249516883

Comment:
> What's the point of this change?

It prevents the spamming the local login with messages every time you change something (Server OK and so on). I can remove it so users can add it themselves if it has other unwanted effects I'm not aware of.

Re: Update fail2ban to newest stable

[Bnyro]

[-- Attachment #1: Type: text/plain, Size: 337 bytes --]

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616664868

Comment:
Following the proper commit message style is a requirement for the PR to become merged.
You can run `git commit --amend -m "fail2ban: update to 1.0.2.` and `git push -f` to fix the commit message.

Re: [PR PATCH] [Updated] Update fail2ban to newest stable

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 816 bytes --]

There is an updated pull request by MeganerdNL against master on the void-packages repository

https://github.com/MeganerdNL/void-packages fail2ban-update
https://github.com/void-linux/void-packages/pull/44787

Update fail2ban to newest stable
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-glibc

#### Why this was necessary
There are many changes in fail2ban recently, especially for Python 3.11 - which is standard Python 3 in Void Linux now. Solves some compile errors in often used jail configs.



A patch file from https://github.com/void-linux/void-packages/pull/44787.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fail2ban-update-44787.patch --]
[-- Type: text/x-diff, Size: 4841 bytes --]

From d577f4e9e30c030414949e4ef7e926530594c40d Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH] fail2ban: update to 1.0.2

---
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-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 2/4] 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 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
-
-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 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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:
-
-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 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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 db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

Re: Update fail2ban to newest stable

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

New comment by MeganerdNL on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616760581

Comment:
- I removed ">/dev/null 2>&1" in the run command as it could indeed prevent important messages per @necrophcodr / @mhmdanas 
- I corrected the commit message style as required per @Bnyro.

Re: [PR PATCH] [Updated] Update fail2ban to newest stable

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 816 bytes --]

There is an updated pull request by MeganerdNL against master on the void-packages repository

https://github.com/MeganerdNL/void-packages fail2ban-update
https://github.com/void-linux/void-packages/pull/44787

Update fail2ban to newest stable
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-glibc

#### Why this was necessary
There are many changes in fail2ban recently, especially for Python 3.11 - which is standard Python 3 in Void Linux now. Solves some compile errors in often used jail configs.



A patch file from https://github.com/void-linux/void-packages/pull/44787.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fail2ban-update-44787.patch --]
[-- Type: text/x-diff, Size: 4841 bytes --]

From d577f4e9e30c030414949e4ef7e926530594c40d Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH] fail2ban: update to 1.0.2

---
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-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 2/4] 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 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
-
-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 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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:
-
-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 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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 db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

Re: [PR PATCH] [Updated] Update fail2ban to newest stable

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 816 bytes --]

There is an updated pull request by MeganerdNL against master on the void-packages repository

https://github.com/MeganerdNL/void-packages fail2ban-update
https://github.com/void-linux/void-packages/pull/44787

Update fail2ban to newest stable
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-glibc

#### Why this was necessary
There are many changes in fail2ban recently, especially for Python 3.11 - which is standard Python 3 in Void Linux now. Solves some compile errors in often used jail configs.



A patch file from https://github.com/void-linux/void-packages/pull/44787.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fail2ban-update-44787.patch --]
[-- Type: text/x-diff, Size: 4841 bytes --]

From d577f4e9e30c030414949e4ef7e926530594c40d Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH] fail2ban: update to 1.0.2

---
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-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 2/4] 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 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
-
-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 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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:
-
-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 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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 db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

Re: [PR PATCH] [Updated] fail2ban: update to 1.0.2

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

There is an updated pull request by MeganerdNL against master on the void-packages repository

https://github.com/MeganerdNL/void-packages fail2ban-update
https://github.com/void-linux/void-packages/pull/44787

fail2ban: update to 1.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-glibc

#### Why this was necessary
There are many changes in fail2ban recently, especially for Python 3.11 - which is standard Python 3 in Void Linux now. Solves some compile errors in often used jail configs.



A patch file from https://github.com/void-linux/void-packages/pull/44787.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fail2ban-update-44787.patch --]
[-- Type: text/x-diff, Size: 4841 bytes --]

From d577f4e9e30c030414949e4ef7e926530594c40d Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH] fail2ban: update to 1.0.2

---
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-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 2/4] 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 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
-
-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 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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:
-
-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 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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 db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

Re: fail2ban: update to 1.0.2

[Bnyro]

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616805410

Comment:
Please run `git rebase -i master` instead of merging the changes.

Re: fail2ban: update to 1.0.2

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 364 bytes --]

New comment by MeganerdNL on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616811953

Comment:
> Please run `git rebase -i master` instead of merging the changes.

Yes I will in the future. Relatively new to git and github. Quick learner. Let me know if I have to change anything now - it seems not,. Cheers.

Re: fail2ban: update to 1.0.2

[Bnyro]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616812569

Comment:
Yes, you should fix that now because your PR bow contains 2 useless commits where you merged with the latest master changes. Otherwise your PR can't be merged because it destroys the commit history.

Re: fail2ban: update to 1.0.2

[Bnyro]

[-- Attachment #1: Type: text/plain, Size: 338 bytes --]

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616812569

Comment:
Yes, you should fix that now because your PR now contains 2 useless commits where you merged with the latest master changes. Otherwise your PR can't be merged because it destroys the commit history.

Re: [PR PATCH] [Updated] fail2ban: update to 1.0.2

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

There is an updated pull request by MeganerdNL against master on the void-packages repository

https://github.com/MeganerdNL/void-packages fail2ban-update
https://github.com/void-linux/void-packages/pull/44787

fail2ban: update to 1.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-glibc

#### Why this was necessary
There are many changes in fail2ban recently, especially for Python 3.11 - which is standard Python 3 in Void Linux now. Solves some compile errors in often used jail configs.



A patch file from https://github.com/void-linux/void-packages/pull/44787.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fail2ban-update-44787.patch --]
[-- Type: text/x-diff, Size: 4841 bytes --]

From ebd15da052da89998a73f41e098d344d5a43fd79 Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH] fail2ban: update to 1.0.2

---
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-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 2/4] 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 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
-
-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 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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:
-
-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 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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 db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

Re: fail2ban: update to 1.0.2

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

New comment by MeganerdNL on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616814298

Comment:
> Yes, you should fix that now because your PR now contains 2 useless commits where you merged with the latest master changes. Otherwise your PR can't be merged because it destroys the commit history.

I did what you said. But it complained. Then I forced pushed it. Is it oke now? Only 1 commit... so it seems. Really sorry for the trouble. Thanks for the help.

Re: fail2ban: update to 1.0.2

[Bnyro]

[-- Attachment #1: Type: text/plain, Size: 220 bytes --]

New comment by Bnyro on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1616816319

Comment:
Yes, the changes in the PR looks good to me now!
Didn't test the package though.

Re: [PR PATCH] [Updated] fail2ban: update to 1.0.2

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 809 bytes --]

There is an updated pull request by MeganerdNL against master on the void-packages repository

https://github.com/MeganerdNL/void-packages fail2ban-update
https://github.com/void-linux/void-packages/pull/44787

fail2ban: update to 1.0.2
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-glibc

#### Why this was necessary
There are many changes in fail2ban recently, especially for Python 3.11 - which is standard Python 3 in Void Linux now. Solves some compile errors in often used jail configs.



A patch file from https://github.com/void-linux/void-packages/pull/44787.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fail2ban-update-44787.patch --]
[-- Type: text/x-diff, Size: 4841 bytes --]

From 870633ef1b7f8b9e6bc07375aa2fe9db5ca64c99 Mon Sep 17 00:00:00 2001
From: MeganerdNL <meganerd@meganerd.nl>
Date: Sun, 2 Jul 2023 14:03:36 +0200
Subject: [PATCH] fail2ban: update to 1.0.2

---
 srcpkgs/fail2ban/patches/python3.10.patch | 103 ----------------------
 srcpkgs/fail2ban/template                 |   6 +-
 2 files changed, 3 insertions(+), 106 deletions(-)
 delete mode 100644 srcpkgs/fail2ban/patches/python3.10.patch

diff --git a/srcpkgs/fail2ban/patches/python3.10.patch b/srcpkgs/fail2ban/patches/python3.10.patch
deleted file mode 100644
index a44fc9aa7645..000000000000
--- a/srcpkgs/fail2ban/patches/python3.10.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 8ae9208454e426aa87b96ba5df26036c4ae5cefd Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Mon, 8 Feb 2021 16:44:27 +0100
-Subject: [PATCH 1/4] try to provide coverage for 3.10-alpha.5 (#2931)
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-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.0-alpha.5', pypy2, pypy3]
-       fail-fast: false
-     # Steps represent a sequence of tasks that will be executed as part of the job
-     steps:
-
-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 2/4] 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 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
-
-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 3/4] amend for `Mapping`
-
----
- fail2ban/server/actions.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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:
-
-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 4/4] amend for `Mapping` (jails)
-
----
- fail2ban/server/jails.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-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 db25a5f28826..caaf7fd6b537 100644
--- a/srcpkgs/fail2ban/template
+++ b/srcpkgs/fail2ban/template
@@ -1,7 +1,7 @@
 # Template file for 'fail2ban'
 pkgname=fail2ban
-version=0.11.2
-revision=4
+version=1.0.2
+revision=1
 build_style=python3-module
 hostmakedepends="pkg-config python3"
 depends="python3"
@@ -11,7 +11,7 @@ license="GPL-2.0-only"
 homepage="https://www.fail2ban.org/"
 changelog="https://raw.githubusercontent.com/fail2ban/fail2ban/master/ChangeLog"
 distfiles="https://github.com/fail2ban/fail2ban/archive/${version}.tar.gz"
-checksum=383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0
+checksum=ae8b0b41f27a7be12d40488789d6c258029b23a01168e3c0d347ee80b325ac23
 conf_files="
  /etc/fail2ban/fail2ban.conf
  /etc/fail2ban/jail.conf

Re: fail2ban: update to 1.0.2

[MeganerdNL]

[-- Attachment #1: Type: text/plain, Size: 214 bytes --]

New comment by MeganerdNL on void-packages repository

https://github.com/void-linux/void-packages/pull/44787#issuecomment-1618944058

Comment:
Ok. last force-push unnecessary. Nothing happened. Learned something.

Re: [PR PATCH] [Merged]: fail2ban: update to 1.0.2

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 639 bytes --]

There's a merged pull request on the void-packages repository

fail2ban: update to 1.0.2
https://github.com/void-linux/void-packages/pull/44787

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - armv6l-glibc

#### Why this was necessary
There are many changes in fail2ban recently, especially for Python 3.11 - which is standard Python 3 in Void Linux now. Solves some compile errors in often used jail configs.