diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-13 03:48:21 +0000 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-04-13 03:48:21 +0000 |
| commit | 3d6877ee9ee7bba813a4b6be30a11d2b1942c656 (patch) | |
| tree | 56a6ea47f39af019747bd61e1dab7e6c4302e805 /core/file | |
| parent | d8679f0250762892ab1e1a6d71badc2e9d42a526 (diff) | |
Sun Apr 13 03:42:18 UTC 2014
Diffstat (limited to 'core/file')
| -rw-r--r-- | core/file/PKGBUILD | 38 | ||||
| -rw-r--r-- | core/file/file-5.17-off-by-one.patch | 25 |
2 files changed, 15 insertions, 48 deletions
diff --git a/core/file/PKGBUILD b/core/file/PKGBUILD index 859091149..9d2291d7f 100644 --- a/core/file/PKGBUILD +++ b/core/file/PKGBUILD @@ -1,37 +1,29 @@ -# $Id: PKGBUILD 207101 2014-03-06 12:36:01Z allan $ -# Maintainer: Allan McRae <allan@archlinux.org> +# $Id: PKGBUILD 210213 2014-04-11 23:33:00Z seblu $ +# Mainainer: Sébastien Luttringer <seblu@archlinux.org> +# Contributor: Allan McRae <allan@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> pkgname=file -pkgver=5.17 -pkgrel=2 -pkgdesc="File type identification utility" +pkgver=5.18 +pkgrel=1 +pkgdesc='File type identification utility' arch=('i686' 'x86_64') license=('custom') groups=('base' 'base-devel') -url="http://www.darwinsys.com/file/" +url='http://www.darwinsys.com/file/' depends=('glibc' 'zlib') -source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz - file-5.17-off-by-one.patch) -md5sums=('e19c47e069ced7b01ccb4db402cc01d3' - 'f36a87784f1db2e415ce09badb38fbe8') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # https://github.com/file/file/commit/70c65d2e1841 - patch -p1 -i $srcdir/file-5.17-off-by-one.patch -} +source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('d420d8f2990cd344673acfbf8d76ff5a') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd $pkgname-$pkgver ./configure --prefix=/usr --datadir=/usr/share/file - make + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install - - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + rmdir "$pkgdir/usr/share/man/man5" } diff --git a/core/file/file-5.17-off-by-one.patch b/core/file/file-5.17-off-by-one.patch deleted file mode 100644 index 0e8beb442..000000000 --- a/core/file/file-5.17-off-by-one.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 70c65d2e1841491f59168db1f905e8b14083fb1c Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -Date: Tue, 4 Mar 2014 17:42:19 +0000 -Subject: [PATCH] off by one in out of bounds calculations (Jan Kaluza) - ---- - src/softmagic.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/softmagic.c b/src/softmagic.c -index 170de95..5ed3998 100644 ---- a/src/softmagic.c -+++ b/src/softmagic.c -@@ -72,7 +72,7 @@ private int mcopy(struct magic_set *, union VALUETYPE *, int, int, - private void cvt_32(union VALUETYPE *, const struct magic *); - private void cvt_64(union VALUETYPE *, const struct magic *); - --#define OFFSET_OOB(n, o, i) ((n) < (o) || (i) >= ((n) - (o))) -+#define OFFSET_OOB(n, o, i) ((n) < (o) || (i) > ((n) - (o))) - /* - * softmagic - lookup one file in parsed, in-memory copy of database - * Passed the name and FILE * of one file to be typed. --- -1.8.5.5 - |