r43898 - in /packages/mpich/trunk/debian: changelog patches/00list patches/24_use_gnu_source_for_mpd.dpatch patches/25_use_posix_termios_interface.dpatch

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun Sep 18 13:49:33 2011
New Revision: 43898

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43898
Log:
mpich (1.2.7-9.1) unstable; urgency=low

  * Non-maintainer upload.
  * Fix FTBFS by adding â<80><9C>-D_GNU_SOURCEâ<80><9D> to the CFLAGS in mpid/mpd as
    suggested by Peter Green and Petr Salinger (Closes: #522007):
     - 24_use_gnu_source_for_mpd.dpatch
  * Fix FTBFS on GNU/kFreeBSD by sticking to <termios.h> as specified by
    POSIX, as suggested by Petr Salinger (Closes: #533246):
     - 25_use_posix_termios_interface.dpatch

Added:
    packages/mpich/trunk/debian/patches/24_use_gnu_source_for_mpd.dpatch
    packages/mpich/trunk/debian/patches/25_use_posix_termios_interface.dpatch
Modified:
    packages/mpich/trunk/debian/changelog
    packages/mpich/trunk/debian/patches/00list

Modified: packages/mpich/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/mpich/trunk/debian/changelog?rev=43898&op=diff
==============================================================================
--- packages/mpich/trunk/debian/changelog (original)
+++ packages/mpich/trunk/debian/changelog Sun Sep 18 13:49:33 2011
@@ -1,3 +1,15 @@
+mpich (1.2.7-9.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix FTBFS by adding “-D_GNU_SOURCE” to the CFLAGS in mpid/mpd as
+    suggested by Peter Green and Petr Salinger (Closes: #522007):
+     - 24_use_gnu_source_for_mpd.dpatch
+  * Fix FTBFS on GNU/kFreeBSD by sticking to <termios.h> as specified by
+    POSIX, as suggested by Petr Salinger (Closes: #533246):
+     - 25_use_posix_termios_interface.dpatch
+
+ -- Cyril Brulebois <kibi at debian.org>  Fri, 03 Jul 2009 22:14:10 +0200
+
 mpich (1.2.7-9) unstable; urgency=low
 
   * Package is now team-maintained by pkg-scicomp (closes:#447678)
@@ -7,10 +19,9 @@
     - replace call to dh_clean -k by call to dh_prep as suggested by lintian
   * Fix update-alternative settings for libmpich-mpd1.0-dev and
     libmpich-shmem1.0-dev (closes: #512426)
-  * Changed doc-base section of mpi-doc 
   * fix lintian warning about maintainer scripts ignoring errors
 
- -- Alexandre Fayolle <afayolle at debian.org>  Mon, 26 Jan 2009 17:12:52 +0100
+ -- Alexandre Fayolle <afayolle at debian.org>  Mon, 26 Jan 2009 14:03:27 +0100
 
 mpich (1.2.7-8) unstable; urgency=low
 

Modified: packages/mpich/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-science/packages/mpich/trunk/debian/patches/00list?rev=43898&op=diff
==============================================================================
--- packages/mpich/trunk/debian/patches/00list (original)
+++ packages/mpich/trunk/debian/patches/00list Sun Sep 18 13:49:33 2011
@@ -17,3 +17,5 @@
 21_hurd_support
 22_gfortran
 23_gcc4.3
+24_use_gnu_source_for_mpd.dpatch
+25_use_posix_termios_interface.dpatch

Added: packages/mpich/trunk/debian/patches/24_use_gnu_source_for_mpd.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/mpich/trunk/debian/patches/24_use_gnu_source_for_mpd.dpatch?rev=43898&op=file
==============================================================================
--- packages/mpich/trunk/debian/patches/24_use_gnu_source_for_mpd.dpatch (added)
+++ packages/mpich/trunk/debian/patches/24_use_gnu_source_for_mpd.dpatch Sun Sep 18 13:49:33 2011
@@ -1,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 24_use_gnu_source_for_mpd.dpatch by Peter Green <plugwash at p10link.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: with latest glibc _GNU_SOURCE must be defined to use h_addr from
+## DP: struct hostent. This patch defines it for stuff in the mpid/mpd
+## DP: directory
+
+ at DPATCH@
+diff -urNad mpich-1.2.7~/mpid/mpd/Makefile.in mpich-1.2.7/mpid/mpd/Makefile.in
+--- mpich-1.2.7~/mpid/mpd/Makefile.in	      2003-02-04 21:05:59.000000000 +0000
++++ mpich-1.2.7/mpid/mpd/Makefile.in	      2009-04-05 23:41:39.000000000 +0100
+@@ -16,7 +16,7 @@
+ LDFLAGS   = @LDFLAGS@
+ LIBS	     = @LIBS@ 
+ GDB       = @GDB@
+-CFLAGS    = @CFLAGS@
++CFLAGS    = @CFLAGS@ -D_GNU_SOURCE
+ 
+ C_COMPILE = ${CC} ${INCLUDES} ${CFLAGS} ${COPTIONS}
+ C_LINK	     = ${CLINKER} ${CFLAGS} ${COPTIONS} ${LDFLAGS}

Added: packages/mpich/trunk/debian/patches/25_use_posix_termios_interface.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/mpich/trunk/debian/patches/25_use_posix_termios_interface.dpatch?rev=43898&op=file
==============================================================================
--- packages/mpich/trunk/debian/patches/25_use_posix_termios_interface.dpatch (added)
+++ packages/mpich/trunk/debian/patches/25_use_posix_termios_interface.dpatch Sun Sep 18 13:49:33 2011
@@ -1,0 +1,37 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_use_posix_termios_interface.dpatch by Cyril Brulebois <kibi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Stick to POSIX <termios.h> interface as suggested by Petr Salinger.
+## DP: That fixes the FTBFS on GNU/kFreeBSD.
+
+ at DPATCH@
+--- mpich-1.2.7.orig/mpid/ch_p4/p4/lib/p4_secure.c
++++ mpich-1.2.7/mpid/ch_p4/p4/lib/p4_secure.c
+@@ -450,7 +450,7 @@
+ {
+     struct termios tty_new;
+
+-    if (ioctl(0, TIOCGETA, &tty_orig) < 0)
++    if (tcgetattr(0, &tty_orig) < 0)
+     {
+        fprintf(stderr, "tcgetattr failed: %s\n", strerror(errno));
+        return -1;
+@@ -460,7 +460,7 @@
+
+     tty_new.c_lflag &= ~(ECHO);
+
+-    if (ioctl(0, TIOCSETA, &tty_new) < 0)
++    if (tcsetattr(0, TCSANOW, &tty_new) < 0)
+     {
+        fprintf(stderr, "tcsetattr failed: %s\n", strerror(errno));
+        return -1;
+@@ -470,7 +470,7 @@
+
+ static int echo_on (void)
+ {
+-    if (ioctl(0, TIOCSETA, &tty_orig) < 0)
++    if (tcsetattr(0, TCSANOW, &tty_orig) < 0)
+     {
+        fprintf(stderr, "tcsetattr failed: %s\n", strerror(errno));
+        return -1;