[arch-commits] Commit in gzip/repos (8 files)
Sébastien Luttringer
seblu at archlinux.org
Tue Apr 26 16:32:05 UTC 2016
Date: Tuesday, April 26, 2016 @ 18:32:05
Author: seblu
Revision: 266178
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
gzip/repos/testing-i686/
gzip/repos/testing-i686/01-fix-bug-with-l-output-to-pipes.patch
(from rev 266177, gzip/trunk/01-fix-bug-with-l-output-to-pipes.patch)
gzip/repos/testing-i686/PKGBUILD
(from rev 266177, gzip/trunk/PKGBUILD)
gzip/repos/testing-i686/gzip.install
(from rev 266177, gzip/trunk/gzip.install)
gzip/repos/testing-x86_64/
gzip/repos/testing-x86_64/01-fix-bug-with-l-output-to-pipes.patch
(from rev 266177, gzip/trunk/01-fix-bug-with-l-output-to-pipes.patch)
gzip/repos/testing-x86_64/PKGBUILD
(from rev 266177, gzip/trunk/PKGBUILD)
gzip/repos/testing-x86_64/gzip.install
(from rev 266177, gzip/trunk/gzip.install)
--------------------------------------------------------+
testing-i686/01-fix-bug-with-l-output-to-pipes.patch | 45 +++++++++++++
testing-i686/PKGBUILD | 51 +++++++++++++++
testing-i686/gzip.install | 22 ++++++
testing-x86_64/01-fix-bug-with-l-output-to-pipes.patch | 45 +++++++++++++
testing-x86_64/PKGBUILD | 51 +++++++++++++++
testing-x86_64/gzip.install | 22 ++++++
6 files changed, 236 insertions(+)
Copied: gzip/repos/testing-i686/01-fix-bug-with-l-output-to-pipes.patch (from rev 266177, gzip/trunk/01-fix-bug-with-l-output-to-pipes.patch)
===================================================================
--- testing-i686/01-fix-bug-with-l-output-to-pipes.patch (rev 0)
+++ testing-i686/01-fix-bug-with-l-output-to-pipes.patch 2016-04-26 16:32:05 UTC (rev 266178)
@@ -0,0 +1,45 @@
+From 3557cd57906915eb9c990b5f386e25c395592643 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at cs.ucla.edu>
+Date: Wed, 20 Apr 2016 00:43:09 +0000
+Subject: gzip: fix bug with -l output to pipes
+
+Problem reported by Christian Franke via Eric Blake in:
+http://bugs.gnu.org/23314
+* NEWS: Mention this.
+* gzip.c (main): Do not close stdout twice when given -l.
+Instead, -l now just fflushes stdout, so that fdatasync
+can synchronize it if --synchronize is also specified.
+* tests/list: New test case.
+* tests/Makefile.am (TESTS): Add it.
+---
+diff --git a/gzip.c b/gzip.c
+index d66530a..3b8de4d 100644
+--- a/gzip.c
++++ b/gzip.c
+@@ -664,14 +664,16 @@ int main (int argc, char **argv)
+ } else { /* Standard input */
+ treat_stdin();
+ }
+- if (list && !quiet && file_count > 1) {
+- do_list(-1, -1); /* print totals */
+- }
+- if (to_stdout
+- && ((synchronous
+- && (fdatasync (STDOUT_FILENO) != 0 && errno != EINVAL))
+- || close (STDOUT_FILENO) != 0)
+- && errno != EBADF)
++ if (list)
++ {
++ /* Output any totals, and check for output errors. */
++ if (!quiet && 1 < file_count)
++ do_list (-1, -1);
++ if (fflush (stdout) != 0)
++ write_error ();
++ }
++ if (to_stdout && synchronous && fdatasync (STDOUT_FILENO) != 0
++ && errno != EINVAL && errno != EBADF)
+ write_error ();
+ do_exit(exit_code);
+ return exit_code; /* just to avoid lint warning */
+--
+cgit v0.9.0.2
Copied: gzip/repos/testing-i686/PKGBUILD (from rev 266177, gzip/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2016-04-26 16:32:05 UTC (rev 266178)
@@ -0,0 +1,51 @@
+# $Id$
+# Mainainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=gzip
+pkgver=1.7
+pkgrel=2
+pkgdesc='GNU compression utility'
+arch=('i686' 'x86_64')
+url='http://www.gnu.org/software/gzip/'
+license=('GPL3')
+groups=('base' 'base-devel')
+depends=('glibc' 'bash' 'less')
+install=gzip.install
+validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering
+source=("ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz"{,.sig}
+ '01-fix-bug-with-l-output-to-pipes.patch')
+md5sums=('d9ae97206a703a20e6c1c868deb3eb47'
+ 'SKIP'
+ '3fc4318cec1f036b5c340e8aa228005c')
+prepare() {
+ cd $pkgname-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
+ done
+ :
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make prefix="$pkgdir/usr" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gzip/repos/testing-i686/gzip.install (from rev 266177, gzip/trunk/gzip.install)
===================================================================
--- testing-i686/gzip.install (rev 0)
+++ testing-i686/gzip.install 2016-04-26 16:32:05 UTC (rev 266178)
@@ -0,0 +1,22 @@
+# vim:set ts=2 sw=2 et:
+
+infodir=usr/share/info
+filelist=(gzip.info)
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
Copied: gzip/repos/testing-x86_64/01-fix-bug-with-l-output-to-pipes.patch (from rev 266177, gzip/trunk/01-fix-bug-with-l-output-to-pipes.patch)
===================================================================
--- testing-x86_64/01-fix-bug-with-l-output-to-pipes.patch (rev 0)
+++ testing-x86_64/01-fix-bug-with-l-output-to-pipes.patch 2016-04-26 16:32:05 UTC (rev 266178)
@@ -0,0 +1,45 @@
+From 3557cd57906915eb9c990b5f386e25c395592643 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at cs.ucla.edu>
+Date: Wed, 20 Apr 2016 00:43:09 +0000
+Subject: gzip: fix bug with -l output to pipes
+
+Problem reported by Christian Franke via Eric Blake in:
+http://bugs.gnu.org/23314
+* NEWS: Mention this.
+* gzip.c (main): Do not close stdout twice when given -l.
+Instead, -l now just fflushes stdout, so that fdatasync
+can synchronize it if --synchronize is also specified.
+* tests/list: New test case.
+* tests/Makefile.am (TESTS): Add it.
+---
+diff --git a/gzip.c b/gzip.c
+index d66530a..3b8de4d 100644
+--- a/gzip.c
++++ b/gzip.c
+@@ -664,14 +664,16 @@ int main (int argc, char **argv)
+ } else { /* Standard input */
+ treat_stdin();
+ }
+- if (list && !quiet && file_count > 1) {
+- do_list(-1, -1); /* print totals */
+- }
+- if (to_stdout
+- && ((synchronous
+- && (fdatasync (STDOUT_FILENO) != 0 && errno != EINVAL))
+- || close (STDOUT_FILENO) != 0)
+- && errno != EBADF)
++ if (list)
++ {
++ /* Output any totals, and check for output errors. */
++ if (!quiet && 1 < file_count)
++ do_list (-1, -1);
++ if (fflush (stdout) != 0)
++ write_error ();
++ }
++ if (to_stdout && synchronous && fdatasync (STDOUT_FILENO) != 0
++ && errno != EINVAL && errno != EBADF)
+ write_error ();
+ do_exit(exit_code);
+ return exit_code; /* just to avoid lint warning */
+--
+cgit v0.9.0.2
Copied: gzip/repos/testing-x86_64/PKGBUILD (from rev 266177, gzip/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2016-04-26 16:32:05 UTC (rev 266178)
@@ -0,0 +1,51 @@
+# $Id$
+# Mainainer: Sébastien "Seblu" Luttringer <seblu at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: judd <jvinet at zeroflux.org>
+
+pkgname=gzip
+pkgver=1.7
+pkgrel=2
+pkgdesc='GNU compression utility'
+arch=('i686' 'x86_64')
+url='http://www.gnu.org/software/gzip/'
+license=('GPL3')
+groups=('base' 'base-devel')
+depends=('glibc' 'bash' 'less')
+install=gzip.install
+validpgpkeys=('155D3FC500C834486D1EEA677FD9FCCB000BEEEE') # Jim Meyering
+source=("ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz"{,.sig}
+ '01-fix-bug-with-l-output-to-pipes.patch')
+md5sums=('d9ae97206a703a20e6c1c868deb3eb47'
+ 'SKIP'
+ '3fc4318cec1f036b5c340e8aa228005c')
+prepare() {
+ cd $pkgname-$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local filename
+ for filename in "${source[@]}"; do
+ if [[ "$filename" =~ \.patch$ ]]; then
+ msg2 "Applying patch $filename"
+ patch -p1 -N -i "$srcdir/$filename"
+ fi
+ done
+ :
+}
+
+build() {
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr
+ make
+}
+
+check() {
+ cd $pkgname-$pkgver
+ make check
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make prefix="$pkgdir/usr" install
+}
+
+# vim:set ts=2 sw=2 et:
Copied: gzip/repos/testing-x86_64/gzip.install (from rev 266177, gzip/trunk/gzip.install)
===================================================================
--- testing-x86_64/gzip.install (rev 0)
+++ testing-x86_64/gzip.install 2016-04-26 16:32:05 UTC (rev 266178)
@@ -0,0 +1,22 @@
+# vim:set ts=2 sw=2 et:
+
+infodir=usr/share/info
+filelist=(gzip.info)
+
+post_install() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
+
+post_upgrade() {
+ post_install "$1"
+}
+
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
More information about the arch-commits
mailing list