From c603884a4f1775271da7183d50836708408e69df Mon Sep 17 00:00:00 2001 From: abveritas Date: Tue, 14 Jun 2011 03:14:41 +0000 Subject: [PATCH] continuation glibc/core update b43-fwcutter, bc, cpio, dhcpcd, diffutils, file --- b43-fwcutter/PKGBUILD | 19 +++++++++-------- bc/PKGBUILD | 2 +- cpio/PKGBUILD | 13 +++++++++--- dhcpcd/PKGBUILD | 4 ++-- diffutils/PKGBUILD | 10 +++++---- file/PKGBUILD | 36 ++++++++++++++++++++++++--------- file/file-5.05-zip64.patch | 11 ++++++++++ file/file-5.07-zip-detect.patch | 13 ++++++++++++ 8 files changed, 81 insertions(+), 27 deletions(-) create mode 100644 file/file-5.05-zip64.patch create mode 100644 file/file-5.07-zip-detect.patch diff --git a/b43-fwcutter/PKGBUILD b/b43-fwcutter/PKGBUILD index c09e7cdb3..494706a9a 100644 --- a/b43-fwcutter/PKGBUILD +++ b/b43-fwcutter/PKGBUILD @@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=b43-fwcutter -pkgver=013 +pkgver=014 pkgrel=1 pkgdesc="firmware extractor for the bcm43xx kernel module" url="http://linuxwireless.org/en/users/Drivers/b43" @@ -16,13 +16,16 @@ depends=('glibc') license=('GPL') arch=('i686' 'x86_64') source=(http://bu3sch.de/b43/fwcutter/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3547ec6c474ac1bc2c4a5bb765b791a4') +md5sums=('dd63f9149510bd6e01b89314e955083b') -build() -{ - cd $startdir/src/$pkgname-$pkgver - make || return 1 - install -D -m755 b43-fwcutter $startdir/pkg/usr/bin/b43-fwcutter || return 1 - install -D -m644 b43-fwcutter.1 $startdir/pkg/usr/share/man/man1/b43-fwcutter.1 || return 1 +build() { + cd $srcdir/$pkgname-$pkgver + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + install -D -m755 b43-fwcutter $pkgdir/usr/bin/b43-fwcutter + install -D -m644 b43-fwcutter.1 $pkgdir/usr/share/man/man1/b43-fwcutter.1 } diff --git a/bc/PKGBUILD b/bc/PKGBUILD index 2c6bea440..54918fc23 100644 --- a/bc/PKGBUILD +++ b/bc/PKGBUILD @@ -9,7 +9,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=bc pkgver=1.06 -pkgrel=7 +pkgrel=8 pkgdesc="An arbitrary precision calculator language" arch=('i686' 'x86_64') url="http://www.gnu.org/software/bc/" diff --git a/cpio/PKGBUILD b/cpio/PKGBUILD index 9f34c4500..d6a4cae3d 100644 --- a/cpio/PKGBUILD +++ b/cpio/PKGBUILD @@ -1,8 +1,15 @@ -# $Id: PKGBUILD 76085 2010-04-07 18:00:10Z tpowa $ -# Maintainer: judd +# +# Core Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa + +# include global config +source ../_buildscripts/${current_repo}-${_arch}-cfg.conf + pkgname=cpio pkgver=2.11 -pkgrel=2 +pkgrel=3 pkgdesc="A tool to copy files into or out of a cpio or tar archive" arch=(i686 x86_64) license=('GPL') diff --git a/dhcpcd/PKGBUILD b/dhcpcd/PKGBUILD index a3b2fcc38..4efa5d842 100644 --- a/dhcpcd/PKGBUILD +++ b/dhcpcd/PKGBUILD @@ -5,7 +5,7 @@ # maintainer (x86_64): Manuel Tortosa pkgname=dhcpcd -pkgver=5.2.8 +pkgver=5.2.12 pkgrel=1 pkgdesc="RFC2131 compliant DHCP client daemon" url="http://roy.marples.name/dhcpcd/" @@ -17,7 +17,7 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf') options=('emptydirs') # We Need the Empty /var/lib/dhcpcd Directory source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \ 'dhcpcd.conf.d') -sha1sums=('3a7ffc6d3599fd4146791853b083dc577d8dd9c0' +sha1sums=('27378a251705c7888332e6d60eea7805d1f8aeb5' 'b67b9ce6a2faaca75fea356966a16be2283b7db0') build() { diff --git a/diffutils/PKGBUILD b/diffutils/PKGBUILD index 6f0c43214..415951c3b 100644 --- a/diffutils/PKGBUILD +++ b/diffutils/PKGBUILD @@ -1,10 +1,12 @@ -# $Id: PKGBUILD 79537 2010-05-04 12:05:07Z allan $ -# Maintainer: Allan McRae -# Contributor: Andreas Radke +# +# Chakra Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa pkgname=diffutils pkgver=3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Utility programs used for creating patch files" arch=('i686' 'x86_64') url="http://www.gnu.org/software/diffutils" diff --git a/file/PKGBUILD b/file/PKGBUILD index 70b9e89f8..897bdbf11 100644 --- a/file/PKGBUILD +++ b/file/PKGBUILD @@ -1,10 +1,15 @@ -# $Id: PKGBUILD 65356 2010-01-28 04:43:43Z allan $ -# Maintainer: Allan McRae -# Contributor: Andreas Radke +# +# Core Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa + +# include global config +source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgname=file -pkgver=5.04 -pkgrel=2 +pkgver=5.07 +pkgrel=1 pkgdesc="File type identification utility" arch=('i686' 'x86_64') license=('custom') @@ -12,14 +17,27 @@ groups=('base') url="http://www.darwinsys.com/file/" depends=('glibc' 'zlib') options=('!libtool') -source=(ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('accade81ff1cc774904b47c72c8aeea0') +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') build() { - cd ${srcdir}/$pkgname-$pkgver + cd "${srcdir}/${pkgname}-${pkgver}" sed -i 's#\$(datadir)/misc#\$(datadir)#' configure + + # identify zip64 files + patch -Np1 -i ${srcdir}/file-5.05-zip64.patch + patch -Np1 -i ${srcdir}/file-5.07-zip-detect.patch ./configure --prefix=/usr --datadir=/usr/share/file - make || return 1 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR=${pkgdir} install install -dm755 ${pkgdir}/usr/share/misc ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc diff --git a/file/file-5.05-zip64.patch b/file/file-5.05-zip64.patch new file mode 100644 index 000000000..2c9aede5f --- /dev/null +++ b/file/file-5.05-zip64.patch @@ -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 diff --git a/file/file-5.07-zip-detect.patch b/file/file-5.07-zip-detect.patch new file mode 100644 index 000000000..3e8f128d8 --- /dev/null +++ b/file/file-5.07-zip-detect.patch @@ -0,0 +1,13 @@ +--- 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 @@ + >>>>78 string -template Template + !:mime application/vnd.oasis.opendocument.image-template + ++>26 byte x Zip archive data ++ ++ ++ + # StarView Metafile + # From Pierre Ducroquet + 0 string VCLMTF StarView MetaFile