[DebianGIS-dev] r2683 - in packages/hdf5/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-01-29 11:29:43 +0000 (Fri, 29 Jan 2010)
New Revision: 2683

Added:
   packages/hdf5/trunk/debian/patches/sigbus.diff
Modified:
   packages/hdf5/trunk/debian/changelog
   packages/hdf5/trunk/debian/patches/series
   packages/hdf5/trunk/debian/rules
Log:
Fixed sigbus error in H5detect.


Modified: packages/hdf5/trunk/debian/changelog
===================================================================
--- packages/hdf5/trunk/debian/changelog	2010-01-26 22:12:21 UTC (rev 2682)
+++ packages/hdf5/trunk/debian/changelog	2010-01-29 11:29:43 UTC (rev 2683)
@@ -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

Modified: packages/hdf5/trunk/debian/patches/series
===================================================================
--- packages/hdf5/trunk/debian/patches/series	2010-01-26 22:12:21 UTC (rev 2682)
+++ packages/hdf5/trunk/debian/patches/series	2010-01-29 11:29:43 UTC (rev 2683)
@@ -1,2 +1,3 @@
 autotools.diff -p1
 mpi.diff
+sigbus.diff

Added: packages/hdf5/trunk/debian/patches/sigbus.diff
===================================================================
--- packages/hdf5/trunk/debian/patches/sigbus.diff	                        (rev 0)
+++ packages/hdf5/trunk/debian/patches/sigbus.diff	2010-01-29 11:29:43 UTC (rev 2683)
@@ -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

Modified: packages/hdf5/trunk/debian/rules
===================================================================
--- packages/hdf5/trunk/debian/rules	2010-01-26 22:12:21 UTC (rev 2682)
+++ packages/hdf5/trunk/debian/rules	2010-01-29 11:29:43 UTC (rev 2683)
@@ -49,6 +49,8 @@
 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