summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-analyzer/scapy/ChangeLog6
-rw-r--r--net-analyzer/scapy/files/ethertypes37
-rw-r--r--net-analyzer/scapy/files/scapy-1.1.1-config-file.patch13
-rw-r--r--net-analyzer/scapy/scapy-1.1.1-r1.ebuild62
-rw-r--r--net-analyzer/scapy/scapy-2.0.1.ebuild27
5 files changed, 5 insertions, 140 deletions
diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index 108b9b9c9081..c259cb9ecf7b 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-analyzer/scapy
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.35 2012/01/28 15:34:08 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.36 2012/06/06 00:09:40 ikelos Exp $
+
+ 06 Jun 2012; Mike Auty <ikelos@gentoo.org> -scapy-1.1.1-r1.ebuild,
+ -files/scapy-1.1.1-config-file.patch, -scapy-2.0.1.ebuild, -files/ethertypes:
+ Remove old versions, fixes bugs 419811 and 419813.
28 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> scapy-2.2.0-r1.ebuild:
x86 stable wrt bug #400427
diff --git a/net-analyzer/scapy/files/ethertypes b/net-analyzer/scapy/files/ethertypes
deleted file mode 100644
index 5e700f663987..000000000000
--- 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
-#
-# <name> <hexnumber> <alias1>...<alias35> #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 ac38942b52e5..000000000000
--- 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/scapy-1.1.1-r1.ebuild b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
deleted file mode 100644
index 6e79479bf4aa..000000000000
--- a/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,62 +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
-}
-
-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/net-analyzer/scapy/scapy-2.0.1.ebuild b/net-analyzer/scapy/scapy-2.0.1.ebuild
deleted file mode 100644
index c36f71e77a0d..000000000000
--- a/net-analyzer/scapy/scapy-2.0.1.ebuild
+++ /dev/null
@@ -1,27 +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-2.0.1.ebuild,v 1.5 2011/04/05 17:28:33 arfrever Exp $
-
-EAPI="3"
-
-inherit distutils
-
-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 )"