[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6528/8267] file: 5.30 -> 5.31

[Emmanuele Bassi <ebassi src gnome org>]

commit 3674b6e8bde8703f357913f2336e5fad4c8fc276
Author: Fan Xin <fan xin jp fujitsu com>
Date:   Tue Jun 20 13:53:06 2017 +0900

    file: 5.30 -> 5.31
    
    1. Upgrade file from 5.30 to 5.31
    
    2. Rebase the following patch file.
       debian-742262.patch
    
    (From OE-Core rev: f38290ec2a727427a6481e4dafb02ecd8a60fad1)
    
    Signed-off-by: Fan Xin <fan xin jp fujitsu com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../recipes-devtools/file/file/debian-742262.patch |   17 ++++++++++++++---
 .../file/{file_5.30.bb => file_5.31.bb}            |    2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/meta/recipes-devtools/file/file/debian-742262.patch 
b/meta/recipes-devtools/file/file/debian-742262.patch
index 1ef485e..d31ac59 100644
--- a/meta/recipes-devtools/file/file/debian-742262.patch
+++ b/meta/recipes-devtools/file/file/debian-742262.patch
@@ -1,19 +1,30 @@
-The awk pattern was checked *before* the Perl pattern, so the perl
-script with BEGIN{...} would be reported as awk, this patch fixes it.
+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 <debian axhn manchmal in-ulm de>
 Signed-off-by: Robert Yang <liezhi yang windriver com>
+
+Rebase on 5.31
+
+Signed-off-by: Fan Xin <fan xin jp fujitsu com>
 ---
+ magic/Magdir/commands | 1 +
+ 1 file changed, 1 insertion(+)
+
 diff --git a/magic/Magdir/commands b/magic/Magdir/commands
+index 1a46efd..255c04b 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      =^\\s{0,100}BEGIN\\s{0,100}[{]  awk or perl script text
+ 0     regex/4096      =^[A-Za-z0-9_]{0,100}BEGIN[A-Za-z0-9_]{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
+-- 
+1.9.1
+
diff --git a/meta/recipes-devtools/file/file_5.30.bb b/meta/recipes-devtools/file/file_5.31.bb
similarity index 96%
rename from meta/recipes-devtools/file/file_5.30.bb
rename to meta/recipes-devtools/file/file_5.31.bb
index 0998fcf..1b1f502 100644
--- a/meta/recipes-devtools/file/file_5.30.bb
+++ b/meta/recipes-devtools/file/file_5.31.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://github.com/file/file.git \
         file://0001-Add-P-prompt-into-Usage-info.patch \
         "
 
-SRCREV = "79814950aafb81ecd6a910c2a8a3b8ec12f3e4a6"
+SRCREV = "70c5f15060c7ad81150177de83a3e64500a54c9f"
 S = "${WORKDIR}/git"
 
 inherit autotools