Added a patch from GMsoft for WLAN devices

5 files changed, 89 insertions, 20 deletions

diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog
index 01be1089096c..bff5334dc085 100644
--- a/net-analyzer/hping/ChangeLog
+++ b/net-analyzer/hping/ChangeLog
@@ -1,35 +1,41 @@
 # ChangeLog for net-analyzer/hping
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.9 2003/11/25 04:00:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.10 2003/12/03 21:30:28 avenj Exp $
+
+*hping-2.0.0_rc2-r1 (03 Dec 2003)
+
+	03 Dec 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2-r1.ebuild,
+			files/wlan-header-fix.patch :
+	Patch from GMsoft to fix a WLAN bug. Bug #34481.
 
 	20 Nov 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2.ebuild :
 	Build fixes from trauma@web.de, bug #33495.
 
-  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> hping-2.0.0_rc2.ebuild:
-  Add ~alpha
+	24 Nov 2003; Aron Griffis <agriffis@gentoo.org> hping-2.0.0_rc2.ebuild:
+	Add ~alpha
 
 *hping-2.0.0_rc2 (03 March 2003)
 
-  03 Aug 2003; Guy Martin <gmsoft@gentoo.org> hping-2.0.0_rc2.ebuild :
-  Added hppa to KEYWORDS.
+	03 Aug 2003; Guy Martin <gmsoft@gentoo.org> hping-2.0.0_rc2.ebuild :
+	Added hppa to KEYWORDS.
 
-  03 March 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2.ebuild :
-  Version bump.
+	03 March 2003; Jon Portnoy <avenj@gentoo.org> hping-2.0.0_rc2.ebuild :
+	Version bump.
 
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+	06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
-  28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
-  moved to net-analyzer - added SLOT
+	28 Jun 2002; Thilo Bangert <bangert@gentoo.org> :
+	moved to net-analyzer - added SLOT
 
 *hping-2.0.0_rc1 (1 Feb 2002)
 
-  15 Feb 2003; Mark Guertin <gerk@gentoo.org> hping-2.0.0_rc1.ebuild :
-  set ppc in keywords
+	15 Feb 2003; Mark Guertin <gerk@gentoo.org> hping-2.0.0_rc1.ebuild :
+	set ppc in keywords
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+	1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
+	Added initial ChangeLog which should be updated whenever the package is
+	updated in any way. This changelog is targetted to users. This means that the
+	comments should well explained and written in clean English. The details about
+	writing correct changelogs are explained in the skel.ChangeLog file which you
+	can find in the root directory of the portage repository.
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index f500d81a8e67..7e983de8ae31 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -1,8 +1,8 @@
-MD5 c687cffb1d1c4d53dda052dc1da23ead ChangeLog 1374
+MD5 1951b6d6ed2f11e711b3eeb262f7236c ChangeLog 1546
 MD5 fe0c4b649fc135e8fe6cf95c9868dda4 hping-2.0.0_rc1.ebuild 961
 MD5 50a1dde3fc4fc3a55cf50cbd1904e59b hping-2.0.0_rc2.ebuild 839
 MD5 75ed528e33e83ac57ce987793d740b5c metadata.xml 245
-MD5 728455a0304cca4a7c868012ef9cf95b hping-2.0.0_rc2-r1.ebuild 885
+MD5 4309ff4dd986821e2007ac5507f15924 hping-2.0.0_rc2-r1.ebuild 885
 MD5 704f5fd266e6ab22f0eed2acb3aa621b files/digest-hping-2.0.0_rc1 65
 MD5 eef05cbe61a0adf5b65aced19f629085 files/digest-hping-2.0.0_rc2 66
 MD5 cca06082ed7613b5803b6c7ff62a31bf files/wlan-header-fix.patch 848
diff --git a/net-analyzer/hping/files/digest-hping-2.0.0_rc2-r1 b/net-analyzer/hping/files/digest-hping-2.0.0_rc2-r1
new file mode 100644
index 000000000000..30bfb232cf07
--- /dev/null
+++ b/net-analyzer/hping/files/digest-hping-2.0.0_rc2-r1
@@ -0,0 +1 @@
+MD5 f9ab1f84ec89f2a1c428988231d554b0 hping2.0.0-rc2.tar.gz 100501
diff --git a/net-analyzer/hping/files/wlan-header-fix.patch b/net-analyzer/hping/files/wlan-header-fix.patch
new file mode 100644
index 000000000000..0e22e42e0a93
--- /dev/null
+++ b/net-analyzer/hping/files/wlan-header-fix.patch
@@ -0,0 +1,24 @@
+diff -uNr hping2-rc2.orig/getlhs.c hping2-rc2/getlhs.c
+--- hping2-rc2.orig/getlhs.c	2003-11-27 00:10:32.000000000 +0100
++++ hping2-rc2/getlhs.c	2003-11-27 00:11:37.000000000 +0100
+@@ -88,6 +88,9 @@
+ 	} else if ( strstr(ifname, "eth") ) {
+ 		linkhdr_size = ETHHDR_SIZE;
+ 		return 0;
++	} else if ( strstr(ifname, "wlan") ) {
++		linkhdr_size = WLANHDR_SIZE;
++		return 0;
+ 	} else if (strstr(ifname, "ets")) {
+ 		linkhdr_size = 0;
+ 		return 0;
+diff -uNr hping2-rc2.orig/hping2.h hping2-rc2/hping2.h
+--- hping2-rc2.orig/hping2.h	2003-11-27 00:10:32.000000000 +0100
++++ hping2-rc2/hping2.h	2003-11-27 00:11:44.000000000 +0100
+@@ -97,6 +97,7 @@
+ #define PPPHDR_SIZE_NETBSD	4
+ #define ETHHDR_SIZE		14
+ #define LOHDR_SIZE		14
++#define WLANHDR_SIZE		14
+ 
+ /* packet size (physical header size + ip header + tcp header + 0 data bytes) */
+ #ifndef IP_MAX_SIZE
diff --git a/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild b/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..0f9f1ede275a
--- /dev/null
+++ b/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-2.0.0_rc2-r1.ebuild,v 1.1 2003/12/03 21:30:28 avenj Exp $
+
+S=${WORKDIR}/hping2-rc2
+DESCRIPTION="A ping-like TCP/IP packet assembler/analyzer."
+SRC_URI="http://www.hping.org/hping2.0.0-rc2.tar.gz"
+HOMEPAGE="http://www.hping.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~hppa ~ia64 ~amd64 ~alpha"
+
+DEPEND="net-libs/libpcap"
+
+src_compile() {
+	epatch ${FILESDIR}/wlan-header-fix.patch
+
+	./configure || die
+
+	if [ `use debug` ]
+	then
+		make CCOPT="${CFLAGS}" || die
+	else
+		make CCOPT="${CFLAGS}" || die
+	fi
+}
+
+src_install () {
+	cd ${S}
+
+	dodir /usr/sbin
+	dosbin hping2
+	dosym /usr/sbin/hping2 /usr/sbin/hping
+
+	doman docs/hping2.8
+	dodoc INSTALL KNOWN-BUGS NEWS README TODO AUTHORS BUGS CHANGES COPYING
+}