Control: tags 902817 + patch Control: tags 902817 + pending Dear maintainer,
I've prepared an NMU for fail2ban (versioned as 0.10.2-2.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for fail2ban-0.10.2 fail2ban-0.10.2 changelog | 7 +++ patches/0005-python37.patch | 86 ++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 3 files changed, 94 insertions(+) diff -Nru fail2ban-0.10.2/debian/changelog fail2ban-0.10.2/debian/changelog --- fail2ban-0.10.2/debian/changelog 2018-04-04 06:47:53.000000000 +0200 +++ fail2ban-0.10.2/debian/changelog 2018-09-23 20:14:23.000000000 +0200 @@ -1,3 +1,10 @@ +fail2ban (0.10.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add patch from upstream to fix SyntaxError with Python 3.7. Closes: #902817 + + -- Mattia Rizzolo <mat...@debian.org> Sun, 23 Sep 2018 20:14:23 +0200 + fail2ban (0.10.2-2) unstable; urgency=medium [ Arturo Borrero Gonzalez ] diff -Nru fail2ban-0.10.2/debian/patches/0005-python37.patch fail2ban-0.10.2/debian/patches/0005-python37.patch --- fail2ban-0.10.2/debian/patches/0005-python37.patch 1970-01-01 01:00:00.000000000 +0100 +++ fail2ban-0.10.2/debian/patches/0005-python37.patch 2018-09-23 20:13:46.000000000 +0200 @@ -0,0 +1,86 @@ +From ac9d5f61e7e9151f7518c26db192dd6d0bf56591 Mon Sep 17 00:00:00 2001 +From: sebres <serg.bres...@sebres.de> +Date: Wed, 24 Jan 2018 15:47:05 +0100 +Subject: [PATCH] rewrite keywords reserved in python 3.7 (`async` -> + `nonsync`) + +Origin: upstream, https://github.com/fail2ban/fail2ban/commit/ac9d5f61e7e9151f7518c26db192dd6d0bf56591 +Bug-Debian: https://bugs.debian.org/902817 + +--- + fail2ban/client/fail2banclient.py | 6 +++--- + fail2ban/client/fail2banserver.py | 23 +++++++++++++---------- + 2 files changed, 16 insertions(+), 13 deletions(-) + +diff --git a/fail2ban/client/fail2banclient.py b/fail2ban/client/fail2banclient.py +index 0a1ae4f11..13ebcdef4 100755 +--- a/fail2ban/client/fail2banclient.py ++++ b/fail2ban/client/fail2banclient.py +@@ -228,9 +228,9 @@ def __startServer(self, background=True): + return True + + ## +- def configureServer(self, async=True, phase=None): +- # if asynchron start this operation in the new thread: +- if async: ++ def configureServer(self, nonsync=True, phase=None): ++ # if asynchronous start this operation in the new thread: ++ if nonsync: + th = Thread(target=Fail2banClient.configureServer, args=(self, False, phase)) + th.daemon = True + return th.start() +diff --git a/fail2ban/client/fail2banserver.py b/fail2ban/client/fail2banserver.py +index 6c57fbf88..afe36cf43 100644 +--- a/fail2ban/client/fail2banserver.py ++++ b/fail2ban/client/fail2banserver.py +@@ -164,21 +164,24 @@ def start(self, argv): + cli = self._Fail2banClient() + return cli.start(argv) + +- # Start the server: +- from ..server.utils import Utils +- # background = True, if should be new process running in background, otherwise start in foreground +- # process will be forked in daemonize, inside of Server module. +- # async = True, if started from client, should... ++ # Start the server, corresponding options: ++ # background = True, if should be new process running in background, otherwise start in ++ # foreground process will be forked in daemonize, inside of Server module. ++ # nonsync = True, normally internal call only, if started from client, so configures ++ # the server via asynchronous thread. + background = self._conf["background"] +- async = self._conf.get("async", False) ++ nonsync = self._conf.get("async", False) ++ + # If was started not from the client: +- if not async: ++ if not nonsync: ++ # Load requirements on demand (we need utils only when asynchronous handling): ++ from ..server.utils import Utils + # Start new thread with client to read configuration and + # transfer it to the server: + cli = self._Fail2banClient() + phase = dict() + logSys.debug('Configure via async client thread') +- cli.configureServer(async=True, phase=phase) ++ cli.configureServer(phase=phase) + # wait, do not continue if configuration is not 100% valid: + Utils.wait_for(lambda: phase.get('ready', None) is not None, self._conf["timeout"], 0.001) + logSys.log(5, ' server phase %s', phase) +@@ -195,7 +198,7 @@ def _server_ready(): + pid = os.getpid() + server = Fail2banServer.startServerDirect(self._conf, background) + # notify waiting thread server ready resp. done (background execution, error case, etc): +- if not async: ++ if not nonsync: + _server_ready() + # If forked - just exit other processes + if pid != os.getpid(): # pragma: no cover +@@ -204,7 +207,7 @@ def _server_ready(): + cli._server = server + + # wait for client answer "done": +- if not async and cli: ++ if not nonsync and cli: + Utils.wait_for(lambda: phase.get('done', None) is not None, self._conf["timeout"], 0.001) + if not phase.get('done', False): + if server: # pragma: no cover diff -Nru fail2ban-0.10.2/debian/patches/series fail2ban-0.10.2/debian/patches/series --- fail2ban-0.10.2/debian/patches/series 2018-04-04 06:47:53.000000000 +0200 +++ fail2ban-0.10.2/debian/patches/series 2018-09-23 20:13:05.000000000 +0200 @@ -7,3 +7,4 @@ 0004-BF-use-build_-_2to3-if-in-_2to3.patch 0001-BF-RF-test-for-being-a-root-to-check-if-actually-can.patch deb_no_iptables_service +0005-python37.patch
signature.asc
Description: PGP signature
