[arch-commits] Commit in file/trunk (PKGBUILD file-5.17-off-by-one.patch)

[Sébastien Luttringer]

    Date: Thursday, March 27, 2014 @ 01:34:09
  Author: seblu
Revision: 208795

upgpkg: file 5.18-1

Modified:
  file/trunk/PKGBUILD
Deleted:
  file/trunk/file-5.17-off-by-one.patch

----------------------------+
 PKGBUILD                   |   36 ++++++++++++++----------------------
 file-5.17-off-by-one.patch |   25 -------------------------
 2 files changed, 14 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-26 23:14:00 UTC (rev 208794)
+++ PKGBUILD	2014-03-27 00:34:09 UTC (rev 208795)
@@ -1,37 +1,29 @@
 # $Id$
-# Maintainer: Allan McRae <allan at archlinux.org>
+# Mainainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: Andreas Radke <andyrtr at 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')
+source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('d420d8f2990cd344673acfbf8d76ff5a')
 
-prepare() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  
-  # https://github.com/file/file/commit/70c65d2e1841
-  patch -p1 -i $srcdir/file-5.17-off-by-one.patch
-}
-
 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"
 }

Deleted: file-5.17-off-by-one.patch
===================================================================
--- file-5.17-off-by-one.patch	2014-03-26 23:14:00 UTC (rev 208794)
+++ file-5.17-off-by-one.patch	2014-03-27 00:34:09 UTC (rev 208795)
@@ -1,25 +0,0 @@
-From 70c65d2e1841491f59168db1f905e8b14083fb1c Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos at 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
-