Michael Tokarev: new upstream release, make it compilable too

[Michael Tokarev]

Module: mdadm
Branch: master
Commit: 8fbf562ad451080db4fc493ca5807c3f35afd2e1
URL:    http://git.debian.org/?p=pkg-mdadm/mdadm.git;a=commit;h=8fbf562ad451080db4fc493ca5807c3f35afd2e1

Author: Michael Tokarev <mjt at tls.msk.ru>
Date:   Fri May 25 20:51:47 2012 +0400

new upstream release, make it compilable too

---

 debian/changelog                  |    9 +++++++
 debian/patches/series             |    1 +
 debian/patches/sha1-includes.diff |   45 +++++++++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c3cd96a..f6f4a10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mdadm (3.2.5-1) UNRELEASED; urgency=low
+
+  * new upstream (bugfix) release, fixing regression when --add'ing
+    device to an array, introduced in 3.2.4, plus other minor fixes
+    (Closes: #673104, #673344)
+  * new patch: sha1-includes.diff to fix #include mess in new sha1.h
+
+ -- Michael Tokarev <mjt at tls.msk.ru>  Fri, 25 May 2012 20:23:52 +0400
+
 mdadm (3.2.4-1) unstable; urgency=low
 
   * new upstream (bugfix) release (Closes: #664088, #661552)
diff --git a/debian/patches/series b/debian/patches/series
index fc8d553..23da48d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 debian-conffile-location.diff
 debian-disable-udev-incr-assembly.diff
 debian-no-Werror.diff
+sha1-includes.diff
diff --git a/debian/patches/sha1-includes.diff b/debian/patches/sha1-includes.diff
new file mode 100644
index 0000000..526e1db
--- /dev/null
+++ b/debian/patches/sha1-includes.diff
@@ -0,0 +1,45 @@
+From: Michael Tokarev <mjt at tls.msk.ru>
+Subject: do not #include ansidecl.h from sha1.h, use system headers
+
+In 3.2.5 version of mdadm, new sha1 implementation has been included
+which tries to include ansidecl.h header which is internal to some
+other project.  But this #include isn't really necessary, since this
+implementation does not actually use any defines from ansidecl.h.  So
+just remove the #include, instead of adding a new external dependency.
+
+References: http://www.spinics.net/lists/raid/msg38859.html
+
+While at it, unconditionally include system headers like limits.h and
+stdint.h, since on a Linux system these headers are available, and
+these contains definitive information about real system types than
+any guesses.
+
+--- a/sha1.h
++++ b/sha1.h
+@@ -22,12 +22,10 @@
+ 
+ #include <stdio.h>
+ 
+-#if defined HAVE_LIMITS_H || _LIBC
++#if 1 /* defined HAVE_LIMITS_H || _LIBC */
+ # include <limits.h>
+ #endif
+ 
+-#include "ansidecl.h"
+-
+ /* The following contortions are an attempt to use the C preprocessor
+    to determine an unsigned integral type that is 32 bits wide.  An
+    alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but
+@@ -35,9 +33,9 @@
+    the resulting executable.  Locally running cross-compiled executables
+    is usually not possible.  */
+ 
+-#ifdef _LIBC
+-# include <sys/types.h>
+-typedef u_int32_t sha1_uint32;
++#if 1 /* def _LIBC */
++# include <stdint.h>
++typedef uint32_t sha1_uint32;
+ typedef uintptr_t sha1_uintptr;
+ #else
+ #  define INT_MAX_32_BITS 2147483647