diff options
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/debian-conffile-location.diff | 79 | ||||
-rw-r--r-- | debian/patches/debian-disable-udev-incr-assembly.diff | 27 | ||||
-rw-r--r-- | debian/patches/debian-no-Werror.diff | 8 | ||||
-rw-r--r-- | debian/patches/fix-enough-function-for-RAID10.patch | 46 | ||||
-rw-r--r-- | debian/patches/fix-segfaults-in-detail.patch | 42 | ||||
-rw-r--r-- | debian/patches/mdmon-allow-takeover-when-original-was-started-with-.patch | 37 | ||||
-rw-r--r-- | debian/patches/mdmon-fix-arg-parsing.patch | 32 | ||||
-rw-r--r-- | debian/patches/mdmon-fix-arg-processing-for-a.patch | 31 | ||||
-rw-r--r-- | debian/patches/series | 8 | ||||
-rw-r--r-- | debian/patches/sha1-includes.diff | 9 | ||||
-rw-r--r-- | debian/patches/spelling-and-manpages.patch | 101 | ||||
-rw-r--r-- | debian/patches/super0-do-not-override-uuid-with-homehost.patch | 34 |
12 files changed, 39 insertions, 415 deletions
diff --git a/debian/patches/debian-conffile-location.diff b/debian/patches/debian-conffile-location.diff index 8e4c47bd..8acc6077 100644 --- a/debian/patches/debian-conffile-location.diff +++ b/debian/patches/debian-conffile-location.diff @@ -17,12 +17,10 @@ Reviewed-by: martin f. krafft <madduck@debian.org> mdassemble.8 | 2 +- 5 files changed, 11 insertions(+), 13 deletions(-) -diff --git a/Makefile b/Makefile -index 72087be..8c1fa08 100644 --- a/Makefile +++ b/Makefile -@@ -60,8 +60,8 @@ else - endif +@@ -61,8 +61,8 @@ + PKG_CONFIG ?= pkg-config SYSCONFDIR = /etc -CONFFILE = $(SYSCONFDIR)/mdadm.conf @@ -32,74 +30,67 @@ index 72087be..8c1fa08 100644 MAILCMD =/usr/sbin/sendmail -t CONFFILEFLAGS = -DCONFFILE=\"$(CONFFILE)\" -DCONFFILE2=\"$(CONFFILE2)\" # Both MAP_DIR and MDMON_DIR should be somewhere that persists across the -diff --git a/ReadMe.c b/ReadMe.c -index b658841..a5dac94 100644 --- a/ReadMe.c +++ b/ReadMe.c -@@ -565,7 +565,7 @@ char Help_incr[] = +@@ -590,7 +590,7 @@ ; char Help_config[] = -"The /etc/mdadm.conf config file:\n\n" +"The /etc/mdadm/mdadm.conf config file:\n\n" " The config file contains, apart from blank lines and comment lines that\n" - " start with a hash(#), four sorts of configuration lines: array lines, \n" - " device lines, mailaddr lines and program lines.\n" -diff --git a/mdadm.8.in b/mdadm.8.in -index 7e8981e..5342d5c 100644 + " start with a hash(#), array lines, device lines, and various\n" + " configuration lines.\n" --- a/mdadm.8.in +++ b/mdadm.8.in -@@ -262,9 +262,9 @@ the exact meaning of this option in different contexts. +@@ -264,13 +264,13 @@ .TP .BR \-c ", " \-\-config= - Specify the config file. Default is to use --.BR /etc/mdadm.conf , --or if that is missing then --.BR /etc/mdadm/mdadm.conf . -+.BR /etc/mdadm/mdadm.conf , -+or if that is missing, then -+.BR /etc/mdadm.conf . + Specify the config file or directory. Default is to use +-.B /etc/mdadm.conf ++.B /etc/mdadm/mdadm.conf + and +-.BR /etc/mdadm.conf.d , ++.BR /etc/mdadm/mdadm.conf.d , + or if those are missing then +-.B /etc/mdadm/mdadm.conf ++.B /etc/mdadm.conf + and +-.BR /etc/mdadm/mdadm.conf.d . ++.BR /etc/mdadm.conf.d . If the config file given is .B "partitions" then nothing will be read, but -@@ -1529,8 +1529,6 @@ The config file is only used if explicitly named with +@@ -1742,9 +1742,9 @@ or requested with (a possibly implicit) .BR \-\-scan . In the later case, -.B /etc/mdadm.conf -or .B /etc/mdadm/mdadm.conf ++or ++.B /etc/mdadm.conf is used. -@@ -1859,7 +1857,7 @@ or - .B \-\-scan - will cause the output to be less detailed and the format to be - suitable for inclusion in --.BR mdadm.conf . -+.BR /etc/mdadm/mdadm.conf . - The exit status of - .I mdadm - will normally be 0 unless -@@ -1936,7 +1934,7 @@ or - is given, then multiple devices that are components of the one array - are grouped together and reported in a single entry suitable - for inclusion in --.BR mdadm.conf . -+.BR /etc/mdadm/mdadm.conf . - - Having - .B \-\-scan -@@ -2698,7 +2696,7 @@ uses this to find arrays when + If +@@ -3003,7 +3003,7 @@ is given in Misc mode, and to monitor array reconstruction on Monitor mode. -.SS /etc/mdadm.conf -+.SS /etc/mdadm/mdadm.conf ++.SS /etc/mdadm/mdadm.conf (or /etc/mdadm.conf) The config file lists which devices may be scanned to see if they contain MD super block, and gives identifying information -diff --git a/mdadm.conf.5 b/mdadm.conf.5 -index 9f31c73..f0b07a1 100644 +@@ -3011,7 +3011,7 @@ + .BR mdadm.conf (5) + for more details. + +-.SS /etc/mdadm.conf.d ++.SS /etc/mdadm/mdadm.conf.d (or /etc/mdadm.conf.d) + + A directory containing configuration files which are read in lexical + order. --- a/mdadm.conf.5 +++ b/mdadm.conf.5 @@ -8,7 +8,7 @@ @@ -111,11 +102,9 @@ index 9f31c73..f0b07a1 100644 .SH DESCRIPTION .PP .I mdadm -diff --git a/mdassemble.8 b/mdassemble.8 -index 0210524..27779af 100644 --- a/mdassemble.8 +++ b/mdassemble.8 -@@ -40,7 +40,7 @@ There are no options to +@@ -40,7 +40,7 @@ .SH FILES diff --git a/debian/patches/debian-disable-udev-incr-assembly.diff b/debian/patches/debian-disable-udev-incr-assembly.diff deleted file mode 100644 index d4da159d..00000000 --- a/debian/patches/debian-disable-udev-incr-assembly.diff +++ /dev/null @@ -1,27 +0,0 @@ -From: martin f. krafft <madduck@debian.org> -Subject: Disable udev incremental assembly - -Upstream enabled incremental assembly in the udev rules by default for 3.1.3, -but this is too early. Hence, this patch simply reverts the change. - -Signed-off-by: martin f. krafft <madduck@debian.org> - ---- - udev-md-raid.rules | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/udev-md-raid.rules b/udev-md-raid.rules -index f564f70..241c31d 100644 ---- a/udev-md-raid.rules -+++ b/udev-md-raid.rules -@@ -8,6 +8,10 @@ GOTO="md_inc_skip" - - LABEL="md_inc" - -+## DISABLED: Incremental udev assembly disabled -+## ** this is a Debian-specific change ** -+GOTO="md_inc_skip" -+ - # remember you can limit what gets auto/incrementally assembled by - # mdadm.conf(5)'s 'AUTO' and selectively whitelist using 'ARRAY' - ACTION=="add", RUN+="/sbin/mdadm --incremental $tempnode" diff --git a/debian/patches/debian-no-Werror.diff b/debian/patches/debian-no-Werror.diff index e88db590..0a427f16 100644 --- a/debian/patches/debian-no-Werror.diff +++ b/debian/patches/debian-no-Werror.diff @@ -11,16 +11,14 @@ Signed-off-by: martin f. krafft <madduck@debian.org> Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -diff --git a/Makefile b/Makefile -index b8d363f..63d9742 100644 --- a/Makefile +++ b/Makefile -@@ -42,7 +42,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix include -I$(KLIBC)/klibc/include -I$(KLIB +@@ -43,7 +43,7 @@ CC = $(CROSS_COMPILE)gcc - CXFLAGS = -ggdb + CXFLAGS ?= -ggdb -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter ifdef WARN_UNUSED - CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O + CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3 endif diff --git a/debian/patches/fix-enough-function-for-RAID10.patch b/debian/patches/fix-enough-function-for-RAID10.patch deleted file mode 100644 index 6f2ae996..00000000 --- a/debian/patches/fix-enough-function-for-RAID10.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2117ad1dd1b79cf6d02a065d9e38076aa9f4788d Mon Sep 17 00:00:00 2001 -From: NeilBrown <neilb@suse.de> -Date: Thu, 27 Sep 2012 16:58:44 +1000 -Subject: Fix 'enough' function for RAID10. -Bug-Debian: http://bugs.debian.org/691668 -Comment: from stable/bugfix 3.2.6 upstream version - -The 'enough' function is written to work with 'near' arrays only -in that is implicitly assumes that the offset from one 'group' of -devices to the next is the same as the number of copies. -In reality it is the number of 'near' copies. - -So change it to make this number explicit. - -Reported-by: Jakub Husák <jakub@gooseman.cz> -Signed-off-by: NeilBrown <neilb@suse.de> ---- - util.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/util.c b/util.c -index 83f3187..eef0d6f 100644 ---- a/util.c -+++ b/util.c -@@ -332,14 +332,15 @@ int enough(int level, int raid_disks, int layout, int clean, char *avail) - /* there must be one of the 'copies' form 'first' */ - int n = copies; - int cnt=0; -+ int this = first; - while (n--) { -- if (avail[first]) -+ if (avail[this]) - cnt++; -- first = (first+1) % raid_disks; -+ this = (this+1) % raid_disks; - } - if (cnt == 0) - return 0; -- -+ first = (first+(layout&255)) % raid_disks; - } while (first != 0); - return 1; - --- -1.7.10.4 - diff --git a/debian/patches/fix-segfaults-in-detail.patch b/debian/patches/fix-segfaults-in-detail.patch deleted file mode 100644 index 6d78bcf6..00000000 --- a/debian/patches/fix-segfaults-in-detail.patch +++ /dev/null @@ -1,42 +0,0 @@ -From aec89f63e98322a141d146a84c67b0cc2d1cd1a4 Mon Sep 17 00:00:00 2001 -From: Lukasz Dorau <lukasz.dorau@intel.com> -Date: Thu, 27 Sep 2012 16:58:44 +1000 -Subject: fix segfaults in Detail() -Bug-Debian: http://bugs.debian.org/691670 -Comment: from stable/bugfix upstream 3.2.6 version - -If disk has been removed, 'st' and 'info' can be NULL. It causes segfault. -'st' and 'info' should be checked against being NULL before being used. - -Signed-off-by: Lukasz Dorau <lukasz.dorau@intel.com> -Signed-off-by: NeilBrown <neilb@suse.de> ---- - Detail.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Detail.c b/Detail.c -index 85e2b89..67ddc80 100644 ---- a/Detail.c -+++ b/Detail.c -@@ -424,7 +424,7 @@ int Detail(char *dev, int brief, int export, int test, char *homehost, char *pre - } - free_mdstat(ms); - -- if (st->sb && info->reshape_active) { -+ if ((st && st->sb) && (info && info->reshape_active)) { - #if 0 - This is pretty boring - printf(" Reshape pos'n : %llu%s\n", (unsigned long long) info->reshape_progress<<9, -@@ -575,7 +575,8 @@ This is pretty boring - if (spares && brief && array.raid_disks) printf(" spares=%d", spares); - if (brief && st && st->sb) - st->ss->brief_detail_super(st); -- st->ss->free_super(st); -+ if (st) -+ st->ss->free_super(st); - - if (brief > 1 && devices) printf("\n devices=%s", devices); - if (brief) printf("\n"); --- -1.7.10.4 - diff --git a/debian/patches/mdmon-allow-takeover-when-original-was-started-with-.patch b/debian/patches/mdmon-allow-takeover-when-original-was-started-with-.patch deleted file mode 100644 index ad643e4c..00000000 --- a/debian/patches/mdmon-allow-takeover-when-original-was-started-with-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From c4e96a305fbca4f83ae9f3a81482481524380905 Mon Sep 17 00:00:00 2001 -From: NeilBrown <neilb@suse.de> -Date: Mon, 20 Aug 2012 10:37:21 +1000 -Subject: mdmon: allow --takeover when original was started with --offroot -Bug-Debian: http://bugs.debian.org/691671 -Comment: from stable/bugfix upstream 3.2.6 version -Comment: one of the 3 patches fixing mentioned issues - -As --offroot causes ARGV[0] to be changed, we need to be more -lenient when checking that the mdmon we are about to kill really -is mdmon. i.e. allow name to be "@dmon" instead. - -Signed-off-by: NeilBrown <neilb@suse.de> ---- - mdmon.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/mdmon.c b/mdmon.c -index 2d0503d..54e1238 100644 ---- a/mdmon.c -+++ b/mdmon.c -@@ -184,7 +184,11 @@ static void try_kill_monitor(pid_t pid, char *devname, int sock) - buf[sizeof(buf)-1] = 0; - close(fd); - -- if (n < 0 || !strstr(buf, "mdmon")) -+ /* Note that if started with --offroot, the name -+ * might be "@dmon" -+ */ -+ if (n < 0 || !(strstr(buf, "mdmon") || -+ strstr(buf, "@dmon"))) - return; - - kill(pid, SIGTERM); --- -1.7.10.4 - diff --git a/debian/patches/mdmon-fix-arg-parsing.patch b/debian/patches/mdmon-fix-arg-parsing.patch deleted file mode 100644 index 5c147ccd..00000000 --- a/debian/patches/mdmon-fix-arg-parsing.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 68ad53b301b6fc722fee6d32a5267c1a4506452d Mon Sep 17 00:00:00 2001 -From: NeilBrown <neilb@suse.de> -Date: Mon, 9 Jul 2012 16:50:22 +1000 -Subject: mdmon: fix arg parsing. -Bug-Debian: http://bugs.debian.org/691671 -Comment: from stable/bugfix upstream 3.2.6 version -Comment: one of the 3 patches fixing mentioned issues - --t aka --takeover should not be setting container_name. -It sets it to NULL which causes failure when you try - mdmon --all --takeover - -Signed-off-by: NeilBrown <neilb@suse.de> ---- - mdmon.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/mdmon.c b/mdmon.c -index 2093476..dee02a9 100644 ---- a/mdmon.c -+++ b/mdmon.c -@@ -306,7 +306,6 @@ int main(int argc, char *argv[]) - all = 1; - break; - case 't': -- container_name = optarg; - takeover = 1; - break; - case OffRootOpt: --- -1.7.10.4 - diff --git a/debian/patches/mdmon-fix-arg-processing-for-a.patch b/debian/patches/mdmon-fix-arg-processing-for-a.patch deleted file mode 100644 index c7f66a59..00000000 --- a/debian/patches/mdmon-fix-arg-processing-for-a.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 23084aaa76d9fc3121ff2ab38c04ee9893793e00 Mon Sep 17 00:00:00 2001 -From: NeilBrown <neilb@suse.de> -Date: Mon, 20 Aug 2012 10:33:50 +1000 -Subject: mdmon: fix arg processing for -a -Bug-Debian: http://bugs.debian.org/691671 -Comment: from stable/bugfix upstream 3.2.6 version -Comment: one of the 3 patches fixing mentioned issues - -'-a' was not being recognised as an abbreviation for '--all'. - -Signed-off-by: NeilBrown <neilb@suse.de> ---- - mdmon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mdmon.c b/mdmon.c -index dee02a9..2d0503d 100644 ---- a/mdmon.c -+++ b/mdmon.c -@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) - {NULL, 0, NULL, 0} - }; - -- while ((opt = getopt_long(argc, argv, "th", options, NULL)) != -1) { -+ while ((opt = getopt_long(argc, argv, "tha", options, NULL)) != -1) { - switch (opt) { - case 'a': - container_name = argv[optind-1]; --- -1.7.10.4 - diff --git a/debian/patches/series b/debian/patches/series index 370ad9a2..a1e4e3f6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,11 +1,3 @@ debian-conffile-location.diff -debian-disable-udev-incr-assembly.diff debian-no-Werror.diff sha1-includes.diff -spelling-and-manpages.patch -fix-enough-function-for-RAID10.patch -fix-segfaults-in-detail.patch -super0-do-not-override-uuid-with-homehost.patch -mdmon-allow-takeover-when-original-was-started-with-.patch -mdmon-fix-arg-parsing.patch -mdmon-fix-arg-processing-for-a.patch diff --git a/debian/patches/sha1-includes.diff b/debian/patches/sha1-includes.diff index 526e1db2..0dfd7daf 100644 --- a/debian/patches/sha1-includes.diff +++ b/debian/patches/sha1-includes.diff @@ -16,7 +16,7 @@ any guesses. --- a/sha1.h +++ b/sha1.h -@@ -22,12 +22,10 @@ +@@ -22,7 +22,7 @@ #include <stdio.h> @@ -25,12 +25,7 @@ any guesses. # 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 @@ +@@ -33,9 +33,9 @@ the resulting executable. Locally running cross-compiled executables is usually not possible. */ diff --git a/debian/patches/spelling-and-manpages.patch b/debian/patches/spelling-and-manpages.patch deleted file mode 100644 index 0d89bb86..00000000 --- a/debian/patches/spelling-and-manpages.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- - Build.c | 2 +- - md.4 | 2 +- - mdadm.8.in | 26 -------------------------- - mdadm.conf.5 | 2 +- - super0.c | 2 +- - 5 files changed, 4 insertions(+), 30 deletions(-) - ---- a/Build.c -+++ b/Build.c -@@ -174,7 +174,7 @@ - goto abort; - } - if ((stb.st_mode & S_IFMT)!= S_IFBLK) { -- fprintf(stderr, Name ": Wierd: %s is no longer a block device.\n", -+ fprintf(stderr, Name ": Weird: %s is no longer a block device.\n", - dv->devname); - goto abort; - } ---- a/md.4 -+++ b/md.4 -@@ -773,7 +773,7 @@ - .I n - gives the md device number, - .I l --gives the level, 0 for RAID0 or -1 for LINEAR, -+gives the level, 0 for RAID0 or \-1 for LINEAR, - .I c - gives the chunk size as a base-2 logarithm offset by twelve, so 0 - means 4K, 1 means 8K. ---- a/mdadm.conf.5 -+++ b/mdadm.conf.5 -@@ -573,7 +573,7 @@ - .br - HOMEHOST <system> - .br --AUTO +1.x homehost -all -+AUTO +1.x homehost \-all - - .SH SEE ALSO - .BR mdadm (8), ---- a/super0.c -+++ b/super0.c -@@ -445,7 +445,7 @@ - sb32+MD_SB_GENERIC_CONSTANT_WORDS+7+1, - (MD_SB_WORDS - (MD_SB_GENERIC_CONSTANT_WORDS+7+1))*4); - if (verbose >= 0) -- fprintf (stderr, Name ": adjusting superblock of %s for 2.2/sparc compatability.\n", -+ fprintf (stderr, Name ": adjusting superblock of %s for 2.2/sparc compatibility.\n", - devname); - } else if (strcmp(update, "super-minor") ==0) { - sb->md_minor = info->array.md_minor; ---- a/mdadm.8.in -+++ b/mdadm.8.in -@@ -332,7 +332,6 @@ - .IP "0, 0.90, default" - .el - .IP "0, 0.90" --.. - Use the original 0.90 format superblock. This format limits arrays to - 28 component devices and limits component devices of levels 1 and - greater to 2 terabytes. It is also possible for there to be confusion -@@ -342,7 +341,6 @@ - .IP "1, 1.0, 1.1, 1.2" - .el - .IP "1, 1.0, 1.1, 1.2 default" --.. - Use the new version-1 format superblock. This has fewer restrictions. - It can easily be moved between hosts with different endian-ness, and a - recovery operation can be checkpointed and restarted. The different -@@ -888,30 +886,6 @@ - or - .BR \-\-build . - --.ig XX --.\".TP --.\".BR \-\-symlink = no --.\"Normally when --.\".B \-\-auto --.\"causes --.\".I mdadm --.\"to create devices in --.\".B /dev/md/ --.\"it will also create symlinks from --.\".B /dev/ --.\"with names starting with --.\".B md --.\"or --.\".BR md_ . --.\"Use --.\".B \-\-symlink=no --.\"to suppress this, or --.\".B \-\-symlink=yes --.\"to enforce this even if it is suppressing --.\".IR mdadm.conf . --.\" --.XX -- - .TP - .BR \-a ", " "\-\-add" - This option can be used in Grow mode in two cases. diff --git a/debian/patches/super0-do-not-override-uuid-with-homehost.patch b/debian/patches/super0-do-not-override-uuid-with-homehost.patch deleted file mode 100644 index 70f0f283..00000000 --- a/debian/patches/super0-do-not-override-uuid-with-homehost.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3713633a30349773a83bd8257cdd64b86ce32dbd Mon Sep 17 00:00:00 2001 -From: Michael Tokarev <mjt@tls.msk.ru> -Date: Sat, 20 Oct 2012 15:40:02 +0400 -Subject: super0: do not override uuid with homehost -Bug-Debian: http://bugs.debian.org/686703 -Comment: from stable/bugfix upstream 3.2.6 version - -When --uuid is specified in the command line, even for v0.90 -superblock we override last portion of uuid with data from ---homehost, which is wrong (and disagrees with the manpage). -Only use homehost in super0 if no uuid is specified. - -Signed-off-By: Michael Tokarev <mjt@tls.msk.ru> -Signed-off-by: NeilBrown <neilb@suse.de> ---- - super0.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/super0.c b/super0.c -index 1375799..ca4c082 100644 ---- a/super0.c -+++ b/super0.c -@@ -657,7 +657,7 @@ static int init_super0(struct supertype *st, mdu_array_info_t *info, - if (rfd >= 0) - close(rfd); - } -- if (homehost) { -+ if (homehost && !uuid) { - char buf[20]; - char *hash = sha1_buffer(homehost, - strlen(homehost), --- -1.7.10.4 - |