[meta-security][master][PATCH 0/2] python-fail2ban: solved the conflict with python3-fail2ban

[meta-security][master][PATCH 0/2] python-fail2ban: solved the conflict with python3-fail2ban

[Zang Ruochen]

-Use the update-alternatives class to resolve conflicts.

Zang Ruochen (2):
  [yocto][meta-security][master][PATCH 1/2] python-fail2ban: solved
    the conflict with python3-fail2ban
  [yocto][meta-security][master][PATCH 2/2] python3-fail2ban:
    solved the conflict with python-fail2ban

 recipes-security/fail2ban/python-fail2ban_0.10.4.0.bb | 11 ++++++++++-
 .../fail2ban/python3-fail2ban_0.10.4.0.bb             | 10 +++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

-- 
2.20.1

[meta-security][master][PATCH 1/2] python-fail2ban: solved the conflict with python3-fail2ban

[Zang Ruochen]

-Use update-alternatives class to resolve conflicts with python3-fail2ban.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 recipes-security/fail2ban/python-fail2ban_0.10.4.0.bb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/recipes-security/fail2ban/python-fail2ban_0.10.4.0.bb b/recipes-security/fail2ban/python-fail2ban_0.10.4.0.bb
index 17a7dd8..3eea365 100644
--- a/recipes-security/fail2ban/python-fail2ban_0.10.4.0.bb
+++ b/recipes-security/fail2ban/python-fail2ban_0.10.4.0.bb
@@ -1,4 +1,13 @@
-inherit setuptools
+inherit setuptools update-alternatives
 require python-fail2ban.inc
 
 RDEPENDS_${PN}-ptest = "python python-modules python-fail2ban"
+
+ALTERNATIVE_${PN} = "fail2ban-client fail2ban-regex fail2ban-server fail2ban-testcases"
+
+ALTERNATIVE_TARGET[fail2ban-client] = "${bindir}/fail2ban-client"
+ALTERNATIVE_TARGET[fail2ban-regex] = "${bindir}/fail2ban-regex"
+ALTERNATIVE_TARGET[fail2ban-server] = "${bindir}/fail2ban-server"
+ALTERNATIVE_TARGET[fail2ban-testcases] = "${bindir}/fail2ban-testcases"
+
+ALTERNATIVE_PRIORITY = "30"
-- 
2.20.1

[meta-security][master][PATCH 2/2] python3-fail2ban: solved the conflict with python-fail2ban

[Zang Ruochen]

-Use update-alternatives class to resolve conflicts with python-fail2ban

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 recipes-security/fail2ban/python3-fail2ban_0.10.4.0.bb | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/recipes-security/fail2ban/python3-fail2ban_0.10.4.0.bb b/recipes-security/fail2ban/python3-fail2ban_0.10.4.0.bb
index 23ef027..e01482c 100644
--- a/recipes-security/fail2ban/python3-fail2ban_0.10.4.0.bb
+++ b/recipes-security/fail2ban/python3-fail2ban_0.10.4.0.bb
@@ -1,4 +1,4 @@
-inherit setuptools3
+inherit setuptools3 update-alternatives
 require python-fail2ban.inc
 
 RDEPENDS_${PN}-ptest = "python3-core python3-io python3-modules python3-fail2ban"
@@ -6,3 +6,11 @@ RDEPENDS_${PN}-ptest = "python3-core python3-io python3-modules python3-fail2ban
 SRC_URI += " \
         file://0001-To-fix-build-error-of-xrang.patch \
 "
+
+ALTERNATIVE_${PN} = "fail2ban-client fail2ban-regex fail2ban-server fail2ban-testcases"
+ALTERNATIVE_TARGET[fail2ban-client] = "${bindir}/fail2ban-client"
+ALTERNATIVE_TARGET[fail2ban-regex] = "${bindir}/fail2ban-regex"
+ALTERNATIVE_TARGET[fail2ban-server] = "${bindir}/fail2ban-server"
+ALTERNATIVE_TARGET[fail2ban-testcases] = "${bindir}/fail2ban-testcases"
+
+ALTERNATIVE_PRIORITY = "60"
-- 
2.20.1