Add in a patch from Scott. Fixes bug 383739.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux i686

4 files changed, 65 insertions, 7 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index 8749c3d1b6db..68549a2e14b6 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/scapy
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.32 2011/04/19 11:39:14 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.33 2011/09/20 21:56:45 ikelos Exp $
+
+*scapy-2.2.0-r1 (20 Sep 2011)
+
+  20 Sep 2011; Mike Auty <ikelos@gentoo.org> +scapy-2.2.0-r1.ebuild,
+  +files/scapy-2.2.0-fix-sendpfast.patch:
+  Add in a patch from Scott. Fixes bug 383739.
 
   19 Apr 2011; Thomas Kahle <tomka@gentoo.org> scapy-2.1.0.ebuild:
   x86 stable per bug 359829
diff --git a/net-analyzer/scapy/Manifest b/net-analyzer/scapy/Manifest
index 782c7b2e2fe4..dd78a17ca3f5 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -1,8 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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-2.2.0-fix-sendpfast.patch 502 RMD160 23843e84d2ca2848b77af3392911916c109fb4d7 SHA1 e12e9204898ab18025545508fdda18eaf83e05c9 SHA256 696eb6799c6eec5c15bf5b3c8fa5c73ebd1a926f1e5db6f62807291b3d18db85
 DIST scapy-1.1.1.tar.gz 147401 RMD160 20bdb1ea59a05f452a515e438e230e1d85b81016 SHA1 870da8e6e2a8786b03a0055fc2cc1d1317f308e4 SHA256 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
 DIST scapy-2.0.1.tar.gz 864953 RMD160 a4af2137458ad4ffa573ed81303506fdceefbc95 SHA1 fceb4e60fbea0f2ce8ed258957a5eca1baa05ac5 SHA256 4575588bc55733bea7b2c94bf6cf1bd0cfa66c169e2c2d02f5b05a8ad7eaabc1
 DIST scapy-2.1.0.tar.gz 956785 RMD160 caca42e89c87c07a2dbe399dd4e5924cefdff48a SHA1 e507bc0f2a32d209f321580c9338d2ceb72ab93a SHA256 43ca233b0cfc950401193e2702ea32ee1dd83d4bab671371e322a7b6c52275ba
@@ -10,13 +11,14 @@ DIST scapy-2.2.0.tar.gz 972996 RMD160 0cb0e14e6e84ba6a22b0afd7f2913a98888a418e S
 EBUILD scapy-1.1.1-r1.ebuild 1788 RMD160 a1f645ecd8c42a3bb3b171de5a66f07edcafe655 SHA1 825608473e0cae0a2b63aa1d7b920cff02673217 SHA256 233b7807500799c6246cac36bda1760f2c58f2db685ba4af5743f03168aa6573
 EBUILD scapy-2.0.1.ebuild 911 RMD160 8309bb8bc41cd7d6f401fef41946bbd2d3c95007 SHA1 c34cd2a2842fa22c22bbda4ba8013e2e789a0338 SHA256 6e473ae25b213c5ca33cd664bb659eba95a1158bfcd859e252712cc4a19a86bd
 EBUILD scapy-2.1.0.ebuild 977 RMD160 9e8737fc2420c60e9a48b5b21024b3afb415ae57 SHA1 cb790437f4f35ab83b53e21482adb0386d462a6a SHA256 395b125e990d4b02d4a8fa853061e551bec9f702658d1b2f800342046cff72f2
+EBUILD scapy-2.2.0-r1.ebuild 1057 RMD160 1ca187b9da1707592e60906ada4b0974bb7e679b SHA1 d8e2475cceb8da263a71c3ce543c8c20978a4fe6 SHA256 8f487b84fc75cf6e69a99f024bebfbc5dbf79cec4ff5cffcc74ba4ec37dfcbc0
 EBUILD scapy-2.2.0.ebuild 983 RMD160 aa9febf38c98c7842a56164f73e69c6eab6e931e SHA1 d18e187a560418f04ffcbcc01ae1a3ba7f4ec757 SHA256 565a1c05240dce358150bbf2f4cce69047ac3ea311961936cddfffbe619ff80b
-MISC ChangeLog 4935 RMD160 27ad2581844f3fc106058deae8f954054c9ed75a SHA1 373016596f54d82cd9c837e1b45d8281e20b3dc8 SHA256 d297bee7a838d0a5baf6490f1bbcbde4a40c400e49b5a13002af29e023d93180
+MISC ChangeLog 5126 RMD160 7affdf187567c9582ee8e1f4b105cdf8649ce0cf SHA1 cf9a3181ff010802fa52d8b4260ab38bf7b48d28 SHA256 056761fe9cb4e26e1fc217e2d3325bf523751ae9fd43d0f734132a63d4d18222
 MISC metadata.xml 642 RMD160 bbcc2fb576a2f245a392422d2591e50bae846e7c SHA1 dbd691fabd6e0a7c04e586cef65c8b27426bdfd0 SHA256 be7bd266b0b71b913f17dd191aa0b9ffc24b8ba22ed4199d35af8bc17c59b430
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk2tcg8ACgkQodBTJSDyo67xUAD7Bdtc1tnIqF0GpWq6YllHa79B
-Z2zCbCYWmzjPXdwVX6MA/A2TUKhAg6K3uWJ9m+C1FBldrrEQHwygYGSRRhmAW+MC
-=28+9
+iEYEARECAAYFAk55DCMACgkQu7rWomwgFXq+iACffIPXSab3h+f10kxVT90RZSMB
+3fEAn0rAK9dS2VUcVppffCKfddwamkyy
+=O1Dl
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/scapy/files/scapy-2.2.0-fix-sendpfast.patch b/net-analyzer/scapy/files/scapy-2.2.0-fix-sendpfast.patch
new file mode 100644
index 000000000000..e10f97353d71
--- /dev/null
+++ b/net-analyzer/scapy/files/scapy-2.2.0-fix-sendpfast.patch
@@ -0,0 +1,12 @@
+diff -ru a/scapy-2.2.0/scapy/sendrecv.py b/scapy-2.2.0/scapy/sendrecv.py
+--- a/scapy-2.2.0/scapy/sendrecv.py	2010-08-11 11:09:51.000000000 +1200
++++ b/scapy-2.2.0/scapy/sendrecv.py	2011-09-20 11:22:26.776978191 +1200
+@@ -13,7 +13,7 @@
+ import arch
+ from config import conf
+ from packet import Gen
+-from utils import warning,get_temp_file,PcapReader
++from utils import warning,get_temp_file,PcapReader,wrpcap
+ import plist
+ from error import log_runtime,log_interactive
+ from base_classes import SetGen
diff --git a/net-analyzer/scapy/scapy-2.2.0-r1.ebuild b/net-analyzer/scapy/scapy-2.2.0-r1.ebuild
new file mode 100644
index 000000000000..8748b47da7fc
--- /dev/null
+++ b/net-analyzer/scapy/scapy-2.2.0-r1.ebuild
@@ -0,0 +1,38 @@
+# 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.2.0-r1.ebuild,v 1.1 2011/09/20 21:56:45 ikelos Exp $
+
+EAPI="3"
+
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils 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=""
+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}-fix-sendpfast.patch
+}
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}