mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-10 08:14:09 -09:00
package/fail2ban: bump to version 1.0.1
Removing also upstreamed patches. Signed-off-by: Angelo Compagnucci <angelo@amarulasolutions.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Angelo Compagnucci
committed by
Thomas Petazzoni
Thomas Petazzoni
parent
d1ed333dfe
commit
76853089d5
@@ -1,158 +0,0 @@
|
|||||||
From 410a6ce5c80dd981c22752da034f2529b5eee844 Mon Sep 17 00:00:00 2001
|
|
||||||
From: sebres <serg.brester@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
|
|
||||||
|
|
||||||
[Retrieved from:
|
|
||||||
https://github.com/fail2ban/fail2ban/commit/410a6ce5c80dd981c22752da034f2529b5eee844]
|
|
||||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
From 5ac303df8a171f748330d4c645ccbf1c2c7f3497 Mon Sep 17 00:00:00 2001
|
|
||||||
From: sebres <info@sebres.de>
|
|
||||||
Date: Sun, 19 Sep 2021 18:49:18 +0200
|
|
||||||
Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup
|
|
||||||
command: use_2to3 is invalid (setuptools 58+)
|
|
||||||
|
|
||||||
[Retrieved from:
|
|
||||||
https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497]
|
|
||||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
||||||
---
|
|
||||||
setup.py | 16 +---------------
|
|
||||||
1 file changed, 1 insertion(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/setup.py b/setup.py
|
|
||||||
index f4c2550f6..98413273c 100755
|
|
||||||
--- a/setup.py
|
|
||||||
+++ b/setup.py
|
|
||||||
@@ -48,7 +48,7 @@
|
|
||||||
from glob import glob
|
|
||||||
|
|
||||||
from fail2ban.setup import updatePyExec
|
|
||||||
-
|
|
||||||
+from fail2ban.version import version
|
|
||||||
|
|
||||||
source_dir = os.path.realpath(os.path.dirname(
|
|
||||||
# __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.):
|
|
||||||
@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False):
|
|
||||||
# Wrapper to specify fail2ban own options:
|
|
||||||
class install_command_f2b(install):
|
|
||||||
user_options = install.user_options + [
|
|
||||||
- ('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'),
|
|
||||||
('without-tests', None, 'without tests files installation'),
|
|
||||||
]
|
|
||||||
def initialize_options(self):
|
|
||||||
- self.disable_2to3 = None
|
|
||||||
self.without_tests = not with_tests
|
|
||||||
install.initialize_options(self)
|
|
||||||
def finalize_options(self):
|
|
||||||
- global _2to3
|
|
||||||
- ## in the test cases 2to3 should be already done (fail2ban-2to3):
|
|
||||||
- if self.disable_2to3:
|
|
||||||
- _2to3 = False
|
|
||||||
- if _2to3:
|
|
||||||
- cmdclass = self.distribution.cmdclass
|
|
||||||
- cmdclass['build_py'] = build_py_2to3
|
|
||||||
- cmdclass['build_scripts'] = build_scripts_2to3
|
|
||||||
if self.without_tests:
|
|
||||||
self.distribution.scripts.remove('bin/fail2ban-testcases')
|
|
||||||
|
|
||||||
@@ -178,7 +168,6 @@ def run(self):
|
|
||||||
if setuptools:
|
|
||||||
setup_extra = {
|
|
||||||
'test_suite': "fail2ban.tests.utils.gatherTests",
|
|
||||||
- 'use_2to3': True,
|
|
||||||
}
|
|
||||||
else:
|
|
||||||
setup_extra = {}
|
|
||||||
@@ -202,9 +191,6 @@ def run(self):
|
|
||||||
('/usr/share/doc/fail2ban', doc_files)
|
|
||||||
)
|
|
||||||
|
|
||||||
-# Get version number, avoiding importing fail2ban.
|
|
||||||
-# This is due to tests not functioning for python3 as 2to3 takes place later
|
|
||||||
-exec(open(join("fail2ban", "version.py")).read())
|
|
||||||
|
|
||||||
setup(
|
|
||||||
name = "fail2ban",
|
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
# sha256 locally computed
|
# sha256 locally computed
|
||||||
sha256 383108e5f8644cefb288537950923b7520f642e7e114efb843f6e7ea9268b1e0 fail2ban-0.11.2.tar.gz
|
sha256 62b54679ebae81ac57f32c5e27aba9f2494ec5bafd45a0fd68e7a27fd448e5ac fail2ban-1.0.1.tar.gz
|
||||||
sha256 a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b COPYING
|
sha256 a75fec0260742fe6275d63ff6a5d97b924b28766558306b3fa4069763096929b COPYING
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
FAIL2BAN_VERSION = 0.11.2
|
FAIL2BAN_VERSION = 1.0.1
|
||||||
FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION))
|
FAIL2BAN_SITE = $(call github,fail2ban,fail2ban,$(FAIL2BAN_VERSION))
|
||||||
FAIL2BAN_LICENSE = GPL-2.0+
|
FAIL2BAN_LICENSE = GPL-2.0+
|
||||||
FAIL2BAN_LICENSE_FILES = COPYING
|
FAIL2BAN_LICENSE_FILES = COPYING
|
||||||
|
|||||||
Reference in New Issue
Block a user