rpms/file
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix #1134580 - detect Mach-O universal binary

Browse Source
This commit is contained in:
Jan Kaluza 2014-09-03 11:38:09 +02:00
parent cf93dca77b
commit 7da30d3292
2 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
file-5.19-cafebabe.patch Normal file
View File

@ -0,0 +1,44 @@
diff --git a/magic/Magdir/cafebabe b/magic/Magdir/cafebabe
index b3206e7..271250b 100644
--- a/magic/Magdir/cafebabe
+++ b/magic/Magdir/cafebabe
@@ -15,20 +15,6 @@
# might add another one or two as time goes by...
#
### JAVA START ###
-0 belong 0xcafebabe
->4 belong >30 compiled Java class data,
-!:mime application/x-java-applet
->>6 beshort x version %d.
->>4 beshort x \b%d
-# Which is which?
-#>>4 belong 0x032d (Java 1.0)
-#>>4 belong 0x032d (Java 1.1)
->>4 belong 0x002e (Java 1.2)
->>4 belong 0x002f (Java 1.3)
->>4 belong 0x0030 (Java 1.4)
->>4 belong 0x0031 (Java 1.5)
->>4 belong 0x0032 (Java 1.6)
-
0 belong 0xcafed00d JAR compressed with pack200,
>5 byte x version %d.
>4 byte x \b%d
@@ -51,6 +37,18 @@
0 belong 0xcafebabe
>4 belong 1 Mach-O universal binary with 1 architecture:
>>8 use mach-o \b
+>4 belong >30 compiled Java class data,
+!:mime application/x-java-applet
+>>6 beshort x version %d.
+>>4 beshort x \b%d
+# Which is which?
+#>>4 belong 0x032d (Java 1.0)
+#>>4 belong 0x032d (Java 1.1)
+>>4 belong 0x002e (Java 1.2)
+>>4 belong 0x002f (Java 1.3)
+>>4 belong 0x0030 (Java 1.4)
+>>4 belong 0x0031 (Java 1.5)
+>>4 belong 0x0032 (Java 1.6)
>4 belong >1
>>4 belong <20 Mach-O universal binary with %d architectures:
>>>8 use mach-o \b

7
file.spec
View File

@ -4,7 +4,7 @@
Summary: A utility for determining file types
Name: file
Version: 5.19
Release: 5%{?dist}
Release: 6%{?dist}
License: BSD
Group: Applications/File
Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@ -23,6 +23,7 @@ Patch10: file-5.19-pascal.patch
Patch11: file-5.19-locale-archive.patch
Patch12: file-5.19-msooxml.patch
Patch13: file-5.19-python-3.4.patch
Patch14: file-5.19-cafebabe.patch
URL: http://www.darwinsys.com/file/
Requires: file-libs = %{version}-%{release}
BuildRequires: zlib-devel
@ -96,6 +97,7 @@ file(1) command.
%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
# Patches can generate *.orig files, which can't stay in the magic dir,
# otherwise there will be problems with compiling magic file!
@ -204,6 +206,9 @@ cd %{py3dir}
%endif
%changelog
* Wed Sep 03 2014 Jan Kaluza <jkaluza@redhat.com> - 5.19-6
- fix #1134580 - detect Mach-O universal binary
* Wed Sep 03 2014 Jan Kaluza <jkaluza@redhat.com> - 5.19-5
- fix #1101404 - remove weak Pascal patterns
- fix #1107995 - detect locale-archive