Date: Thursday, December 11, 2014 @ 13:35:38
Author: seblu
Revision: 227453
upgpkg: file 5.21-1
Modified:
file/trunk/PKGBUILD
Deleted:
file/trunk/01-cve-2014-3710.patch
------------------------+
01-cve-2014-3710.patch | 18 ------------------
PKGBUILD | 17 +++++------------
2 files changed, 5 insertions(+), 30 deletions(-)
Deleted: 01-cve-2014-3710.patch
===================================================================
--- 01-cve-2014-3710.patch 2014-12-11 12:08:04 UTC (rev 227452)
+++ 01-cve-2014-3710.patch 2014-12-11 12:35:38 UTC (rev 227453)
@@ -1,18 +0,0 @@
-diff --git a/src/readelf.c b/src/readelf.c
-index 08f81f5..9ebdebd 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -477,6 +477,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset,
size_t size,
- uint32_t namesz, descsz;
- unsigned char *nbuf = CAST(unsigned char *, vbuf);
-
-+ if (xnh_sizeof + offset > size) {
-+ /*
-+ * We're out of note headers.
-+ */
-+ return xnh_sizeof + offset;
-+ }
-+
- (void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof);
- offset += xnh_sizeof;
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-11 12:08:04 UTC (rev 227452)
+++ PKGBUILD 2014-12-11 12:35:38 UTC (rev 227453)
@@ -1,11 +1,11 @@
# $Id$
-# Mainainer: Sébastien Luttringer <[email protected]>
+# Maintainer: Sébastien Luttringer <[email protected]>
# Contributor: Allan McRae <[email protected]>
# Contributor: Andreas Radke <[email protected]>
pkgname=file
-pkgver=5.20
-pkgrel=2
+pkgver=5.21
+pkgrel=1
pkgdesc='File type identification utility'
arch=('i686' 'x86_64')
license=('custom')
@@ -12,16 +12,9 @@
groups=('base' 'base-devel')
url='http://www.darwinsys.com/file/'
depends=('glibc' 'zlib')
-source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz";
- '01-cve-2014-3710.patch')
-md5sums=('5d5e13eb3e0e13839da869a31790faf2'
- 'dde0002f513f44c4ef6c2152f0ece4ed')
+source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz";)
+md5sums=('549fe96e09041eabece9de2bb28ef923')
-prepare() {
- # https://bugs.archlinux.org/task/42759
- patch -p1 -d $pkgname-$pkgver < '01-cve-2014-3710.patch'
-}
-
build() {
cd $pkgname-$pkgver
./configure --prefix=/usr --datadir=/usr/share/file
