Fixed a big-endian-issue.

4 files changed, 61 insertions, 8 deletions

diff --git a/sys-apps/usbutils/ChangeLog b/sys-apps/usbutils/ChangeLog
index e0144c2a0298..47abb947d4f5 100644
--- a/sys-apps/usbutils/ChangeLog
+++ b/sys-apps/usbutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/usbutils
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.24 2004/04/27 21:37:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/ChangeLog,v 1.25 2004/06/14 22:07:47 hansmi Exp $
+
+  15 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>
+  +files/0.11/lsusb-endian.patch, usbutils-0.11-r3.ebuild:
+  Patched a big-endian-issue. See bug 43565.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> usbutils-0.11-r3.ebuild:
   Add inherit eutils
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index 1b4e161e099a..8f3331f0936c 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -1,11 +1,12 @@
-MD5 b74b688c488a9c69935a060159c65082 ChangeLog 2745
-MD5 2760430de06d2194089e8e3c85fc5546 usbutils-0.11.ebuild 791
-MD5 634fcad3b5c8d2e37ad8e80906c234d3 usbutils-0.9.ebuild 776
 MD5 4f958f8da0c0753ceb66017dc90f7608 usbutils-0.11-r1.ebuild 1064
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e3e3e01e3b9e79679f4a083f53ae6597 usbutils-0.11-r3.ebuild 1390
-MD5 5513f7a6e7cd2707ec619a3885be6724 files/digest-usbutils-0.11 65
-MD5 2164369bd1bd95109baae92b4d45fb65 files/digest-usbutils-0.9 64
+MD5 3931f14836fd2529efb74843d8b8e33c ChangeLog 2901
+MD5 74ede9aa31cddc5822dae7a948f38f36 usbutils-0.11-r3.ebuild 1472
+MD5 634fcad3b5c8d2e37ad8e80906c234d3 usbutils-0.9.ebuild 776
+MD5 2760430de06d2194089e8e3c85fc5546 usbutils-0.11.ebuild 791
 MD5 5513f7a6e7cd2707ec619a3885be6724 files/digest-usbutils-0.11-r1 65
+MD5 2164369bd1bd95109baae92b4d45fb65 files/digest-usbutils-0.9 64
 MD5 ff18a11aef5916bf61226bf1d9503b15 files/digest-usbutils-0.11-r3 128
+MD5 5513f7a6e7cd2707ec619a3885be6724 files/digest-usbutils-0.11 65
+MD5 02a749d768d2c60df972e04643b4a071 files/0.11/lsusb-endian.patch 1834
 MD5 79f1705c48b215f002d9f6541cdca376 files/0.11/ppc64-usbutils-kheaderfix.patch 621
diff --git a/sys-apps/usbutils/files/0.11/lsusb-endian.patch b/sys-apps/usbutils/files/0.11/lsusb-endian.patch
new file mode 100644
index 000000000000..0ea38c34ee38
--- /dev/null
+++ b/sys-apps/usbutils/files/0.11/lsusb-endian.patch
@@ -0,0 +1,45 @@
+--- lsusb.c.orig	2002-08-06 08:35:21.000000000 +0200
++++ lsusb.c	2004-06-14 23:46:50.620570416 +0200
+@@ -69,6 +69,14 @@
+ 
+ #define VERBLEVEL_DEFAULT 0	/* 0 gives lspci behaviour; 1, lsusb-0.9 */
+ 
++/* Handle endian-ness */
++#if __BYTE_ORDER == __BIG_ENDIAN || BYTE_ORDER == BIG_ENDIAN
++//#define SWAP(n) ((n << 24) | ((n&65280)<<8) | ((n&16711680)>>8) | (n>>24))
++#define SWAP(n) (((n) & 0x00ff) << 8 | ((n) & 0xff00) >> 8)
++#else
++#define SWAP(n) (n)
++#endif
++
+ static const char *procbususb = "/proc/bus/usb";
+ static unsigned int verblevel = VERBLEVEL_DEFAULT;
+ static int do_report_desc = 1;
+@@ -293,7 +301,8 @@
+ 	       "  iSerial             %5u %s\n"
+ 	       "  bNumConfigurations  %5u\n",
+ 	       buf[0], buf[1], buf[3], buf[2], buf[4], cls, buf[5], subcls, buf[6], proto, buf[7],
+-	       vid, vendor, pid, product, buf[13], buf[12], buf[14], mfg, buf[15], prod, buf[16], serial, buf[17]);
++	       SWAP(vid), vendor, SWAP(pid), product, buf[13], buf[12], buf[14], mfg, buf[15],
++	       prod, buf[16], serial, buf[17]);
+ 	dump_junk(buf, "  ", 18);
+ }
+ 
+@@ -1374,7 +1383,7 @@
+ 	pid = buf[10] | (buf[11] << 8);
+ 	get_vendor_string(vendor, sizeof(vendor), vid);
+ 	get_product_string(product, sizeof(product), vid, pid);
+-	printf("Device: ID %04x:%04x %s %s\n", vid, pid, vendor, product);
++	printf("Device: ID %04x:%04x %s %s\n", SWAP(vid), SWAP(pid), vendor, product);
+ 	dumpdev(buf, fd, flags);
+ 	status=0;
+  err:
+@@ -1432,7 +1441,7 @@
+ 			get_product_string(product, sizeof(product), vid, pid);
+ 			if (verblevel > 0)
+ 				printf("\n");
+-			printf("Bus %s Device %s: ID %04x:%04x %s %s\n", de->d_name, de2->d_name, vid, pid, vendor, product);
++			printf("Bus %s Device %s: ID %04x:%04x %s %s\n", de->d_name, de2->d_name, SWAP(vid), SWAP(pid), vendor, product);
+ 			if (verblevel > 0)
+ 				dumpdev(buf, fd, flags);
+ 		err:
diff --git a/sys-apps/usbutils/usbutils-0.11-r3.ebuild b/sys-apps/usbutils/usbutils-0.11-r3.ebuild
index 35ffa7730658..9832ba402a57 100644
--- a/sys-apps/usbutils/usbutils-0.11-r3.ebuild
+++ b/sys-apps/usbutils/usbutils-0.11-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r3.ebuild,v 1.12 2004/04/27 21:37:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/usbutils/usbutils-0.11-r3.ebuild,v 1.13 2004/06/14 22:07:47 hansmi Exp $
 
 inherit gnuconfig eutils
 
@@ -30,6 +30,9 @@ src_unpack() {
 	mv ${WORKDIR}/usb.ids-${USB_IDS_VER} ${S}/usb.ids || die "unable to replace usb.ids"
 
 	use ppc64 && ( cd ${S}; epatch ${FILESDIR}/0.11/ppc64-usbutils-kheaderfix.patch )
+
+	# Fix endian-issues
+	( cd "${S}" && epatch "${FILESDIR}/0.11/lsusb-endian.patch" )
 }
 
 src_compile() {