fixes for pack200 from From: Ivan Todoroski <grnch@gmx.net>

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index ccf9621e3639e98fbbc5c98b956e3d03205740a8..8cb985900687fd81023590618a13b00d1d36cc81 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -776,9 +776,6 @@
 0      lelong  0x10201A7A      Symbian installation file (Symbian OS 9.x)
 !:mime x-epoc/x-sisx-app
 
-# Pack200 Java archives, http://jcp.org/en/jsr/detail?id=200
-0      belong  0xcafed00d      Pack200 Java archive
-
 # From "Nelson A. de Oliveira" <naoliv@gmail.com>
 0      string  MPQ\032         MoPaQ (MPQ) archive
 

diff --git a/magic/Magdir/cafebabe b/magic/Magdir/cafebabe
index 40cf5850436a67f47f68f489a42859c5f04bf4cd..db385eaab819a856a422c4c59953baefa2712cc5 100644 (file)
--- a/magic/Magdir/cafebabe
+++ b/magic/Magdir/cafebabe
@@ -21,5 +21,7 @@
 >>4    belong          1               Mach-O fat file with 1 architecture
 >>4    belong          >1
 >>>4   belong          <20             Mach-O fat file with %ld architectures
->2     beshort         0xd00d          JAR compressed with pack200
+>2     beshort         0xd00d          JAR compressed with pack200,
+>>5    byte            x               version %d.
+>>4    byte            x               \b%d
 !:mime application/x-java-pack200