From ae3d937d61f75937b479647cc8bfbf4ae998481d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 10 Mar 2022 22:53:47 +0100 Subject: [PATCH] rebase of the patches --- debian/patches/997601-use_2to3.diff | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/patches/997601-use_2to3.diff b/debian/patches/997601-use_2to3.diff index 5aef0012..26d3071d 100644 --- a/debian/patches/997601-use_2to3.diff +++ b/debian/patches/997601-use_2to3.diff @@ -8,11 +8,11 @@ Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup 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 @@ +Index: fail2ban/setup.py +=================================================================== +--- fail2ban.orig/setup.py ++++ fail2ban/setup.py +@@ -56,7 +56,7 @@ import warnings from glob import glob from fail2ban.setup import updatePyExec @@ -21,7 +21,7 @@ index f4c2550f6..98413273c 100755 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): +@@ -120,22 +120,12 @@ class install_scripts_f2b(install_script # Wrapper to specify fail2ban own options: class install_command_f2b(install): user_options = install.user_options + [ @@ -44,7 +44,7 @@ index f4c2550f6..98413273c 100755 if self.without_tests: self.distribution.scripts.remove('bin/fail2ban-testcases') -@@ -178,7 +168,6 @@ def run(self): +@@ -186,7 +176,6 @@ commands.''' if setuptools: setup_extra = { 'test_suite': "fail2ban.tests.utils.gatherTests", @@ -52,7 +52,7 @@ index f4c2550f6..98413273c 100755 } else: setup_extra = {} -@@ -202,9 +191,6 @@ def run(self): +@@ -210,9 +199,6 @@ if platform_system in ('linux', 'solaris ('/usr/share/doc/fail2ban', doc_files) )