Upgrade scapy to 2.4.2
PATCH v2 1/1 Upgrade scapy to 2.4.2
Upstream MANIFEST.in removed doc and test directories so remove ptest.
Signed-off-by Scott Ellis <[email protected]>
--- 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
recipes-security/scapy/files/run-ptest deleted +0 -4
@@ -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:/'
recipes-security/scapy/python-scapy.inc +3 -8
@@ -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 \
recipes-security/scapy/python-scapy_2.4.0.bb deleted +0 -6
@@ -1,6 +0,0 @@ -inherit setuptools -require python-scapy.inc - -SRC_URI += "file://run-ptest" - -RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
recipes-security/scapy/python-scapy_2.4.2.bb new file +4 -0
@@ -0,0 +1,4 @@ +inherit setuptools +require python-scapy.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"
recipes-security/scapy/python3-scapy_2.4.0.bb deleted +0 -4
@@ -1,4 +0,0 @@ -inherit setuptools3 -require python-scapy.inc - -SRC_URI += "file://run-ptest"
recipes-security/scapy/python3-scapy_2.4.2.bb new file +2 -0
@@ -0,0 +1,2 @@ +inherit setuptools3 +require python-scapy.inc
Signature · 1 line
2.7.4
Scott,
Quoted 4 lines · Scott Ellis
Upstream MANIFEST.in removed doc and test directories so remove ptest.
Signed-off-by Scott Ellis <[email protected]>
Quoted 13 lines
--- 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
Quoted 74 lines
recipes-security/scapy/files/run-ptest deleted +0
-4@@ -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:/'recipes-security/scapy/python-scapy.inc +3
-8@@ -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 \recipes-security/scapy/python-scapy_2.4.0.bb deleted +0
-6@@ -1,6 +0,0 @@ -inherit setuptools -require python-scapy.inc - -SRC_URI += "file://run-ptest" - -RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"recipes-security/scapy/python-scapy_2.4.2.bb new file +4
-0@@ -0,0 +1,4 @@ +inherit setuptools +require python-scapy.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"recipes-security/scapy/python3-scapy_2.4.0.bb deleted +0
-4@@ -1,4 +0,0 @@ -inherit setuptools3 -require python-scapy.inc - -SRC_URI += "file://run-ptest"recipes-security/scapy/python3-scapy_2.4.2.bb new file +2
-0@@ -0,0 +1,2 @@ +inherit setuptools3 +require python-scapy.inc
series merged
Quoted 91 lines · Scott Ellis
Upstream MANIFEST.in removed doc and test directories so remove ptest.
Signed-off-by Scott Ellis <[email protected]>--- 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.bbrecipes-security/scapy/files/run-ptest deleted +0
-4@@ -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:/'recipes-security/scapy/python-scapy.inc +3
-8@@ -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 \recipes-security/scapy/python-scapy_2.4.0.bb deleted +0
-6@@ -1,6 +0,0 @@ -inherit setuptools -require python-scapy.inc - -SRC_URI += "file://run-ptest" - -RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"recipes-security/scapy/python-scapy_2.4.2.bb new file +4
-0@@ -0,0 +1,4 @@ +inherit setuptools +require python-scapy.inc + +RDEPENDS_${PN} += "${PYTHON_PN}-subprocess"recipes-security/scapy/python3-scapy_2.4.0.bb deleted +0
-4@@ -1,4 +0,0 @@ -inherit setuptools3 -require python-scapy.inc - -SRC_URI += "file://run-ptest"recipes-security/scapy/python3-scapy_2.4.2.bb new file +2
-0@@ -0,0 +1,2 @@ +inherit setuptools3 +require python-scapy.inc