From 06792df134ffd54c33e2b83b5daf92f5eb3dfee2 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 22 Jun 2017 13:25:06 +0100 Subject: Defuzz patches. --- debian/patches/debian-conffile-location.diff | 12 ++++++------ debian/patches/debian-no-Werror.diff | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/patches/debian-conffile-location.diff b/debian/patches/debian-conffile-location.diff index 8acc6077..40a1e87a 100644 --- a/debian/patches/debian-conffile-location.diff +++ b/debian/patches/debian-conffile-location.diff @@ -19,7 +19,7 @@ Reviewed-by: martin f. krafft --- a/Makefile +++ b/Makefile -@@ -61,8 +61,8 @@ +@@ -62,8 +62,8 @@ PKG_CONFIG ?= pkg-config SYSCONFDIR = /etc @@ -32,7 +32,7 @@ Reviewed-by: martin f. krafft # Both MAP_DIR and MDMON_DIR should be somewhere that persists across the --- a/ReadMe.c +++ b/ReadMe.c -@@ -590,7 +590,7 @@ +@@ -604,7 +604,7 @@ ; char Help_config[] = @@ -43,7 +43,7 @@ Reviewed-by: martin f. krafft " configuration lines.\n" --- a/mdadm.8.in +++ b/mdadm.8.in -@@ -264,13 +264,13 @@ +@@ -267,13 +267,13 @@ .TP .BR \-c ", " \-\-config= Specify the config file or directory. Default is to use @@ -61,7 +61,7 @@ Reviewed-by: martin f. krafft If the config file given is .B "partitions" then nothing will be read, but -@@ -1742,9 +1742,9 @@ +@@ -1888,9 +1888,9 @@ or requested with (a possibly implicit) .BR \-\-scan . In the later case, @@ -73,7 +73,7 @@ Reviewed-by: martin f. krafft is used. If -@@ -3003,7 +3003,7 @@ +@@ -3184,7 +3184,7 @@ is given in Misc mode, and to monitor array reconstruction on Monitor mode. @@ -82,7 +82,7 @@ Reviewed-by: martin f. krafft The config file lists which devices may be scanned to see if they contain MD super block, and gives identifying information -@@ -3011,7 +3011,7 @@ +@@ -3192,7 +3192,7 @@ .BR mdadm.conf (5) for more details. diff --git a/debian/patches/debian-no-Werror.diff b/debian/patches/debian-no-Werror.diff index 0a427f16..7dcefd1a 100644 --- a/debian/patches/debian-no-Werror.diff +++ b/debian/patches/debian-no-Werror.diff @@ -15,7 +15,7 @@ Signed-off-by: martin f. krafft +++ b/Makefile @@ -43,7 +43,7 @@ - CC = $(CROSS_COMPILE)gcc + CC ?= $(CROSS_COMPILE)gcc CXFLAGS ?= -ggdb -CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter +CWFLAGS = -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter -- cgit v1.2.3