Fix from upstream for big endian hosts.

Package-Manager: portage-2.1_pre7-r2

4 files changed, 46 insertions, 11 deletions

diff --git a/sys-apps/busybox/ChangeLog b/sys-apps/busybox/ChangeLog
index 7bdde22e4ca5..a2ed3d529e7d 100644
--- a/sys-apps/busybox/ChangeLog
+++ b/sys-apps/busybox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/busybox
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.85 2006/03/28 02:47:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/ChangeLog,v 1.86 2006/03/28 06:09:28 vapier Exp $
+
+  28 Mar 2006; Mike Frysinger <vapier@gentoo.org> +files/1.1.1/insmod.patch,
+  busybox-1.1.1.ebuild:
+  Fix from upstream for big endian hosts.
 
   28 Mar 2006; Mike Frysinger <vapier@gentoo.org> busybox-1.1.0.ebuild,
   busybox-1.1.1.ebuild:
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 50bdb0cc4cce..ac6174a55ea4 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6d9b092f07643a8b092eb330c5a66e75 ChangeLog 15109
-RMD160 254c18cb4b640b9a3fb800f1c814a0922478f9d2 ChangeLog 15109
-SHA256 2e99af44aeb2a240b3a6b224b759feb9d9423a224a918a1162533a36516f256e ChangeLog 15109
+MD5 8945c26ea8adc01e8df74a64e88321ea ChangeLog 15253
+RMD160 24eb822a86d5ae22a9b6182e476d66c6dc92c8df ChangeLog 15253
+SHA256 6fe25d97dfb2e36c6557f851f45b90182190fab35f47b46ce2e26b4b7232cb37 ChangeLog 15253
 MD5 ef371aabe6da10b27577d6b87f35df44 busybox-1.00-r4.ebuild 7100
 RMD160 450e11502218ffc5b667cc2390437f5f1fa07e3b busybox-1.00-r4.ebuild 7100
 SHA256 b18b6474046e4ac82ed7d09379e4a4e399e1a8d9a5d489fc6767866b90086185 busybox-1.00-r4.ebuild 7100
@@ -13,9 +13,9 @@ SHA256 33833d698e1eb0c94aa02d2cd995b5f62d3df51aa7fff0d1ded4110e46a91239 busybox-
 MD5 32fb5ba2b19ef384a2d4bfd7264bb149 busybox-1.1.0.ebuild 6716
 RMD160 5edaa61f5207d99a4692b1785c53ff672ac1f292 busybox-1.1.0.ebuild 6716
 SHA256 9a3685c26f5e43ef73be3dd293320ca6977b90dea00b9a8d9bb06d14374ac4ff busybox-1.1.0.ebuild 6716
-MD5 933bc85b049fd3250eb562f4b5785fd7 busybox-1.1.1.ebuild 6446
-RMD160 65780ceefa6b18f13ea04d8290932eeb0c8b325d busybox-1.1.1.ebuild 6446
-SHA256 6ee54dec05d41fb1e8e5cef2b3a5e403833776fbffa98e0e6c4ab5f447f487ab busybox-1.1.1.ebuild 6446
+MD5 e404d93fb7938f0e0fee3a124ee47977 busybox-1.1.1.ebuild 6487
+RMD160 b9ce26c1a7fea3ab48066fbb9b1d8302dc335337 busybox-1.1.1.ebuild 6487
+SHA256 4a5fa01f53bd0dc43c7eb01608543e00ce3943f32bb2191f5b36a5889b1cac3a busybox-1.1.1.ebuild 6487
 MD5 81f4a0289354f964e744acb2f74c1894 files/1.00/bash-tests.patch 1474
 RMD160 01c16591ff5d5b339a605a4372c6e431270862ed files/1.00/bash-tests.patch 1474
 SHA256 091f9aa2a5294cf9659ffaa2c6f995e9af2d0cdc2388ecab3620d06fd4ac4cb2 files/1.00/bash-tests.patch 1474
@@ -64,6 +64,9 @@ SHA256 822f72925dbff554a1f4e8c34a979bf7fc192b5683b62a40f6d78316b80d8a8c files/1.
 MD5 b18000984506dc9c97619aa1cb7dd9f1 files/1.1.1/bb.patch 539
 RMD160 d3e9bc94ddb868c97b6fbd55af103fcac815ba19 files/1.1.1/bb.patch 539
 SHA256 9fc3caffbce98bbb985b1495ae9c54da0ddee9b235b29a0587693718a530204a files/1.1.1/bb.patch 539
+MD5 402cd0c96e9f7f299b84665916caf73f files/1.1.1/insmod.patch 860
+RMD160 8ea2bb102c2a0a5e1556f701c65becc478c2106c files/1.1.1/insmod.patch 860
+SHA256 504e7ef9ec46a054c5140e59b40c90c76b6d9de81f28edb204e0e42879f14d89 files/1.1.1/insmod.patch 860
 MD5 d9841a0171170d16bb121c696591e7ef files/config-netboot 9853
 RMD160 3d62cf31765adbc88c7a39f0f21223d7e73ef627 files/config-netboot 9853
 SHA256 75cae861b7bae144ca86998cb90dae9bcb0f54e09ed0c36d1ed81ad79a401e3d files/config-netboot 9853
@@ -85,7 +88,7 @@ SHA256 a11fdd02015a232398fdf22a20d26a95fc34d44c54513e6b26b6128d0b76122e metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEKKQT2+ySkm8kpY0RAtlcAJ9LsoheWYSz7iev41df5jSVCqKPigCdFBCV
-dNxjBQ18YwytCZne9K4YLkw=
-=opgY
+iD8DBQFEKNN02+ySkm8kpY0RApPWAJ9/lAVaO44/1Ibr/AenVxh6pP6HEACfaMbf
+5USv7p9u4hv9EF9l2Ez94mQ=
+=KYWi
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/busybox/busybox-1.1.1.ebuild b/sys-apps/busybox/busybox-1.1.1.ebuild
index ce970422dcd7..ab6a203644d7 100644
--- a/sys-apps/busybox/busybox-1.1.1.ebuild
+++ b/sys-apps/busybox/busybox-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.1.ebuild,v 1.2 2006/03/28 02:47:19 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/busybox/busybox-1.1.1.ebuild,v 1.3 2006/03/28 06:09:28 vapier Exp $
 
 inherit eutils
 
@@ -58,6 +58,7 @@ src_unpack() {
 
 	# patches go here!
 	epatch "${FILESDIR}"/1.1.1/bb.patch
+	epatch "${FILESDIR}"/1.1.1/insmod.patch
 
 	# check for a busybox config before making one of our own.
 	# if one exist lets return and use it.
diff --git a/sys-apps/busybox/files/1.1.1/insmod.patch b/sys-apps/busybox/files/1.1.1/insmod.patch
new file mode 100644
index 000000000000..f3078d7853dc
--- /dev/null
+++ b/sys-apps/busybox/files/1.1.1/insmod.patch
@@ -0,0 +1,27 @@
+Index: modutils/insmod.c
+===================================================================
+--- modutils/insmod.c	(revision 14652)
++++ modutils/insmod.c	(revision 14653)
+@@ -516,12 +516,6 @@ int delete_module(const char *);
+ #include <elf.h>
+ #include <endian.h>
+ 
+-#if BB_LITTLE_ENDIAN
+-# define ELFDATAM	ELFDATA2LSB
+-#else
+-# define ELFDATAM	ELFDATA2MSB
+-#endif
+-
+ #ifndef ElfW
+ # if ELFCLASSM == ELFCLASS32
+ #  define ElfW(x)  Elf32_ ## x
+@@ -3331,7 +3325,8 @@ static struct obj_file *obj_load(FILE * 
+ 		return NULL;
+ 	}
+ 	if (f->header.e_ident[EI_CLASS] != ELFCLASSM
+-			|| f->header.e_ident[EI_DATA] != ELFDATAM
++			|| f->header.e_ident[EI_DATA] != (BB_BIG_ENDIAN
++			   	? ELFDATA2MSB : ELFDATA2LSB)
+ 			|| f->header.e_ident[EI_VERSION] != EV_CURRENT
+ 			|| !MATCH_MACHINE(f->header.e_machine)) {
+ 		bb_error_msg("ELF file not for this architecture");