python3-fail2ban: fix build failure and cleanup

Fixes:
error in fail2ban setup command: use_2to3 is invalid.
ERROR: 'python3 setup.py build ' execution failed.

drop custom fail2ban_setup.py
remove pyhton-fail2ban as its a symlink to python3

Update to tip for 11.2 branch

Signed-off-by: Armin Kuster <akuster808@gmail.com>

2 files changed, 4 insertions, 178 deletions

diff --git a/recipes-security/fail2ban/files/fail2ban_setup.py b/recipes-security/fail2ban/files/fail2ban_setup.py
deleted file mode 100755
index e231949..0000000
--- a/recipes-security/fail2ban/files/fail2ban_setup.py
+++ /dev/null
@@ -1,174 +0,0 @@
-# emacs: -*- mode: python; py-indent-offset: 4; indent-tabs-mode: t -*-
-# vi: set ft=python sts=4 ts=4 sw=4 noet :
-
-# This file is part of Fail2Ban.
-#
-# Fail2Ban is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# Fail2Ban is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Fail2Ban; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-
-__author__ = "Cyril Jaquier, Steven Hiscocks, Yaroslav Halchenko"
-__copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2008-2016 Fail2Ban Contributors"
-__license__ = "GPL"
-
-import platform
-
-try:
-        import setuptools
-        from setuptools import setup
-        from setuptools.command.install import install
-        from setuptools.command.install_scripts import install_scripts
-except ImportError:
-        setuptools = None
-        from distutils.core import setup
-
-# all versions
-from distutils.command.build_py import build_py
-from distutils.command.build_scripts import build_scripts
-if setuptools is None:
-        from distutils.command.install import install
-        from distutils.command.install_scripts import install_scripts
-try:
-        # python 3.x
-        from distutils.command.build_py import build_py_2to3
-        from distutils.command.build_scripts import build_scripts_2to3
-        _2to3 = True
-except ImportError:
-        # python 2.x
-        _2to3 = False
-
-import os
-from os.path import isfile, join, isdir, realpath
-import sys
-import warnings
-from glob import glob
-
-from fail2ban.setup import updatePyExec
-
-if setuptools and "test" in sys.argv:
-        import logging
-        logSys = logging.getLogger("fail2ban")
-        hdlr = logging.StreamHandler(sys.stdout)
-        fmt = logging.Formatter("%(asctime)-15s %(message)s")
-        hdlr.setFormatter(fmt)
-        logSys.addHandler(hdlr)
-        if set(["-q", "--quiet"]) & set(sys.argv):
-                logSys.setLevel(logging.CRITICAL)
-                warnings.simplefilter("ignore")
-                sys.warnoptions.append("ignore")
-        elif set(["-v", "--verbose"]) & set(sys.argv):
-                logSys.setLevel(logging.DEBUG)
-        else:
-                logSys.setLevel(logging.INFO)
-elif "test" in sys.argv:
-        print("python distribute required to execute fail2ban tests")
-        print("")
-
-longdesc = '''
-Fail2Ban scans log files like /var/log/pwdfail or
-/var/log/apache/error_log and bans IP that makes
-too many password failures. It updates firewall rules
-to reject the IP address or executes user defined
-commands.'''
-
-if setuptools:
-        setup_extra = {
-                'test_suite': "fail2ban.tests.utils.gatherTests",
-                'use_2to3': True,
-        }
-else:
-        setup_extra = {}
-
-data_files_extra = []
-
-# Installing documentation files only under Linux or other GNU/ systems
-# (e.g. GNU/kFreeBSD), since others might have protective mechanisms forbidding
-# installation there (see e.g. #1233)
-platform_system = platform.system().lower()
-doc_files = ['README.md', 'DEVELOP', 'FILTERS', 'doc/run-rootless.txt']
-if platform_system in ('solaris', 'sunos'):
-        doc_files.append('README.Solaris')
-if platform_system in ('linux', 'solaris', 'sunos') or platform_system.startswith('gnu'):
-        data_files_extra.append(
-                ('/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",
-        version = version,
-        description = "Ban IPs that make too many password failures",
-        long_description = longdesc,
-        author = "Cyril Jaquier & Fail2Ban Contributors",
-        author_email = "cyril.jaquier@fail2ban.org",
-        url = "http://www.fail2ban.org",
-        license = "GPL",
-        platforms = "Posix",
-        cmdclass = {
-                'build_py': build_py, 'build_scripts': build_scripts, 
-        },
-        scripts = [
-                'bin/fail2ban-client',
-                'bin/fail2ban-server',
-                'bin/fail2ban-regex',
-                'bin/fail2ban-testcases',
-                # 'bin/fail2ban-python', -- link (binary), will be installed via install_scripts_f2b wrapper
-        ],
-        packages = [
-                'fail2ban',
-                'fail2ban.client',
-                'fail2ban.server',
-                'fail2ban.tests',
-                'fail2ban.tests.action_d',
-        ],
-        package_data = {
-                'fail2ban.tests':
-                        [ join(w[0], f).replace("fail2ban/tests/", "", 1)
-                                for w in os.walk('fail2ban/tests/files')
-                                for f in w[2]] +
-                        [ join(w[0], f).replace("fail2ban/tests/", "", 1)
-                                for w in os.walk('fail2ban/tests/config')
-                                for f in w[2]] +
-                        [ join(w[0], f).replace("fail2ban/tests/", "", 1)
-                                for w in os.walk('fail2ban/tests/action_d')
-                                for f in w[2]]
-        },
-        data_files = [
-                ('/etc/fail2ban',
-                        glob("config/*.conf")
-                ),
-                ('/etc/fail2ban/filter.d',
-                        glob("config/filter.d/*.conf")
-                ),
-                ('/etc/fail2ban/filter.d/ignorecommands',
-                        [p for p in glob("config/filter.d/ignorecommands/*") if isfile(p)]
-                ),
-                ('/etc/fail2ban/action.d',
-                        glob("config/action.d/*.conf") +
-                        glob("config/action.d/*.py")
-                ),
-                ('/etc/fail2ban/fail2ban.d',
-                        ''
-                ),
-                ('/etc/fail2ban/jail.d',
-                        ''
-                ),
-                ('/var/lib/fail2ban',
-                        ''
-                ),
-        ] + data_files_extra,
-        **setup_extra
-)
diff --git a/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb b/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb
index ed75a0e..627496f 100644
--- a/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb
+++ b/recipes-security/fail2ban/python3-fail2ban_0.11.2.bb
@@ -9,10 +9,9 @@ HOMEPAGE = "http://www.fail2ban.org"
 LICENSE = "GPL-2.0"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ecabc31e90311da843753ba772885d9f"
 
-SRCREV ="eea1881b734b73599a21df2bfbe58b11f78d0a46"
+SRCREV ="d6b884f3b72b8a42b21da863836569ef6836c2ea"
 SRC_URI = " git://github.com/fail2ban/fail2ban.git;branch=0.11 \
         file://initd \
-        file://fail2ban_setup.py \
         file://run-ptest \
 "
 
@@ -20,13 +19,13 @@ inherit update-rc.d ptest setuptools3
 
 S = "${WORKDIR}/git"
 
-do_compile:prepend () {
-    cp ${WORKDIR}/fail2ban_setup.py ${S}/setup.py
+do_compile () {
     cd ${S}
     ./fail2ban-2to3
 }
 
 do_install:append () {
+    rm  -f ${D}/${bindir}/fail2ban-python
     install -d ${D}/${sysconfdir}/fail2ban
     install -d ${D}/${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/initd ${D}${sysconfdir}/init.d/fail2ban-server
@@ -38,6 +37,7 @@ do_install_ptest:append () {
     install -d ${D}${PTEST_PATH}/bin
     sed -i -e 's/##PYTHON##/${PYTHON_PN}/g' ${D}${PTEST_PATH}/run-ptest
     install -D ${S}/bin/* ${D}${PTEST_PATH}/bin
+    rm -f ${D}${PTEST_PATH}/bin/fail2ban-python
 }
 
 FILES:${PN} += "/run"