patches from apple.

diff --git a/magic/Magdir/apple b/magic/Magdir/apple
index 3ab60b0b4026a6a563c37ccedb2c746ebd3cf1ad..093ac0aba40def3674db68f05735671ae06cae0d 100644 (file)
--- a/magic/Magdir/apple
+++ b/magic/Magdir/apple
@@ -199,3 +199,30 @@
 0      string          caff            CoreAudio Format audio file
 >4     beshort         <10             version %d
 >6     beshort         x
+
+
+#------------------------------------------------------------------------------
+# Keychain database files
+0      string          kych            Mac OS X Keychain File
+
+#------------------------------------------------------------------------------
+# Code Signing related file types
+0      belong          0xfade0c00      Mac OS X Code Requirement
+>8     belong          1                       (opExpr)
+>4     belong          x                       - %d bytes
+
+0      belong          0xfade0c01      Mac OS X Code Requirement Set
+>8     belong          >1                      containing %d items
+>4     belong          x                       - %d bytes
+
+0      belong          0xfade0c02      Mac OS X Code Directory
+>8     belong          x                       version %x
+>12    belong          >0                      flags 0x%x
+>4     belong          x                       - %d bytes
+
+0      belong          0xfade0cc0      Mac OS X Detached Code Signature (non-executable)
+>4     belong          x                       - %d bytes
+
+0      belong          0xfade0cc1      Mac OS X Detached Code Signature
+>8     belong          >1                      (%d elements)
+>4     belong          x                       - %d bytes

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index f1e74effe245b1e2b23147d427bc86a1f0d934c6..ef8430e63e7ed214266d1e34df5d072ff1d26c1c 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -531,6 +531,7 @@
 
 # ZIP archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
 0      string          PK\003\004
+>      byte            0x00            Zip archive data
 >4     byte            0x09            Zip archive data, at least v0.9 to extract
 >4     byte            0x0a            Zip archive data, at least v1.0 to extract
 >4     byte            0x0b            Zip archive data, at least v1.1 to extract

diff --git a/magic/Magdir/efi b/magic/Magdir/efi
new file mode 100644 (file)
index 0000000..4eec2eb
--- /dev/null
+++ b/magic/Magdir/efi
@@ -0,0 +1,14 @@
+
+#------------------------------------------------------------------------------
+# efi:  file(1) magic for Universal EFI binaries
+
+0      lelong  0x0ef1fab9
+>4     lelong  1               Universal EFI binary with 1 architecture
+>>&0   lelong  7               \b, i386
+>>&0   lelong  0x01000007      \b, x86_64
+>4     lelong  2               Universal EFI binary with 2 architectures
+>>&0   lelong  7               \b, i386
+>>&0   lelong  0x01000007      \b, x86_64
+>>&20  lelong  7               \b, i386
+>>&20  lelong  0x01000007      \b, x86_64
+>4     lelong  >2              Universal EFI binary with %ld architectures

diff --git a/magic/Magdir/macintosh b/magic/Magdir/macintosh
index 5d9637630289a8f2378583e9cc6bc2364517cee3..4acd5c88e17030aaf10ed246913b71929077211d 100644 (file)
--- a/magic/Magdir/macintosh
+++ b/magic/Magdir/macintosh
@@ -357,4 +357,4 @@
 >>>>0xa54      belong          x               number of blocks: %d
 
 # From: Remi Mommsen <mommsen@slac.stanford.edu>
-0              string          BOMStore        Mac OS X bill of materials (BOM) fil
+0              string          BOMStore        Mac OS X bill of materials (BOM) file

diff --git a/magic/Makefile.am b/magic/Makefile.am
index bc5e002a3750c665a2276db8b5feee61e6503e38..730ad32530413a9727ea00557a2890a1ea28bea5 100644 (file)
--- a/magic/Makefile.am
+++ b/magic/Makefile.am
@@ -77,6 +77,7 @@ Magdir/digital \
 Magdir/dolby \
 Magdir/dump \
 Magdir/editors \
+Magdir/efi \
 Magdir/elf \
 Magdir/encore \
 Magdir/epoc \