Fixed startup config file reading problem when scapy is used as a library, bug 203557, reported by Craig <craig AT haquarter.de>. Remove old.

(Portage version: 2.1.3.19)

6 files changed, 45 insertions, 18 deletions

diff --git a/net-analyzer/scapy/ChangeLog b/net-analyzer/scapy/ChangeLog
index 50a2405cfeda..baf467bdf4b6 100644
--- a/net-analyzer/scapy/ChangeLog
+++ b/net-analyzer/scapy/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/scapy
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.13 2007/09/09 11:08:44 lcars Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/ChangeLog,v 1.14 2008/01/30 17:13:13 pva Exp $
+
+*scapy-1.1.1-r1 (30 Jan 2008)
+
+  30 Jan 2008; <pva@gentoo.org> +files/scapy-1.1.1-config-file.patch,
+  -scapy-1.0.5.ebuild, scapy-1.1.1.ebuild, +scapy-1.1.1-r1.ebuild:
+  Fixed startup config file reading problem when scapy is used as a library,
+  bug 203557, reported by Craig <craig AT haquarter.de>. Remove old.
 
   09 Sep 2007; Andrea Barisani <lcars@gentoo.org> -scapy-1.0.2.ebuild,
   -scapy-1.0.2-r1.ebuild, -scapy-1.0.3.ebuild, -scapy-1.0.3-r1.ebuild,
diff --git a/net-analyzer/scapy/files/digest-scapy-1.0.5 b/net-analyzer/scapy/files/digest-scapy-1.0.5
deleted file mode 100644
index 6a71e42c4b06..000000000000
--- a/net-analyzer/scapy/files/digest-scapy-1.0.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b094a03472375c3add5415345b8d79d6 scapy-1.0.5.tar.gz 144746
-RMD160 33bbc31385ca098b1361d8233f17222fa460836f scapy-1.0.5.tar.gz 144746
-SHA256 a8a77854dfdc6cee71344527510e64d1985222d20637c08f0b46b8d709c2e766 scapy-1.0.5.tar.gz 144746
diff --git a/net-analyzer/scapy/files/digest-scapy-1.1.1-r1 b/net-analyzer/scapy/files/digest-scapy-1.1.1-r1
new file mode 100644
index 000000000000..7e7e374b0880
--- /dev/null
+++ b/net-analyzer/scapy/files/digest-scapy-1.1.1-r1
@@ -0,0 +1,3 @@
+MD5 8ac720a1bea4304797c713ef1ed063f1 scapy-1.1.1.tar.gz 147401
+RMD160 20bdb1ea59a05f452a515e438e230e1d85b81016 scapy-1.1.1.tar.gz 147401
+SHA256 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956 scapy-1.1.1.tar.gz 147401
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 000000000000..ac38942b52e5
--- /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/scapy-1.0.5.ebuild b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
index c610275cb105..c274454c1e01 100644
--- a/net-analyzer/scapy/scapy-1.0.5.ebuild
+++ b/net-analyzer/scapy/scapy-1.1.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.0.5.ebuild,v 1.1 2006/11/13 16:57:55 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.1.1-r1.ebuild,v 1.1 2008/01/30 17:13:14 pva Exp $
 
-inherit python multilib
+inherit eutils python multilib
 
 DESCRIPTION="A Python interactive packet manipulation program for mastering the network"
 HOMEPAGE="http://www.secdev.org/projects/scapy/"
@@ -22,6 +22,13 @@ RDEPEND="net-analyzer/tcpdump
 	imagemagick? ( media-gfx/imagemagick )
 	visual? ( dev-python/visual )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-config-file.patch
+}
+
 src_install() {
 	exeinto /usr/bin
 	newexe scapy.py scapy
@@ -32,10 +39,10 @@ src_install() {
 	doins scapy.py
 
 	insinto /etc
-	doins ${FILESDIR}/ethertypes
-	dodoc AUTHORS COPYING README changelog.txt
-	doman scapy.1.*
-	}
+	doins "${FILESDIR}"/ethertypes
+	dodoc AUTHORS README changelog.txt
+	doman scapy.1
+}
 
 pkg_postinst() {
 	python_mod_optimize
diff --git a/net-analyzer/scapy/scapy-1.1.1.ebuild b/net-analyzer/scapy/scapy-1.1.1.ebuild
index 2eaf120e8a72..3f4ada9d4704 100644
--- a/net-analyzer/scapy/scapy-1.1.1.ebuild
+++ b/net-analyzer/scapy/scapy-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# 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.ebuild,v 1.1 2007/08/27 13:41:52 lcars Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/scapy/scapy-1.1.1.ebuild,v 1.2 2008/01/30 17:13:14 pva Exp $
 
 inherit python multilib
 
@@ -32,10 +32,10 @@ src_install() {
 	doins scapy.py
 
 	insinto /etc
-	doins ${FILESDIR}/ethertypes
-	dodoc AUTHORS COPYING README changelog.txt
-	doman scapy.1.*
-	}
+	doins "${FILESDIR}"/ethertypes
+	dodoc AUTHORS README changelog.txt
+	doman scapy.1
+}
 
 pkg_postinst() {
 	python_mod_optimize