sysstat: refresh patches

The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.

Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450).  This is obviously bad.

We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.

(From OE-Core rev: 4a0c9bb514ff3d6966f1da480cd48c076403f58d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 13 insertions, 16 deletions

diff --git a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch b/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
index c12652307c..5fc26fbc27 100644
--- a/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
+++ b/meta/recipes-extended/sysstat/sysstat/0001-Include-needed-headers-explicitly.patch
@@ -21,10 +21,10 @@ Upstream-Status: Pending
  sa_common.c | 1 +
  3 files changed, 3 insertions(+)
 
-diff --git a/common.c b/common.c
-index a23155b..ad86446 100644
---- a/common.c
-+++ b/common.c
+Index: sysstat-11.5.7/common.c
+===================================================================
+--- sysstat-11.5.7.orig/common.c
++++ sysstat-11.5.7/common.c
 @@ -20,6 +20,7 @@
   */
  
@@ -32,11 +32,11 @@ index a23155b..ad86446 100644
 +#include <limits.h>
  #include <string.h>
  #include <stdlib.h>
- #include <time.h>
-diff --git a/ioconf.c b/ioconf.c
-index 7d88c5d..6d67691 100644
---- a/ioconf.c
-+++ b/ioconf.c
+ #include <stdarg.h>
+Index: sysstat-11.5.7/ioconf.c
+===================================================================
+--- sysstat-11.5.7.orig/ioconf.c
++++ sysstat-11.5.7/ioconf.c
 @@ -27,6 +27,7 @@
  #include <errno.h>
  #include <dirent.h>
@@ -45,10 +45,10 @@ index 7d88c5d..6d67691 100644
  
  #include "ioconf.h"
  #include "common.h"
-diff --git a/sa_common.c b/sa_common.c
-index b7351d9..c9e3299 100644
---- a/sa_common.c
-+++ b/sa_common.c
+Index: sysstat-11.5.7/sa_common.c
+===================================================================
+--- sysstat-11.5.7.orig/sa_common.c
++++ sysstat-11.5.7/sa_common.c
 @@ -20,6 +20,7 @@
   */
  
@@ -57,6 +57,3 @@ index b7351d9..c9e3299 100644
  #include <string.h>
  #include <stdlib.h>
  #include <time.h>
--- 
-2.5.2
-