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

Package-Manager: portage-2.1.3.19

7 files changed, 64 insertions, 34 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/Manifest b/net-analyzer/scapy/Manifest
index 4381b47f9529..8f36670aafb3 100644
--- a/net-analyzer/scapy/Manifest
+++ b/net-analyzer/scapy/Manifest
@@ -2,27 +2,30 @@ AUX ethertypes 1317 RMD160 296b88fed911b25398b5f657cd6bb5c91e72e288 SHA1 6ed0fe2
 MD5 94bffde8f75a1b8f891fb780bfe15ca2 files/ethertypes 1317
 RMD160 296b88fed911b25398b5f657cd6bb5c91e72e288 files/ethertypes 1317
 SHA256 e140071e462df8aab9f7b63a3965bf206797ecbcff334a3ec494256defe35dcb files/ethertypes 1317
-DIST scapy-1.0.5.tar.gz 144746 RMD160 33bbc31385ca098b1361d8233f17222fa460836f SHA1 58ab1ef469d48a84fe987a3a91d6e40a59bb687d SHA256 a8a77854dfdc6cee71344527510e64d1985222d20637c08f0b46b8d709c2e766
+AUX scapy-1.1.1-config-file.patch 417 RMD160 57a6052b534ec4cab472196ce910789ef19c9697 SHA1 27ff9ba71624093836391238623c706c29756f08 SHA256 203709d462ce5d828169d613b7280e7bc78413cf8512b933fdc1d91194738e33
+MD5 baf27b4dcc0e3564683190ad5e9c4507 files/scapy-1.1.1-config-file.patch 417
+RMD160 57a6052b534ec4cab472196ce910789ef19c9697 files/scapy-1.1.1-config-file.patch 417
+SHA256 203709d462ce5d828169d613b7280e7bc78413cf8512b933fdc1d91194738e33 files/scapy-1.1.1-config-file.patch 417
 DIST scapy-1.1.1.tar.gz 147401 RMD160 20bdb1ea59a05f452a515e438e230e1d85b81016 SHA1 870da8e6e2a8786b03a0055fc2cc1d1317f308e4 SHA256 2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
-EBUILD scapy-1.0.5.ebuild 1635 RMD160 88ef4c60234b601acac824ba91a54bb216acb0d0 SHA1 cc56460b0647b9286ed91729b150e652ada378ae SHA256 cec8c431452e26a09ec8384312a51bc6811424dc0ff22e54cdb16911ef4f9230
-MD5 3c55e8847efd76abed194e0252d20854 scapy-1.0.5.ebuild 1635
-RMD160 88ef4c60234b601acac824ba91a54bb216acb0d0 scapy-1.0.5.ebuild 1635
-SHA256 cec8c431452e26a09ec8384312a51bc6811424dc0ff22e54cdb16911ef4f9230 scapy-1.0.5.ebuild 1635
-EBUILD scapy-1.1.1.ebuild 1635 RMD160 35e66e9cf0a1f01401386b8e96cad930999ee943 SHA1 0c1f96b09605548ffa2641be3979f04dac9566aa SHA256 90cd6ad1f0a7e7a069e0d1ffa796c5944f557ac762b81cea8f7672ea277880bc
-MD5 394c1589f6bb018e31fc1561cd475bef scapy-1.1.1.ebuild 1635
-RMD160 35e66e9cf0a1f01401386b8e96cad930999ee943 scapy-1.1.1.ebuild 1635
-SHA256 90cd6ad1f0a7e7a069e0d1ffa796c5944f557ac762b81cea8f7672ea277880bc scapy-1.1.1.ebuild 1635
-MISC ChangeLog 1802 RMD160 4a95029537dad52ae424c89ad9e27e246dcbc0f7 SHA1 4e8ebc4b10faf4788262997ae64c7f78471e03f0 SHA256 e8e31ee5e94350a24eaac7a73bd8d21a93879f7845f1d9bf442b373fb299198e
-MD5 64a0b0b6cdad9da6fef9988bcaf2d406 ChangeLog 1802
-RMD160 4a95029537dad52ae424c89ad9e27e246dcbc0f7 ChangeLog 1802
-SHA256 e8e31ee5e94350a24eaac7a73bd8d21a93879f7845f1d9bf442b373fb299198e ChangeLog 1802
+EBUILD scapy-1.1.1-r1.ebuild 1722 RMD160 534324c26a032bb6719576234236190c3fc32601 SHA1 426d3b3d94561ad8f684a8487dae49a44c9e1109 SHA256 66c17fdd5cf1b30c522f953cc2744f17f3c5562a826c986f7378ac072fb3f97f
+MD5 05872490fccbd47b25478f62b7373ad0 scapy-1.1.1-r1.ebuild 1722
+RMD160 534324c26a032bb6719576234236190c3fc32601 scapy-1.1.1-r1.ebuild 1722
+SHA256 66c17fdd5cf1b30c522f953cc2744f17f3c5562a826c986f7378ac072fb3f97f scapy-1.1.1-r1.ebuild 1722
+EBUILD scapy-1.1.1.ebuild 1624 RMD160 f7e5d746b8573f9da64cef2502a82e6fb5b077d4 SHA1 9d34ed704851af4e245c8596d8b9e80e652c0305 SHA256 273931f61098caf2cebd9dea5c538c638bed949785b3cf5bd87eafd437022439
+MD5 512b01faa406820a8bc1080069cdeb74 scapy-1.1.1.ebuild 1624
+RMD160 f7e5d746b8573f9da64cef2502a82e6fb5b077d4 scapy-1.1.1.ebuild 1624
+SHA256 273931f61098caf2cebd9dea5c538c638bed949785b3cf5bd87eafd437022439 scapy-1.1.1.ebuild 1624
+MISC ChangeLog 2115 RMD160 f05fc5728cee8d9c1e58548f0cf799aea163ae43 SHA1 c8ae69187df9529f892ddae6b85498bae67f752d SHA256 c43167d5badc36eef17d7770f389a9c2ae79360a4cb04c357288405cb306284d
+MD5 02b5d2f27103d827ea0b9ca20cc7b447 ChangeLog 2115
+RMD160 f05fc5728cee8d9c1e58548f0cf799aea163ae43 ChangeLog 2115
+SHA256 c43167d5badc36eef17d7770f389a9c2ae79360a4cb04c357288405cb306284d ChangeLog 2115
 MISC metadata.xml 355 RMD160 688a1f9880c088ac5da974b5a3822b394a7451c3 SHA1 727498ee2bb84d7c13392f3fac0357423fe18f76 SHA256 162295dcb18fa7d4f77dbee062aa50203c6feeb46db8e47660c33e22882f1287
 MD5 c0cf59a965bb4c8fb3fba2080d854821 metadata.xml 355
 RMD160 688a1f9880c088ac5da974b5a3822b394a7451c3 metadata.xml 355
 SHA256 162295dcb18fa7d4f77dbee062aa50203c6feeb46db8e47660c33e22882f1287 metadata.xml 355
-MD5 9c16b3851b1c2c3dedf097fde9d2e0fd files/digest-scapy-1.0.5 235
-RMD160 9fc01e44cbcb17b71abb9ba1b7b2af87bfb1f306 files/digest-scapy-1.0.5 235
-SHA256 651f6a943e5604a7444256340a48498c8d52e93d2bf5beb0c54fa3fe6a34e1f7 files/digest-scapy-1.0.5 235
 MD5 339cd02e9af7db0b139cc13951659211 files/digest-scapy-1.1.1 235
 RMD160 72b0060bef5aefa246bc901d98d7b2e79880867a files/digest-scapy-1.1.1 235
 SHA256 9eae52f96afb0f38088cb69a7ce46225e358a42ec2d6ea7e0c687ce053fc8cdd files/digest-scapy-1.1.1 235
+MD5 339cd02e9af7db0b139cc13951659211 files/digest-scapy-1.1.1-r1 235
+RMD160 72b0060bef5aefa246bc901d98d7b2e79880867a files/digest-scapy-1.1.1-r1 235
+SHA256 9eae52f96afb0f38088cb69a7ce46225e358a42ec2d6ea7e0c687ce053fc8cdd files/digest-scapy-1.1.1-r1 235
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