diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2025-05-04 10:56:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-05-06 12:22:35 +0200 |
| commit | 6567fd4072acb3d9c7a3d8347b9dc86af5e7c60f (patch) | |
| tree | c0f728f907373d4a664e71ca71a43b1eea03737e /gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch | |
| parent | 43a5197c6cbd6c5b24d1057db2171b78e04e39df (diff) | |
gnu: fail2ban: Update to 1.1.0.
* gnu/packages/patches/fail2ban-0.11.2_CVE-2021-32749.patch,
gnu/packages/fail2ban-0.11.2_fix-setuptools-drop-2to3.patch,
gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch,
gnu/packages/patches/fail2ban-python310-server-action.patch,
gnu/packages/fail2ban-python310-server-actions.patch: Delete patches.
* gnu/local.mk: Deregister patches.
* gnu/packages/admin.scm (fail2ban): Update to 1.1.0.
[source]<snippet>: Use (srfi srfi-26) for readability.
<patches>: Deregister patches.
[build-system]: Switch to pyproject-build-system.
[arguments]<phases>: Remove phase 'invoke-2to3. Add phase
'avoid-external-binary-in-/bin to avoid creating a symlink to
python-wrapper binary during installation (current 'install phase
breaks otherwise). Run phases 'fix-default-config and
'set-action-dependencies before 'build phase (needed for pyproject).
[native-inputs]: Add python-setuptools, python-wheel.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch')
| -rw-r--r-- | gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch b/gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch deleted file mode 100644 index 91d973e72e..0000000000 --- a/gnu/packages/patches/fail2ban-0.11.2_fix-test-suite.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 747d4683221b5584f9663695fb48145689b42ceb Mon Sep 17 00:00:00 2001 -From: sebres <info@sebres.de> -Date: Mon, 4 Jan 2021 02:42:38 +0100 -Subject: [PATCH] fixes century selector of %ExY and %Exy in datepattern for - tests, considering interval from 2005 (alternate now) to now; + better - grouping algorithm for resulting century RE - ---- - fail2ban/server/strptime.py | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/fail2ban/server/strptime.py b/fail2ban/server/strptime.py -index 1464a96d1f..39fc795865 100644 ---- a/fail2ban/server/strptime.py -+++ b/fail2ban/server/strptime.py -@@ -36,10 +36,30 @@ def _getYearCentRE(cent=(0,3), distance=3, now=(MyTime.now(), MyTime.alternateNo - Thereby respect possible run in the test-cases (alternate date used there) - """ - cent = lambda year, f=cent[0], t=cent[1]: str(year)[f:t] -+ def grp(exprset): -+ c = None -+ if len(exprset) > 1: -+ for i in exprset: -+ if c is None or i[0:-1] == c: -+ c = i[0:-1] -+ else: -+ c = None -+ break -+ if not c: -+ for i in exprset: -+ if c is None or i[0] == c: -+ c = i[0] -+ else: -+ c = None -+ break -+ if c: -+ return "%s%s" % (c, grp([i[len(c):] for i in exprset])) -+ return ("(?:%s)" % "|".join(exprset) if len(exprset[0]) > 1 else "[%s]" % "".join(exprset)) \ -+ if len(exprset) > 1 else "".join(exprset) - exprset = set( cent(now[0].year + i) for i in (-1, distance) ) - if len(now) and now[1]: -- exprset |= set( cent(now[1].year + i) for i in (-1, distance) ) -- return "(?:%s)" % "|".join(exprset) if len(exprset) > 1 else "".join(exprset) -+ exprset |= set( cent(now[1].year + i) for i in xrange(-1, now[0].year-now[1].year+1, distance) ) -+ return grp(sorted(list(exprset))) - - timeRE = TimeRE() - |