Add patch from debian for unaligned acceses, alpha/ia64/sparc stable wrt #299710

Package-Manager: portage-2.1.6.13/cvs/Linux ia64

4 files changed, 41 insertions, 4 deletions

diff --git a/sci-libs/hdf5/ChangeLog b/sci-libs/hdf5/ChangeLog
index eb079cf55536..0c579d73fc15 100644
--- a/sci-libs/hdf5/ChangeLog
+++ b/sci-libs/hdf5/ChangeLog
@@ -1,6 +1,11 @@
 B1;1704;0c# ChangeLog for sci-libs/hdf5
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.50 2010/01/21 13:38:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/ChangeLog,v 1.51 2010/02/05 19:01:27 armin76 Exp $
+
+  05 Feb 2010; Raúl Porcel <armin76@gentoo.org> hdf5-1.8.4-r1.ebuild,
+  +files/hdf5-1.8.4-sigbus.patch:
+  Add patch from debian for unaligned acceses, alpha/ia64/sparc stable wrt
+  #299710
 
   21 Jan 2010; Jeroen Roovers <jer@gentoo.org> hdf5-1.8.4-r1.ebuild:
   Stable for HPPA (bug #299710).
diff --git a/sci-libs/hdf5/Manifest b/sci-libs/hdf5/Manifest
index 706c7bf7c1d5..2f0f71c24311 100644
--- a/sci-libs/hdf5/Manifest
+++ b/sci-libs/hdf5/Manifest
@@ -7,6 +7,7 @@ AUX hdf5-1.8.3-noreturn.patch 3222 RMD160 39285ba18447b0f8db22a5f8e9d51a3cd8a8e9
 AUX hdf5-1.8.3-signal.patch 2226 RMD160 afe0ea8ad24fd84bed4642436c972fb5e492045e SHA1 5251a4520140b29ef0cb62d916732c9dd4089dd4 SHA256 0d07d222802005df65d42493dac16897865954755e4a59e681fa043e370a0f71
 AUX hdf5-1.8.4-gnutools.patch 4607 RMD160 a27fcd676bc3a04ac535dd55c48a72a5317b08a9 SHA1 8aa01c68f788bfedb490dafd0252970105810eac SHA256 d4f989f289e7fb3ee8e585b10232811c17588b730013698fc439cc0fdabcb252
 AUX hdf5-1.8.4-scaleoffset.patch 1098 RMD160 4983755ff2d284c73f8479cbf11a19b1bf4ef7c2 SHA1 29be6d6cb7de5db5e10429879f9d6673b6af1519 SHA256 596568d5cf56eba73de4e88a3e7aa0c8c13f3660279ffda783e2074e846a9b2d
+AUX hdf5-1.8.4-sigbus.patch 779 RMD160 ba4c92e0ba5ef95b1459d4b570d9113acbc65613 SHA1 3fc4c90ac42b9a59f26a459e6faf6f7410b87a9a SHA256 69c0ef464d99b6c2bd3a959b8210e7772a662054b481bed7775ec21c731bf106
 AUX hdf5-gcc4.3.3-fix.patch 412 RMD160 ee46bae5cb81382cc8d04f6d0f31bec37d88987d SHA1 a9ad925bd4107809e45faf44cd6ee88b13ca2b8a SHA256 1583e143c57181608cd34c9accc8830d665aaf01124994ef6642aead5e22bff5
 AUX hdf5-mpich2.patch 488 RMD160 f8ab476eed88267c4b79cc56ae683dc485255921 SHA1 a3f7ee6a2f682982d8a562bcc117c7fc09b69224 SHA256 a154a32a7b6dbc8edac7c72f1a6100b9f0532d2f9591681f505e949b0db6a1e5
 AUX mpd.conf 48 RMD160 289de9bb40759e3f71229cf47e4d2af83703a85f SHA1 244eee76dbf4ff269e4489d5cc7c3577c6c1fa6b SHA256 ae740cacaf2cb798921cb2092f5af98de67445e27af3f88858f3e6d2bbb127f4
@@ -23,6 +24,6 @@ EBUILD hdf5-1.6.5-r1.ebuild 6638 RMD160 b19d0ec9f56fa0ba1423a494798ab79bccc1380d
 EBUILD hdf5-1.6.6.ebuild 7782 RMD160 2ee70cea539827f28e08f18638703d9a0a87a40e SHA1 cbe8ba966c6435269a84bc120189fb63ac559f8a SHA256 ab6325efffbf410230cf8df6391e33d925c6b0ed9f7b0fcaddf57c8d174ed8fd
 EBUILD hdf5-1.6.7.ebuild 7799 RMD160 992a00257e2e94d2933d61950b1a85155ce995f3 SHA1 1d51c88dc85b13f658bbfde4676de013b23da2d5 SHA256 a3cacbfed63bd26c0f9346d3e0e424b0444ce1dc6e38e2fd4fa5a87f2c9f403b
 EBUILD hdf5-1.8.3-r1.ebuild 2435 RMD160 ee9b11586a1515abfd0d3182cf119b8f6b1a4011 SHA1 41e03d5c7ee325af7843e701930d216517845f3b SHA256 eb220cc4691c19ba0ade57d30f619013440d11c6be50194d15c8c9027481e09e
-EBUILD hdf5-1.8.4-r1.ebuild 2625 RMD160 d29323d0be7f8912a43d4f33ce96946063eaafdc SHA1 b7909a34c0bcddddf79dd4d36157aa12874c5f23 SHA256 c11931cf7eb07de5a5451468d25608e7d6fc2f6464a74e8dc8e111b821dda3dd
-MISC ChangeLog 11342 RMD160 affd8f364ad41bba9a60c292f1682dcc9cd96683 SHA1 6ae4c5e7463eff1d7c437033d029ac48f9daf83a SHA256 973c865e9b9080a246e40c3732385eba90f1a0b3eec3c69bd20ce704b001a456
+EBUILD hdf5-1.8.4-r1.ebuild 2669 RMD160 b550d87d13db6e229c34276d93d20191c8df8cb4 SHA1 2a93e875c993743e0ae721506d7ace5ea7518380 SHA256 6f47f41e9fb597198de59f0dc643c48b1b3a204fd758be2e1330e345c14651e7
+MISC ChangeLog 11537 RMD160 a437da92d4bf6f8715562232a00226e6d74faad2 SHA1 b0a21120db5d2e22360bcee541668096e2a9948d SHA256 439c8886c8b5a9a20d6c1e019f13a2de540ff6cca9e32f21db7a25157c845e0f
 MISC metadata.xml 649 RMD160 1b9a1fca35d2d3f57bd4295590a195d2e185ac7b SHA1 3f660a0e5cbad641be13c544a3ef115121c590fb SHA256 108e74754b00646a4e0196b4c305711e210beb91f64ab3ef188369037bc2eea2
diff --git a/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch b/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch
new file mode 100644
index 000000000000..8efa69b8881b
--- /dev/null
+++ b/sci-libs/hdf5/files/hdf5-1.8.4-sigbus.patch
@@ -0,0 +1,30 @@
+Index: hdf5-1.8.4/src/H5detect.c
+===================================================================
+--- hdf5-1.8.4.orig/src/H5detect.c	2010-01-29 12:21:36.000000000 +0100
++++ hdf5-1.8.4/src/H5detect.c	2010-01-29 12:21:52.000000000 +0100
+@@ -470,6 +470,12 @@
+ static void
+ sigsegv_handler(int UNUSED signo)
+ {
++    sigset_t set;
++
++    sigemptyset(&set);
++    sigaddset(&set,SIGSEGV);
++    sigprocmask(SIG_UNBLOCK,&set,NULL);
++    
+     signal(SIGSEGV, sigsegv_handler);
+     longjmp(jbuf_g, 1);
+ }
+@@ -495,6 +501,12 @@
+ static void
+ sigbus_handler(int UNUSED signo)
+ {
++    sigset_t set;
++
++    sigemptyset(&set);
++    sigaddset(&set,SIGBUS);
++    sigprocmask(SIG_UNBLOCK,&set,NULL);
++    
+     signal(SIGBUS, sigbus_handler);
+     longjmp(jbuf_g, 1);
+ #ifdef H5_HAVE_SIGLONGJMP
\ No newline at end of file
diff --git a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
index 3146a9787736..1113305378b6 100644
--- a/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
+++ b/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild,v 1.6 2010/01/21 13:38:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf5/hdf5-1.8.4-r1.ebuild,v 1.7 2010/02/05 19:01:27 armin76 Exp $
 
 EAPI=2
 inherit eutils autotools
@@ -45,6 +45,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.8.3-noreturn.patch
 	epatch "${FILESDIR}"/${P}-gnutools.patch
 	epatch "${FILESDIR}"/${P}-scaleoffset.patch
+	epatch "${FILESDIR}"/${P}-sigbus.patch
 
 	# respect gentoo examples directory
 	sed -i \