[meta-security,v2] Upgrade scapy to 2.4.2

Submitted by Scott Ellis on Jan. 19, 2019, 11:16 a.m. | Patch ID: 158113

Details

Message ID 1547896560-947-1-git-send-email-scott@jumpnowtek.com
State New
Headers show

Commit Message

Scott Ellis Jan. 19, 2019, 11:16 a.m.
Upstream MANIFEST.in removed doc and test directories
so remove ptest.

Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
---
 recipes-security/scapy/files/run-ptest        |  4 ----
 recipes-security/scapy/python-scapy.inc       | 11 +++--------
 recipes-security/scapy/python-scapy_2.4.0.bb  |  6 ------
 recipes-security/scapy/python-scapy_2.4.2.bb  |  4 ++++
 recipes-security/scapy/python3-scapy_2.4.0.bb |  4 ----
 recipes-security/scapy/python3-scapy_2.4.2.bb |  2 ++
 6 files changed, 9 insertions(+), 22 deletions(-)
 delete mode 100755 recipes-security/scapy/files/run-ptest
 delete mode 100644 recipes-security/scapy/python-scapy_2.4.0.bb
 create mode 100644 recipes-security/scapy/python-scapy_2.4.2.bb
 delete mode 100644 recipes-security/scapy/python3-scapy_2.4.0.bb
 create mode 100644 recipes-security/scapy/python3-scapy_2.4.2.bb

Patch hide | download patch | download mbox

diff --git a/recipes-security/scapy/files/run-ptest b/recipes-security/scapy/files/run-ptest
deleted file mode 100755
index 91b29f9..0000000
--- a/recipes-security/scapy/files/run-ptest
+++ /dev/null
@@ -1,4 +0,0 @@ 
-#!/bin/sh
-UTscapy -t regression.uts -f text -l -C \
-    -o @PTEST_PATH@/scapy_ptest_$(date +%Y%m%d-%H%M%S).log \
-    2>&1 | sed -e 's/^passed None/PASS:/' -e 's/^failed None/FAIL:/'
diff --git a/recipes-security/scapy/python-scapy.inc b/recipes-security/scapy/python-scapy.inc
index 5abe7db..95e5312 100644
--- a/recipes-security/scapy/python-scapy.inc
+++ b/recipes-security/scapy/python-scapy.inc
@@ -5,15 +5,10 @@  LICENSE = "GPLv2"
 
 LIC_FILES_CHKSUM = "file://bin/scapy;beginline=9;endline=13;md5=1d5249872cc54cd4ca3d3879262d0c69"
 
-SRC_URI[md5sum] = "d7d3c4294f5a718e234775d38dbeb7ec"
-SRC_URI[sha256sum] = "452f714f5c2eac6fd0a6146b1dbddfc24dd5f4103f3ed76227995a488cfb2b73"
+SRC_URI[md5sum] = "e6a03d8c924a6bbde1e86fc58bd2b9d6"
+SRC_URI[sha256sum] = "1baa048936207ceb1a4281a0e1e3b4317667c754872a0bb4734c5213c468e86a"
 
-inherit pypi ptest
-
-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
-}
+inherit pypi
 
 RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-netclient  \
                   ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \
diff --git a/recipes-security/scapy/python-scapy_2.4.0.bb b/recipes-security/scapy/python-scapy_2.4.0.bb
deleted file mode 100644
index 98db1fd..0000000
--- a/recipes-security/scapy/python-scapy_2.4.0.bb
+++ /dev/null
@@ -1,6 +0,0 @@ 
-inherit setuptools
-require python-scapy.inc
-
-SRC_URI += "file://run-ptest"
-
-RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
diff --git a/recipes-security/scapy/python-scapy_2.4.2.bb b/recipes-security/scapy/python-scapy_2.4.2.bb
new file mode 100644
index 0000000..ea8764a
--- /dev/null
+++ b/recipes-security/scapy/python-scapy_2.4.2.bb
@@ -0,0 +1,4 @@ 
+inherit setuptools
+require python-scapy.inc
+
+RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
diff --git a/recipes-security/scapy/python3-scapy_2.4.0.bb b/recipes-security/scapy/python3-scapy_2.4.0.bb
deleted file mode 100644
index 93ca7be..0000000
--- a/recipes-security/scapy/python3-scapy_2.4.0.bb
+++ /dev/null
@@ -1,4 +0,0 @@ 
-inherit setuptools3
-require python-scapy.inc
-
-SRC_URI += "file://run-ptest"
diff --git a/recipes-security/scapy/python3-scapy_2.4.2.bb b/recipes-security/scapy/python3-scapy_2.4.2.bb
new file mode 100644
index 0000000..34eb2a3
--- /dev/null
+++ b/recipes-security/scapy/python3-scapy_2.4.2.bb
@@ -0,0 +1,2 @@ 
+inherit setuptools3
+require python-scapy.inc

Comments

Armin Kuster Feb. 3, 2019, 10:41 p.m.
Scott,


On 1/19/19 3:16 AM, Scott Ellis wrote:
> Upstream MANIFEST.in removed doc and test directories
> so remove ptest.
>
> Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
> ---
>  recipes-security/scapy/files/run-ptest        |  4 ----
>  recipes-security/scapy/python-scapy.inc       | 11 +++--------
>  recipes-security/scapy/python-scapy_2.4.0.bb  |  6 ------
>  recipes-security/scapy/python-scapy_2.4.2.bb  |  4 ++++
>  recipes-security/scapy/python3-scapy_2.4.0.bb |  4 ----
>  recipes-security/scapy/python3-scapy_2.4.2.bb |  2 ++
>  6 files changed, 9 insertions(+), 22 deletions(-)
>  delete mode 100755 recipes-security/scapy/files/run-ptest
>  delete mode 100644 recipes-security/scapy/python-scapy_2.4.0.bb
>  create mode 100644 recipes-security/scapy/python-scapy_2.4.2.bb
>  delete mode 100644 recipes-security/scapy/python3-scapy_2.4.0.bb
>  create mode 100644 recipes-security/scapy/python3-scapy_2.4.2.bb

Thank you for the update. The issue I have is the doc's and test got
removed from the pypi package via commit:
https://github.com/secdev/scapy/commit/8857c03bad798ba902b34c64282ef72483569c77
when they went to 2.4.2.


Any ideas on how to restore the ptests?  I know 2.4.1 still has the
tests. I wonder how may folks run this ptest?

I am holding this update for now.

- armin

>
> diff --git a/recipes-security/scapy/files/run-ptest b/recipes-security/scapy/files/run-ptest
> deleted file mode 100755
> index 91b29f9..0000000
> --- a/recipes-security/scapy/files/run-ptest
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -#!/bin/sh
> -UTscapy -t regression.uts -f text -l -C \
> -    -o @PTEST_PATH@/scapy_ptest_$(date +%Y%m%d-%H%M%S).log \
> -    2>&1 | sed -e 's/^passed None/PASS:/' -e 's/^failed None/FAIL:/'
> diff --git a/recipes-security/scapy/python-scapy.inc b/recipes-security/scapy/python-scapy.inc
> index 5abe7db..95e5312 100644
> --- a/recipes-security/scapy/python-scapy.inc
> +++ b/recipes-security/scapy/python-scapy.inc
> @@ -5,15 +5,10 @@ LICENSE = "GPLv2"
>  
>  LIC_FILES_CHKSUM = "file://bin/scapy;beginline=9;endline=13;md5=1d5249872cc54cd4ca3d3879262d0c69"
>  
> -SRC_URI[md5sum] = "d7d3c4294f5a718e234775d38dbeb7ec"
> -SRC_URI[sha256sum] = "452f714f5c2eac6fd0a6146b1dbddfc24dd5f4103f3ed76227995a488cfb2b73"
> +SRC_URI[md5sum] = "e6a03d8c924a6bbde1e86fc58bd2b9d6"
> +SRC_URI[sha256sum] = "1baa048936207ceb1a4281a0e1e3b4317667c754872a0bb4734c5213c468e86a"
>  
> -inherit pypi ptest
> -
> -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
> -}
> +inherit pypi
>  
>  RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-netclient  \
>                    ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \
> diff --git a/recipes-security/scapy/python-scapy_2.4.0.bb b/recipes-security/scapy/python-scapy_2.4.0.bb
> deleted file mode 100644
> index 98db1fd..0000000
> --- a/recipes-security/scapy/python-scapy_2.4.0.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -inherit setuptools
> -require python-scapy.inc
> -
> -SRC_URI += "file://run-ptest"
> -
> -RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
> diff --git a/recipes-security/scapy/python-scapy_2.4.2.bb b/recipes-security/scapy/python-scapy_2.4.2.bb
> new file mode 100644
> index 0000000..ea8764a
> --- /dev/null
> +++ b/recipes-security/scapy/python-scapy_2.4.2.bb
> @@ -0,0 +1,4 @@
> +inherit setuptools
> +require python-scapy.inc
> +
> +RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
> diff --git a/recipes-security/scapy/python3-scapy_2.4.0.bb b/recipes-security/scapy/python3-scapy_2.4.0.bb
> deleted file mode 100644
> index 93ca7be..0000000
> --- a/recipes-security/scapy/python3-scapy_2.4.0.bb
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -inherit setuptools3
> -require python-scapy.inc
> -
> -SRC_URI += "file://run-ptest"
> diff --git a/recipes-security/scapy/python3-scapy_2.4.2.bb b/recipes-security/scapy/python3-scapy_2.4.2.bb
> new file mode 100644
> index 0000000..34eb2a3
> --- /dev/null
> +++ b/recipes-security/scapy/python3-scapy_2.4.2.bb
> @@ -0,0 +1,2 @@
> +inherit setuptools3
> +require python-scapy.inc
Armin Kuster Feb. 12, 2019, 2:01 a.m.
series merged

On 1/19/19 3:16 AM, Scott Ellis wrote:
> Upstream MANIFEST.in removed doc and test directories
> so remove ptest.
>
> Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
> ---
>  recipes-security/scapy/files/run-ptest        |  4 ----
>  recipes-security/scapy/python-scapy.inc       | 11 +++--------
>  recipes-security/scapy/python-scapy_2.4.0.bb  |  6 ------
>  recipes-security/scapy/python-scapy_2.4.2.bb  |  4 ++++
>  recipes-security/scapy/python3-scapy_2.4.0.bb |  4 ----
>  recipes-security/scapy/python3-scapy_2.4.2.bb |  2 ++
>  6 files changed, 9 insertions(+), 22 deletions(-)
>  delete mode 100755 recipes-security/scapy/files/run-ptest
>  delete mode 100644 recipes-security/scapy/python-scapy_2.4.0.bb
>  create mode 100644 recipes-security/scapy/python-scapy_2.4.2.bb
>  delete mode 100644 recipes-security/scapy/python3-scapy_2.4.0.bb
>  create mode 100644 recipes-security/scapy/python3-scapy_2.4.2.bb
>
> diff --git a/recipes-security/scapy/files/run-ptest b/recipes-security/scapy/files/run-ptest
> deleted file mode 100755
> index 91b29f9..0000000
> --- a/recipes-security/scapy/files/run-ptest
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -#!/bin/sh
> -UTscapy -t regression.uts -f text -l -C \
> -    -o @PTEST_PATH@/scapy_ptest_$(date +%Y%m%d-%H%M%S).log \
> -    2>&1 | sed -e 's/^passed None/PASS:/' -e 's/^failed None/FAIL:/'
> diff --git a/recipes-security/scapy/python-scapy.inc b/recipes-security/scapy/python-scapy.inc
> index 5abe7db..95e5312 100644
> --- a/recipes-security/scapy/python-scapy.inc
> +++ b/recipes-security/scapy/python-scapy.inc
> @@ -5,15 +5,10 @@ LICENSE = "GPLv2"
>  
>  LIC_FILES_CHKSUM = "file://bin/scapy;beginline=9;endline=13;md5=1d5249872cc54cd4ca3d3879262d0c69"
>  
> -SRC_URI[md5sum] = "d7d3c4294f5a718e234775d38dbeb7ec"
> -SRC_URI[sha256sum] = "452f714f5c2eac6fd0a6146b1dbddfc24dd5f4103f3ed76227995a488cfb2b73"
> +SRC_URI[md5sum] = "e6a03d8c924a6bbde1e86fc58bd2b9d6"
> +SRC_URI[sha256sum] = "1baa048936207ceb1a4281a0e1e3b4317667c754872a0bb4734c5213c468e86a"
>  
> -inherit pypi ptest
> -
> -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
> -}
> +inherit pypi
>  
>  RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-netclient  \
>                    ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \
> diff --git a/recipes-security/scapy/python-scapy_2.4.0.bb b/recipes-security/scapy/python-scapy_2.4.0.bb
> deleted file mode 100644
> index 98db1fd..0000000
> --- a/recipes-security/scapy/python-scapy_2.4.0.bb
> +++ /dev/null
> @@ -1,6 +0,0 @@
> -inherit setuptools
> -require python-scapy.inc
> -
> -SRC_URI += "file://run-ptest"
> -
> -RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
> diff --git a/recipes-security/scapy/python-scapy_2.4.2.bb b/recipes-security/scapy/python-scapy_2.4.2.bb
> new file mode 100644
> index 0000000..ea8764a
> --- /dev/null
> +++ b/recipes-security/scapy/python-scapy_2.4.2.bb
> @@ -0,0 +1,4 @@
> +inherit setuptools
> +require python-scapy.inc
> +
> +RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
> diff --git a/recipes-security/scapy/python3-scapy_2.4.0.bb b/recipes-security/scapy/python3-scapy_2.4.0.bb
> deleted file mode 100644
> index 93ca7be..0000000
> --- a/recipes-security/scapy/python3-scapy_2.4.0.bb
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -inherit setuptools3
> -require python-scapy.inc
> -
> -SRC_URI += "file://run-ptest"
> diff --git a/recipes-security/scapy/python3-scapy_2.4.2.bb b/recipes-security/scapy/python3-scapy_2.4.2.bb
> new file mode 100644
> index 0000000..34eb2a3
> --- /dev/null
> +++ b/recipes-security/scapy/python3-scapy_2.4.2.bb
> @@ -0,0 +1,2 @@
> +inherit setuptools3
> +require python-scapy.inc