Date: Tuesday, January 18, 2011 @ 23:37:18 Author: allan Revision: 106779
upgpkg: file 5.05-1 upstream update Added: file/trunk/file-5.05-zip64.patch Modified: file/trunk/PKGBUILD Deleted: file/trunk/file-5.04-python-2.7.patch file/trunk/file-5.04-zip64.patch ----------------------------+ PKGBUILD | 16 ++++++---------- file-5.04-python-2.7.patch | 20 -------------------- file-5.04-zip64.patch | 11 ----------- file-5.05-zip64.patch | 11 +++++++++++ 4 files changed, 17 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-01-19 01:33:32 UTC (rev 106778) +++ PKGBUILD 2011-01-19 04:37:18 UTC (rev 106779) @@ -3,8 +3,8 @@ # Contributor: Andreas Radke <[email protected]> pkgname=file -pkgver=5.04 -pkgrel=3 +pkgver=5.05 +pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -13,20 +13,16 @@ depends=('glibc' 'zlib') options=('!libtool') source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.04-python-2.7.patch - file-5.04-zip64.patch) -md5sums=('accade81ff1cc774904b47c72c8aeea0' - '4f223a3ff4f157320f1e6faffc4afb88' - 'b547eb3430adb3deb756d3a43dd7ad46') + file-5.05-zip64.patch) +md5sums=('0b429063710457be2bd17a18389cb018' + '385f020467debd98bd2d8df6143f93d0') build() { cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#\$(datadir)/misc#\$(datadir)#' configure - # identify python 2.7 byte-compiled files - patch -Np1 -i ../file-5.04-python-2.7.patch # identify zip64 files - patch -Np1 -i ../file-5.04-zip64.patch + patch -Np1 -i ${srcdir}/file-5.05-zip64.patch ./configure --prefix=/usr --datadir=/usr/share/file make Deleted: file-5.04-python-2.7.patch =================================================================== --- file-5.04-python-2.7.patch 2011-01-19 01:33:32 UTC (rev 106778) +++ file-5.04-python-2.7.patch 2011-01-19 04:37:18 UTC (rev 106779) @@ -1,20 +0,0 @@ -diff -up file-5.04/magic/Magdir/python.py27 file-5.04/magic/Magdir/python ---- file-5.04/magic/Magdir/python.py27 2009-10-27 15:49:57.000000000 +0100 -+++ file-5.04/magic/Magdir/python 2010-08-12 11:44:48.387964124 +0200 -@@ -6,7 +6,7 @@ - # From: David Necas <[email protected]> - # often the module starts with a multiline string - 0 string """ a python script text executable --# MAGIC as specified in Python/import.c (1.5 to 2.6a1 and 3.1a0, assuming -+# MAGIC as specified in Python/import.c (1.5 to 2.7a0 and 3.1a0, assuming - # that Py_UnicodeFlag is off for Python 2) - # 20121 ( YEAR - 1995 ) + MONTH + DAY (little endian followed by "\r\n" - 0 belong 0x994e0d0a python 1.5/1.6 byte-compiled -@@ -17,6 +17,7 @@ - 0 belong 0x6df20d0a python 2.4 byte-compiled - 0 belong 0xb3f20d0a python 2.5 byte-compiled - 0 belong 0xd1f20d0a python 2.6 byte-compiled -+0 belong 0x03f30d0a python 2.7 byte-compiled - 0 belong 0x3b0c0d0a python 3.0 byte-compiled - 0 belong 0x4f0c0d0a python 3.1 byte-compiled - Deleted: file-5.04-zip64.patch =================================================================== --- file-5.04-zip64.patch 2011-01-19 01:33:32 UTC (rev 106778) +++ file-5.04-zip64.patch 2011-01-19 04:37:18 UTC (rev 106779) @@ -1,11 +0,0 @@ ---- file-5.04/magic/Magdir/archive 2010-09-27 17:52:19.242245630 +0530 -+++ file-5.04/magic/Magdir/archive 2010-09-27 17:52:12.015252938 +0530 -@@ -581,6 +581,8 @@ - !:mime application/zip - >>4 byte 0x14 Zip archive data, at least v2.0 to extract - !:mime application/zip -+>>4 byte 0x2d Zip64 archive data, at least v3.0 to extract -+!:mime application/zip - - # OpenOffice.org / KOffice / StarOffice documents - # Listed here because they ARE zip files Added: file-5.05-zip64.patch =================================================================== --- file-5.05-zip64.patch (rev 0) +++ file-5.05-zip64.patch 2011-01-19 04:37:18 UTC (rev 106779) @@ -0,0 +1,11 @@ +diff -Naur file-5.05-old//magic/Magdir/archive file-5.05/magic/Magdir/archive +--- file-5.05-old//magic/Magdir/archive 2011-01-08 06:24:25.000000000 +1000 ++++ file-5.05/magic/Magdir/archive 2011-01-19 14:37:47.766673895 +1000 +@@ -688,6 +688,7 @@ + >>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 + + # Zoo archiver + 20 lelong 0xfdc4a7dc Zoo archive data
