[arch-commits] Commit in gzip/trunk (PKGBUILD gzip-1.5-yesno-declaration.patch)

Allan McRae allan at nymeria.archlinux.org
Tue Feb 5 22:48:34 UTC 2013


    Date: Tuesday, February 5, 2013 @ 23:48:34
  Author: allan
Revision: 177078

upgpkg: gzip 1.5-3

fix yesno issue (FS#33121)

Added:
  gzip/trunk/gzip-1.5-yesno-declaration.patch
Modified:
  gzip/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |    9 ++++++---
 gzip-1.5-yesno-declaration.patch |   36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-05 22:13:13 UTC (rev 177077)
+++ PKGBUILD	2013-02-05 22:48:34 UTC (rev 177078)
@@ -4,7 +4,7 @@
 
 pkgname=gzip
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="GNU compression utility"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gzip/"
@@ -12,13 +12,16 @@
 groups=('base' 'base-devel')
 depends=('glibc' 'bash')
 install=gzip.install
-source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig})
+source=(ftp://ftp.gnu.org/pub/gnu/gzip/gzip-$pkgver.tar.xz{,.sig}
+        gzip-1.5-yesno-declaration.patch)
 md5sums=('2a431e169b6f62f7332ef6d47cc53bae'
-         '2de95937a3f65137acf9c55d4ad0447a')
+         '2de95937a3f65137acf9c55d4ad0447a'
+         'd63249578de2eb6aadaded26918d8eed')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr
+  patch -p1 -i $srcdir/gzip-1.5-yesno-declaration.patch
   make
 }
 

Added: gzip-1.5-yesno-declaration.patch
===================================================================
--- gzip-1.5-yesno-declaration.patch	                        (rev 0)
+++ gzip-1.5-yesno-declaration.patch	2013-02-05 22:48:34 UTC (rev 177078)
@@ -0,0 +1,36 @@
+From e40a9b65ae95ed6face7ce1336905f0ab0a4992b Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at cs.ucla.edu>
+Date: Tue, 05 Feb 2013 21:37:40 +0000
+Subject: gzip: fix bug where you say "n" and gzip acts as if you said "y"
+
+Problem reported for GCC 4.7 x86-64 -O2 by Allan McRae in
+<http://lists.gnu.org/archive/html/bug-gzip/2013-02/msg00000.html>.
+* NEWS: Document this.  Use consistent format in earlier note.
+* gzip.c: Include yesno.h.
+* gzip.h (yesno): Remove decl; that's yesno.h's job.
+---
+diff --git a/gzip.c b/gzip.c
+index b9b4d64..66529e0 100644
+--- a/gzip.c
++++ b/gzip.c
+@@ -74,6 +74,7 @@ static char const *const license_msg[] = {
+ #include "ignore-value.h"
+ #include "stat-time.h"
+ #include "version.h"
++#include "yesno.h"
+ 
+                 /* configuration */
+ 
+diff --git a/gzip.h b/gzip.h
+index bf253d0..648073e 100644
+--- a/gzip.h
++++ b/gzip.h
+@@ -321,6 +321,3 @@ extern void fprint_off    (FILE *, off_t, int);
+ 
+         /* in inflate.c */
+ extern int inflate (void);
+-
+-        /* in yesno.c */
+-extern int yesno (void);
+--
+cgit v0.9.0.2




More information about the arch-commits mailing list