From 109ff80fc1159df11ca58df6d3e9669685862cad Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 9 Feb 2022 17:50:39 +0100 Subject: [PATCH] package/fail2ban: drop python2 support Signed-off-by: Peter Korsgaard Signed-off-by: Yann E. MORIN --- package/fail2ban/Config.in | 2 +- package/fail2ban/fail2ban.mk | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/package/fail2ban/Config.in b/package/fail2ban/Config.in index 86e6233793..8a48a8c1d0 100644 --- a/package/fail2ban/Config.in +++ b/package/fail2ban/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_FAIL2BAN bool "fail2ban" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON3 select BR2_PACKAGE_PYTHON_SYSTEMD if BR2_PACKAGE_SYSTEMD help Fail2ban scans log files (e.g. /var/log/apache/error_log) and diff --git a/package/fail2ban/fail2ban.mk b/package/fail2ban/fail2ban.mk index 9202dc1ddd..4a08981a97 100644 --- a/package/fail2ban/fail2ban.mk +++ b/package/fail2ban/fail2ban.mk @@ -15,15 +15,13 @@ FAIL2BAN_SETUP_TYPE = distutils # 0001-fixed-possible-RCE-vulnerability-unset-escape-variable.patch FAIL2BAN_IGNORE_CVES += CVE-2021-32749 -ifeq ($(BR2_PACKAGE_PYTHON3),y) define FAIL2BAN_PYTHON_2TO3 $(HOST_DIR)/bin/2to3 --write --nobackups --no-diffs $(@D)/bin/* $(@D)/fail2ban endef -FAIL2BAN_DEPENDENCIES += host-python3 +FAIL2BAN_DEPENDENCIES = host-python3 # We can't use _POST_PATCH_HOOKS because dependencies are not guaranteed # to build and install before _POST_PATCH_HOOKS run. FAIL2BAN_PRE_CONFIGURE_HOOKS += FAIL2BAN_PYTHON_2TO3 -endif define FAIL2BAN_FIX_DEFAULT_CONFIG $(SED) '/^socket/c\socket = /run/fail2ban.sock' $(TARGET_DIR)/etc/fail2ban/fail2ban.conf @@ -34,8 +32,7 @@ FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_DEFAULT_CONFIG # fail2ban-python points to host python define FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK - ln -snf $(if $(BR2_PACKAGE_PYTHON),python,python3) \ - $(TARGET_DIR)/usr/bin/fail2ban-python + ln -snf python3 $(TARGET_DIR)/usr/bin/fail2ban-python endef FAIL2BAN_POST_INSTALL_TARGET_HOOKS += FAIL2BAN_FIX_FAIL2BAN_PYTHON_SYMLINK