[SCM] hdf5 branch, upstream, updated. upstream/1.8.4-patch1-79-gbfcb1ff

[Francesco Paolo Lovergine]

The following commit has been merged in the upstream branch:
commit 70d989f928655b9660f3a6fc73ea4ffd3f6939eb
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Jan 29 11:29:43 2010 +0000

    Fixed sigbus error in H5detect.

diff --git a/debian/changelog b/debian/changelog
index e5939e2..83600d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+hdf5 (1.8.4-4) unstable; urgency=low
+
+  * New patch sigbus.diff to revert changes done in 1.8.4 for SIGBUS/SIGSEGV 
+    handlers which cause sigbus error on space, mips and mipsel in H5detect. 
+    (closes: #567256)
+  * SuperH saga ends hopefully with a final patch to debian/rules. 
+    Thanks Nobuhiro Iwamatsu. (closes: #553979)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 29 Jan 2010 12:27:12 +0100
+
 hdf5 (1.8.4-3) unstable; urgency=low
 
   * All libraries have to conflict against past 1.8.3 virtual package to solve
diff --git a/debian/patches/series b/debian/patches/series
index 8902f5f..b41f792 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 autotools.diff -p1
 mpi.diff
+sigbus.diff
diff --git a/debian/patches/sigbus.diff b/debian/patches/sigbus.diff
new file mode 100644
index 0000000..e209b8d
--- /dev/null
+++ b/debian/patches/sigbus.diff
@@ -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
diff --git a/debian/rules b/debian/rules
index 3e8bb13..240fdae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,8 @@ else ifeq ($(DEB_BUILD_ARCH),mipsel)
 build_openmpi = no
 else ifeq ($(DEB_BUILD_ARCH),s390)
 build_openmpi = no
+else ifeq ($(DEB_BUILD_ARCH),sh4)
+build_openmpi = no
 else
 build_openmpi = yes
 endif

-- 
Hierarchical Data Format 5 (HDF5)