summaryrefslogtreecommitdiff
path: root/core/file/file-5.07-zip-detect.patch
diff options
context:
space:
mode:
Diffstat (limited to 'core/file/file-5.07-zip-detect.patch')
-rw-r--r--core/file/file-5.07-zip-detect.patch45
1 files changed, 36 insertions, 9 deletions
diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch
index 3e8f128d8..ce433bb90 100644
--- a/core/file/file-5.07-zip-detect.patch
+++ b/core/file/file-5.07-zip-detect.patch
@@ -1,13 +1,40 @@
---- file-5.07/magic/Magdir/archive.old 2011-04-23 17:02:48.000000000 +0200
-+++ file-5.07/magic/Magdir/archive 2011-05-15 10:14:44.509271579 +0200
-@@ -654,6 +654,10 @@
+diff -Naur file-5.07-orig//magic/Magdir/archive file-5.07/magic/Magdir/archive
+--- file-5.07-orig//magic/Magdir/archive 2011-04-24 01:02:48.000000000 +1000
++++ file-5.07/magic/Magdir/archive 2011-07-14 11:55:11.821178049 +1000
+@@ -1,5 +1,5 @@
+ #------------------------------------------------------------------------------
+-# $File: archive,v 1.63 2011/04/23 15:02:48 christos Exp $
++# $File: archive,v 1.66 2011/05/25 17:45:54 christos Exp $
+ # archive: file(1) magic for archive formats (see also "msdos" for self-
+ # extracting compressed archives)
+ #
+@@ -654,12 +654,6 @@
>>>>78 string -template Template
!:mime application/vnd.oasis.opendocument.image-template
-+>26 byte x Zip archive data
+-# StarView Metafile
+-# From Pierre Ducroquet <pinaraf@pinaraf.info>
+-0 string VCLMTF StarView MetaFile
+->6 beshort x \b, version %d
+->8 belong x \b, size %d
+-
+ # EPUB (OEBPS) books using OCF (OEBPS Container Format)
+ # From: Adam Buchbinder <adam.buchbinder@gmail.com>
+ # http://www.idpf.org/ocf/ocf1.0/download/ocf10.htm, section 4.
+@@ -692,8 +686,15 @@
+ >>4 byte 0x09 \b, at least v0.9 to extract
+ >>4 byte 0x0a \b, at least v1.0 to extract
+ >>4 byte 0x0b \b, at least v1.1 to extract
+->>0x161 string WINZIP \b, WinZIP self-extracting
+ >>4 byte 0x14 \b, at least v2.0 to extract
++>>4 byte 0x2d \b, at least v3.0 to extract
++>>0x161 string WINZIP \b, WinZIP self-extracting
+
-+
-+
- # StarView Metafile
- # From Pierre Ducroquet <pinaraf@pinaraf.info>
- 0 string VCLMTF StarView MetaFile
++# StarView Metafile
++# From Pierre Ducroquet <pinaraf@pinaraf.info>
++0 string VCLMTF StarView MetaFile
++>6 beshort x \b, version %d
++>8 belong x \b, size %d
+
+ # Zoo archiver
+ 20 lelong 0xfdc4a7dc Zoo archive data