Fix from upstream for alignment troubles on sparc #217783 by Friedrich Oslage.

Package-Manager: portage-2.2_pre5

4 files changed, 40 insertions, 7 deletions

diff --git a/sys-apps/lshw/ChangeLog b/sys-apps/lshw/ChangeLog
index 7add8eb2b9d9..884bdc5a3170 100644
--- a/sys-apps/lshw/ChangeLog
+++ b/sys-apps/lshw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/lshw
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.64 2008/04/20 08:35:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/ChangeLog,v 1.65 2008/04/20 08:42:54 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/lshw-02.12.01b-alignment.patch, lshw-02.12.01b.ebuild:
+  Fix from upstream for alignment troubles on sparc #217783 by Friedrich Oslage.
 
   20 Apr 2008; Mike Frysinger <vapier@gentoo.org>
   +files/lshw-02.12.01b-gcc43.patch, lshw-02.12.01b.ebuild:
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 52f6bd6db764..0ec75e8bb87d 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX lshw-02.08.01b-build.patch 2896 RMD160 4f1a6b9f77309b57b4029c0f3c264ebe122a6e8e SHA1 356cf1f01801354a0ff92f589e7550af7e117b17 SHA256 5de9455ca97d3acfe4a4f7967b5905f49a3eb81dc7634fa3abead32369eb5746
 AUX lshw-02.09b-cpuid-PIC.patch 1058 RMD160 4c9a1234b31edc0840b7266a9cf72965b940fc87 SHA1 712e2bc94c49c2163f115784bdfe89b1f951609c SHA256 69c32964a502f46ae16522bca28040ed91abe81b49889c3739ecd5708d92319d
 AUX lshw-02.11.01b-build.patch 2095 RMD160 abe5ce4eba439c2b7cc925769968fcd37e997885 SHA1 e152121cd2fed36ece5a70ad02a1b1da570ce16d SHA256 86e9a55153d30b56cd0b458f92d3f22fb17a74fe68359937b149e6eeb09aea48
+AUX lshw-02.12.01b-alignment.patch 786 RMD160 0b3db7c4bd205bc84d8b9a7ea8b68c55cb1fdc2a SHA1 fbf1cb6fc5dcbe287b5b86dd09c83d66ba61d3b2 SHA256 2823eb1653ccdb6ba1bf812ff0320cc4c4204ab4d9fa68911037367f400c9088
 AUX lshw-02.12.01b-build.patch 2037 RMD160 df23c0e759652dc7fba719fa9655994e1b479a1a SHA1 7d173edc64e90dfe969c207e55206ebf398a0f81 SHA256 2e07b9e4f2b927bae14a547ecfb8f9447ffa7cc8370965033e2cd9bad56753f8
 AUX lshw-02.12.01b-gcc43.patch 7081 RMD160 d9076fe5937137231c7d94f4b708bac9896c5909 SHA1 2cfb5e81731ea905b1f380e1d4b9dfc87e9146a3 SHA256 663b203e675a9cd544fce04ad8fa90e35cfc5b4b8461cd63590c574fe394907e
 DIST lshw-B.02.10.tar.gz 1111483 RMD160 14f91939a144f48040e6d810b9585e3869720fbc SHA1 e1ce1a4dffcaaf667432cc644df1438932ad127f SHA256 5146b14583e3ecebc1f0af03037c7e1563ebaeb2f9689d0baa8029a1727bf503
@@ -11,13 +12,13 @@ DIST lshw-B.02.11.01.tar.gz 1165673 RMD160 6dc3913d04bc1cda0d44df99f1f48a8cc81ec
 DIST lshw-B.02.12.01.tar.gz 1230882 RMD160 475b42cf09aa8c53ce2514187cc659547cff89c7 SHA1 5bd81faf68bb211c78b338a82b112a048b4ff062 SHA256 9cfeafe18ee78b72cc6aaeeba7ad1ca61d7dc725cc4981bcd985845d9e09645d
 EBUILD lshw-02.10b.ebuild 1152 RMD160 7bf951f5364725960d7c40d94d8c20fafb21e764 SHA1 f63dd40652ffba8cb666a350e31e393b581fd107 SHA256 12830b8c8349cb8a124fb756980de4dad7172f7b597370bc9bcb4372a24dd311
 EBUILD lshw-02.11.01b.ebuild 1256 RMD160 fbd2e8603c3437317343953dca0640a60f1d91eb SHA1 40e64962ab7c2c403393fb36d963d0e56e8ef198 SHA256 88dad80dd5ada5f423d9002340ec1fa8a7eafc14fd035f555dee1f6ad9699a52
-EBUILD lshw-02.12.01b.ebuild 1303 RMD160 354613b03ef9ae65cd2c4b7f8b641acd4bfc2693 SHA1 c4a2b64babe608e4a354ea22ff4895045d6780b4 SHA256 a54446b4437aed4f3042d1eb00bdde95d59349a607de92f8218893a13ab7faaf
-MISC ChangeLog 7812 RMD160 4c3ddbc5486f2ebfb73086de905141dd5abaf532 SHA1 63c154f2a97970c743bfd2efc19bd6d7eaea1a3a SHA256 a32b62cb320cb1b7bf82deb361ccd968574950da699e3ea369e6ac33a307fdb4
+EBUILD lshw-02.12.01b.ebuild 1354 RMD160 1a65fde2a9ec91dcc53815aab2a01556630a7940 SHA1 b01d7bd785b2f7940216a7734590eb9a9ee497cb SHA256 dd10772b314ea546abb81714025c69df8ada2fdce699b7bfaf13f452c1a8f64c
+MISC ChangeLog 8008 RMD160 18364be49a27cff3cf4c3ec4a7ffb99484e540c8 SHA1 e350ee8dfa4d682d741cc7eddac642bb110da348 SHA256 bf2825b300c34b2bc9758522505ef747d0772659b8c986bc221c3f5f20ad001e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFICwBnj9hvisErhMIRAoKjAKDIzR2vR+0OVBfZfoFuHiu/UvI8PgCffwKl
-Lj5PHr9FbaiFRNeDh28PIUQ=
-=XvWR
+iD8DBQFICwIUj9hvisErhMIRAiqyAJ9MY6w328ZlmzKeF4vSYC4uIIC5tACgqCGI
+cyQ+jvfTSQ9X3rZoMVwGmVM=
+=PanA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lshw/files/lshw-02.12.01b-alignment.patch b/sys-apps/lshw/files/lshw-02.12.01b-alignment.patch
new file mode 100644
index 000000000000..c1dbae83810a
--- /dev/null
+++ b/sys-apps/lshw/files/lshw-02.12.01b-alignment.patch
@@ -0,0 +1,27 @@
+fix from upstream for alignment errors
+
+http://ezix.org/project/changeset?new=packages/lshw/development/src/core/scsi.cc%401927&old=packages/lshw/development/src/core/scsi.cc%401923
+
+--- src/core/scsi.cc
++++ src/core/scsi.cc
+@@ -566,11 +566,15 @@
+     if (fd >= 0)
+     {
+       int bus = -1;
+-      char host[50];
+-      int * length = (int*)host;
+-      *length = sizeof(host);
+-      memset(host, 0, sizeof(host));
+-      if (ioctl(fd, SCSI_IOCTL_PROBE_HOST, &host) >= 0)
++      union
++      {
++        char host[50];
++        int length;
++      } tmp;
++      tmp.length = sizeof(tmp.host);
++      memset(tmp.host, 0, sizeof(tmp.host));
++
++      if(ioctl(fd, SCSI_IOCTL_PROBE_HOST, &tmp.length) >= 0)
+       {
+         if (ioctl(fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus) >= 0)
+         {
diff --git a/sys-apps/lshw/lshw-02.12.01b.ebuild b/sys-apps/lshw/lshw-02.12.01b.ebuild
index 75eeb752f951..9aa8d3dd764b 100644
--- a/sys-apps/lshw/lshw-02.12.01b.ebuild
+++ b/sys-apps/lshw/lshw-02.12.01b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.12.01b.ebuild,v 1.5 2008/04/20 08:35:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lshw/lshw-02.12.01b.ebuild,v 1.6 2008/04/20 08:42:54 vapier Exp $
 
 inherit flag-o-matic eutils toolchain-funcs
 
@@ -29,6 +29,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-02.12.01b-build.patch
 	epatch "${FILESDIR}"/${PN}-02.09b-cpuid-PIC.patch #61947
 	epatch "${FILESDIR}"/${P}-gcc43.patch #213912
+	epatch "${FILESDIR}"/${P}-alignment.patch #217783
 }
 
 src_compile() {