- remove useless patches (fixed in upstream version)

gzip-1.3.5-cve-2006-4335.patch

@@ -1,15 +0,0 @@
---- gzip-1.3.3/unlzh.c.4335	1999-10-06 07:00:00.000000000 +0200
-+++ gzip-1.3.3/unlzh.c	2006-09-07 09:41:41.000000000 +0200
-@@ -149,7 +149,11 @@
-     unsigned i, k, len, ch, jutbits, avail, nextcode, mask;
- 
-     for (i = 1; i <= 16; i++) count[i] = 0;
--    for (i = 0; i < (unsigned)nchar; i++) count[bitlen[i]]++;
-+    for (i = 0; i < (unsigned)nchar; i++) {
-+        if (bitlen[i] > 16)
-+        error("Bad table (case a)\n");
-+        else count[bitlen[i]]++;
-+    }
- 
-     start[1] = 0;
-     for (i = 1; i <= 16; i++)

gzip-1.3.5-cve-2006-4336.patch

@@ -1,20 +0,0 @@
---- gzip-1.3.3/unpack.c.4336	1999-10-06 07:00:00.000000000 +0200
-+++ gzip-1.3.3/unpack.c	2006-09-07 10:49:08.000000000 +0200
-@@ -133,7 +133,7 @@
- 	/* Remember where the literals of this length start in literal[] : */
- 	lit_base[len] = base;
- 	/* And read the literals: */
--	for (n = leaves[len]; n > 0; n--) {
-+	for (n = leaves[len]; n > 0 && base < LITERALS; n--) {
- 	    literal[base++] = (uch)get_byte();
- 	}
-     }
-@@ -169,7 +169,7 @@
-     prefixp = &prefix_len[1<<peek_bits];
-     for (len = 1; len <= peek_bits; len++) {
- 	int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
--	while (prefixes--) *--prefixp = (uch)len;
-+	while (prefixes-- && prefixp > prefix_len) *--prefixp = (uch)len;
-     }
-     /* The length of all other codes is unknown: */
-     while (prefixp > prefix_len) *--prefixp = 0;

gzip.spec

@@ -1,7 +1,7 @@
 Summary: The GNU data compression program
 Name: gzip
 Version: 1.3.12
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/File
 Source: ftp://alpha.gnu.org/gnu/gzip/gzip-%{version}.tar.gz
@@ -11,8 +11,6 @@ Patch3: gzip-1.3.9-stderr.patch
 Patch4: gzip-1.3.10-zgreppipe.patch
 Patch5: gzip-1.3.9-rsync.patch
 Patch7: gzip-1.3.9-addsuffix.patch
-Patch12: gzip-1.3.5-cve-2006-4335.patch
-Patch13: gzip-1.3.5-cve-2006-4336.patch
 Patch14: gzip-1.3.5-cve-2006-4338.patch
 Patch15: gzip-1.3.9-cve-2006-4337.patch
 Patch16: gzip-1.3.5-cve-2006-4337_len.patch
@@ -38,13 +36,10 @@ very commonly used data compression program.
 %patch4 -p1 -b .nixi
 %patch5 -p1 -b .rsync
 %patch7 -p1 -b .addsuffix
-%patch12 -p1 -b .4335
-%patch13 -p1 -b .4336
 %patch14 -p1 -b .4338
 %patch15 -p1 -b .4337
 %patch16 -p1 -b .4337l
 %patch17 -p1 -b .futimens
-
 %build
 export DEFS="NO_ASM"
 export CPPFLAGS="-DHAVE_LSTAT"
@@ -91,6 +86,9 @@ fi
 %{_infodir}/gzip.info*
 
 %changelog
+* Fri Jun 15 2007 Ivana Varekova <varekova@redhat.com> - 1.3.12-3
+- remove useless patches (fixed in upstream version)
+
 * Mon Jun 11 2007 Ivana Varekova <varekova@redhat.com> - 1.3.12-2
 - remove useless patches