diff --git a/dev-python/scapy-http/Manifest b/dev-python/scapy-http/Manifest index c156a69a0..685050849 100644 --- a/dev-python/scapy-http/Manifest +++ b/dev-python/scapy-http/Manifest @@ -1 +1 @@ -DIST scapy-http-1.8.tar.gz 3331 SHA256 fa72d967b7fd82ffbbbf244dc4fda3154a723fd6334006e0f17d4c991b52fa4d SHA512 3f5ea802d776cdb4933ad0e15fd166e25a57bec1930a010364406669d0236279a468b65397b5113d535788a1ea118a190ad04a421325490320e8f98c26786c42 WHIRLPOOL f53e2ba64234e4c2b0a1629f82a585fd4ac2cfb617c5e0839ac5a36beae6beb9bcb3d5ac4ab3df3a376c569aa620050d2fdfc0128bcbe780dc742ac458a586eb +DIST scapy-http-1.8.tar.gz 3331 BLAKE2B ae2a9cf86875bb76570eb5e3066961baf41d3694efe798f68ced064cfa38e6be320fac9c2ebe69abd24cb0d8212bbe5d52ff94fb18480e80c0fdf37cf3c0cf51 SHA512 3f5ea802d776cdb4933ad0e15fd166e25a57bec1930a010364406669d0236279a468b65397b5113d535788a1ea118a190ad04a421325490320e8f98c26786c42 diff --git a/dev-python/scapy-http/scapy-http-1.8.ebuild b/dev-python/scapy-http/scapy-http-1.8-r1.ebuild similarity index 69% rename from dev-python/scapy-http/scapy-http-1.8.ebuild rename to dev-python/scapy-http/scapy-http-1.8-r1.ebuild index ec436ebe4..0457b37fc 100644 --- a/dev-python/scapy-http/scapy-http-1.8.ebuild +++ b/dev-python/scapy-http/scapy-http-1.8-r1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) inherit distutils-r1 @@ -16,8 +16,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND="virtual/python-scapy[$PYTHON_USEDEP]" -RDEPEND="${DEPEND}" +DEPEND="|| ( net-analyzer/scapy[$PYTHON_USEDEP] + $(python_gen_cond_dep 'dev-python/typing[${PYTHON_USEDEP}]' python3_{4,5,6}) + )" #https://github.com/invernizzi/scapy-http/issues/25 my_install(){ diff --git a/dev-python/scapy-python3/Manifest b/dev-python/scapy-python3/Manifest index cfe7b36cf..e5d0c2ae9 100644 --- a/dev-python/scapy-python3/Manifest +++ b/dev-python/scapy-python3/Manifest @@ -1,3 +1 @@ -DIST scapy-python3-0.20.tar.gz 1167308 SHA256 a239522e88bf2fb9a9568acd69559ebedca622b119e5cc046897bfd79caefd63 SHA512 34f425dd8c3c016100f17e294cc576f8da10a447c8824d7cbb7e9b7d6c13a8a28a7a1ca012f4673a9b760c3a77fe7a3adb54447c0cf954ccd629c635131df112 WHIRLPOOL 184f92583cc6b587d0dca39905bb1cbb1f9092065cc9bf1aa25df77d486c8950839980813c36ccb8951c3cf01b8a200d930680889078cf4635d9c177de1d72b0 -DIST scapy-python3-0.21.tar.gz 2179545 SHA256 abe65bb75cb9bcabbb69399c548c7981260f06439a1328d87d3d6ed66a978202 SHA512 d1f5eee914a25a7217f187fe8c757d330aa0375e1c90fb2e5f71ffaa2c7f97d0bf7e62f1e5ed9f9b7238a5d467d3c4f7186f5238b6d7444e94d9d98a1a602f76 WHIRLPOOL 848d00f84a84d74887c7bc628acffc7064971e841811516cbbaeb73f3be52234edec2ccff3b87df0cb64eea20a9eea88e431d2682616a18c4af6fa1408add0d3 -DIST scapy-python3-0.23.tar.gz 2196173 SHA256 8760991a67162f43af4d9e64828bcefc100ba88859b75177ae9f7ace56e58186 SHA512 9cb214a46f6f8b90c10afb903600472e389c30840e6e42c876cb035d18fe13f2affb2914263a668e802ac55727e7651e8dcc1c0ed753a92cd234488158a9ff60 WHIRLPOOL 38c41d1d606667bd7368384b2d143de3537fe74b9ce1f95bbdfdaa5a7f2f73c43f142b3e9591951f1deae39d570fbf0788672b381277ec0e4d822cc1c78f2add +DIST scapy-python3-0.23.tar.gz 2196173 BLAKE2B 32a3b48c83a2e2a4262f47307bde02c272106f863bb52e362dc0e1a23ef2095426a7cdfe7ae53bc6ff980ef08277857a3e877777a6222d89a26812fd69b030b1 SHA512 9cb214a46f6f8b90c10afb903600472e389c30840e6e42c876cb035d18fe13f2affb2914263a668e802ac55727e7651e8dcc1c0ed753a92cd234488158a9ff60 diff --git a/dev-python/scapy-python3/scapy-python3-0.20.ebuild b/dev-python/scapy-python3/scapy-python3-0.20.ebuild deleted file mode 100644 index 6d9189933..000000000 --- a/dev-python/scapy-python3/scapy-python3-0.20.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_{4,5} ) - -IUSE="test" -inherit distutils-r1 - -DESCRIPTION="Packet crafting/sending/... PCAP processing tool with python3 compatibility" -HOMEPAGE="https://pypi.python.org/pypi/scapy-python3/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -PDEPEND="virtual/python-scapy" - -src_prepare(){ - #we provide common files (binaries/man/doc) via virtual package - sed -i -e '/scripts = SCRIPTS/d' setup.py - sed -i -e '/data_files/d' setup.py -} diff --git a/dev-python/scapy-python3/scapy-python3-0.21.ebuild b/dev-python/scapy-python3/scapy-python3-0.21.ebuild deleted file mode 100644 index 4e1209c5f..000000000 --- a/dev-python/scapy-python3/scapy-python3-0.21.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5} ) - -IUSE="test" -inherit distutils-r1 - -DESCRIPTION="Packet crafting/sending/... PCAP processing tool with python3 compatibility" -HOMEPAGE="https://pypi.python.org/pypi/scapy-python3/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -PDEPEND="virtual/python-scapy" - -src_prepare(){ - #we provide common files (binaries/man/doc) via virtual package - sed -i -e '/scripts = SCRIPTS/d' setup.py - sed -i -e '/data_files/d' setup.py - eapply_user -} diff --git a/dev-python/scapy-python3/scapy-python3-0.23.ebuild b/dev-python/scapy-python3/scapy-python3-0.23-r1.ebuild similarity index 84% rename from dev-python/scapy-python3/scapy-python3-0.23.ebuild rename to dev-python/scapy-python3/scapy-python3-0.23-r1.ebuild index bcd70e83f..3aa225e29 100644 --- a/dev-python/scapy-python3/scapy-python3-0.23.ebuild +++ b/dev-python/scapy-python3/scapy-python3-0.23-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) +PYTHON_COMPAT=( python3_{4,5,6} ) IUSE="test" inherit distutils-r1 @@ -14,10 +14,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="~amd64 ~x86" DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" -PDEPEND="virtual/python-scapy" +RDEPEND="!net-analyzer/scapy + !virtual/python-scapy" src_prepare(){ #we provide common files (binaries/man/doc) via virtual package diff --git a/net-wireless/wifi-pumpkin/Manifest b/net-wireless/wifi-pumpkin/Manifest index 9fea2ba5b..5a7e86a90 100644 --- a/net-wireless/wifi-pumpkin/Manifest +++ b/net-wireless/wifi-pumpkin/Manifest @@ -1,3 +1,3 @@ -DIST wifi-pumpkin-0.7.8.tar.gz 3210268 SHA256 a84c6421d964e9c5b0afa9bb7f962e9508ddf522884aaa9edb2b0ec53e209159 SHA512 35e8e6040ee87cb4545d587649c75517e0771ba63c40ed5f291c044711c2d29e10bd06e0af4031efc723a671a5a7736eb13d3c0fbf430fc8d4c4782be26a7a8b WHIRLPOOL 7006b40af5e838cf7118bd02f61fa2df043ba4897af5f06119b2ebc7dff303c52e2e824a7a350196ff09f25eeb10125f8c69834ebc4f092f4996e5816e727e35 -DIST wifi-pumpkin-0.8.4.tar.gz 3924775 SHA256 11126abd6b4c70ca5126660d8b9ce6e53eca3196fe334a6cf4c43adb19abc2ec SHA512 9f8c0889cecf4d106d559436940c1e07db26a9f9f06cc78e7eae111838484a1a3aaf49a055b1b3fc8dbd17ac6ae24cbde666b69b4eaf94ccd5543ccb894ced94 WHIRLPOOL bfeb38903988028186f6e22162cbf58a167c13c04c8a8e34aa0f998da0029bf2165f441f53ae37d47f9a0969cee24feedc1b446a0c480c94395e01971b0bf604 -DIST wifi-pumpkin-0.8.5.tar.gz 3855311 SHA256 9190f1fdab97eb842b8f1a757bdf1668c7b355aa3cc1ab2c8bac5068fab1891b SHA512 1dd48a871050f368e1f744ad8174f2c152a3391e6ce61035e2fbf690d08c32f2dff1d8357cd3b1c62cd3592287300e63acba989bc352ef2ebd169f4b07e67b8a WHIRLPOOL 5398ec85863e27cf3efda4d1376c014e534885027e3b37454aa824b435fc7f30a8a9990dca77ce4baaa9f64c3e7980ea8bf8cd6b7c09dbebcd9f753d6369e2c1 +DIST wifi-pumpkin-0.7.8.tar.gz 3210268 BLAKE2B 4b2f50e76e65ea4047d1d6cc5e613eeb583bb0d6349fb73391b2a5ed9672b670007fb5544bc235caea0ed904c6195bad9912100dd844cd078564c43643d66da3 SHA512 35e8e6040ee87cb4545d587649c75517e0771ba63c40ed5f291c044711c2d29e10bd06e0af4031efc723a671a5a7736eb13d3c0fbf430fc8d4c4782be26a7a8b +DIST wifi-pumpkin-0.8.4.tar.gz 3924775 BLAKE2B a5e3707e4a77d471a9d253f4d66abb5da6ae4b2b7e6144afe7b2347a1adc6bea7f4aef8b91a5f36273da67de5a17c78fe6f2d37cadc69dd20e1d7e24112dc04d SHA512 9f8c0889cecf4d106d559436940c1e07db26a9f9f06cc78e7eae111838484a1a3aaf49a055b1b3fc8dbd17ac6ae24cbde666b69b4eaf94ccd5543ccb894ced94 +DIST wifi-pumpkin-0.8.5.tar.gz 3855311 BLAKE2B 082afcdf1765a16c1efe55ab4118bba3e8aa9d2b91e160e0ac3bbcba450318b92a9ae15573781df49d6e711442d4ed1401cf53d458ce965e615c5418c928b222 SHA512 1dd48a871050f368e1f744ad8174f2c152a3391e6ce61035e2fbf690d08c32f2dff1d8357cd3b1c62cd3592287300e63acba989bc352ef2ebd169f4b07e67b8a diff --git a/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild b/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5-r1.ebuild similarity index 98% rename from net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild rename to net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5-r1.ebuild index bc11f6de5..aa2993daa 100644 --- a/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5.ebuild +++ b/net-wireless/wifi-pumpkin/wifi-pumpkin-0.8.5-r1.ebuild @@ -23,6 +23,7 @@ RDEPEND="${PYTHON_DEPS} net-wireless/rfkill dev-python/PyQt4[${PYTHON_USEDEP}] dev-python/twisted-web[${PYTHON_USEDEP}] + net-analyzer/scapy[${PYTHON_USEDEP}] dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/python-nmap[${PYTHON_USEDEP}] dev-python/netaddr[${PYTHON_USEDEP}] @@ -41,7 +42,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/hyperframe[${PYTHON_USEDEP}] dev-python/hyper-h2[${PYTHON_USEDEP}] =net-proxy/mitmproxy-0.11*[${PYTHON_USEDEP}] - virtual/python-scapy[${PYTHON_USEDEP}] + dev-python/scapy-http[${PYTHON_USEDEP}] dev-python/service_identity[${PYTHON_USEDEP}] diff --git a/virtual/python-scapy/files/UTscapy b/virtual/python-scapy/files/UTscapy deleted file mode 100755 index f24a82c6b..000000000 --- a/virtual/python-scapy/files/UTscapy +++ /dev/null @@ -1,27 +0,0 @@ -#! /usr/bin/env python - - -############################################################################# -## ## -## UTscapy.py --- Unit Tests with scapy ## -## see http://www.secdev.org/projects/UTscapy/ ## -## for more informations ## -## ## -## Copyright (C) 2005 Philippe Biondi ## -## ## -## This program is free software; you can redistribute it and/or modify it ## -## under the terms of the GNU General Public License version 2 as ## -## published by the Free Software Foundation. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of ## -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## -## General Public License for more details. ## -## ## -############################################################################# - - -import sys -from scapy.tools.UTscapy import main - -main(sys.argv[1:]) diff --git a/virtual/python-scapy/files/scapy b/virtual/python-scapy/files/scapy deleted file mode 100755 index 39e36aab0..000000000 --- a/virtual/python-scapy/files/scapy +++ /dev/null @@ -1,25 +0,0 @@ -#! /usr/bin/env python - -############################################################################# -## ## -## scapy.py --- Interactive packet manipulation tool ## -## see http://www.secdev.org/projects/scapy/ ## -## for more informations ## -## ## -## Copyright (C) Philippe Biondi ## -## ## -## This program is free software; you can redistribute it and/or modify it ## -## under the terms of the GNU General Public License version 2 as ## -## published by the Free Software Foundation. ## -## ## -## This program is distributed in the hope that it will be useful, but ## -## WITHOUT ANY WARRANTY; without even the implied warranty of ## -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ## -## General Public License for more details. ## -## ## -############################################################################# - - -from scapy.main import interact - -interact() diff --git a/virtual/python-scapy/files/scapy.1 b/virtual/python-scapy/files/scapy.1 deleted file mode 100644 index b0cb37397..000000000 --- a/virtual/python-scapy/files/scapy.1 +++ /dev/null @@ -1,198 +0,0 @@ -.TH SCAPY 1 "May 12, 2003" -.SH NAME -scapy \- Interactive packet manipulation tool -.SH SYNOPSIS -.B scapy -.RI [ options ] -.SH DESCRIPTION -This manual page documents briefly the -.B scapy -tool. -.PP -\fBscapy\fP is a powerful interactive packet manipulation tool, -packet generator, network scanner, network discovery, packet sniffer, -etc. It can for the moment replace hping, parts of nmap, arpspoof, arp-sk, -arping, tcpdump, tshark, p0f, ... -.PP -\fBscapy\fP uses the python interpreter as a command board. That means that -you can use directly python language (assign variables, use loops, -define functions, etc.) If you give a file as parameter when you run -\fBscapy\fP, your session (variables, functions, intances, ...) will be saved -when you leave the interpretor, and restored the next time you launch -\fBscapy\fP. -.PP -The idea is simple. Those kind of tools do two things : sending packets -and receiving answers. That's what \fBscapy\fP does : you define a set of -packets, it sends them, receives answers, matches requests with answers -and returns a list of packet couples (request, answer) and a list of -unmatched packets. This has the big advantage over tools like nmap or -hping that an answer is not reduced to (open/closed/filtered), but is -the whole packet. -.PP -On top of this can be build more high level functions, for example one -that does traceroutes and give as a result only the start TTL of the -request and the source IP of the answer. One that pings a whole network -and gives the list of machines answering. One that does a portscan and -returns a LaTeX report. - -.SH OPTIONS -Options for scapy are: -.TP -\fB\-h\fR -display usage -.TP -\fB\-d\fR -increase log verbosity. Can be used many times. -.TP -\fB\-s\fR FILE -use FILE to save/load session values (variables, functions, intances, ...) -.TP -\fB\-p\fR PRESTART_FILE -use PRESTART_FILE instead of $HOME/.scapy_prestart.py as pre-startup file -.TP -\fB\-P\fR -do not run prestart file -.TP -\fB\-c\fR STARTUP_FILE -use STARTUP_FILE instead of $HOME/.scapy_startup.py as startup file -.TP -\fB\-C\fR -do not run startup file - -.SH COMMANDS -Only the vital commands to begin are listed here for the moment. -.TP -\fBls()\fR -lists supported protocol layers. If a protocol layer is given as parameter, lists its fields and types of fields. -.TP -\fBlsc()\fR -lists some user commands. If a command is given as parameter, its documentation is displayed. -.TP -\fBconf\fR -this object contains the configuration. - -.SH FILES -\fB$HOME/.scapy_prestart.py\fR -This file is run before scapy core is loaded. Only the \fb\conf\fP object -is available. This file can be used to manipulate \fBconf.load_layers\fP -list to choose which layers will be loaded: - -.nf -conf.load_layers.remove("bluetooth") -conf.load_layers.append("new_layer") -.fi - -\fB$HOME/.scapy_startup.py\fR -This file is run after scapy is loaded. It can be used to configure -some of the scapy behaviors: - -.nf -conf.prog.pdfreader="xpdf" -split_layers(UDP,DNS) -.fi - -.SH EXAMPLES - -More verbose examples are available at -http://www.secdev.org/projects/scapy/demo.html -Just run \fBscapy\fP and try the following commands in the interpreter. - -.LP -Test the robustness of a network stack with invalid packets: -.nf -sr(IP(dst="172.16.1.1", ihl=2, options="\verb$\x02$", version=3)/ICMP()) -.fi - -.LP -Packet sniffing and dissection (with a bpf filter or thetereal-like output): -.nf -a=sniff(filter="tcp port 110") -a=sniff(prn = lambda x: x.display) -.fi - -.LP -Sniffed packet reemission: -.nf -a=sniff(filter="tcp port 110") -sendp(a) -.fi - -.LP -Pcap file packet reemission: -.nf -sendp(rdpcap("file.cap")) -.fi - -.LP -Manual TCP traceroute: -.nf -sr(IP(dst="www.google.com", ttl=(1,30))/TCP(seq=RandInt(), sport=RandShort(), dport=dport) -.fi - -.LP -Protocol scan: -.nf -sr(IP(dst="172.16.1.28", proto=(1,254))) -.fi - -.LP -ARP ping: -.nf -srp(Ether(dst="ff:ff:ff:ff:ff:ff")/ARP(pdst="172.16.1.1/24")) -.fi - -.LP -ACK scan: -.nf -sr(IP(dst="172.16.1.28")/TCP(dport=(1,1024), flags="A")) -.fi - -.LP -Passive OS fingerprinting: -.nf -sniff(prn=prnp0f) -.fi - -.LP -Active OS fingerprinting: -.nf -nmap_fp("172.16.1.232") -.fi - - -.LP -ARP cache poisonning: -.nf -sendp(Ether(dst=tmac)/ARP(op="who-has", psrc=victim, pdst=target)) -.fi - -.LP -Reporting: -.nf -report_ports("192.168.2.34", (20,30)) -.fi - -.SH SEE ALSO - -.nf -http://www.secdev.org/projects/scapy -http://trac.secdev.org/scapy -.fi - -.SH BUGS -Does not give the right source IP for routes that use interface aliases. - -May miss packets under heavy load. - -Session saving is limited by Python ability to marshal objects. As a -consequence, lambda functions and generators can't be saved, which seriously -reduce usefulness of this feature. - -BPF filters don't work on Point-to-point interfaces. - - -.SH AUTHOR -Philippe Biondi -.PP -This manual page was written by Alberto Gonzalez Iniesta -and Philippe Biondi. diff --git a/virtual/python-scapy/python-scapy-1.ebuild b/virtual/python-scapy/python-scapy-1.ebuild deleted file mode 100644 index b2ef06006..000000000 --- a/virtual/python-scapy/python-scapy-1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python{2_7,3_4,3_5} ) - -inherit python-r1 - -DESCRIPTION="A virtual for scapy, for Python 2 & 3" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -RDEPEND="${PYTHON_DEPS} - $(python_gen_cond_dep 'net-analyzer/scapy[${PYTHON_USEDEP}]' python2*) - $(python_gen_cond_dep 'dev-python/scapy-python3[${PYTHON_USEDEP}]' python3*)" -DEPEND="!!