From 53c22e5a791244f3e5d830c981b5eafa33f6551f Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 5 Mar 2019 16:30:01 +0000 Subject: file: upgrade to 5.36 Upgrade to 5.36. Drop debian-742262.patch, this appears to have been fixed properly upstream some releases ago. (From OE-Core rev: cf6a32debcde5bfde94126c3b4200800d672e605) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../recipes-devtools/file/file/debian-742262.patch | 27 ---------------------- 1 file changed, 27 deletions(-) delete mode 100644 meta/recipes-devtools/file/file/debian-742262.patch (limited to 'meta/recipes-devtools/file/file') diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch deleted file mode 100644 index 319f9dbcf9..0000000000 --- a/meta/recipes-devtools/file/file/debian-742262.patch +++ /dev/null @@ -1,27 +0,0 @@ -The awk pattern was checked *before* the Perl pattern, so the -perl script with BEGIN{...} would be reported as awk, this patch fixes it. - -Upstream-Status: Backport [debian] - -Signed-off-by: Christoph Biedl -Signed-off-by: Robert Yang - -Rebase on 5.31 - -Signed-off-by: Fan Xin ---- - magic/Magdir/commands | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/magic/Magdir/commands b/magic/Magdir/commands -index f6ad1c8..f79e7dd 100644 ---- a/magic/Magdir/commands -+++ b/magic/Magdir/commands -@@ -57,6 +57,7 @@ - 0 string/wt #!\ /usr/bin/awk awk script text executable - !:mime text/x-awk - 0 regex/4096 =^[\040\t\f\r\n]{0,100}BEGIN[\040\t\f\r\n]{0,100}[{] awk or perl script text -+!:strength - 12 - - # AT&T Bell Labs' Plan 9 shell - 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable -- cgit v1.2.3-54-g00ecf