From 4f52b45d310ba409988e4e83fded0cf2ad11d3c7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jul 27 2015 09:18:18 +0000 Subject: import gzip-1.5-8.el7 --- diff --git a/SOURCES/gzip-1.5-overwrite.patch b/SOURCES/gzip-1.5-overwrite.patch new file mode 100644 index 0000000..2ae70a6 --- /dev/null +++ b/SOURCES/gzip-1.5-overwrite.patch @@ -0,0 +1,22 @@ +diff --git a/gzip.c b/gzip.c +index 5d14022..e63cb44 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 b88cefb..c696914 100644 +--- a/gzip.h ++++ b/gzip.h +@@ -325,5 +325,3 @@ extern void fprint_off (FILE *, off_t, int); + /* in inflate.c */ + extern int inflate (void); + +- /* in yesno.c */ +-extern int yesno (void); diff --git a/SPECS/gzip.spec b/SPECS/gzip.spec index 9a72d7d..fd5a0e9 100644 --- a/SPECS/gzip.spec +++ b/SPECS/gzip.spec @@ -1,7 +1,7 @@ Summary: The GNU data compression program Name: gzip Version: 1.5 -Release: 7%{?dist} +Release: 8%{?dist} # info pages are under GFDL license License: GPLv3+ and GFDL Group: Applications/File @@ -14,6 +14,7 @@ Patch6: gzip-1.3.5-cve-2006-4338.patch Patch7: gzip-1.3.13-cve-2006-4337.patch Patch8: gzip-1.3.5-cve-2006-4337_len.patch Patch9: gzip-1.5-nonblock.patch +Patch10: gzip-1.5-overwrite.patch # Fixed in upstream code. # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378 URL: http://www.gzip.org/ @@ -48,6 +49,7 @@ very commonly used data compression program. %patch7 -p1 -b .4337 %patch8 -p1 -b .4337l %patch9 -p1 -b .nonblock +%patch10 -p1 -b .overwrite %build export DEFS="NO_ASM" @@ -88,6 +90,12 @@ fi %{_infodir}/gzip.info* %changelog +* Mon Mar 16 2015 Petr Stodulka - 1.5-8 +- Gzip overwrite existing files when user choose "no" on yes/no question. + It's due to wrong dupicit declaration of yesno() function in gzip.h + which is compiled wrong with -O2 option. + Resolves: rhbz#1201689 + * Fri Jan 24 2014 Daniel Mach - 1.5-7 - Mass rebuild 2014-01-24