Date: Wednesday, July 13, 2011 @ 21:54:47
Author: allan
Revision: 131726
upgpkg: file 5.07-4
upstream fix for zip detection (FS#24571)
Modified:
file/trunk/PKGBUILD
file/trunk/file-5.07-zip-detect.patch
----------------------------+
PKGBUILD | 10 +++------
file-5.07-zip-detect.patch | 45 ++++++++++++++++++++++++++++++++++---------
2 files changed, 40 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2011-07-14 01:51:53 UTC (rev 131725)
+++ PKGBUILD 2011-07-14 01:54:47 UTC (rev 131726)
@@ -4,7 +4,7 @@
pkgname=file
pkgver=5.07
-pkgrel=3
+pkgrel=4
pkgdesc="File type identification utility"
arch=('i686' 'x86_64')
license=('custom')
@@ -13,19 +13,17 @@
depends=('glibc' 'zlib')
options=('!libtool')
source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz
- file-5.05-zip64.patch
file-5.07-zip-detect.patch)
md5sums=('b8d1f9a8a644067bd0a703cebf3f4858'
- '385f020467debd98bd2d8df6143f93d0'
- 'bcbf2e152f38003a2736298bbd0f37f8')
+ 'ac155cf89af6665dfee76738c27366d8')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
- # identify zip64 files
- patch -Np1 -i ${srcdir}/file-5.05-zip64.patch
+ # combined upstream patches to fix zip file detection
patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch
+
./configure --prefix=/usr --datadir=/usr/share/file
make
}
Modified: file-5.07-zip-detect.patch
===================================================================
--- file-5.07-zip-detect.patch 2011-07-14 01:51:53 UTC (rev 131725)
+++ file-5.07-zip-detect.patch 2011-07-14 01:54:47 UTC (rev 131726)
@@ -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 <[email protected]>
+-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 <[email protected]>
+ # 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 <[email protected]>
- 0 string VCLMTF StarView MetaFile
++# StarView Metafile
++# From Pierre Ducroquet <[email protected]>
++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
