On 5/30/21 8:45 AM, Armin Kuster via lists.openembedded.org wrote:

Update to the official 2.4.5 pkg
The original package has not been updated in years.
Include ptest

Ignore this. It has a dependency on meta-networking (tcpdump).

maybe this belongs in that layer??

-armin

Signed-off-by: Armin Kuster <akuster808@...>
---
.../python/python3-scapy/run-ptest | 4 ++
.../python/python3-scapy_0.26.bb | 13 ------
.../python/python3-scapy_2.4.5.bb | 41 +++++++++++++++++++
3 files changed, 45 insertions(+), 13 deletions(-)
create mode 100644 meta-python/recipes-devtools/python/python3-scapy/run-ptest
delete mode 100644 meta-python/recipes-devtools/python/python3-scapy_0.26.bb
create mode 100644 meta-python/recipes-devtools/python/python3-scapy_2.4.5.bb

diff --git a/meta-python/recipes-devtools/python/python3-scapy/run-ptest b/meta-python/recipes-devtools/python/python3-scapy/run-ptest
new file mode 100644
index 000000000..797d8ecf7
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-scapy/run-ptest
@@ -0,0 +1,4 @@
+#!/bin/sh
+UTscapy3 -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/meta-python/recipes-devtools/python/python3-scapy_0.26.bb b/meta-python/recipes-devtools/python/python3-scapy_0.26.bb
deleted file mode 100644
index 31c88942d..000000000
--- a/meta-python/recipes-devtools/python/python3-scapy_0.26.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Packet crafting/sending/sniffing, PCAP processing tool,\
-based on scapy with python3 compatibility"
-SECTION = "devel/python"
-HOMEPAGE = "https://github.com/phaethon/scapy"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://PKG-INFO;md5=a88f5c4e1c935f295ebeaf51fc8644ef"
-
-inherit pypi setuptools3
-
-PYPI_PACKAGE = "scapy-python3"
-
-SRC_URI[md5sum] = "513469447735a4a416d495f63e28aa4b"
-SRC_URI[sha256sum] = "81e4f5522d38c136fd3f1be4e35ffe4fd1f4c2091db3c021d95f8b9d5978b9eb"
diff --git a/meta-python/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-python/recipes-devtools/python/python3-scapy_2.4.5.bb
new file mode 100644
index 000000000..b1b9bcbd6
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python3-scapy_2.4.5.bb
@@ -0,0 +1,41 @@
+SUMMARY = "Network scanning and manipulation tool"
+DESCRIPTION = "Scapy is a powerful interactive packet manipulation program. \
+It is able to forge or decode packets of a wide number of protocols, send them \
+on the wire, capture them, match requests and replies, and much more. It can \
+easily handle most classical tasks like scanning, tracerouting, probing, unit tests, \
+attacks or network discovery (it can replace hping, 85% of nmap, arpspoof, arp-sk, \
+arping, tcpdump, tethereal, p0f, etc.). It also performs very well at a lot of other \
+specific tasks that most other tools can't handle, like sending invalid frames, \
+injecting your own 802.11 frames, combining technics (VLAN hopping+ARP cache poisoning, \
+VOIP decoding on WEP encrypted channel, ...), etc."
+SECTION = "security"
+LICENSE = "GPLv2"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
+
+# If you want ptest support, use the git repo
+# UTscapy does not exist in the pypi pkg
+#
+SRCREV = "32cd7eb0f620d9adf171c48d55514e8326a538d7"
+SRC_URI = "git://github.com/secdev/scapy.git \
+ file://run-ptest"
+
+S = "${WORKDIR}/git"
+
+UPSTREAM_CHECK_COMMITS = "1"
+
+inherit setuptools3 ptest
+
+do_install_append() {
+ mv ${D}${bindir}/scapy ${D}${bindir}/scapy3
+ mv ${D}${bindir}/UTscapy ${D}${bindir}/UTscapy3
+}
+
+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
+}
+
+RDEPENDS_${PN} = "tcpdump ${PYTHON_PN}-compression ${PYTHON_PN}-cryptography ${PYTHON_PN}-netclient \
+ ${PYTHON_PN}-netserver ${PYTHON_PN}-pydoc ${PYTHON_PN}-pkgutil ${PYTHON_PN}-shell \
+ ${PYTHON_PN}-threading ${PYTHON_PN}-numbers ${PYTHON_PN}-pycrypto"