Date: Saturday, January 3, 2015 @ 14:24:18 Author: seblu Revision: 228387
upgpkg: file 5.22-1 Modified: file/trunk/PKGBUILD Deleted: file/trunk/01-fix-broken-xz.patch file/trunk/02-ignore-exit-code-from-uncompress.patch -------------------------------------------+ 01-fix-broken-xz.patch | 44 ---------------------------- 02-ignore-exit-code-from-uncompress.patch | 34 --------------------- PKGBUILD | 29 +++++++++--------- 3 files changed, 15 insertions(+), 92 deletions(-) Deleted: 01-fix-broken-xz.patch =================================================================== --- 01-fix-broken-xz.patch 2015-01-03 11:27:30 UTC (rev 228386) +++ 01-fix-broken-xz.patch 2015-01-03 13:24:18 UTC (rev 228387) @@ -1,44 +0,0 @@ -From abc95cd644418cc5205a8ad07d864f0851ac49df Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <[email protected]> -Date: Thu, 11 Dec 2014 11:47:08 +0000 -Subject: [PATCH] PR/405: file -bizL git-2.1.3.tar.xz broke because the xz - decompressor dies with SIGPIPE when we stop reading from it early. ignore - SIGPIPE> - ---- - src/compress.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/compress.c b/src/compress.c -index fa9e07a..bf93839 100644 ---- a/src/compress.c -+++ b/src/compress.c -@@ -45,6 +45,7 @@ FILE_RCSID("@(#)$File: compress.c,v 1.74 2014/10/26 20:23:30 christos Exp $") - #endif - #include <string.h> - #include <errno.h> -+#include <signal.h> - #if !defined(__MINGW32__) && !defined(WIN32) - #include <sys/ioctl.h> - #endif -@@ -103,10 +104,12 @@ file_zmagic(struct magic_set *ms, int fd, const char *name, - size_t i, nsz; - int rv = 0; - int mime = ms->flags & MAGIC_MIME; -+ sig_t osigpipe; - - if ((ms->flags & MAGIC_COMPRESS) == 0) - return 0; - -+ osigpipe = signal(SIGPIPE, SIG_IGN); - for (i = 0; i < ncompr; i++) { - if (nbytes < compr[i].maglen) - continue; -@@ -133,6 +136,7 @@ file_zmagic(struct magic_set *ms, int fd, const char *name, - } - } - error: -+ (void)signal(SIGPIPE, osigpipe); - free(newbuf); - ms->flags |= MAGIC_COMPRESS; - return rv; Deleted: 02-ignore-exit-code-from-uncompress.patch =================================================================== --- 02-ignore-exit-code-from-uncompress.patch 2015-01-03 11:27:30 UTC (rev 228386) +++ 02-ignore-exit-code-from-uncompress.patch 2015-01-03 13:24:18 UTC (rev 228387) @@ -1,34 +0,0 @@ -From 05463f7b3d4588a656089e20ab53a5b81b875341 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <[email protected]> -Date: Fri, 12 Dec 2014 16:33:01 +0000 -Subject: [PATCH] PR/405: Ignore exit code from uncompress programs because - some (validly) exit with non-zero code when they get SIGPIPE. - ---- - src/compress.c | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/src/compress.c b/src/compress.c -index bf93839..30be569 100644 ---- a/src/compress.c -+++ b/src/compress.c -@@ -512,11 +512,16 @@ uncompressbuf(struct magic_set *ms, int fd, size_t method, - strerror(errno)); - #endif - n = NODATA; -- } else if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { -+ } else if (!WIFEXITED(status)) { - #ifdef DEBUG -- (void)fprintf(stderr, "Child status (0x%x)\n", status); -+ (void)fprintf(stderr, "Child not exited (0x%x)\n", -+ status); -+#endif -+ } else if (WEXITSTATUS(status) != 0) { -+#ifdef DEBUG -+ (void)fprintf(stderr, "Child exited (0x%d)\n", -+ WEXITSTATUS(status)); - #endif -- n = NODATA; - } - - (void) close(fdin[0]); Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-03 11:27:30 UTC (rev 228386) +++ PKGBUILD 2015-01-03 13:24:18 UTC (rev 228387) @@ -4,8 +4,8 @@ # Contributor: Andreas Radke <[email protected]> pkgname=file -pkgver=5.21 -pkgrel=3 +pkgver=5.22 +pkgrel=1 pkgdesc='File type identification utility' arch=('i686' 'x86_64') license=('custom') @@ -12,19 +12,15 @@ 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-fix-broken-xz.patch' - '02-ignore-exit-code-from-uncompress.patch') -md5sums=('549fe96e09041eabece9de2bb28ef923' - '62c8d81023e1705d8826d79d0a8fdaae' - '39e9867b888bf6e2c1664d3c44712f3b') +source=("ftp://ftp.astron.com/pub/$pkgname/$pkgname-$pkgver.tar.gz";) +md5sums=('8fb13e5259fe447e02c4a37bc7225add') -prepare() { - # https://bugs.archlinux.org/task/43078 - patch -p1 -d $pkgname-$pkgver < '01-fix-broken-xz.patch' - # https://bugs.archlinux.org/task/43082 - patch -p1 -d $pkgname-$pkgver < '02-ignore-exit-code-from-uncompress.patch' -} +#prepare() { +# # https://bugs.archlinux.org/task/43078 +# patch -p1 -d $pkgname-$pkgver < '01-fix-broken-xz.patch' +# # https://bugs.archlinux.org/task/43082 +# patch -p1 -d $pkgname-$pkgver < '02-ignore-exit-code-from-uncompress.patch' +#} build() { cd $pkgname-$pkgver @@ -32,6 +28,11 @@ make } +check() { + cd $pkgname-$pkgver + make check +} + package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install
