mirror of https://github.com/fail2ban/fail2ban
Cherry pick 5ac303df8a
to address the 2to3 issue. Thanks to Paul Wise for digging (Closes: #997601)
parent
bdb82eb3b2
commit
8b111878f4
|
@ -1,3 +1,12 @@
|
|||
fail2ban (0.11.2-4) unstable; urgency=medium
|
||||
|
||||
* Cherry pick 5ac303df8a171f748330d4c645ccbf1c2c7f3497
|
||||
to address the 2to3 issue.
|
||||
Thanks to Paul Wise for digging
|
||||
(Closes: #997601)
|
||||
|
||||
-- Sylvestre Ledru <sylvestre@debian.org> Tue, 11 Jan 2022 09:12:57 +0100
|
||||
|
||||
fail2ban (0.11.2-3) unstable; urgency=medium
|
||||
|
||||
[ Debian Janitor ]
|
||||
|
|
|
@ -0,0 +1,64 @@
|
|||
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+)
|
||||
|
||||
---
|
||||
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",
|
|
@ -10,3 +10,4 @@ fix-mail.patch
|
|||
debian_roundcube.diff
|
||||
systemd-run.diff
|
||||
scanlogd.patch
|
||||
997601-use_2to3.diff
|
||||
|
|
Loading…
Reference in New Issue