Added byte ordering fix for amd64 and hppa in bytesex.h.patch. Stable on hppa.

5 files changed, 28 insertions, 17 deletions

diff --git a/net-analyzer/hping/ChangeLog b/net-analyzer/hping/ChangeLog
index 8de585637eca..d1072c754d8e 100644
--- a/net-analyzer/hping/ChangeLog
+++ b/net-analyzer/hping/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/hping
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.24 2004/07/27 20:48:32 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/ChangeLog,v 1.25 2004/07/29 15:58:29 gmsoft Exp $
+
+  29 Jul 2004; Guy Martin <gmsoft@gentoo.org> -files/amd64-header-fix.patch,
+  +files/bytesex.h.patch, hping-2.0.0_rc3.ebuild:
+  Added byte ordering fix for amd64 and hppa in bytesex.h.patch. Stable on hppa.
 
   22 Jul 2004; Jason Wever <weeve@gentoo.org> hping-2.0.0_rc3.ebuild:
   Stable on sparc.
diff --git a/net-analyzer/hping/Manifest b/net-analyzer/hping/Manifest
index 258257f7b465..2acb735920a5 100644
--- a/net-analyzer/hping/Manifest
+++ b/net-analyzer/hping/Manifest
@@ -1,12 +1,12 @@
-MD5 afa8f2f286b216d11cd91c54a58211b0 ChangeLog 3107
+MD5 c302da519693033badf3e6154f21f4cb ChangeLog 3318
 MD5 b81df8eb3d394f37bbb9837346907224 hping-2.0.0_rc1.ebuild 960
 MD5 31ba38fdee4250040b5f035028891abf hping-2.0.0_rc2-r1.ebuild 903
 MD5 00b97cbd98b3326baa875697173d1501 hping-2.0.0_rc2.ebuild 835
-MD5 a8a3a494ad3838a4f49c4485e2930e6e hping-2.0.0_rc3.ebuild 988
 MD5 51334b67d2cbed22e0efec4143bc6ff0 metadata.xml 245
+MD5 ef3a5344a965bd7959c9e8664fea62f0 hping-2.0.0_rc3.ebuild 983
 MD5 704f5fd266e6ab22f0eed2acb3aa621b files/digest-hping-2.0.0_rc1 65
 MD5 eef05cbe61a0adf5b65aced19f629085 files/digest-hping-2.0.0_rc2 66
 MD5 eef05cbe61a0adf5b65aced19f629085 files/digest-hping-2.0.0_rc2-r1 66
 MD5 f72fc3b23f30d84ba7210390cf3b4b57 files/digest-hping-2.0.0_rc3 66
 MD5 cca06082ed7613b5803b6c7ff62a31bf files/wlan-header-fix.patch 848
-MD5 08a6ef20445e0c32881dc7981b2af90f files/amd64-header-fix.patch 337
+MD5 9d855cb52e43027b417ebb95dbad5c72 files/bytesex.h.patch 623
diff --git a/net-analyzer/hping/files/amd64-header-fix.patch b/net-analyzer/hping/files/amd64-header-fix.patch
deleted file mode 100644
index af176dfe1741..000000000000
--- a/net-analyzer/hping/files/amd64-header-fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bytesex.h	2003-07-28 10:00:55.000000000 +0100
-+++ /tmp/bytesex.h	2004-07-27 21:40:30.502635352 +0100
-@@ -9,6 +9,7 @@
- 
- #if 	defined(__i386__) \
- 	|| defined(__alpha__) \
-+	|| defined(__x86_64__) \
- 	|| (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__)))
- #define BYTE_ORDER_LITTLE_ENDIAN
- #elif 	defined(__mc68000__) \
diff --git a/net-analyzer/hping/files/bytesex.h.patch b/net-analyzer/hping/files/bytesex.h.patch
new file mode 100644
index 000000000000..65e88896d3d1
--- /dev/null
+++ b/net-analyzer/hping/files/bytesex.h.patch
@@ -0,0 +1,17 @@
+diff -uNr hping2-rc3.orig/bytesex.h hping2-rc3/bytesex.h
+--- hping2-rc3.orig/bytesex.h	2004-07-29 15:46:47.572596272 +0000
++++ hping2-rc3/bytesex.h	2004-07-29 15:48:14.557372576 +0000
+@@ -9,11 +9,13 @@
+ 
+ #if 	defined(__i386__) \
+ 	|| defined(__alpha__) \
++	|| defined(__x86_64__) \
+ 	|| (defined(__mips__) && (defined(MIPSEL) || defined (__MIPSEL__)))
+ #define BYTE_ORDER_LITTLE_ENDIAN
+ #elif 	defined(__mc68000__) \
+ 	|| defined (__sparc__) \
+ 	|| defined (__sparc) \
++	|| defined (__hppa__) \
+ 	|| defined (__PPC__) \
+ 	|| defined (__BIG_ENDIAN__) \
+ 	|| (defined(__mips__) && (defined(MIPSEB) || defined (__MIPSEB__)))
diff --git a/net-analyzer/hping/hping-2.0.0_rc3.ebuild b/net-analyzer/hping/hping-2.0.0_rc3.ebuild
index 94557d45aad7..120f3611cf1b 100644
--- a/net-analyzer/hping/hping-2.0.0_rc3.ebuild
+++ b/net-analyzer/hping/hping-2.0.0_rc3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-2.0.0_rc3.ebuild,v 1.9 2004/07/27 20:48:32 malc Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/hping/hping-2.0.0_rc3.ebuild,v 1.10 2004/07/29 15:58:29 gmsoft Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.hping.org/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ~hppa ~ia64 ~amd64 ~alpha"
+KEYWORDS="x86 sparc hppa ~ia64 ~amd64 ~alpha"
 IUSE="debug"
 
 DEPEND="net-libs/libpcap"
@@ -20,7 +20,7 @@ S="${WORKDIR}/${MY_P//\.[0-9]}"
 
 src_compile() {
 	./configure || die
-	epatch ${FILESDIR}/amd64-header-fix.patch
+	epatch ${FILESDIR}/bytesex.h.patch
 
 	if use debug
 	then