From 319de7e44f9fc853b53f2628abaf640d8241f615 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 15 Nov 2017 16:46:31 +0000 Subject: squashfs-tools: 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. Signed-off-by: Ross Burton --- .../squashfs-tools/squashfs-tools/fix-compat.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch b/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch index d545146912..0ce7b4e8ce 100644 --- a/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch +++ b/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch @@ -23,7 +23,7 @@ Index: squashfs-tools/mksquashfs.c =================================================================== --- squashfs-tools.orig/mksquashfs.c +++ squashfs-tools/mksquashfs.c -@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st +@@ -1261,6 +1261,10 @@ void write_dir(squashfs_inode *inode, st dir_size + 3, directory_block, directory_offset, NULL, NULL, dir, 0); @@ -50,9 +50,9 @@ Index: squashfs-tools/unsquashfs.c =================================================================== --- squashfs-tools.orig/unsquashfs.c +++ squashfs-tools/unsquashfs.c -@@ -38,6 +38,10 @@ - #include - #include +@@ -42,6 +42,10 @@ + #include + #endif +#ifndef FNM_EXTMATCH +#define FNM_EXTMATCH 0 -- cgit 1.2.3-korg