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

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

[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 with python3-scapy
  [yocto][meta-security][master][warrior][PATCH 3/3] python3-scapy: solved
    the conflict with python-scapy

 recipes-security/scapy/python-scapy.inc       | 7 -------
 recipes-security/scapy/python-scapy_2.4.2.bb  | 5 +++++
 recipes-security/scapy/python3-scapy_2.4.2.bb | 4 ++++
 3 files changed, 9 insertions(+), 7 deletions(-)

-- 
2.20.1

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

[Zang Ruochen]

-Remove redundant sed operations.

Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com>
---
 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-security/scapy/python-scapy.inc
+++ b/recipes-security/scapy/python-scapy.inc
@@ -12,13 +12,6 @@ SRC_URI = "git://github.com/secdev/scapy.git"
 
 inherit ptest
 
-do_install_append() {
-    if [ "${PYTHON_PN}" = "python3" ]; then
-        sed -i -e 's/python/python3/' ${D}${bindir}/scapy
-        sed -i -e 's/python/python3/' ${D}${bindir}/UTscapy
-    fi
-}
-
 do_install_ptest() {
     install -m 0644 ${S}/test/regression.uts ${D}${PTEST_PATH}
     sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-ptest
-- 
2.20.1

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

[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 <zangrc.fnst@cn.fujitsu.com>
---
 recipes-security/scapy/python-scapy_2.4.2.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/recipes-security/scapy/python-scapy_2.4.2.bb b/recipes-security/scapy/python-scapy_2.4.2.bb
index 98db1fd..982620e 100644
--- a/recipes-security/scapy/python-scapy_2.4.2.bb
+++ b/recipes-security/scapy/python-scapy_2.4.2.bb
@@ -4,3 +4,8 @@ require python-scapy.inc
 SRC_URI += "file://run-ptest"
 
 RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
+
+do_install_append() {
+        mv ${D}${bindir}/scapy ${D}${bindir}/scapy2
+        mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy2
+}
-- 
2.20.1

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

[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 <zangrc.fnst@cn.fujitsu.com>
---
 recipes-security/scapy/python3-scapy_2.4.2.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/recipes-security/scapy/python3-scapy_2.4.2.bb b/recipes-security/scapy/python3-scapy_2.4.2.bb
index 83c79f4..abcaeeb 100644
--- a/recipes-security/scapy/python3-scapy_2.4.2.bb
+++ b/recipes-security/scapy/python3-scapy_2.4.2.bb
@@ -3,3 +3,7 @@ require python-scapy.inc
 
 SRC_URI += "file://run-ptest"
 
+do_install_append() {
+        mv ${D}${bindir}/scapy ${D}${bindir}/scapy3
+        mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3
+}
-- 
2.20.1

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

[Adrian Bunk]

On Mon, Jun 10, 2019 at 03:24:24PM +0800, Zang Ruochen wrote:
> -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 <zangrc.fnst@cn.fujitsu.com>
> ---
>  recipes-security/scapy/python3-scapy_2.4.2.bb | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/recipes-security/scapy/python3-scapy_2.4.2.bb b/recipes-security/scapy/python3-scapy_2.4.2.bb
> index 83c79f4..abcaeeb 100644
> --- a/recipes-security/scapy/python3-scapy_2.4.2.bb
> +++ b/recipes-security/scapy/python3-scapy_2.4.2.bb
> @@ -3,3 +3,7 @@ require python-scapy.inc
>  
>  SRC_URI += "file://run-ptest"
>  
> +do_install_append() {
> +        mv ${D}${bindir}/scapy ${D}${bindir}/scapy3
> +        mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3
> +}

A proper solution would require using alternatives so that installing 
either the python2 or the python3 version would provide the binary.

But given that python2 is reaching end of life I would suggest to just 
rename the python2 binaries and keep the python3 binaries that will stay
long-term at their upstream names.

cu
Adrian

-- 

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

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

[akuster808]

On 6/10/19 12:24 AM, Zang Ruochen wrote:
> -Remove redundant sed operations.
>
> -Rename conflicting files to resolve conflicts.
merged to master.

working on warrior

thanks,
- armin
>
>
> 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 with python3-scapy
>   [yocto][meta-security][master][warrior][PATCH 3/3] python3-scapy: solved
>     the conflict with python-scapy
>
>  recipes-security/scapy/python-scapy.inc       | 7 -------
>  recipes-security/scapy/python-scapy_2.4.2.bb  | 5 +++++
>  recipes-security/scapy/python3-scapy_2.4.2.bb | 4 ++++
>  3 files changed, 9 insertions(+), 7 deletions(-)
>