diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest deleted file mode 100644 index c58fad6aa..000000000 --- a/net-analyzer/scapy/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST scapy-1.1.1.tar.gz 147401 SHA256 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956 diff --git a/net-analyzer/scapy/files/ethertypes b/net-analyzer/scapy/files/ethertypes deleted file mode 100644 index 5e700f663..000000000 --- a/net-analyzer/scapy/files/ethertypes +++ /dev/null @@ -1,37 +0,0 @@ -# -# Ethernet frame types -# This file describes some of the various Ethernet -# protocol types that are used on Ethernet networks. -# -# This list could be found on: -# http://www.iana.org/assignments/ethernet-numbers -# -# ... #Comment -# -IPv4 0800 ip ip4 # Internet IP (IPv4) -X25 0805 -ARP 0806 ether-arp # -FR_ARP 0808 # Frame Relay ARP [RFC1701] -BPQ 08FF # G8BPQ AX.25 Ethernet Packet -DEC 6000 # DEC Assigned proto -DNA_DL 6001 # DEC DNA Dump/Load -DNA_RC 6002 # DEC DNA Remote Console -DNA_RT 6003 # DEC DNA Routing -LAT 6004 # DEC LAT -DIAG 6005 # DEC Diagnostics -CUST 6006 # DEC Customer use -SCA 6007 # DEC Systems Comms Arch -TEB 6558 # Trans Ether Bridging [RFC1701] -RAW_FR 6559 # Raw Frame Relay [RFC1701] -AARP 80F3 # Appletalk AARP -ATALK 809B # Appletalk -802_1Q 8100 8021q 1q 802.1q dot1q # 802.1Q Virtual LAN tagged frame -IPX 8137 # Novell IPX -NetBEUI 8191 # NetBEUI -IPv6 86DD ip6 # IP version 6 -PPP 880B # PPP -ATMMPOA 884C # MultiProtocol over ATM -PPP_DISC 8863 # PPPoE discovery messages -PPP_SES 8864 # PPPoE session messages -ATMFATE 8884 # Frame-based ATM Transport over Ethernet -LOOP 9000 loopback # loop proto diff --git a/net-analyzer/scapy/files/scapy-1.1.1-config-file.patch b/net-analyzer/scapy/files/scapy-1.1.1-config-file.patch deleted file mode 100644 index ac38942b5..000000000 --- a/net-analyzer/scapy/files/scapy-1.1.1-config-file.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://hg.secdev.org/scapy/rev/443b35c8c6de - -Fixed startup config file reading problem when scapy is used as a library - ---- scapy.py.orig 2008-01-30 19:47:55.000000000 +0300 -+++ scapy.py 2008-01-30 19:48:42.000000000 +0300 -@@ -12190,4 +12190,5 @@ - if __name__ == "__main__": - interact() - else: -- read_config_file(DEFAULT_CONFIG_FILE) -+ if DEFAULT_CONFIG_FILE: -+ read_config_file(DEFAULT_CONFIG_FILE) diff --git a/net-analyzer/scapy/files/scapy-1.1.1-with-which-width.patch b/net-analyzer/scapy/files/scapy-1.1.1-with-which-width.patch deleted file mode 100644 index 1be7e22fc..000000000 --- a/net-analyzer/scapy/files/scapy-1.1.1-with-which-width.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur scapy-1.1.1-orig/scapy.py scapy-1.1.1/scapy.py ---- scapy-1.1.1-orig/scapy.py 2007-04-09 09:17:35.000000000 -0400 -+++ scapy-1.1.1/scapy.py 2009-09-08 17:30:02.000000000 -0400 -@@ -3067,9 +3067,9 @@ - if loctrace: - trt[trace_id] = loctrace - -- tr = map(lambda x: Gnuplot.Data(x,with="lines"), trt.values()) -+ tr = map(lambda x: Gnuplot.Data(x,width="lines"), trt.values()) - g = Gnuplot.Gnuplot() -- world = Gnuplot.File(conf.gnuplot_world,with="lines") -+ world = Gnuplot.File(conf.gnuplot_world,width="lines") - g.plot(world,*tr) - return g - diff --git a/net-analyzer/scapy/scapy-1.1.1-r2.ebuild b/net-analyzer/scapy/scapy-1.1.1-r2.ebuild deleted file mode 100644 index 03b696c95..000000000 --- a/net-analyzer/scapy/scapy-1.1.1-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.1.1-r1.ebuild,v 1.8 2011/04/05 17:28:33 arfrever Exp $ - -EAPI="3" - -inherit eutils python multilib - -DESCRIPTION="A Python interactive packet manipulation program for mastering the network" -HOMEPAGE="http://www.secdev.org/projects/scapy/" -SRC_URI="http://www.secdev.org/projects/scapy/files/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="gnuplot pyx crypt graphviz imagemagick visual tcpreplay" - -DEPEND="dev-lang/python" -RDEPEND="net-analyzer/tcpdump - gnuplot? ( dev-python/gnuplot-py ) - pyx? ( dev-python/pyx ) - crypt? ( dev-python/pycrypto ) - graphviz? ( media-gfx/graphviz ) - imagemagick? ( || ( media-gfx/imagemagick - media-gfx/graphicsmagick[imagemagick] ) ) - visual? ( dev-python/visual ) - tcpreplay? ( net-analyzer/tcpreplay )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-config-file.patch - epatch "${FILESDIR}"/${P}-with-which-width.patch -} - -src_install() { - exeinto /usr/bin - newexe scapy.py scapy - - # also install scapy as a importable python module - insinto $(python_get_sitedir) - doins scapy.py - - insinto /etc - doins "${FILESDIR}"/ethertypes - dodoc AUTHORS README changelog.txt - doman scapy.1 -} - -pkg_postinst() { - python_mod_optimize scapy.py - - einfo "" - einfo "- Check http://www.secdev.org/projects/scapy/ for additional info" - einfo "" - einfo "- To subscribe to the mailing-list, send a mail to scapy.ml-subscribe(at)secdev.org" - einfo "- To send a mail to the mailing-list: scapy.ml(at)secdev.org" - einfo "- Web archive : http://news.gmane.org/gmane.comp.security.scapy.general" - einfo "- NNTP, RSS, etc : http://gmane.org/info.php?group=gmane.comp.security.scapy.general" - einfo "" -} - -pkg_postrm() { - python_mod_cleanup scapy.py -} diff --git a/profiles/pentoo/base/package.accept_keywords/net-analyzer b/profiles/pentoo/base/package.accept_keywords/net-analyzer index 74fa6904f..8ebf7d22f 100644 --- a/profiles/pentoo/base/package.accept_keywords/net-analyzer +++ b/profiles/pentoo/base/package.accept_keywords/net-analyzer @@ -77,7 +77,7 @@ net-analyzer/nessus-plugins ~net-analyzer/rain-1.2.9_beta1 ~net-analyzer/recon-ng-4.8.0 ~net-analyzer/rrdtool-1.4.7 -~net-analyzer/scapy-2.3.1 +~net-analyzer/scapy-2.3.3 ~net-analyzer/siphon-666-r1 ~net-analyzer/sipvicious-0.2.8 ~net-analyzer/sqlninja-0.2.6_p1