update to new version 5.24
This commit is contained in:
Jan Kaluza
parent
801858b197
commit
ef4b8e93a1
1
.gitignore
vendored
1
.gitignore
vendored
@ -9,3 +9,4 @@ file-5.04.tar.gz
|
||||
/file-5.19.tar.gz
|
||||
/file-5.20.tar.gz
|
||||
/file-5.22.tar.gz
|
||||
/file-5.24.tar.gz
|
||||
|
||||
@ -1,42 +1,56 @@
|
||||
diff --git a/magic/Magdir/perl b/magic/Magdir/perl
|
||||
index b5b54fb..490dbeb 100644
|
||||
index 127a373..7cf6434 100644
|
||||
--- a/magic/Magdir/perl
|
||||
+++ b/magic/Magdir/perl
|
||||
@@ -7,30 +7,39 @@
|
||||
@@ -7,40 +7,54 @@
|
||||
# Send additions to <perl5-porters@perl.org>
|
||||
0 search/1 eval\ "exec\ /bin/perl Perl script text
|
||||
0 search/1024 eval\ "exec\ perl Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1 eval\ "exec\ /usr/bin/perl Perl script text
|
||||
0 search/1024 eval\ "exec\ /bin/perl Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1 eval\ "exec\ /usr/local/bin/perl Perl script text
|
||||
0 search/1024 eval\ "exec\ /usr/bin/perl Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1 eval\ '(exit\ $?0)'\ &&\ eval\ 'exec Perl script text
|
||||
0 search/1024 eval\ "exec\ /usr/local/bin/perl Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1 #!/usr/bin/env\ perl Perl script text executable
|
||||
0 search/1024 eval\ 'exec\ perl Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1 #!\ /usr/bin/env\ perl Perl script text executable
|
||||
0 search/1024 eval\ 'exec\ /bin/perl Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1 #!
|
||||
->0 regex \^#!.*/bin/perl$ Perl script text executable
|
||||
+>0 regex \^#!.*/bin/perl.*$ Perl script text executable
|
||||
0 search/1024 eval\ 'exec\ /usr/bin/perl Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1024 eval\ 'exec\ /usr/local/bin/perl Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1024 eval\ '(exit\ $?0)'\ &&\ eval\ 'exec Perl script text
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1024 #!/usr/bin/env\ perl Perl script text executable
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1024 #!\ /usr/bin/env\ perl Perl script text executable
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
0 search/1024 #!
|
||||
>0 regex \^#!.*/bin/perl([[:space:]].*)*$ Perl script text executable
|
||||
!:mime text/x-perl
|
||||
+!:strength + 30
|
||||
|
||||
# by Dmitry V. Levin and Alexey Tourbin
|
||||
# check the first line
|
||||
0 search/1 package
|
||||
0 search/1024 package
|
||||
>0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *; Perl5 module source text
|
||||
-!:strength + 10
|
||||
+!:mime text/x-perl
|
||||
+!:strength + 45
|
||||
# not 'p', check other lines
|
||||
0 search/1 !p
|
||||
0 search/1024 !p
|
||||
>0 regex \^package[\ \t]+[0-9A-Za-z_:]+\ *;
|
||||
>>0 regex \^1\ *;|\^(use|sub|my)\ .*[(;{=] Perl5 module source text
|
||||
-!:strength + 10
|
||||
|
||||
@ -1,8 +1,16 @@
|
||||
diff --git a/magic/Magdir/cafebabe b/magic/Magdir/cafebabe
|
||||
index b3206e7..271250b 100644
|
||||
index 51e97c4..1d007b6 100644
|
||||
--- a/magic/Magdir/cafebabe
|
||||
+++ b/magic/Magdir/cafebabe
|
||||
@@ -15,20 +15,6 @@
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
-# $File: cafebabe,v 1.20 2015/05/29 14:21:58 christos Exp $
|
||||
+# $File: cafebabe,v 1.17 2015/01/01 17:07:00 christos Exp $
|
||||
# Cafe Babes unite!
|
||||
#
|
||||
# Since Java bytecode and Mach-O universal binaries have the same magic number,
|
||||
@@ -15,22 +15,6 @@
|
||||
# might add another one or two as time goes by...
|
||||
#
|
||||
### JAVA START ###
|
||||
@ -19,13 +27,17 @@ index b3206e7..271250b 100644
|
||||
->>4 belong 0x0030 (Java 1.4)
|
||||
->>4 belong 0x0031 (Java 1.5)
|
||||
->>4 belong 0x0032 (Java 1.6)
|
||||
->>4 belong 0x0033 (Java 1.7)
|
||||
->>4 belong 0x0034 (Java 1.8)
|
||||
-
|
||||
0 belong 0xcafed00d JAR compressed with pack200,
|
||||
>5 byte x version %d.
|
||||
>4 byte x \b%d
|
||||
@@ -51,6 +37,18 @@
|
||||
@@ -52,18 +36,26 @@
|
||||
|
||||
0 belong 0xcafebabe
|
||||
>4 belong 1 Mach-O universal binary with 1 architecture:
|
||||
-!:mime application/x-mach-binary
|
||||
>>8 use mach-o \b
|
||||
+>4 belong >30 compiled Java class data,
|
||||
+!:mime application/x-java-applet
|
||||
@ -41,4 +53,16 @@ index b3206e7..271250b 100644
|
||||
+>>4 belong 0x0032 (Java 1.6)
|
||||
>4 belong >1
|
||||
>>4 belong <20 Mach-O universal binary with %d architectures:
|
||||
-!:mime application/x-mach-binary
|
||||
>>>8 use mach-o \b
|
||||
>>>28 use mach-o \b
|
||||
->>4 belong 2
|
||||
+>>4 belong >2
|
||||
>>>48 use mach-o \b
|
||||
->>4 belong 3
|
||||
+>>4 belong >3
|
||||
>>>68 use mach-o \b
|
||||
->>4 belong 4
|
||||
->>>88 use mach-o \b
|
||||
|
||||
### MACH-O END ###
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
|
||||
Summary: A utility for determining file types
|
||||
Name: file
|
||||
Version: 5.22
|
||||
Release: 5%{?dist}
|
||||
Version: 5.24
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Group: Applications/File
|
||||
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
|
||||
@ -21,7 +21,7 @@ Patch8: file-5.14-perl.patch
|
||||
Patch14: file-5.19-cafebabe.patch
|
||||
Patch15: file-5.22-awk-perl.patch
|
||||
Patch16: file-5.22-zlib.patch
|
||||
Patch17: file-5.22-jpeg.patch
|
||||
Patch17: file-5.24-varied.patch
|
||||
URL: http://www.darwinsys.com/file/
|
||||
Requires: file-libs = %{version}-%{release}
|
||||
BuildRequires: zlib-devel
|
||||
@ -202,6 +202,9 @@ cd %{py3dir}
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Jul 16 2015 Jan Kaluza <jkaluza@redhat.com> - 5.24-1
|
||||
- update to new version 5.24
|
||||
|
||||
* Mon Jun 22 2015 Jan Kaluza <jkaluza@redhat.com> - 5.22-5
|
||||
- fix #1201630 - fix recursion in JPEG magic pattern
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user