From 4370e3d3fb81c6557295face5e66d3261ed5b51b Mon Sep 17 00:00:00 2001 From: Petr Gotthard Date: Fri, 24 Feb 2023 17:20:16 +0000 Subject: python3-scapy: upgrade 2.4.5 -> 2.5.0 Changelog: https://github.com/secdev/scapy/releases/tag/v2.5.0 Also, in this version the UTscapy wrapper gets no longer installed into /usr/bin, so for ptest we need to install it. Signed-off-by: Petr Gotthard Signed-off-by: Khem Raj --- .../python/python3-scapy/run-ptest | 2 +- .../recipes-devtools/python/python3-scapy_2.4.5.bb | 41 ---------------------- .../recipes-devtools/python/python3-scapy_2.5.0.bb | 41 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb create mode 100644 meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb diff --git a/meta-networking/recipes-devtools/python/python3-scapy/run-ptest b/meta-networking/recipes-devtools/python/python3-scapy/run-ptest index 797d8ecf78..417e21053c 100644 --- a/meta-networking/recipes-devtools/python/python3-scapy/run-ptest +++ b/meta-networking/recipes-devtools/python/python3-scapy/run-ptest @@ -1,4 +1,4 @@ #!/bin/sh -UTscapy3 -t regression.uts -f text -l -C \ +python3 UTscapy.py -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-networking/recipes-devtools/python/python3-scapy_2.4.5.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb deleted file mode 100644 index 0f66dfd784..0000000000 --- a/meta-networking/recipes-devtools/python/python3-scapy_2.4.5.bb +++ /dev/null @@ -1,41 +0,0 @@ -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 = "GPL-2.0-only" - -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;branch=master;protocol=https \ - 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" diff --git a/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.bb new file mode 100644 index 0000000000..cc3f2ee1dd --- /dev/null +++ b/meta-networking/recipes-devtools/python/python3-scapy_2.5.0.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 = "GPL-2.0-only" + +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 = "9473f77d8b548c8e478e52838bdd4c12f5d4f4ff" +SRC_URI = "git://github.com/secdev/scapy.git;branch=master;protocol=https \ + file://run-ptest" + +S = "${WORKDIR}/git" + +UPSTREAM_CHECK_COMMITS = "1" + +inherit setuptools3 ptest + +do_install:append() { + mv ${D}${bindir}/scapy ${D}${bindir}/scapy3 +} + +do_install_ptest() { + install -m 0644 ${S}/scapy/tools/UTscapy.py ${D}${PTEST_PATH} + 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}-fcntl" -- cgit 1.2.3-korg