diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-20 11:41:05 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-20 11:41:05 -0300 |
commit | 0d18015803bebeb58911bf791653597291056095 (patch) | |
tree | df21e7972fd9d4555942dbad0bde22066ebf95f3 /testing/file/file-5.07-zip-detect.patch | |
parent | 2f352ca8b911d96566b10adc049f76a552ab93aa (diff) | |
parent | 3da6b13f1eb136d0899bd2e8dd217048bb4d9030 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/keysafe/PKGBUILD
community/lesspipe/PKGBUILD
community/xchat-systray-integration/PKGBUILD
core/gen-init-cpio/PKGBUILD
extra/xarchiver/PKGBUILD
Diffstat (limited to 'testing/file/file-5.07-zip-detect.patch')
-rw-r--r-- | testing/file/file-5.07-zip-detect.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/testing/file/file-5.07-zip-detect.patch b/testing/file/file-5.07-zip-detect.patch deleted file mode 100644 index ce433bb90..000000000 --- a/testing/file/file-5.07-zip-detect.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - --# 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 -+>6 beshort x \b, version %d -+>8 belong x \b, size %d - - # Zoo archiver - 20 lelong 0xfdc4a7dc Zoo archive data |