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 f4c2550f6f..98413273c5 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",
/log/gnu?id=3d9f26a0f87985034eb487c12a855b243eb94ad1'>gnu</a>/<a href='/guix/log/gnu/tests?id=3d9f26a0f87985034eb487c12a855b243eb94ad1'>tests</a>/<a href='/guix/log/gnu/tests/networking.scm?id=3d9f26a0f87985034eb487c12a855b243eb94ad1'>networking.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/tests/networking.scm?id=3d9f26a0f87985034eb487c12a855b243eb94ad1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-04-30 03:47:16 +0200'>2018-04-30</span></td><td><a href='/guix/commit/gnu/tests/networking.scm?id=d94e81dbfc2613f2e3f89500e2a87421f57a032c'>services: Add modem-manager-service-type.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/networking.scm (modem-manager-service-type): New variable.
(&lt;modem-manager-configuration&gt;): New variable.
(modem-manager-configuration): New procedure.
(modem-manager-configuration?): New procedure.
* doc/guix.texi (Networking Services): Document it.
* gnu/tests/networking.scm: Import (gnu services base).
</span></span></td><td>Danny Milosavljevic</td></tr>
<tr><td><span title='2018-04-21 23:46:30 -0700'>2018-04-21</span></td><td><a href='/guix/commit/gnu/tests/networking.scm?id=f1104d900978900addad731dfec4e0e6e5765fbe'>services: Add dhcpd-service-type and &lt;dhcpd-configuration&gt;.</a><span class='msg-avail'>...<span class='msg-tooltip'>* doc/guix.texi (Networking Services): Document it.
* gnu/services/networking.scm (dhcpd-service-type): Add it.
(dhcpd-configuration, dhcpd-configuration?): Add it.
(dhcpd-configuration-package): Add it.
(dhcpd-configuration-config-file): Add it.
(dhcpd-configuration-version): Add it.
(dhcpd-configuration-run-directory): Add it.
(dhcpd-configuration-lease-file): Add it.
(dhcpd-configuration-pid-file): Add it.
(dhcpd-configuration-interfaces): Add it.
* gnu/tests/networking.scm (minimal-dhcpd-v4-config-file)
(dhcpd-v4-configuration, %dhcpd-os, run-dhcpd-test, %test-dhcpd): New
variables.
</span></span></td><td>Chris Marusich</td></tr>
<tr><td><span title='2017-12-29 14:07:38 +0100'>2017-12-29</span></td><td><a href='/guix/commit/gnu/tests/networking.scm?id=671dbdb9d54b437aacb82bd5901c011ca44801dd'>tests: networking: Add tests for Open vSwitch.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests/networking.scm (openvswitch-configuration-service,
%openvswitch-os): New variables.
(setup-openvswitch, run-openvswitch-test): New procedures.
(%test-openvswitch): New public variable.
</span></span></td><td>Marius Bakke</td></tr>