diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-07-02 19:16:01 +0100 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2016-07-02 19:16:01 +0100 |
commit | b83f8fcaffa542498c5698a3a161b9967ac1d3d6 (patch) | |
tree | 3cb83259723d112fd7b08b5bd299df2f5ee94009 /debian/patches/sha1-includes.diff |
mdadm (3.4-2) unstable; urgency=low
* Reneable incremental assembly
* Rely on udev to assemble incremental arrays
* In environments with systemd rely on mdadm-last-resort@.timer|.service
units to activate degrated raids
* In environments initramfs-tools initrd (no systemd) add local-block
script to do the same after 2/3rds of root delay iteration
* Drop local-top initramfs script
* Drop dependency on initscripts package
* Drop INITRDSTART support
* Drop mdadm-raid init script
* Drop ancient preinst
* In mdadm.init remove dependency on mdadm-raid
* In mdadm.init check, and bail out running in a container
* In mdadm.config drop mdadm/autostart logic
* Drop CREATE stanzas from mkconf and don't include them in the
initramfs. The generated defaults, are the compiled-in defaults. And
the current one generates warnings when running mdadm in the
initramfs, as there is no passwd|group files to resolve root/disk
uid/gid. Closes: 717609
* Adapt changes and formatting of initramfs hook from Ubuntu
* Bump standards version to 3.9.7, no changes required
* Fix copyright-refers-to-symlink-license
* Closes: #781172, #796624, #769201, #813335, #632401, #804973, #714155,
#770002, #737132, #675452, #726390, #813637, #814036.
# imported from the archive
Diffstat (limited to 'debian/patches/sha1-includes.diff')
-rw-r--r-- | debian/patches/sha1-includes.diff | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/debian/patches/sha1-includes.diff b/debian/patches/sha1-includes.diff new file mode 100644 index 00000000..0dfd7daf --- /dev/null +++ b/debian/patches/sha1-includes.diff @@ -0,0 +1,40 @@ +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,7 +22,7 @@ + + #include <stdio.h> + +-#if defined HAVE_LIMITS_H || _LIBC ++#if 1 /* defined HAVE_LIMITS_H || _LIBC */ + # include <limits.h> + #endif + +@@ -33,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 |