From a4302e43e5aea0da7330eb771eee13d8fa91cdaa Mon Sep 17 00:00:00 2001 From: Zero_Chaos Date: Fri, 21 Aug 2009 23:03:56 +0000 Subject: [PATCH] scapy fix for the bug reported by aricon --- net-analyzer/scapy/Manifest | 5 ++ net-analyzer/scapy/files/ethertypes | 37 +++++++++++ .../scapy/files/scapy-1.1.1-config-file.patch | 13 ++++ .../files/scapy-1.1.1-with-which-width.patch | 13 ++++ net-analyzer/scapy/scapy-1.1.1-r2.ebuild | 63 +++++++++++++++++++ 5 files changed, 131 insertions(+) create mode 100644 net-analyzer/scapy/Manifest create mode 100644 net-analyzer/scapy/files/ethertypes create mode 100644 net-analyzer/scapy/files/scapy-1.1.1-config-file.patch create mode 100644 net-analyzer/scapy/files/scapy-1.1.1-with-which-width.patch create mode 100644 net-analyzer/scapy/scapy-1.1.1-r2.ebuild diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest new file mode 100644 index 000000000..076ce810e --- /dev/null +++ b/net-analyzer/scapy/Manifest @@ -0,0 +1,5 @@ +AUX ethertypes 1317 RMD160 296b88fed911b25398b5f657cd6bb5c91e72e288 SHA1 6ed0fe2446666876d77b8971fd8edf495a9c0be3 SHA256 e140071e462df8aab9f7b63a3965bf206797ecbcff334a3ec494256defe35dcb +AUX scapy-1.1.1-config-file.patch 417 RMD160 57a6052b534ec4cab472196ce910789ef19c9697 SHA1 27ff9ba71624093836391238623c706c29756f08 SHA256 203709d462ce5d828169d613b7280e7bc78413cf8512b933fdc1d91194738e33 +AUX scapy-1.1.1-with-which-width.patch 578 RMD160 bf73a9606460785697d92f81336103391678704b SHA1 30845c60e41cb6c3a8ebf58fef263f76f7b708f3 SHA256 433dcbf9435df13bf78f43d7332caddc9252910643baa512745915d19b79ea5a +DIST scapy-1.1.1.tar.gz 147401 RMD160 20bdb1ea59a05f452a515e438e230e1d85b81016 SHA1 870da8e6e2a8786b03a0055fc2cc1d1317f308e4 SHA256 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956 +EBUILD scapy-1.1.1-r2.ebuild 1773 RMD160 47143e1326d9cc6a20723367c8a4abc33cc26a01 SHA1 ebb71a887ddcd842fd2d6f25b430e57dee75a122 SHA256 6bf529a7cbeb7c1f46b239b2de6fc973a51c14bb47a20588e380f3af6d4c8417 diff --git a/net-analyzer/scapy/files/ethertypes b/net-analyzer/scapy/files/ethertypes new file mode 100644 index 000000000..5e700f663 --- /dev/null +++ b/net-analyzer/scapy/files/ethertypes @@ -0,0 +1,37 @@ +# +# 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 new file mode 100644 index 000000000..ac38942b5 --- /dev/null +++ b/net-analyzer/scapy/files/scapy-1.1.1-config-file.patch @@ -0,0 +1,13 @@ +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 new file mode 100644 index 000000000..4f1e15dad --- /dev/null +++ b/net-analyzer/scapy/files/scapy-1.1.1-with-which-width.patch @@ -0,0 +1,13 @@ +--- scapy 2009-08-14 09:27:54.000000000 +0000 ++++ scapy.new 2009-08-21 18:53:23.231868637 +0000 + -3067,9 +3067,9 @@ class TracerouteResult(SndRcvList): + 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 new file mode 100644 index 000000000..e6763536c --- /dev/null +++ b/net-analyzer/scapy/scapy-1.1.1-r2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2008 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.3 2008/05/01 14:31:00 maekke Exp $ + +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" + +DEPEND="virtual/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 ) + visual? ( dev-python/visual )" + +src_unpack() { + unpack ${A} + cd "${S}" + + 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 + python_version + insinto /usr/$(get_libdir)/python${PYVER}/site-packages + doins scapy.py + + insinto /etc + doins "${FILESDIR}"/ethertypes + dodoc AUTHORS README changelog.txt + doman scapy.1 +} + +pkg_postinst() { + python_mod_optimize + + 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 +}