From cf6a32debcde5bfde94126c3b4200800d672e605 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 5 Mar 2019 16:30:01 +0000 Subject: [PATCH] file: upgrade to 5.36 Upgrade to 5.36. Drop debian-742262.patch, this appears to have been fixed properly upstream some releases ago. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../file/file/debian-742262.patch | 27 ------------------- .../file/{file_5.35.bb => file_5.36.bb} | 6 ++--- 2 files changed, 2 insertions(+), 31 deletions(-) delete mode 100644 meta/recipes-devtools/file/file/debian-742262.patch rename meta/recipes-devtools/file/{file_5.35.bb => file_5.36.bb} (90%) 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 diff --git a/meta/recipes-devtools/file/file_5.35.bb b/meta/recipes-devtools/file/file_5.36.bb similarity index 90% rename from meta/recipes-devtools/file/file_5.35.bb rename to meta/recipes-devtools/file/file_5.36.bb index 2f0589de68..1a81fde259 100644 --- a/meta/recipes-devtools/file/file_5.35.bb +++ b/meta/recipes-devtools/file/file_5.36.bb @@ -14,11 +14,9 @@ DEPENDS_class-native = "zlib-native" # Blacklist a bogus tag in upstream check UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P(?!6_23).+)" -SRC_URI = "git://github.com/file/file.git \ - file://debian-742262.patch \ - " +SRC_URI = "git://github.com/file/file.git" -SRCREV = "d1ff3af7a2c6b38bdbdde7af26b59e3c50a48fff" +SRCREV = "f3a4b9ada3ca99e62c62b9aa78eee4935a8094fe" S = "${WORKDIR}/git" inherit autotools update-alternatives -- 2.40.1