diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:56:37 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-08-08 10:56:37 -0300 |
| commit | 8b82a3250aa4e181b97e7faeb055a00e718bdadb (patch) | |
| tree | 9f1af6b49d55bbcc847ec8ebed1f8ae2f197e461 /core/file | |
| parent | e0981df8c5fce1353e1499a5085e27f92afddcea (diff) | |
| parent | 665308e50fd95e984da057ab8ddb6505b596b841 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lxsession-lite/PKGBUILD
community/synce-odccm/PKGBUILD
extra/cyrus-sasl-plugins/PKGBUILD
Diffstat (limited to 'core/file')
| -rw-r--r-- | core/file/file-5.07-zip-detect.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch deleted file mode 100644 index ce433bb90..000000000 --- a/core/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 |