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

[Allan McRae]

    Date: Thursday, March 6, 2014 @ 03:19:37
  Author: allan
Revision: 206919

upgpkg: file 5.17-2

fix off by one error

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

----------------------------+
 PKGBUILD                   |   15 ++++++++++++---
 file-5.17-off-by-one.patch |   25 +++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-06 02:13:08 UTC (rev 206918)
+++ PKGBUILD	2014-03-06 02:19:37 UTC (rev 206919)
@@ -4,7 +4,7 @@
 
 pkgname=file
 pkgver=5.17
-pkgrel=1
+pkgrel=2
 pkgdesc="File type identification utility"
 arch=('i686' 'x86_64')
 license=('custom')
@@ -11,9 +11,18 @@
 groups=('base' 'base-devel')
 url="http://www.darwinsys.com/file/"
 depends=('glibc' 'zlib')
-source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e19c47e069ced7b01ccb4db402cc01d3')
+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
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --datadir=/usr/share/file

Added: file-5.17-off-by-one.patch
===================================================================
--- file-5.17-off-by-one.patch	                        (rev 0)
+++ file-5.17-off-by-one.patch	2014-03-06 02:19:37 UTC (rev 206919)
@@ -0,0 +1,25 @@
+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
+