rename patch

(Portage version: 2.1.2_pre1)
 (Signed Manifest commit)

2 files changed, 22 insertions, 192 deletions

diff --git a/app-arch/gzip/Manifest b/app-arch/gzip/Manifest
index 4fbdd9d43acc..e3a5e9fb8f67 100644
--- a/app-arch/gzip/Manifest
+++ b/app-arch/gzip/Manifest
@@ -1,7 +1,10 @@
-AUX CVE-2006-4334-8.diff 5430 RMD160 079f49c9870ff2c117c0253df61e52851a99a392 SHA1 493b148f31695b61461f790ed8f1b97c36973f0c SHA256 1f0b7372de131b00692060bd758ff279bfe8c5985bf04fb2d3eef93b5a2fdc1c
-MD5 a701b8d1fb55c64c48554646e55b355e files/CVE-2006-4334-8.diff 5430
-RMD160 079f49c9870ff2c117c0253df61e52851a99a392 files/CVE-2006-4334-8.diff 5430
-SHA256 1f0b7372de131b00692060bd758ff279bfe8c5985bf04fb2d3eef93b5a2fdc1c files/CVE-2006-4334-8.diff 5430
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gzip-1.3.5-CVE-2006-4334-8.patch 5173 RMD160 6ff5ef3e913162b95bb430b88df270ff4d2b58e5 SHA1 9308e09dd6cc755a5cf20fbb4723567fa6f36f81 SHA256 f02d5c874897ca6cdf02c9d4c08b86262e6682decf1d6c5d94dea93b0a892c06
+MD5 94d483b3d8caf3505532061d4cf33e56 files/gzip-1.3.5-CVE-2006-4334-8.patch 5173
+RMD160 6ff5ef3e913162b95bb430b88df270ff4d2b58e5 files/gzip-1.3.5-CVE-2006-4334-8.patch 5173
+SHA256 f02d5c874897ca6cdf02c9d4c08b86262e6682decf1d6c5d94dea93b0a892c06 files/gzip-1.3.5-CVE-2006-4334-8.patch 5173
 AUX gzip-1.3.5-alpha.patch 1302 RMD160 6a5b719d9f9b2dcedfb8c16dcc53c3ee73be3fef SHA1 73c2a453df635fd7b37878c678434063e961fd7c SHA256 78ac1ee2c0cfb61da4bc6c17d3755dc93c26974b97ddebcb54121e357c392cba
 MD5 3ac15e61ddb326ae27cb0ae6aa4d580f files/gzip-1.3.5-alpha.patch 1302
 RMD160 6a5b719d9f9b2dcedfb8c16dcc53c3ee73be3fef files/gzip-1.3.5-alpha.patch 1302
@@ -51,14 +54,14 @@ EBUILD gzip-1.3.5-r8.ebuild 2288 RMD160 d47a747efc6dc61ccf74013b6a9b4193bc61102b
 MD5 ae5a6587dd797ff4fdca9c9ebd0e7d5a gzip-1.3.5-r8.ebuild 2288
 RMD160 d47a747efc6dc61ccf74013b6a9b4193bc61102b gzip-1.3.5-r8.ebuild 2288
 SHA256 f00620f6624a6ba7517a48accfbedd19c019c8b871cf0ab5b11ba57d6913fa61 gzip-1.3.5-r8.ebuild 2288
-EBUILD gzip-1.3.5-r9.ebuild 2284 RMD160 81c5c025d1ed792383a35531963a7164dd515fba SHA1 7865c1e68ff2c8ff0cafee6684a164fb69aaceeb SHA256 86ed9d3247951756f8f7f5e8f60ba709c6331781934923c97818f2f612b711e3
-MD5 083cebc147a8a37e117c6e0a5c2f5f64 gzip-1.3.5-r9.ebuild 2284
-RMD160 81c5c025d1ed792383a35531963a7164dd515fba gzip-1.3.5-r9.ebuild 2284
-SHA256 86ed9d3247951756f8f7f5e8f60ba709c6331781934923c97818f2f612b711e3 gzip-1.3.5-r9.ebuild 2284
-MISC ChangeLog 10419 RMD160 60d683177697a593b33660d26d7fe31857d28a77 SHA1 31ea8bc8a3a5c17f4ae9f86f68c5363960cc0b11 SHA256 e84c40aa8b28979b98a0758c9f312d3acc3b64a526ed26db1dd417fa6c515c34
-MD5 ddd87e6281f57675bba9d566b7b738a7 ChangeLog 10419
-RMD160 60d683177697a593b33660d26d7fe31857d28a77 ChangeLog 10419
-SHA256 e84c40aa8b28979b98a0758c9f312d3acc3b64a526ed26db1dd417fa6c515c34 ChangeLog 10419
+EBUILD gzip-1.3.5-r9.ebuild 2289 RMD160 8e072c91b8681f81ec1f2d6565aa4cdc7cb8df65 SHA1 0eddebb200e15d8743f1ee87292204ca44e9e32e SHA256 308a850722b0027174fbae73d745527956945708402664d41e72c1d04cdcb496
+MD5 63673e9d6671daabfb593336ec10244e gzip-1.3.5-r9.ebuild 2289
+RMD160 8e072c91b8681f81ec1f2d6565aa4cdc7cb8df65 gzip-1.3.5-r9.ebuild 2289
+SHA256 308a850722b0027174fbae73d745527956945708402664d41e72c1d04cdcb496 gzip-1.3.5-r9.ebuild 2289
+MISC ChangeLog 10431 RMD160 ace551721a91a2e97fd826f3271f4ae02cbebfa9 SHA1 5dfbda671586ac1f959849a40b5afaeb9443ef8c SHA256 df18687132a5c1bbcda82a5b91cdbefdf212fa4d4616d23b232813284705af4f
+MD5 0fbbee5ee7bb6dc6ef6fb62de7d033da ChangeLog 10431
+RMD160 ace551721a91a2e97fd826f3271f4ae02cbebfa9 ChangeLog 10431
+SHA256 df18687132a5c1bbcda82a5b91cdbefdf212fa4d4616d23b232813284705af4f ChangeLog 10431
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -69,3 +72,10 @@ SHA256 0bfcc4dcd48430f1951f1452812e9809725069fb910d5234a32d8788ba84fa96 files/di
 MD5 b88cd4d307670111059400e1132d179f files/digest-gzip-1.3.5-r9 232
 RMD160 9ce0351305c191b5400cf658faf4b282dad18b42 files/digest-gzip-1.3.5-r9 232
 SHA256 0bfcc4dcd48430f1951f1452812e9809725069fb910d5234a32d8788ba84fa96 files/digest-gzip-1.3.5-r9 232
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFEcpgamhnQswr0vIRAioIAJ0VLecDGKJpBmKGhBUKhIOMvnhAhgCfa7Mr
+qmnhg1avI+Wybkqu0cbGaUc=
+=LnHt
+-----END PGP SIGNATURE-----
diff --git a/app-arch/gzip/files/CVE-2006-4334-8.diff b/app-arch/gzip/files/CVE-2006-4334-8.diff
deleted file mode 100644
index f49f4b652bc9..000000000000
--- a/app-arch/gzip/files/CVE-2006-4334-8.diff
+++ /dev/null
@@ -1,180 +0,0 @@
---- gzip-1.3.5/gzip.h	2001-10-01 07:53:41.000000000 +0100
-+++ gzip-1.3.5/gzip.h	2006-08-18 22:44:38.755598000 +0100
-@@ -198,6 +198,8 @@
- extern int to_stdout;      /* output to stdout (-c) */
- extern int save_orig_name; /* set if original name must be saved */
- 
-+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
-+
- #define get_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
- #define try_byte()  (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
- 
---- gzip-1.3.5/inflate.c	2002-09-25 22:20:13.000000000 +0100
-+++ gzip-1.3.5/inflate.c	2006-07-21 09:10:43.350376000 +0100
-@@ -337,7 +337,7 @@
-   {
-     *t = (struct huft *)NULL;
-     *m = 0;
--    return 0;
-+    return 2;
-   }
- 
- 
---- gzip-1.3.5/unlzh.c	1999-10-06 06:00:00.000000000 +0100
-+++ gzip-1.3.5/unlzh.c	2006-08-18 22:56:19.446997000 +0100
-@@ -149,13 +149,17 @@
-     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++)
- 	start[i + 1] = start[i] + (count[i] << (16 - i));
--    if ((start[17] & 0xffff) != 0)
--	error("Bad table\n");
-+    if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
-+	error("Bad table (case b)\n");
- 
-     jutbits = 16 - tablebits;
-     for (i = 1; i <= (unsigned)tablebits; i++) {
-@@ -169,15 +173,15 @@
- 
-     i = start[tablebits + 1] >> jutbits;
-     if (i != 0) {
--	k = 1 << tablebits;
--	while (i != k) table[i++] = 0;
-+	k = MIN(1 << tablebits, DIST_BUFSIZE);
-+	while (i < k) table[i++] = 0;
-     }
- 
-     avail = nchar;
-     mask = (unsigned) 1 << (15 - tablebits);
-     for (ch = 0; ch < (unsigned)nchar; ch++) {
- 	if ((len = bitlen[ch]) == 0) continue;
--	nextcode = start[len] + weight[len];
-+	nextcode = MIN(start[len] + weight[len], DIST_BUFSIZE);
- 	if (len <= (unsigned)tablebits) {
- 	    for (i = start[len]; i < nextcode; i++) table[i] = ch;
- 	} else {
-@@ -218,7 +222,7 @@
- 	for (i = 0; i < 256; i++) pt_table[i] = c;
-     } else {
- 	i = 0;
--	while (i < n) {
-+	while (i < MIN(n,NPT)) {
- 	    c = bitbuf >> (BITBUFSIZ - 3);
- 	    if (c == 7) {
- 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
-@@ -228,7 +232,7 @@
- 	    pt_len[i++] = c;
- 	    if (i == i_special) {
- 		c = getbits(2);
--		while (--c >= 0) pt_len[i++] = 0;
-+		while (--c >= 0 && i < NPT) pt_len[i++] = 0;
- 	    }
- 	}
- 	while (i < nn) pt_len[i++] = 0;
-@@ -248,7 +252,7 @@
- 	for (i = 0; i < 4096; i++) c_table[i] = c;
-     } else {
- 	i = 0;
--	while (i < n) {
-+	while (i < MIN(n,NC)) {
- 	    c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
- 	    if (c >= NT) {
- 		mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
-@@ -256,14 +260,14 @@
- 		    if (bitbuf & mask) c = right[c];
- 		    else               c = left [c];
- 		    mask >>= 1;
--		} while (c >= NT);
-+		} while (c >= NT && (mask || c != left[c]));
- 	    }
- 	    fillbuf((int) pt_len[c]);
- 	    if (c <= 2) {
- 		if      (c == 0) c = 1;
- 		else if (c == 1) c = getbits(4) + 3;
- 		else             c = getbits(CBIT) + 20;
--		while (--c >= 0) c_len[i++] = 0;
-+		while (--c >= 0 && i < NC) c_len[i++] = 0;
- 	    } else c_len[i++] = c - 2;
- 	}
- 	while (i < NC) c_len[i++] = 0;
-@@ -292,7 +296,7 @@
- 	    if (bitbuf & mask) j = right[j];
- 	    else               j = left [j];
- 	    mask >>= 1;
--	} while (j >= NC);
-+	} while (j >= NC && (mask || j != left[j]));
-     }
-     fillbuf((int) c_len[j]);
-     return j;
-@@ -309,7 +313,7 @@
- 	    if (bitbuf & mask) j = right[j];
- 	    else               j = left [j];
- 	    mask >>= 1;
--	} while (j >= NP);
-+	} while (j >= NP && (mask || j != left[j]));
-     }
-     fillbuf((int) pt_len[j]);
-     if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));
-@@ -356,7 +360,7 @@
-     while (--j >= 0) {
- 	buffer[r] = buffer[i];
- 	i = (i + 1) & (DICSIZ - 1);
--	if (++r == count) return r;
-+	if (++r >= count) return r;
-     }
-     for ( ; ; ) {
- 	c = decode_c();
-@@ -366,14 +370,14 @@
- 	}
- 	if (c <= UCHAR_MAX) {
- 	    buffer[r] = c;
--	    if (++r == count) return r;
-+	    if (++r >= count) return r;
- 	} else {
- 	    j = c - (UCHAR_MAX + 1 - THRESHOLD);
- 	    i = (r - decode_p() - 1) & (DICSIZ - 1);
- 	    while (--j >= 0) {
- 		buffer[r] = buffer[i];
- 		i = (i + 1) & (DICSIZ - 1);
--		if (++r == count) return r;
-+		if (++r >= count) return r;
- 	    }
- 	}
-     }
---- gzip-1.3.5/unpack.c	1999-10-06 06:00:00.000000000 +0100
-+++ gzip-1.3.5/unpack.c	2006-07-21 15:49:48.615190000 +0100
-@@ -13,7 +13,6 @@
- #include "gzip.h"
- #include "crypt.h"
- 
--#define MIN(a,b) ((a) <= (b) ? (a) : (b))
- /* The arguments must not have side effects. */
- 
- #define MAX_BITLEN 25
-@@ -133,7 +132,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 +168,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;