orion pushed to rpms/fail2ban (epel8). "Add patch for python 3.11."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:04 UTC
From fb9a87495ac4dc2cbbae4ad703824bd6b3dd5a02 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Jul 26 2022 02:29:30 +0000
Subject: Add patch for python 3.11.
---
diff --git a/3267.patch b/3267.patch
new file mode 100644
index 0000000..9fa335e
--- /dev/null
+++ b/3267.patch
@@ -0,0 +1,86 @@
+From 500895dcfa31f11c81b3c9128781a49a05e3bd05 Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester(a)sebres.de>
+Date: Mon, 25 Apr 2022 18:53:19 +0200
+Subject: [PATCH 1/5] GHA: update python 3.11 version
+
+---
+ .github/workflows/main.yml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: fail2ban-0.11.2/fail2ban/server/datetemplate.py
+===================================================================
+--- fail2ban-0.11.2.orig/fail2ban/server/datetemplate.py
++++ fail2ban-0.11.2/fail2ban/server/datetemplate.py
+@@ -35,6 +35,7 @@ logSys = getLogger(__name__)
+ # check already grouped contains "(", but ignores char "\(" and conditional "(?(id)...)":
+ RE_GROUPED = re.compile(r'(?<!(?:\(\?))(?<!\\)\((?!\?)')
+ RE_GROUP = ( re.compile(r'^((?:\(\?\w+\))?\^?(?:\(\?\w+\))?)(.*?)(\$?)$'), r"\1(\2)\3" )
++RE_GLOBALFLAGS = re.compile(r'((?:^|(?!<\\))\(\?[a-z]+\))')
+
+ RE_EXLINE_NO_BOUNDS = re.compile(r'^\{UNB\}')
+ RE_EXLINE_BOUND_BEG = re.compile(r'^\{\^LN-BEG\}')
+@@ -110,6 +111,11 @@ class DateTemplate(object):
+ # because it may be very slow in negative case (by long log-lines not matching pattern)
+
+ regex = regex.strip()
++ # cut global flags like (?iu) from RE in order to pre-set it after processing:
++ gf = RE_GLOBALFLAGS.search(regex)
++ if gf:
++ regex = RE_GLOBALFLAGS.sub('', regex, count=1)
++ # check word boundaries needed:
+ boundBegin = wordBegin and not RE_NO_WRD_BOUND_BEG.search(regex)
+ boundEnd = wordEnd and not RE_NO_WRD_BOUND_END.search(regex)
+ # if no group add it now, should always have a group(1):
+@@ -135,6 +141,8 @@ class DateTemplate(object):
+ self.flags |= DateTemplate.LINE_END
+ # remove possible special pattern "**" in front and end of regex:
+ regex = RE_DEL_WRD_BOUNDS[0].sub(RE_DEL_WRD_BOUNDS[1], regex)
++ if gf: # restore global flags:
++ regex = gf.group(1) + regex
+ self._regex = regex
+ logSys.log(7, ' constructed regex %s', regex)
+ self._cRegex = None
+Index: fail2ban-0.11.2/fail2ban/server/failregex.py
+===================================================================
+--- fail2ban-0.11.2.orig/fail2ban/server/failregex.py
++++ fail2ban-0.11.2/fail2ban/server/failregex.py
+@@ -91,6 +91,13 @@ R_MAP = {
+ "port": "fport",
+ }
+
++# map global flags like ((?i)xxx) or (?:(?i)xxx) to local flags (?i:xxx) if supported by RE-engine in this python version:
++try:
++ re.search("^re(?i:val)$", "reVAL")
++ R_GLOB2LOCFLAGS = ( re.compile(r"(?<!\\)\((?:\?:)?(\(\?[a-z]+)\)"), r"\1:" )
++except:
++ R_GLOB2LOCFLAGS = ()
++
+ def mapTag2Opt(tag):
+ tag = tag.lower()
+ return R_MAP.get(tag, tag)
+@@ -128,6 +135,9 @@ class Regex:
+ #
+ if regex.lstrip() == '':
+ raise RegexException("Cannot add empty regex")
++ # special handling wrapping global flags to local flags:
++ if R_GLOB2LOCFLAGS:
++ regex = R_GLOB2LOCFLAGS[0].sub(R_GLOB2LOCFLAGS[1], regex)
+ try:
+ self._regexObj = re.compile(regex, re.MULTILINE if multiline else 0)
+ self._regex = regex
+Index: fail2ban-0.11.2/fail2ban/tests/fail2banclienttestcase.py
+===================================================================
+--- fail2ban-0.11.2.orig/fail2ban/tests/fail2banclienttestcase.py
++++ fail2ban-0.11.2/fail2ban/tests/fail2banclienttestcase.py
+@@ -600,6 +600,11 @@ class Fail2banClientTest(Fail2banClientS
+ os.kill(pid, signal.SIGCONT)
+ self.assertLogged("timed out")
+ self.pruneLog()
++ # check readline module available (expected by interactive client)
++ try:
++ import readline
++ except ImportError as e:
++ raise unittest.SkipTest('Skip test because of import error: %s' % e)
+ # interactive client chat with started server:
+ INTERACT += [
+ "echo INTERACT-ECHO",
diff --git a/fail2ban.spec b/fail2ban.spec
index 6d7b302..d03608d 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -27,6 +27,7 @@ Patch3: https://github.com/fail2ban/fail2ban/commit/410a6ce5c80dd981c22752da034f
#Patch4: https://github.com/fail2ban/fail2ban/commit/ebf5784b8cd4b7c52d0f328b78083...
# https://bugzilla.redhat.com/show_bug.cgi?id=2034205
Patch5: fail2ban-python311.patch
+Patch6: https://patch-diff.githubusercontent.com/raw/fail2ban/fail2ban/pull/3267....
BuildArch: noarch
https://src.fedoraproject.org/rpms/fail2ban/c/fb9a87495ac4dc2cbbae4ad7038...
1Â year, 1Â month
orion pushed to rpms/fail2ban (epel8). "Update to 1.0.2."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:04 UTC
From 74ee613b996728c1e890b542c70c22f4196d523d Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Dec 17 2022 23:14:39 +0000
Subject: Update to 1.0.2.
---
diff --git a/.gitignore b/.gitignore
index 79e39c8..7fbd936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ fail2ban-0.8.4.tar.bz2
/fail2ban-0.11.1.tar.gz
/fail2ban-0.11.2.tar.gz
/fail2ban-1.0.1.tar.gz
+/fail2ban-1.0.2.tar.gz
diff --git a/3267.patch b/3267.patch
deleted file mode 100644
index 9fa335e..0000000
--- a/3267.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 500895dcfa31f11c81b3c9128781a49a05e3bd05 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester(a)sebres.de>
-Date: Mon, 25 Apr 2022 18:53:19 +0200
-Subject: [PATCH 1/5] GHA: update python 3.11 version
-
----
- .github/workflows/main.yml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: fail2ban-0.11.2/fail2ban/server/datetemplate.py
-===================================================================
---- fail2ban-0.11.2.orig/fail2ban/server/datetemplate.py
-+++ fail2ban-0.11.2/fail2ban/server/datetemplate.py
-@@ -35,6 +35,7 @@ logSys = getLogger(__name__)
- # check already grouped contains "(", but ignores char "\(" and conditional "(?(id)...)":
- RE_GROUPED = re.compile(r'(?<!(?:\(\?))(?<!\\)\((?!\?)')
- RE_GROUP = ( re.compile(r'^((?:\(\?\w+\))?\^?(?:\(\?\w+\))?)(.*?)(\$?)$'), r"\1(\2)\3" )
-+RE_GLOBALFLAGS = re.compile(r'((?:^|(?!<\\))\(\?[a-z]+\))')
-
- RE_EXLINE_NO_BOUNDS = re.compile(r'^\{UNB\}')
- RE_EXLINE_BOUND_BEG = re.compile(r'^\{\^LN-BEG\}')
-@@ -110,6 +111,11 @@ class DateTemplate(object):
- # because it may be very slow in negative case (by long log-lines not matching pattern)
-
- regex = regex.strip()
-+ # cut global flags like (?iu) from RE in order to pre-set it after processing:
-+ gf = RE_GLOBALFLAGS.search(regex)
-+ if gf:
-+ regex = RE_GLOBALFLAGS.sub('', regex, count=1)
-+ # check word boundaries needed:
- boundBegin = wordBegin and not RE_NO_WRD_BOUND_BEG.search(regex)
- boundEnd = wordEnd and not RE_NO_WRD_BOUND_END.search(regex)
- # if no group add it now, should always have a group(1):
-@@ -135,6 +141,8 @@ class DateTemplate(object):
- self.flags |= DateTemplate.LINE_END
- # remove possible special pattern "**" in front and end of regex:
- regex = RE_DEL_WRD_BOUNDS[0].sub(RE_DEL_WRD_BOUNDS[1], regex)
-+ if gf: # restore global flags:
-+ regex = gf.group(1) + regex
- self._regex = regex
- logSys.log(7, ' constructed regex %s', regex)
- self._cRegex = None
-Index: fail2ban-0.11.2/fail2ban/server/failregex.py
-===================================================================
---- fail2ban-0.11.2.orig/fail2ban/server/failregex.py
-+++ fail2ban-0.11.2/fail2ban/server/failregex.py
-@@ -91,6 +91,13 @@ R_MAP = {
- "port": "fport",
- }
-
-+# map global flags like ((?i)xxx) or (?:(?i)xxx) to local flags (?i:xxx) if supported by RE-engine in this python version:
-+try:
-+ re.search("^re(?i:val)$", "reVAL")
-+ R_GLOB2LOCFLAGS = ( re.compile(r"(?<!\\)\((?:\?:)?(\(\?[a-z]+)\)"), r"\1:" )
-+except:
-+ R_GLOB2LOCFLAGS = ()
-+
- def mapTag2Opt(tag):
- tag = tag.lower()
- return R_MAP.get(tag, tag)
-@@ -128,6 +135,9 @@ class Regex:
- #
- if regex.lstrip() == '':
- raise RegexException("Cannot add empty regex")
-+ # special handling wrapping global flags to local flags:
-+ if R_GLOB2LOCFLAGS:
-+ regex = R_GLOB2LOCFLAGS[0].sub(R_GLOB2LOCFLAGS[1], regex)
- try:
- self._regexObj = re.compile(regex, re.MULTILINE if multiline else 0)
- self._regex = regex
-Index: fail2ban-0.11.2/fail2ban/tests/fail2banclienttestcase.py
-===================================================================
---- fail2ban-0.11.2.orig/fail2ban/tests/fail2banclienttestcase.py
-+++ fail2ban-0.11.2/fail2ban/tests/fail2banclienttestcase.py
-@@ -600,6 +600,11 @@ class Fail2banClientTest(Fail2banClientS
- os.kill(pid, signal.SIGCONT)
- self.assertLogged("timed out")
- self.pruneLog()
-+ # check readline module available (expected by interactive client)
-+ try:
-+ import readline
-+ except ImportError as e:
-+ raise unittest.SkipTest('Skip test because of import error: %s' % e)
- # interactive client chat with started server:
- INTERACT += [
- "echo INTERACT-ECHO",
diff --git a/410a6ce5c80dd981c22752da034f2529b5eee844.patch b/410a6ce5c80dd981c22752da034f2529b5eee844.patch
deleted file mode 100644
index d3c6779..0000000
--- a/410a6ce5c80dd981c22752da034f2529b5eee844.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 410a6ce5c80dd981c22752da034f2529b5eee844 Mon Sep 17 00:00:00 2001
-From: sebres <serg.brester(a)sebres.de>
-Date: Mon, 21 Jun 2021 17:12:53 +0200
-Subject: [PATCH] fixed possible RCE vulnerability, unset escape variable
- (default tilde) stops consider "~" char after new-line as composing escape
- sequence
-
----
- config/action.d/complain.conf | 2 +-
- config/action.d/dshield.conf | 2 +-
- config/action.d/mail-buffered.conf | 8 ++++----
- config/action.d/mail-whois-lines.conf | 2 +-
- config/action.d/mail-whois.conf | 6 +++---
- config/action.d/mail.conf | 6 +++---
- 6 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/config/action.d/complain.conf b/config/action.d/complain.conf
-index 3a5f882c9f..4d73b05859 100644
---- a/config/action.d/complain.conf
-+++ b/config/action.d/complain.conf
-@@ -102,7 +102,7 @@ logpath = /dev/null
- # Notes.: Your system mail command. Is passed 2 args: subject and recipient
- # Values: CMD
- #
--mailcmd = mail -s
-+mailcmd = mail -E 'set escape' -s
-
- # Option: mailargs
- # Notes.: Additional arguments to mail command. e.g. for standard Unix mail:
-diff --git a/config/action.d/dshield.conf b/config/action.d/dshield.conf
-index c128bef348..3d5a7a53a9 100644
---- a/config/action.d/dshield.conf
-+++ b/config/action.d/dshield.conf
-@@ -179,7 +179,7 @@ tcpflags =
- # Notes.: Your system mail command. Is passed 2 args: subject and recipient
- # Values: CMD
- #
--mailcmd = mail -s
-+mailcmd = mail -E 'set escape' -s
-
- # Option: mailargs
- # Notes.: Additional arguments to mail command. e.g. for standard Unix mail:
-diff --git a/config/action.d/mail-buffered.conf b/config/action.d/mail-buffered.conf
-index 325f185b2f..79b841049c 100644
---- a/config/action.d/mail-buffered.conf
-+++ b/config/action.d/mail-buffered.conf
-@@ -17,7 +17,7 @@ actionstart = printf %%b "Hi,\n
- The jail <name> has been started successfully.\n
- Output will be buffered until <lines> lines are available.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-
- # Option: actionstop
- # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
-@@ -28,13 +28,13 @@ actionstop = if [ -f <tmpfile> ]; then
- These hosts have been banned by Fail2Ban.\n
- `cat <tmpfile>`
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: Summary from <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: Summary from <fq-hostname>" <dest>
- rm <tmpfile>
- fi
- printf %%b "Hi,\n
- The jail <name> has been stopped.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-
- # Option: actioncheck
- # Notes.: command executed once before each actionban command
-@@ -55,7 +55,7 @@ actionban = printf %%b "`date`: <ip> (<failures> failures)\n" >> <tmpfile>
- These hosts have been banned by Fail2Ban.\n
- `cat <tmpfile>`
- \nRegards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: Summary" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: Summary" <dest>
- rm <tmpfile>
- fi
-
-diff --git a/config/action.d/mail-whois-lines.conf b/config/action.d/mail-whois-lines.conf
-index 3a3e56b2c7..d2818cb9b9 100644
---- a/config/action.d/mail-whois-lines.conf
-+++ b/config/action.d/mail-whois-lines.conf
-@@ -72,7 +72,7 @@ actionunban =
- # Notes.: Your system mail command. Is passed 2 args: subject and recipient
- # Values: CMD
- #
--mailcmd = mail -s
-+mailcmd = mail -E 'set escape' -s
-
- # Default name of the chain
- #
-diff --git a/config/action.d/mail-whois.conf b/config/action.d/mail-whois.conf
-index 7fea34c40d..ab33b616dc 100644
---- a/config/action.d/mail-whois.conf
-+++ b/config/action.d/mail-whois.conf
-@@ -20,7 +20,7 @@ norestored = 1
- actionstart = printf %%b "Hi,\n
- The jail <name> has been started successfully.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-
- # Option: actionstop
- # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
-@@ -29,7 +29,7 @@ actionstart = printf %%b "Hi,\n
- actionstop = printf %%b "Hi,\n
- The jail <name> has been stopped.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-
- # Option: actioncheck
- # Notes.: command executed once before each actionban command
-@@ -49,7 +49,7 @@ actionban = printf %%b "Hi,\n
- Here is more information about <ip> :\n
- `%(_whois_command)s`\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
-
- # Option: actionunban
- # Notes.: command executed when unbanning an IP. Take care that the
-diff --git a/config/action.d/mail.conf b/config/action.d/mail.conf
-index 5d8c0e154c..f4838ddcb6 100644
---- a/config/action.d/mail.conf
-+++ b/config/action.d/mail.conf
-@@ -16,7 +16,7 @@ norestored = 1
- actionstart = printf %%b "Hi,\n
- The jail <name> has been started successfully.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
-
- # Option: actionstop
- # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
-@@ -25,7 +25,7 @@ actionstart = printf %%b "Hi,\n
- actionstop = printf %%b "Hi,\n
- The jail <name> has been stopped.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
-
- # Option: actioncheck
- # Notes.: command executed once before each actionban command
-@@ -43,7 +43,7 @@ actionban = printf %%b "Hi,\n
- The IP <ip> has just been banned by Fail2Ban after
- <failures> attempts against <name>.\n
- Regards,\n
-- Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
-+ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
-
- # Option: actionunban
- # Notes.: command executed when unbanning an IP. Take care that the
diff --git a/ea26509594a3220b012071604d73bb42d0ecae2c...py-3-10-alpha-5.patch b/ea26509594a3220b012071604d73bb42d0ecae2c...py-3-10-alpha-5.patch
deleted file mode 100644
index c7f2c0f..0000000
--- a/ea26509594a3220b012071604d73bb42d0ecae2c...py-3-10-alpha-5.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From ad74e1c628b4fa2f67d8f7e342138e6e103832ea Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester(a)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 4615401ed..16ff66212 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 a785aab392d8de2ecb685d8bdd9266a0c7f8edf8 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester(a)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 967908af6..91e1ebaf3 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 0e2e2bf37da59649a1c3392b04b9480f84dac446 Mon Sep 17 00:00:00 2001
-From: "Sergey G. Brester" <serg.brester(a)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 972a8c4bd..27e12ddf6 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/f259dac74721c00f0184bf45277137771fc747fe.patch b/f259dac74721c00f0184bf45277137771fc747fe.patch
deleted file mode 100644
index ba399ae..0000000
--- a/f259dac74721c00f0184bf45277137771fc747fe.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 747d4683221b5584f9663695fb48145689b42ceb Mon Sep 17 00:00:00 2001
-From: sebres <info(a)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 1464a96d1..39fc79586 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()
-
diff --git a/fail2ban.spec b/fail2ban.spec
index 74e8a11..f11ef8c 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -1,6 +1,6 @@
Name: fail2ban
-Version: 1.0.1
-Release: 2%{?dist}
+Version: 1.0.2
+Release: 1%{?dist}
Summary: Daemon to ban hosts that cause multiple authentication errors
License: GPLv2+
@@ -11,6 +11,7 @@ Source1: fail2ban.fc
Source2: fail2ban.if
Source3: fail2ban.te
Source4: Makefile
+
# Give up being PartOf iptables and ipset for now
# https://bugzilla.redhat.com/show_bug.cgi?id=1379141
# https://bugzilla.redhat.com/show_bug.cgi?id=1573185
@@ -18,7 +19,7 @@ Patch0: fail2ban-partof.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=2034205
Patch1: fail2ban-python311.patch
# Patch for dovecot jail eating 100% CPU
-Patch2: https://github.com/fail2ban/fail2ban/commit/ca2b94c5229bd474f612b57b67d79...
+#Patch2: https://github.com/fail2ban/fail2ban/commit/ca2b94c5229bd474f612b57b67d79...
BuildArch: noarch
@@ -227,6 +228,7 @@ sed -i "/use_2to3/d" setup.py
%endif
make -f %SOURCE4
+
%install
%if 0%{?rhel} && 0%{?rhel} < 8
%py2_install
@@ -291,6 +293,7 @@ COMPLETIONDIR=%{buildroot}$(pkg-config --variable=completionsdir bash-completion
%__mkdir_p $COMPLETIONDIR
%__install -p -m 644 files/bash-completion $COMPLETIONDIR/fail2ban
+
%check
%if 0%{?rhel} && 0%{?rhel} < 8
%python2 bin/fail2ban-testcases --verbosity=2 --no-network
@@ -351,7 +354,7 @@ fi
%{_mandir}/man1/fail2ban-regex.1*
%{_mandir}/man1/fail2ban-server.1*
%{_mandir}/man5/*.5*
-%config(noreplace) %{_sysconfdir}/fail2ban
+%config(noreplace) %{_sysconfdir}/fail2ban/
%exclude %{_sysconfdir}/fail2ban/action.d/complain.conf
%exclude %{_sysconfdir}/fail2ban/action.d/hostsdeny.conf
%exclude %{_sysconfdir}/fail2ban/action.d/mail.conf
@@ -405,6 +408,9 @@ fi
%changelog
+* Sat Dec 17 2022 Richard Shaw <hobbes1069(a)gmail.com> - 1.0.2-1
+- Update to 1.0.2.
+
* Wed Nov 02 2022 Richard Shaw <hobbes1069(a)gmail.com> - 1.0.1-2
- Add patch for dovecot eating 100% CPU.
diff --git a/sources b/sources
index 90ff00d..6655594 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (fail2ban-1.0.1.tar.gz) = a4d0ee5405225b1ec950f3209bc304c1168c644d06309a187d77119f6bea12c382db046130a86411aad4210b458a16ee092269dc7953400950969a34550c6da5
+SHA512 (fail2ban-1.0.2.tar.gz) = 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb
https://src.fedoraproject.org/rpms/fail2ban/c/74ee613b996728c1e890b542c70...
1Â year, 1Â month
orion pushed to rpms/fail2ban (epel8). "Add new patch to SCM."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:03 UTC
From 268050b7f4b933de944e6c3ba7513fe4aa800e93 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Oct 07 2021 21:49:43 +0000
Subject: Add new patch to SCM.
---
diff --git a/410a6ce5c80dd981c22752da034f2529b5eee844.patch b/410a6ce5c80dd981c22752da034f2529b5eee844.patch
new file mode 100644
index 0000000..d3c6779
--- /dev/null
+++ b/410a6ce5c80dd981c22752da034f2529b5eee844.patch
@@ -0,0 +1,155 @@
+From 410a6ce5c80dd981c22752da034f2529b5eee844 Mon Sep 17 00:00:00 2001
+From: sebres <serg.brester(a)sebres.de>
+Date: Mon, 21 Jun 2021 17:12:53 +0200
+Subject: [PATCH] fixed possible RCE vulnerability, unset escape variable
+ (default tilde) stops consider "~" char after new-line as composing escape
+ sequence
+
+---
+ config/action.d/complain.conf | 2 +-
+ config/action.d/dshield.conf | 2 +-
+ config/action.d/mail-buffered.conf | 8 ++++----
+ config/action.d/mail-whois-lines.conf | 2 +-
+ config/action.d/mail-whois.conf | 6 +++---
+ config/action.d/mail.conf | 6 +++---
+ 6 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/config/action.d/complain.conf b/config/action.d/complain.conf
+index 3a5f882c9f..4d73b05859 100644
+--- a/config/action.d/complain.conf
++++ b/config/action.d/complain.conf
+@@ -102,7 +102,7 @@ logpath = /dev/null
+ # Notes.: Your system mail command. Is passed 2 args: subject and recipient
+ # Values: CMD
+ #
+-mailcmd = mail -s
++mailcmd = mail -E 'set escape' -s
+
+ # Option: mailargs
+ # Notes.: Additional arguments to mail command. e.g. for standard Unix mail:
+diff --git a/config/action.d/dshield.conf b/config/action.d/dshield.conf
+index c128bef348..3d5a7a53a9 100644
+--- a/config/action.d/dshield.conf
++++ b/config/action.d/dshield.conf
+@@ -179,7 +179,7 @@ tcpflags =
+ # Notes.: Your system mail command. Is passed 2 args: subject and recipient
+ # Values: CMD
+ #
+-mailcmd = mail -s
++mailcmd = mail -E 'set escape' -s
+
+ # Option: mailargs
+ # Notes.: Additional arguments to mail command. e.g. for standard Unix mail:
+diff --git a/config/action.d/mail-buffered.conf b/config/action.d/mail-buffered.conf
+index 325f185b2f..79b841049c 100644
+--- a/config/action.d/mail-buffered.conf
++++ b/config/action.d/mail-buffered.conf
+@@ -17,7 +17,7 @@ actionstart = printf %%b "Hi,\n
+ The jail <name> has been started successfully.\n
+ Output will be buffered until <lines> lines are available.\n
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
+
+ # Option: actionstop
+ # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
+@@ -28,13 +28,13 @@ actionstop = if [ -f <tmpfile> ]; then
+ These hosts have been banned by Fail2Ban.\n
+ `cat <tmpfile>`
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: Summary from <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: Summary from <fq-hostname>" <dest>
+ rm <tmpfile>
+ fi
+ printf %%b "Hi,\n
+ The jail <name> has been stopped.\n
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
+
+ # Option: actioncheck
+ # Notes.: command executed once before each actionban command
+@@ -55,7 +55,7 @@ actionban = printf %%b "`date`: <ip> (<failures> failures)\n" >> <tmpfile>
+ These hosts have been banned by Fail2Ban.\n
+ `cat <tmpfile>`
+ \nRegards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: Summary" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: Summary" <dest>
+ rm <tmpfile>
+ fi
+
+diff --git a/config/action.d/mail-whois-lines.conf b/config/action.d/mail-whois-lines.conf
+index 3a3e56b2c7..d2818cb9b9 100644
+--- a/config/action.d/mail-whois-lines.conf
++++ b/config/action.d/mail-whois-lines.conf
+@@ -72,7 +72,7 @@ actionunban =
+ # Notes.: Your system mail command. Is passed 2 args: subject and recipient
+ # Values: CMD
+ #
+-mailcmd = mail -s
++mailcmd = mail -E 'set escape' -s
+
+ # Default name of the chain
+ #
+diff --git a/config/action.d/mail-whois.conf b/config/action.d/mail-whois.conf
+index 7fea34c40d..ab33b616dc 100644
+--- a/config/action.d/mail-whois.conf
++++ b/config/action.d/mail-whois.conf
+@@ -20,7 +20,7 @@ norestored = 1
+ actionstart = printf %%b "Hi,\n
+ The jail <name> has been started successfully.\n
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
+
+ # Option: actionstop
+ # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
+@@ -29,7 +29,7 @@ actionstart = printf %%b "Hi,\n
+ actionstop = printf %%b "Hi,\n
+ The jail <name> has been stopped.\n
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
+
+ # Option: actioncheck
+ # Notes.: command executed once before each actionban command
+@@ -49,7 +49,7 @@ actionban = printf %%b "Hi,\n
+ Here is more information about <ip> :\n
+ `%(_whois_command)s`\n
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
+
+ # Option: actionunban
+ # Notes.: command executed when unbanning an IP. Take care that the
+diff --git a/config/action.d/mail.conf b/config/action.d/mail.conf
+index 5d8c0e154c..f4838ddcb6 100644
+--- a/config/action.d/mail.conf
++++ b/config/action.d/mail.conf
+@@ -16,7 +16,7 @@ norestored = 1
+ actionstart = printf %%b "Hi,\n
+ The jail <name> has been started successfully.\n
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: started on <fq-hostname>" <dest>
+
+ # Option: actionstop
+ # Notes.: command executed at the stop of jail (or at the end of Fail2Ban)
+@@ -25,7 +25,7 @@ actionstart = printf %%b "Hi,\n
+ actionstop = printf %%b "Hi,\n
+ The jail <name> has been stopped.\n
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: stopped on <fq-hostname>" <dest>
+
+ # Option: actioncheck
+ # Notes.: command executed once before each actionban command
+@@ -43,7 +43,7 @@ actionban = printf %%b "Hi,\n
+ The IP <ip> has just been banned by Fail2Ban after
+ <failures> attempts against <name>.\n
+ Regards,\n
+- Fail2Ban"|mail -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
++ Fail2Ban"|mail -E 'set escape' -s "[Fail2Ban] <name>: banned <ip> from <fq-hostname>" <dest>
+
+ # Option: actionunban
+ # Notes.: command executed when unbanning an IP. Take care that the
https://src.fedoraproject.org/rpms/fail2ban/c/268050b7f4b933de944e6c3ba75...
1Â year, 1Â month
orion pushed to rpms/fail2ban (epel8). "Add patches / updates for
various fixes: (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:03 UTC
From 3f49a1709f7b21b5361a191533a2307e2a1b21d2 Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Dec 25 2021 16:35:01 +0000
Subject: Add patches / updates for various fixes:
* Add patch for Python 3.11 compatibilitys, fixes RHBZ#2034205.
* Comment out a few lines in the selinux files that broke building on
EPEL and don't seem to be needed. Fixes RHBZ#2029193.
* Work around 2to3 being removed from Python setuptools.
---
diff --git a/fail2ban-python311.patch b/fail2ban-python311.patch
new file mode 100644
index 0000000..bd5d050
--- /dev/null
+++ b/fail2ban-python311.patch
@@ -0,0 +1,21 @@
+Index: fail2ban-0.11.2/fail2ban/tests/actiontestcase.py
+===================================================================
+--- fail2ban-0.11.2.orig/fail2ban/tests/actiontestcase.py
++++ fail2ban-0.11.2/fail2ban/tests/actiontestcase.py
+@@ -244,14 +244,14 @@ class CommandActionTest(LogCaptureTestCa
+ setattr(self.__action, 'ab', "<ac>")
+ setattr(self.__action, 'x?family=inet6', "")
+ # produce self-referencing properties except:
+- self.assertRaisesRegexp(ValueError, r"properties contain self referencing definitions",
++ self.assertRaisesRegex(ValueError, r"properties contain self referencing definitions",
+ lambda: self.__action.replaceTag("<a><b>",
+ self.__action._properties, conditional="family=inet4")
+ )
+ # remore self-referencing in props:
+ delattr(self.__action, 'ac')
+ # produce self-referencing query except:
+- self.assertRaisesRegexp(ValueError, r"possible self referencing definitions in query",
++ self.assertRaisesRegex(ValueError, r"possible self referencing definitions in query",
+ lambda: self.__action.replaceTag("<x"*30+">"*30,
+ self.__action._properties, conditional="family=inet6")
+ )
diff --git a/fail2ban.spec b/fail2ban.spec
index 93ad3d9..fc96869 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -23,6 +23,10 @@ Patch1: https://github.com/fail2ban/fail2ban/commit/f259dac74721c00f0184bf452771
Patch2: https://github.com/fail2ban/fail2ban/compare/ea26509594a3220b012071604d73...
# CVE-2021-32749 https://github.com/fail2ban/fail2ban/security/advisories/GHSA-m985-3f3v-cwmm
Patch3: https://github.com/fail2ban/fail2ban/commit/410a6ce5c80dd981c22752da034f2...
+# https://github.com/fail2ban/fail2ban/issues/2882
+#Patch4: https://github.com/fail2ban/fail2ban/commit/ebf5784b8cd4b7c52d0f328b78083...
+# https://bugzilla.redhat.com/show_bug.cgi?id=2034205
+Patch5: fail2ban-python311.patch
BuildArch: noarch
@@ -217,6 +221,10 @@ find -type f -exec sed -i -e '1s,^#!/usr/bin/python *,#!/usr/bin/python%{python3
# SELinux sources
cp -p %SOURCE1 %SOURCE2 %SOURCE3 .
+# 2to3 has been removed from setuptools and we already use the binary in
+# %%prep.
+sed -i "/use_2to3/d" setup.py
+
%build
%if 0%{?rhel} && 0%{?rhel} < 8
@@ -263,8 +271,8 @@ cat > %{buildroot}%{_sysconfdir}/%{name}/jail.d/00-firewalld.conf <<EOF
# the firewalld actions as the default actions. You can remove this package
# (along with the empty fail2ban meta-package) if you do not use firewalld
[DEFAULT]
-banaction = firewallcmd-rich-rules[actiontype=<multiport>]
-banaction_allports = firewallcmd-rich-rules[actiontype=<allports>]
+banaction = firewallcmd-rich-rules
+banaction_allports = firewallcmd-rich-rules
EOF
# systemd journal configuration
diff --git a/fail2ban.te b/fail2ban.te
index 92615ca..8cbf7b3 100644
--- a/fail2ban.te
+++ b/fail2ban.te
@@ -45,7 +45,7 @@ allow fail2ban_t self:netlink_netfilter_socket create_socket_perms;
read_files_pattern(fail2ban_t, fail2ban_t, fail2ban_t)
-allow fail2ban_t fail2ban_log_t:file watch;
+#allow fail2ban_t fail2ban_log_t:file watch;
append_files_pattern(fail2ban_t, fail2ban_log_t, fail2ban_log_t)
create_files_pattern(fail2ban_t, fail2ban_log_t, fail2ban_log_t)
setattr_files_pattern(fail2ban_t, fail2ban_log_t, fail2ban_log_t)
@@ -100,10 +100,10 @@ logging_read_syslog_pid(fail2ban_t)
logging_dontaudit_search_audit_logs(fail2ban_t)
logging_mmap_generic_logs(fail2ban_t)
logging_mmap_journal(fail2ban_t)
-logging_watch_audit_log_files(fail2ban_t)
-logging_watch_audit_log_dirs(fail2ban_t)
-logging_watch_generic_log_dirs(fail2ban_t)
-logging_watch_journal_dir(fail2ban_t)
+#logging_watch_audit_log_files(fail2ban_t)
+#logging_watch_audit_log_dirs(fail2ban_t)
+#logging_watch_generic_log_dirs(fail2ban_t)
+#logging_watch_journal_dir(fail2ban_t)
mta_send_mail(fail2ban_t)
https://src.fedoraproject.org/rpms/fail2ban/c/3f49a1709f7b21b5361a191533a...
1Â year, 1Â month
orion pushed to rpms/fail2ban (epel8). "Add patch for Python 3.10a5
compatibility."
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:34:03 UTC
From 4aef760552acf5da3c4ea85bbfe669e0b8d6e97c Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069(a)gmail.com>
Date: Feb 08 2021 23:54:46 +0000
Subject: Add patch for Python 3.10a5 compatibility.
---
diff --git a/ea26509594a3220b012071604d73bb42d0ecae2c...py-3-10-alpha-5.patch b/ea26509594a3220b012071604d73bb42d0ecae2c...py-3-10-alpha-5.patch
new file mode 100644
index 0000000..c7f2c0f
--- /dev/null
+++ b/ea26509594a3220b012071604d73bb42d0ecae2c...py-3-10-alpha-5.patch
@@ -0,0 +1,80 @@
+From ad74e1c628b4fa2f67d8f7e342138e6e103832ea Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester(a)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 4615401ed..16ff66212 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 a785aab392d8de2ecb685d8bdd9266a0c7f8edf8 Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester(a)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 967908af6..91e1ebaf3 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 0e2e2bf37da59649a1c3392b04b9480f84dac446 Mon Sep 17 00:00:00 2001
+From: "Sergey G. Brester" <serg.brester(a)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 972a8c4bd..27e12ddf6 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/fail2ban.spec b/fail2ban.spec
index 1eb8397..bb9e1f6 100644
--- a/fail2ban.spec
+++ b/fail2ban.spec
@@ -18,6 +18,10 @@ Patch0: fail2ban-partof.patch
# Fixes century selector for tests
# https://bugzilla.redhat.com/show_bug.cgi?id=1912472
Patch1: https://github.com/fail2ban/fail2ban/commit/f259dac74721c00f0184bf4527713...
+# Python 3.10a5 compatibility
+# https://bugzilla.redhat.com/show_bug.cgi?id=1926201
+Patch2: https://github.com/fail2ban/fail2ban/compare/ea26509594a3220b012071604d73...
+
BuildArch: noarch
https://src.fedoraproject.org/rpms/fail2ban/c/4aef760552acf5da3c4ea85bbfe...
1Â year, 1Â month
kpvdr pushed to rpms/qpid-proton (f36). "Modified debug stmt for whl
file issue"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 22:05:24 UTC
From e8e808b18efb71de6dcc8840f9af976180c80d0c Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvanderr(a)redhat.com>
Date: Mar 31 2023 22:05:12 +0000
Subject: Modified debug stmt for whl file issue
---
diff --git a/qpid-proton.spec b/qpid-proton.spec
index bcd7193..f649fc3 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -239,7 +239,7 @@ rm -rf build
# library to be installed so we don't duplicate it inside the extension
# That is also why we have to point pkg-config at the installed library
PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig %py3_build_wheel
-ls -la
+ls -la dist/
%py3_install_wheel python_qpid_proton-%{version}-cp310-cp310-linux_%{_arch}.whl
# We seem to need to strip the build extension otherwise it seems to embed a reference to
# the buildroot in the debug info which fails the rpmbuild - probably because we massaged
https://src.fedoraproject.org/rpms/qpid-proton/c/e8e808b18efb71de6dcc8840...
1Â year, 1Â month
rharwood pushed to rpms/grub2 (rawhide). "tmp (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 21:57:48 UTC
From ab62564e2f6f3bf897f65547b6e9155104c283b7 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood(a)redhat.com>
Date: Mar 31 2023 21:47:53 +0000
Subject: tmp
Signed-off-by: Robbie Harwood <rharwood(a)redhat.com>
---
diff --git a/grub.macros b/grub.macros
index ce50aeb..959b972 100644
--- a/grub.macros
+++ b/grub.macros
@@ -623,6 +623,7 @@ if [ %{3} -eq 0 ]; then \
${RPM_BUILD_ROOT}/%{_bindir}/grub2-editenv \\\
${RPM_BUILD_ROOT}/boot/grub2/grubenv create \
fi \
+%{expand:%ifnarch ppc64le \
mkdir pxe \
./grub-mknetdir \\\
--directory ./grub-core \\\
@@ -633,6 +634,7 @@ mkdir pxe \
--net-directory=pxe \\\
--subdir . \
mv pxe/*/core.0 $RPM_BUILD_ROOT/%{_libdir}/grub/%{1}/ \
+%endif} \
%{expand:%%do_install_protected_file grub2-%{legacy_package_arch}} \
cd .. \
%{nil}
https://src.fedoraproject.org/rpms/grub2/c/ab62564e2f6f3bf897f65547b6e915...
1Â year, 1Â month
kpvdr pushed to rpms/qpid-proton (f36). "Modified debug stmt for whl
file issue"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 21:57:16 UTC
From bd0a9aa8f1094e5abb89866dbd53bbb4af37e65f Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kvanderr(a)redhat.com>
Date: Mar 31 2023 21:57:04 +0000
Subject: Modified debug stmt for whl file issue
---
diff --git a/qpid-proton.spec b/qpid-proton.spec
index c0c671f..bcd7193 100644
--- a/qpid-proton.spec
+++ b/qpid-proton.spec
@@ -239,7 +239,7 @@ rm -rf build
# library to be installed so we don't duplicate it inside the extension
# That is also why we have to point pkg-config at the installed library
PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig %py3_build_wheel
-ls -la *.whl
+ls -la
%py3_install_wheel python_qpid_proton-%{version}-cp310-cp310-linux_%{_arch}.whl
# We seem to need to strip the build extension otherwise it seems to embed a reference to
# the buildroot in the debug info which fails the rpmbuild - probably because we massaged
https://src.fedoraproject.org/rpms/qpid-proton/c/bd0a9aa8f1094e5abb89866d...
1Â year, 1Â month
bgurney pushed to rpms/stratis-cli (f36). "Update to 3.5.1 (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2023-03-31 21:51:15 UTC
From 00fa94ae6e66bb2d5cc9cf953f3a541203b48899 Mon Sep 17 00:00:00 2001
From: Bryan Gurney <bgurney(a)redhat.com>
Date: Mar 31 2023 21:50:39 +0000
Subject: Update to 3.5.1
Signed-off-by: Bryan Gurney <bgurney(a)redhat.com>
---
diff --git a/.gitignore b/.gitignore
index 709f423..19f7aa6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
/stratis-cli-3.4.0.tar.gz
/stratis-cli-3.4.1.tar.gz
/stratis-cli-3.5.0.tar.gz
+/stratis-cli-3.5.1.tar.gz
diff --git a/sources b/sources
index 1af1dc6..4a10e21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (stratis-cli-3.5.0.tar.gz) = e67b8531c662c9a01aff4633d73c492d48ad2409f9a4d7c68aaf12549dbdc4bdcefae2c74265a6c535fca5bc8ee1d0c8de78b67ed57404686bd35e1474bae65b
+SHA512 (stratis-cli-3.5.1.tar.gz) = f32854b458f2e61f1bad664894fd8a59ce3ea7351c1adb73c750f2bf9c4795801e9398c6109a13fd7c2af136757a26551c2f7dbc30443743400f27358b357d82
diff --git a/stratis-cli.spec b/stratis-cli.spec
index 520f071..3f21fe0 100644
--- a/stratis-cli.spec
+++ b/stratis-cli.spec
@@ -1,5 +1,5 @@
Name: stratis-cli
-Version: 3.5.0
+Version: 3.5.1
Release: 1%{?dist}
Summary: Command-line tool for interacting with the Stratis daemon
@@ -62,6 +62,9 @@ a2x -f manpage docs/stratis.txt
%{python3_sitelib}/stratis_cli-*.egg-info/
%changelog
+* Fri Mar 31 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.1-1
+- Update to 3.5.1
+
* Fri Feb 03 2023 Bryan Gurney <bgurney(a)redhat.com> - 3.5.0-1
- Update to 3.5.0
diff --git a/tests/tests.yml b/tests/tests.yml
index 39d4d9f..29d1bf6 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -15,4 +15,4 @@
repositories:
- repo: "https://github.com/stratis-storage/testing.git"
dest: "testing"
- version: "v3.4.0"
+ version: "v3.5.1"
https://src.fedoraproject.org/rpms/stratis-cli/c/00fa94ae6e66bb2d5cc9cf95...
1Â year, 1Â month