From 865133d13106bb733fc5f537f01bd8d0fee6837a05431e9c03d966de0c7add62 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 18 Jul 2011 10:03:46 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=26 --- file-5.07-zip.dif | 23 +++++++++++++++++++++++ file.changes | 5 +++++ file.spec | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 file-5.07-zip.dif diff --git a/file-5.07-zip.dif b/file-5.07-zip.dif new file mode 100644 index 0000000..41e85e7 --- /dev/null +++ b/file-5.07-zip.dif @@ -0,0 +1,23 @@ +--- magic/Magdir/archive ++++ magic/Magdir/archive 2011-07-18 09:56:50.651926085 +0000 +@@ -571,6 +571,20 @@ + + # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu) + 0 string PK\003\004 ++>30 ubelong !0x6d696d65 ++>>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 Zip archive data, at least v2.0 to extract ++!:mime application/zip ++ + + # Specialised zip formats which start with a member named 'mimetype' + # (stored uncompressed, with no 'extra field') containing the file's MIME type. diff --git a/file.changes b/file.changes index b70b4ef..7f3c3ce 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 18 12:00:20 CEST 2011 - werner@suse.de + +- Fixed regression on zip archive detection (bnc#706310) + ------------------------------------------------------------------- Tue Jun 14 19:50:04 CEST 2011 - werner@suse.de diff --git a/file.spec b/file.spec index f9f344f..abfe411 100644 --- a/file.spec +++ b/file.spec @@ -44,6 +44,7 @@ Patch7: file-4.20-ssd.dif Patch8: file-4.20-xen.dif Patch9: file-5.07-elf.dif Patch10: file-4.18-printf.dif +Patch11: file-5.07-zip.dif Patch12: file-5.07-option.dif Patch13: file-4.21-scribus.dif Patch15: file-4.21-xcursor.dif @@ -104,6 +105,7 @@ Authors: %patch8 -p0 -b .xen %patch9 -p0 -b .elf %patch10 -p0 -b .prtf +%patch11 -p0 -b .zip %patch12 -p0 -b .opt %patch13 -p0 -b .scri %patch15 -p0 -b .xcur