Fix gcc-3.4 compilation issue for bug 83728.

Package-Manager: portage-2.0.51.18

4 files changed, 33 insertions, 15 deletions

diff --git a/net-analyzer/firewalk/ChangeLog b/net-analyzer/firewalk/ChangeLog
index 817d97092338..89c0854d98e9 100644
--- a/net-analyzer/firewalk/ChangeLog
+++ b/net-analyzer/firewalk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/firewalk
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/ChangeLog,v 1.5 2005/01/29 05:12:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/ChangeLog,v 1.6 2005/03/02 10:48:04 ka0ttic Exp $
+
+  02 Mar 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/firewalk-5.0-gcc3.4.diff, firewalk-5.0.ebuild:
+  Fix gcc-3.4 compilation issue for bug 83728.
 
   29 Jan 2005; Daniel Black <dragonheart@gentoo.org> firewalk-5.0.ebuild:
   changed net-libs/libpcap depend to virtual/libcap
diff --git a/net-analyzer/firewalk/Manifest b/net-analyzer/firewalk/Manifest
index 87d98dc39568..4a4396de2699 100644
--- a/net-analyzer/firewalk/Manifest
+++ b/net-analyzer/firewalk/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 d32e8e98db91516e6657fb5622c2b953 ChangeLog 901
-MD5 cd2638d25557ee0fcc1be68d4fcdea28 firewalk-5.0.ebuild 751
+MD5 23b63dcc0af8e0fa6da1e82a5c161409 firewalk-5.0.ebuild 756
+MD5 f5723b0ddc1a0e141fda291edfde9a36 ChangeLog 1050
 MD5 ac3074aa551da20b321f380c591f0847 metadata.xml 256
+MD5 c3e22ea80840de86d03304169830ef9b files/firewalk-5.0-gcc3.4.diff 427
 MD5 c4a3bbb4496f45c9f93b13ec8504ea42 files/digest-firewalk-5.0 60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB+xtbmdTrptrqvGERAvSEAJ9H+JyFXEZPvMGmjJRYAjI0R+Z5AQCeKW3/
-SrafUVwVSFE3n4rDIapRYK8=
-=zG3A
+iD8DBQFCJZnvEZCkKN40op4RAt+EAJwJJFQ2KsikThxhGsPMxz+n5sV9ygCeLH7X
+GdmHt60SG9JDB9a+FU8bONQ=
+=m7wi
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/firewalk/files/firewalk-5.0-gcc3.4.diff b/net-analyzer/firewalk/files/firewalk-5.0-gcc3.4.diff
new file mode 100644
index 000000000000..c953c20bb31a
--- /dev/null
+++ b/net-analyzer/firewalk/files/firewalk-5.0-gcc3.4.diff
@@ -0,0 +1,11 @@
+--- Firewalk.orig/src/firewalk.c	2005-03-01 21:41:33.000000000 -0500
++++ Firewalk/src/firewalk.c	2005-03-01 21:52:10.165552176 -0500
+@@ -188,8 +188,6 @@
+                     case FW_SERIOUS_ERROR:
+                         /* err msg set in fw_packet_capture() */
+                         return (FW_SERIOUS_ERROR);
+-                    default:
+-                        /* empty */
+                 }
+             }
+         }
diff --git a/net-analyzer/firewalk/firewalk-5.0.ebuild b/net-analyzer/firewalk/firewalk-5.0.ebuild
index 8488bb46f4d1..59ee913f3344 100644
--- a/net-analyzer/firewalk/firewalk-5.0.ebuild
+++ b/net-analyzer/firewalk/firewalk-5.0.ebuild
@@ -1,30 +1,32 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/firewalk-5.0.ebuild,v 1.5 2005/01/29 05:12:51 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/firewalk/firewalk-5.0.ebuild,v 1.6 2005/03/02 10:48:04 ka0ttic Exp $
+
+inherit eutils
 
 DESCRIPTION="A tool for determining a firewall's rule set"
-SRC_URI="http://www.packetfactory.net/firewalk/dist/${P}.tgz"
 HOMEPAGE="http://www.packetfactory.net/firewalk/"
-IUSE=""
-
-S=${WORKDIR}/Firewalk
+SRC_URI="http://www.packetfactory.net/firewalk/dist/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86"
+IUSE=""
 
 DEPEND="virtual/libpcap
 	>=net-libs/libnet-1.1.1
 	>=dev-libs/libdnet-1.7"
 
-src_compile() {
+S="${WORKDIR}/Firewalk"
+
+src_unpack() {
+	unpack ${A}
 	cd ${S}
-	econf || die "econf failed"
-	emake || die "emake failed"
+	epatch ${FILESDIR}/${P}-gcc3.4.diff
 }
 
 src_install() {
-	emake install DESTDIR=${D} || "emake install failed"
+	make DESTDIR="${D}" install || "make install failed"
 	doman man/firewalk.8
 	dodoc README TODO BUGS
 }