Added sed teak that possibly fixes crash reported in bug #262865, thank Albert Gall for report.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 17 insertions, 12 deletions

diff --git a/net-analyzer/netdiscover/ChangeLog b/net-analyzer/netdiscover/ChangeLog
index 73732afe2409..9405d2e073ac 100644
--- a/net-analyzer/netdiscover/ChangeLog
+++ b/net-analyzer/netdiscover/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/netdiscover
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.9 2009/10/11 08:52:18 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/ChangeLog,v 1.10 2009/10/17 14:26:46 pva Exp $
+
+*netdiscover-0.3_beta6-r3 (17 Oct 2009)
+
+  17 Oct 2009; Peter Volkov <pva@gentoo.org>
+  -netdiscover-0.3_beta6-r1.ebuild, +netdiscover-0.3_beta6-r3.ebuild:
+  Added sed teak that possibly fixes crash reported in bug #262865, thank
+  Albert Gall for report.
 
 *netdiscover-0.3_beta6-r2 (11 Oct 2009)
 
diff --git a/net-analyzer/netdiscover/Manifest b/net-analyzer/netdiscover/Manifest
index 9e91a60f0e9d..138a658305a8 100644
--- a/net-analyzer/netdiscover/Manifest
+++ b/net-analyzer/netdiscover/Manifest
@@ -1,7 +1,6 @@
-DIST netdiscover-0.3-beta6-oui-db-update-20080330.patch.bz2 136838 RMD160 0aa967c5c8c61bbbb8a59b5dfdf0e57fa8ca3e2c SHA1 793dbdf68fafc5247f76b483433d7e507be338f2 SHA256 56c6c1f204a22d09faabfa2ddd5e7634c8771804046cbeca7ff208257fa28323
 DIST netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2 151877 RMD160 cd40d36cf4177c157d5def1420bb18ea83dc6964 SHA1 74a32370e7ca9456586ea8482a9c78a12dc4cae1 SHA256 bac5accfcf233ef483552a319970fe2ec9f6dcfe02d8158c0bd10f62855c5104
 DIST netdiscover-0.3-beta6.tar.gz 411018 RMD160 85151d8dd3b8ff1f730df84d5e60b7ef962c4c3d SHA1 b6dfb89a0cbd14e398ae01f358bc56719c994856 SHA256 19c367f823c49999e2c05c485cac0a5d5685d23c6b33deae1e957406571924db
-EBUILD netdiscover-0.3_beta6-r1.ebuild 1092 RMD160 8217d081af9653f0932ec223e0f73b07219a38f5 SHA1 a1513ababa5852a7692a532d92a826d3263da575 SHA256 987b7fa2f2d2813b41e25246c1dd3d7bc9a22452c913f0edf98b7ebf1e96e19f
 EBUILD netdiscover-0.3_beta6-r2.ebuild 1073 RMD160 5558df5b02ca5ad48dc70cfaf6837f10075dd36b SHA1 b01fb475c36c16f62c63b1678034ea325ed0b0e7 SHA256 2b1e2681d619344c9ff67a1e0a1b8dc4cc61c430277d2122b6ef46a60ae971f9
-MISC ChangeLog 1449 RMD160 194a0956843e781546057cde32661e2ce976c86d SHA1 c955495b4ae51773d9a8378bf9c5720751a42936 SHA256 3d55eda7060e7047235d822278f541db6471e820f9d0aba00fdc9e11d1a5dfe3
+EBUILD netdiscover-0.3_beta6-r3.ebuild 1138 RMD160 1a0ba5ded11671ac9fb9bfe8b910b33a6b1d24ed SHA1 cdf7742c943ad60199c511046a03498f6a959aaf SHA256 45363ddd53766ae68275db2a657b6201ff9a5c1c2c4ee1b14e1ba025641c1d45
+MISC ChangeLog 1707 RMD160 adc990f14b36797db6d883dc41230585fc22866b SHA1 50b728338669e5e2013e9c85004c0d047846ecad SHA256 efd526e5da06d84eba59af0f9689c18be09ffa32d122ab4505c948244e6e35af
 MISC metadata.xml 253 RMD160 0ba8e77d3bfd8344a889c723d378a583a10085cb SHA1 1428e7281acba7e97f8b9800b1271a06200fca08 SHA256 7d4583592b08b81b7d172f9791df68ff2e03a5874928e87da06c405387a4d0f7
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r1.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
index 752255d703e1..a86b9618cd59 100644
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r1.ebuild
+++ b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta6-r1.ebuild,v 1.2 2008/07/11 17:58:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild,v 1.1 2009/10/17 14:26:46 pva Exp $
 
+EAPI="2"
 inherit eutils autotools
 
 MY_PV="${PV/_/-}"
@@ -10,7 +11,7 @@ MY_P="${PN}-${MY_PV}"
 DESCRIPTION="An active/passive address reconnaissance tool."
 HOMEPAGE="http://nixgeneration.com/~jaime/netdiscover/"
 SRC_URI="http://nixgeneration.com/~jaime/netdiscover/releases/${MY_P}.tar.gz
-		mirror://gentoo/netdiscover-0.3-beta6-oui-db-update-20080330.patch.bz2"
+		mirror://gentoo/netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2"
 IUSE=""
 
 LICENSE="GPL-2"
@@ -22,11 +23,9 @@ DEPEND=">=net-libs/libnet-1.1.2.1-r1
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${WORKDIR}"/netdiscover-0.3-beta6-oui-db-update-20080330.patch
+src_prepare() {
+	epatch "${WORKDIR}"/netdiscover-0.3-beta6-oui-db-update-20091010.patch
+	sed '/char tmac/{s:6:7:}' -i src/misc.c || die #, drop in beta7
 	# Avoid installation of ChangeLog, LICENSE, etc. We do this ourselves.
 	sed -i 's:netdiscoverdoc:noinst:' Makefile.am
 	eautoreconf