diff options
Diffstat (limited to 'meta/recipes-devtools/file')
| -rw-r--r-- | meta/recipes-devtools/file/file/debian-742262.patch | 27 | ||||
| -rw-r--r-- | meta/recipes-devtools/file/file_5.36.bb (renamed from meta/recipes-devtools/file/file_5.35.bb) | 6 |
2 files changed, 2 insertions, 31 deletions
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 <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 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 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<pver>(?!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 |