[arch-commits] Commit in file/repos (6 files)
Sébastien Luttringer
seblu at archlinux.org
Thu Dec 11 20:50:27 UTC 2014
Date: Thursday, December 11, 2014 @ 21:50:26
Author: seblu
Revision: 227552
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
file/repos/testing-i686/01-fix-broken-xz.patch
(from rev 227551, file/trunk/01-fix-broken-xz.patch)
file/repos/testing-i686/PKGBUILD
(from rev 227551, file/trunk/PKGBUILD)
file/repos/testing-x86_64/01-fix-broken-xz.patch
(from rev 227551, file/trunk/01-fix-broken-xz.patch)
file/repos/testing-x86_64/PKGBUILD
(from rev 227551, file/trunk/PKGBUILD)
Deleted:
file/repos/testing-i686/PKGBUILD
file/repos/testing-x86_64/PKGBUILD
---------------------------------------+
/PKGBUILD | 76 ++++++++++++++++++++++++++++++++
testing-i686/01-fix-broken-xz.patch | 44 ++++++++++++++++++
testing-i686/PKGBUILD | 31 -------------
testing-x86_64/01-fix-broken-xz.patch | 44 ++++++++++++++++++
testing-x86_64/PKGBUILD | 31 -------------
5 files changed, 164 insertions(+), 62 deletions(-)
Copied: file/repos/testing-i686/01-fix-broken-xz.patch (from rev 227551, file/trunk/01-fix-broken-xz.patch)
===================================================================
--- testing-i686/01-fix-broken-xz.patch (rev 0)
+++ testing-i686/01-fix-broken-xz.patch 2014-12-11 20:50:26 UTC (rev 227552)
@@ -0,0 +1,44 @@
+From abc95cd644418cc5205a8ad07d864f0851ac49df Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos at zoulas.com>
+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: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2014-12-11 20:50:04 UTC (rev 227551)
+++ testing-i686/PKGBUILD 2014-12-11 20:50:26 UTC (rev 227552)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=file
-pkgver=5.21
-pkgrel=1
-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")
-md5sums=('549fe96e09041eabece9de2bb28ef923')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --datadir=/usr/share/file
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
- rmdir "$pkgdir/usr/share/man/man5"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: file/repos/testing-i686/PKGBUILD (from rev 227551, file/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2014-12-11 20:50:26 UTC (rev 227552)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=file
+pkgver=5.21
+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"
+ '01-fix-broken-xz.patch')
+md5sums=('549fe96e09041eabece9de2bb28ef923'
+ '62c8d81023e1705d8826d79d0a8fdaae')
+
+prepare() {
+ # https://bugs.archlinux.org/task/43078
+ patch -p1 -d $pkgname-$pkgver < '01-fix-broken-xz.patch'
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --datadir=/usr/share/file
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ rmdir "$pkgdir/usr/share/man/man5"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: file/repos/testing-x86_64/01-fix-broken-xz.patch (from rev 227551, file/trunk/01-fix-broken-xz.patch)
===================================================================
--- testing-x86_64/01-fix-broken-xz.patch (rev 0)
+++ testing-x86_64/01-fix-broken-xz.patch 2014-12-11 20:50:26 UTC (rev 227552)
@@ -0,0 +1,44 @@
+From abc95cd644418cc5205a8ad07d864f0851ac49df Mon Sep 17 00:00:00 2001
+From: Christos Zoulas <christos at zoulas.com>
+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: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2014-12-11 20:50:04 UTC (rev 227551)
+++ testing-x86_64/PKGBUILD 2014-12-11 20:50:26 UTC (rev 227552)
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=file
-pkgver=5.21
-pkgrel=1
-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")
-md5sums=('549fe96e09041eabece9de2bb28ef923')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr --datadir=/usr/share/file
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
- rmdir "$pkgdir/usr/share/man/man5"
-}
-
-# vim:set ts=2 sw=2 et:
Copied: file/repos/testing-x86_64/PKGBUILD (from rev 227551, file/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2014-12-11 20:50:26 UTC (rev 227552)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Sébastien Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=file
+pkgver=5.21
+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"
+ '01-fix-broken-xz.patch')
+md5sums=('549fe96e09041eabece9de2bb28ef923'
+ '62c8d81023e1705d8826d79d0a8fdaae')
+
+prepare() {
+ # https://bugs.archlinux.org/task/43078
+ patch -p1 -d $pkgname-$pkgver < '01-fix-broken-xz.patch'
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --datadir=/usr/share/file
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+ rmdir "$pkgdir/usr/share/man/man5"
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list