diff options
author | Scott Ellis <scottellis.developer@gmail.com> | 2019-01-19 06:16:00 -0500 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2019-02-11 18:00:54 -0800 |
commit | 82118c2bd4c6169b20927c6bcb72766cc2d36ccc (patch) | |
tree | ebe6ab445dc9fe2ced4de566755fe52c6900ed98 | |
parent | 29ef6cccea09ba17be9c5d623039adcfc3796840 (diff) | |
download | meta-security-82118c2bd4c6169b20927c6bcb72766cc2d36ccc.tar.gz |
Upgrade scapy to 2.4.2
Upstream MANIFEST.in removed doc and test directories
so remove ptest.
Signed-off-by: Scott Ellis <scott@jumpnowtek.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rwxr-xr-x | recipes-security/scapy/files/run-ptest | 4 | ||||
-rw-r--r-- | recipes-security/scapy/python-scapy.inc | 11 | ||||
-rw-r--r-- | recipes-security/scapy/python-scapy_2.4.2.bb (renamed from recipes-security/scapy/python-scapy_2.4.0.bb) | 2 | ||||
-rw-r--r-- | recipes-security/scapy/python3-scapy_2.4.2.bb (renamed from recipes-security/scapy/python3-scapy_2.4.0.bb) | 2 |
4 files changed, 3 insertions, 16 deletions
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 @@ | |||
1 | #!/bin/sh | ||
2 | UTscapy -t regression.uts -f text -l -C \ | ||
3 | -o @PTEST_PATH@/scapy_ptest_$(date +%Y%m%d-%H%M%S).log \ | ||
4 | 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" | |||
5 | 5 | ||
6 | LIC_FILES_CHKSUM = "file://bin/scapy;beginline=9;endline=13;md5=1d5249872cc54cd4ca3d3879262d0c69" | 6 | LIC_FILES_CHKSUM = "file://bin/scapy;beginline=9;endline=13;md5=1d5249872cc54cd4ca3d3879262d0c69" |
7 | 7 | ||
8 | SRC_URI[md5sum] = "d7d3c4294f5a718e234775d38dbeb7ec" | 8 | SRC_URI[md5sum] = "e6a03d8c924a6bbde1e86fc58bd2b9d6" |
9 | SRC_URI[sha256sum] = "452f714f5c2eac6fd0a6146b1dbddfc24dd5f4103f3ed76227995a488cfb2b73" | 9 | SRC_URI[sha256sum] = "1baa048936207ceb1a4281a0e1e3b4317667c754872a0bb4734c5213c468e86a" |
10 | 10 | ||
11 | inherit pypi ptest | 11 | inherit pypi |
12 | |||
13 | do_install_ptest() { | ||
14 | install -m 0644 ${S}/test/regression.uts ${D}${PTEST_PATH} | ||
15 | sed -i 's,@PTEST_PATH@,${PTEST_PATH},' ${D}${PTEST_PATH}/run-ptest | ||
16 | } | ||
17 | 12 | ||
18 | RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-netclient \ | 13 | RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-netclient \ |
19 | ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \ | 14 | ${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.2.bb index 98db1fd..ea8764a 100644 --- a/recipes-security/scapy/python-scapy_2.4.0.bb +++ b/recipes-security/scapy/python-scapy_2.4.2.bb | |||
@@ -1,6 +1,4 @@ | |||
1 | inherit setuptools | 1 | inherit setuptools |
2 | require python-scapy.inc | 2 | require python-scapy.inc |
3 | 3 | ||
4 | SRC_URI += "file://run-ptest" | ||
5 | |||
6 | RDEPENDS_${PN} += "${PYTHON_PN}-subprocess" | 4 | 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.2.bb index 93ca7be..34eb2a3 100644 --- a/recipes-security/scapy/python3-scapy_2.4.0.bb +++ b/recipes-security/scapy/python3-scapy_2.4.2.bb | |||
@@ -1,4 +1,2 @@ | |||
1 | inherit setuptools3 | 1 | inherit setuptools3 |
2 | require python-scapy.inc | 2 | require python-scapy.inc |
3 | |||
4 | SRC_URI += "file://run-ptest" | ||