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

2019-06-12 Thread Zang Ruochen
-Use update-alternatives class to resolve conflicts with python-fail2ban Signed-off-by: Zang Ruochen --- 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

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

2019-06-12 Thread 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

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

2019-06-12 Thread Zang Ruochen
-Use update-alternatives class to resolve conflicts with python3-fail2ban. Signed-off-by: Zang Ruochen --- 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

[yocto] [meta-security][master][warrior][PATCH 1/3] python-scapy: Remove redundant sed operations

2019-06-10 Thread Zang Ruochen
-Remove redundant sed operations. Signed-off-by: Zang Ruochen --- recipes-security/scapy/python-scapy.inc | 7 --- 1 file changed, 7 deletions(-) diff --git a/recipes-security/scapy/python-scapy.inc b/recipes-security/scapy/python-scapy.inc index 99f30a7..baa69b2 100644 --- a/recipes

[yocto] [meta-security][master][warrior][PATCH 2/3] python-scapy: solved the conflict with python3-scapy

2019-06-10 Thread Zang Ruochen
-Rename the following file to resolve the conflict with python3-scapy: Rename /usr/bin/UTscapy to /usr/bin/UTscapy2 Rename /usr/bin/scapy to /usr/bin/scapy2 Signed-off-by: Zang Ruochen --- recipes-security/scapy/python-scapy_2.4.2.bb | 5 + 1 file changed, 5 insertions

[yocto] [meta-security][master][warrior][PATCH 3/3] python3-scapy: solved the conflict with python-scapy

2019-06-10 Thread Zang Ruochen
-Rename the following file to resolve the conflict with python-scapy: Rename /usr/bin/UTscapy to /usr/bin/UTscapy3 Rename /usr/bin/scapy to /usr/bin/scapy3 Signed-off-by: Zang Ruochen --- recipes-security/scapy/python3-scapy_2.4.2.bb | 4 1 file changed, 4 insertions

[yocto] [meta-security][master][warrior][PATCH 0/3] python-scapy:solved the conflict with python3-scapy

2019-06-10 Thread Zang Ruochen
-Remove redundant sed operations. -Rename conflicting files to resolve conflicts. Zang Ruochen (3): [yocto][meta-security][master][warrior][PATCH 1/3] python-scapy: Remove redundant sed operations [yocto][meta-security][master][warrior][PATCH 2/3] python-scapy: solved the conflict

[yocto] [meta-security][master][warrior][PATCH] bastille: solved the conflict with perl-module-text-wrap and base-files

2019-06-06 Thread Zang Ruochen
-Remove the link to perl5 to resolve the conflict with perl-module-text-wrap. -Remove the operation on /var/lock to resolve the conflict with base-files. Signed-off-by: Zang Ruochen --- recipes-security/bastille/bastille_3.2.1.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff