New upstream release

.cvsignore

@@ -1 +1 @@
-gzip-1.3.13.tar.gz
+gzip-1.4.tar.xz

gzip-1.3.12-cve-2010-0001.patch

@@ -1,14 +0,0 @@
-diff -up gzip-1.3.12/inflate.c.cve-2010-0001 gzip-1.3.12/inflate.c
-diff -up gzip-1.3.12/unlzw.c.cve-2010-0001 gzip-1.3.12/unlzw.c
---- gzip-1.3.12/unlzw.c.cve-2010-0001	2006-12-11 19:54:39.000000000 +0100
-+++ gzip-1.3.12/unlzw.c	2010-01-14 14:38:58.408250047 +0100
-@@ -248,7 +248,8 @@ int unlzw(in, out)
- 	int  o;
- 
-     resetbuf:
--	e = insize-(o = (posbits>>3));
-+	o = posbits >> 3;
-+	e = o <= insize ? insize - o : 0;
- 
- 	for (i = 0 ; i < e ; ++i) {
- 	    inbuf[i] = inbuf[i+o];

gzip-1.3.12-zdiff.patch

@@ -1,14 +0,0 @@
-diff -up gzip-1.3.12/zdiff.in.pom gzip-1.3.12/zdiff.in
---- gzip-1.3.12/zdiff.in.pom	2007-02-08 23:54:59.000000000 +0100
-+++ gzip-1.3.12/zdiff.in	2009-03-13 15:07:18.000000000 +0100
-@@ -104,8 +104,9 @@ elif test $# -eq 2; then
- 			  exec 4>&1
- 			  (gzip -cdfq -- "$1" 4>&-; echo $? >&4) 3>&- |
- 			    ( (gzip -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- </dev/null |
--			       eval "$cmp" /dev/fd/5 -) 5<&0
-+			       eval "$cmp" /dev/fd/5 - >&3 ) 5<&0
- 			)
-+			gzip_status=$?
- 			case $gzip_status in
- 			  *[1-9]*) gzip_status=1;;
- 			  *) gzip_status=0;;

gzip.spec

@@ -1,11 +1,11 @@
 Summary: The GNU data compression program
 Name: gzip
-Version: 1.3.13
+Version: 1.4
-Release: 3%{?dist}
+Release: 1%{?dist}
 # info pages are under GFDL license
 License: GPLv3+ and GFDL
 Group: Applications/File
-Source: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
+Source: http://ftp.gnu.org/gnu/gzip/gzip-%{version}.tar.xz
 Patch0: gzip-1.3.12-openbsd-owl-tmp.patch
 Patch1: gzip-1.3.5-zforce.patch
 Patch2: gzip-1.3.9-stderr.patch
@@ -15,9 +15,6 @@ Patch5: gzip-1.3.9-addsuffix.patch
 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.3.12-zdiff.patch
-# Fixed in upstream code.
-Patch10: gzip-1.3.12-cve-2010-0001.patch
 # Fixed in upstream code.
 # http://thread.gmane.org/gmane.comp.gnu.gzip.bugs/378
 Patch11: gzip-1.3.13-noemptysuffix.patch
@@ -45,8 +42,6 @@ very commonly used data compression program.
 %patch6 -p1 -b .4338
 %patch7 -p1 -b .4337
 %patch8 -p1 -b .4337l
-%patch9 -p1 -b .ret
-%patch10 -p1 -b .cve-2010-0001
 %patch11 -p1 -b .noemptysuffix
 
 %build
@@ -99,6 +94,12 @@ fi
 %{_infodir}/gzip.info*
 
 %changelog
+* Tue Mar 16 2010 Karel Klic <kklic@redhat.com> - 1.4-1
+- New upstream release
+- Use XZ upstream source archive
+- Removed cve-2010-0001 patch as it's fixed in this release
+- Removed zdiff patch as it's fixed in this release
+
 * Mon Feb 22 2010 Karel Klic <kklic@redhat.com> - 1.3.13-3
 - Added a patch to disallow -S '' parameter (noemptysuffix)
 

sources

@@ -1 +1 @@
-c54a31b93e865f6a4410b2dc64662706  gzip-1.3.13.tar.gz
+fc7be225884ae5324b44167ced89f50a  gzip-1.4.tar.xz