From 5cf65d01013687e7d997966c501bd6e321f910f2 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 25 Feb 2023 18:52:01 +0100 Subject: Refreshing sha1-includes.patch. Signed-off-by: Daniel Baumann --- debian/patches/debian/0005-sha1-includes.patch | 40 ++++++++++++++++++++++++++ debian/patches/series | 2 +- debian/patches/sha1-includes.diff | 40 -------------------------- 3 files changed, 41 insertions(+), 41 deletions(-) create mode 100644 debian/patches/debian/0005-sha1-includes.patch delete mode 100644 debian/patches/sha1-includes.diff diff --git a/debian/patches/debian/0005-sha1-includes.patch b/debian/patches/debian/0005-sha1-includes.patch new file mode 100644 index 0000000..8116f5f --- /dev/null +++ b/debian/patches/debian/0005-sha1-includes.patch @@ -0,0 +1,40 @@ +Author: Michael Tokarev +Description: 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. + +diff -Naurp mdadm.orig/sha1.h mdadm/sha1.h +--- mdadm.orig/sha1.h ++++ mdadm/sha1.h +@@ -22,7 +22,7 @@ + + #include + +-#if defined HAVE_LIMITS_H || _LIBC ++#if 1 /* defined HAVE_LIMITS_H || _LIBC */ + # include + #endif + +@@ -33,9 +33,9 @@ + the resulting executable. Locally running cross-compiled executables + is usually not possible. */ + +-#ifdef _LIBC +-# include +-typedef u_int32_t sha1_uint32; ++#if 1 /* def _LIBC */ ++# include ++typedef uint32_t sha1_uint32; + typedef uintptr_t sha1_uintptr; + #else + # define INT_MAX_32_BITS 2147483647 diff --git a/debian/patches/series b/debian/patches/series index d368285..7d1ea02 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,7 @@ debian/0001-fix-manpages.patch debian/0002-mdmonitor-service-simplify.patch debian/0003-host-name-in-default-mailfrom.patch debian/0004-exit-gracefully-when-md-device-not-found.patch -sha1-includes.diff +debian/0005-sha1-includes.patch readlink-path.patch debian-no-Werror.diff test-installed.patch diff --git a/debian/patches/sha1-includes.diff b/debian/patches/sha1-includes.diff deleted file mode 100644 index 0dfd7da..0000000 --- a/debian/patches/sha1-includes.diff +++ /dev/null @@ -1,40 +0,0 @@ -From: Michael Tokarev -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,7 +22,7 @@ - - #include - --#if defined HAVE_LIMITS_H || _LIBC -+#if 1 /* defined HAVE_LIMITS_H || _LIBC */ - # include - #endif - -@@ -33,9 +33,9 @@ - the resulting executable. Locally running cross-compiled executables - is usually not possible. */ - --#ifdef _LIBC --# include --typedef u_int32_t sha1_uint32; -+#if 1 /* def _LIBC */ -+# include -+typedef uint32_t sha1_uint32; - typedef uintptr_t sha1_uintptr; - #else - # define INT_MAX_32_BITS 2147483647 -- cgit v1.2.3