Sun Jul 17 23:11:47 UTC 2011

3 files changed, 46 insertions, 25 deletions

diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD
index 9869a976c..2a5489e9d 100644
--- a/core/file/PKGBUILD
+++ b/core/file/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 123963 2011-05-15 08:19:29Z tpowa $
+# $Id: PKGBUILD 131726 2011-07-14 01:54:47Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=file
 pkgver=5.07
-pkgrel=3
+pkgrel=4
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -13,19 +13,17 @@ url="http://www.darwinsys.com/file/"
 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 
 }
diff --git a/core/file/file-5.07-zip-detect.patch b/core/file/file-5.07-zip-detect.patch
index 3e8f128d8..ce433bb90 100644
--- a/core/file/file-5.07-zip-detect.patch
+++ b/core/file/file-5.07-zip-detect.patch
@@ -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 <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
++# 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
diff --git a/core/lvm2/PKGBUILD b/core/lvm2/PKGBUILD
index 0e13adba9..a2f1e5010 100644
--- a/core/lvm2/PKGBUILD
+++ b/core/lvm2/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 129975 2011-06-30 17:54:05Z thomas $
+# $Id: PKGBUILD 131232 2011-07-12 03:27:34Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgbase=lvm2
 pkgname=('lvm2' 'device-mapper')
-pkgver=2.02.85
+pkgver=2.02.86
 _pkgverlvm=${pkgver}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://sourceware.org/lvm2/"
 license=('GPL2' 'LGPL2.1')
@@ -14,23 +14,19 @@ groups=('base')
 source=(ftp://sources.redhat.com/pub/lvm2/LVM2.${_pkgverlvm}.tgz
         lvm2_install
         lvm2_hook
-        Be-quiet-on-removing-cache-on-read-only-fs.diff
         11-dm-initramfs.rules)
-md5sums=('91785ca438e5ce679dd3a386b183d552'
+md5sums=('3b42dec4d15ad106302a35149082a20e'
          'dcb82506d732cc7b10159a89b579dba8'
          '8d613b84a175cd85f752a75198e40e15'
-         '6db89da27928d2415a8e26cd0a842712'
          '69e40679cd8b3658bfc619e48baae125')
-sha1sums=('43ba2a3be84b2e897ae6b47b0b0be7e212216be7'
+sha1sums=('f435b389cc11c8f415244fe382f3839d1676770c'
           '7f108b2f2056eb050fc898bf5190ecf9145aed8a'
           'a0e0513c2efb183006e57e595d93ce18be297928'
-          '6d7dd04be291d7537235704c816a701fd5beacc0'
           'f6a554eea9557c3c236df2943bb6e7e723945c41')
 
 build() {
   cd "${srcdir}/LVM2.${_pkgverlvm}"
   sed -i 's|/usr/bin/tr|/bin/tr|' scripts/lvmdump.sh
-  patch -p1 -i ../Be-quiet-on-removing-cache-on-read-only-fs.diff
   unset LDFLAGS
   ./configure --prefix= --sysconfdir=/etc --localstatedir=/var --datarootdir=/usr/share \
     --includedir=/usr/include --with-usrlibdir=/usr/lib \