[arch-commits] Commit in file/repos (6 files)
Allan McRae
allan at nymeria.archlinux.org
Thu Mar 6 02:20:27 UTC 2014
Date: Thursday, March 6, 2014 @ 03:20:26
Author: allan
Revision: 206920
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
file/repos/testing-i686/
file/repos/testing-i686/PKGBUILD
(from rev 206919, file/trunk/PKGBUILD)
file/repos/testing-i686/file-5.17-off-by-one.patch
(from rev 206919, file/trunk/file-5.17-off-by-one.patch)
file/repos/testing-x86_64/
file/repos/testing-x86_64/PKGBUILD
(from rev 206919, file/trunk/PKGBUILD)
file/repos/testing-x86_64/file-5.17-off-by-one.patch
(from rev 206919, file/trunk/file-5.17-off-by-one.patch)
-------------------------------------------+
testing-i686/PKGBUILD | 37 ++++++++++++++++++++++++++++
testing-i686/file-5.17-off-by-one.patch | 25 ++++++++++++++++++
testing-x86_64/PKGBUILD | 37 ++++++++++++++++++++++++++++
testing-x86_64/file-5.17-off-by-one.patch | 25 ++++++++++++++++++
4 files changed, 124 insertions(+)
Copied: file/repos/testing-i686/PKGBUILD (from rev 206919, file/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-03-06 02:20:26 UTC (rev 206920)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: 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"
+arch=('i686' 'x86_64')
+license=('custom')
+groups=('base' 'base-devel')
+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
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --datadir=/usr/share/file
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR=${pkgdir} install
+
+ install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
Copied: file/repos/testing-i686/file-5.17-off-by-one.patch (from rev 206919, file/trunk/file-5.17-off-by-one.patch)
===================================================================
--- testing-i686/file-5.17-off-by-one.patch (rev 0)
+++ testing-i686/file-5.17-off-by-one.patch 2014-03-06 02:20:26 UTC (rev 206920)
@@ -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
+
Copied: file/repos/testing-x86_64/PKGBUILD (from rev 206919, file/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-03-06 02:20:26 UTC (rev 206920)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: 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"
+arch=('i686' 'x86_64')
+license=('custom')
+groups=('base' 'base-devel')
+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
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./configure --prefix=/usr --datadir=/usr/share/file
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR=${pkgdir} install
+
+ install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+}
Copied: file/repos/testing-x86_64/file-5.17-off-by-one.patch (from rev 206919, file/trunk/file-5.17-off-by-one.patch)
===================================================================
--- testing-x86_64/file-5.17-off-by-one.patch (rev 0)
+++ testing-x86_64/file-5.17-off-by-one.patch 2014-03-06 02:20:26 UTC (rev 206920)
@@ -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
+
More information about the arch-commits
mailing list