[arch-commits] Commit in file/trunk (2 files)

[Sébastien Luttringer]

    Date: Saturday, December 13, 2014 @ 01:01:35
  Author: seblu
Revision: 227575

upgpkg: file 5.21-3

- fix FS#43082

Added:
  file/trunk/02-ignore-exit-code-from-uncompress.patch
Modified:
  file/trunk/PKGBUILD

-------------------------------------------+
 02-ignore-exit-code-from-uncompress.patch |   34 ++++++++++++++++++++++++++++
 PKGBUILD                                  |   10 +++++---
 2 files changed, 41 insertions(+), 3 deletions(-)

Added: 02-ignore-exit-code-from-uncompress.patch
===================================================================
--- 02-ignore-exit-code-from-uncompress.patch	                        (rev 0)
+++ 02-ignore-exit-code-from-uncompress.patch	2014-12-13 00:01:35 UTC (rev 227575)
@@ -0,0 +1,34 @@
+From 05463f7b3d4588a656089e20ab53a5b81b875341 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos at zoulas.com>
+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	2014-12-12 23:47:17 UTC (rev 227574)
+++ PKGBUILD	2014-12-13 00:01:35 UTC (rev 227575)
@@ -5,7 +5,7 @@
 
 pkgname=file
 pkgver=5.21
-pkgrel=2
+pkgrel=3
 pkgdesc='File type identification utility'
 arch=('i686' 'x86_64')
 license=('custom')
@@ -13,13 +13,17 @@
 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')
+        '01-fix-broken-xz.patch'
+        '02-ignore-exit-code-from-uncompress.patch')
 md5sums=('549fe96e09041eabece9de2bb28ef923'
-         '62c8d81023e1705d8826d79d0a8fdaae')
+         '62c8d81023e1705d8826d79d0a8fdaae'
+         '39e9867b888bf6e2c1664d3c44712f3b')
 
 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() {