diff options
Diffstat (limited to 'debian/patches/sha1-includes.diff')
| -rw-r--r-- | debian/patches/sha1-includes.diff | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/debian/patches/sha1-includes.diff b/debian/patches/sha1-includes.diff new file mode 100644 index 00000000..526e1db2 --- /dev/null +++ b/debian/patches/sha1-includes.diff @@ -0,0 +1,45 @@ +From: Michael Tokarev <mjt@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 |