Fix Debian bugs #383498 (ODT detected as application/x-zip) and

#409231 (ODT not detected (non-MIME mode)).

diff --git a/magic/Magdir/archive b/magic/Magdir/archive
index a6eeaffa0e8432c3e90f48a6c4743b30034f4441..567db3921158a9a7f86cd74e7d264f4a0c5aad8b 100644 (file)
--- a/magic/Magdir/archive
+++ b/magic/Magdir/archive
@@ -563,15 +563,19 @@
 
 # ZIP archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
 0      string          PK\003\004
-!:mime application/zip
 >4     byte            0x00            Zip archive data
+!:mime application/zip
 >4     byte            0x09            Zip archive data, at least v0.9 to extract
+!:mime application/zip
 >4     byte            0x0a            Zip archive data, at least v1.0 to extract
+!:mime application/zip
 >4     byte            0x0b            Zip archive data, at least v1.1 to extract
+!:mime application/zip
+>0x161 string          WINZIP          Zip archive data, WinZIP self-extracting
+!:mime application/zip
 >4     byte            0x14
 >>30   ubelong         !0x6d696d65     Zip archive data, at least v2.0 to extract
->0x161 string          WINZIP          Zip archive data, WinZIP self-extracting
-
+!:mime application/zip
 
 # OpenOffice.org / KOffice / StarOffice documents
 # From: Abel Cheung <abel@oaka.org>
@@ -611,6 +615,7 @@
 >>>50  string  vnd.oasis.opendocument. OpenDocument
 >>>>73 string  text
 >>>>>77        byte    !0x2d                   Text
+!:mime application/vnd.oasis.opendocument.text
 >>>>>77        string  -template               Text Template
 >>>>>77        string  -web                    HTML Document Template
 >>>>>77        string  -master                 Master Document