OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Oct-2009 08:03:20
Branch: HEAD Handle: 2009100707032000
Modified files:
openpkg-src/gzip gzip.patch
Log:
modifying package: gzip-1.3.13 20091007 again
Summary:
Revision Changes Path
1.14 +22 -22 openpkg-src/gzip/gzip.patch
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/gzip/gzip.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 gzip.patch
--- openpkg-src/gzip/gzip.patch 5 Jun 2007 19:49:53 -0000 1.13
+++ openpkg-src/gzip/gzip.patch 7 Oct 2009 06:03:20 -0000 1.14
@@ -1,9 +1,9 @@
Security Fix
Index: gzip.c
---- gzip.c.orig 2007-03-20 06:09:51 +0100
-+++ gzip.c 2007-06-05 21:47:35 +0200
-@@ -170,7 +170,7 @@
+--- gzip.c.orig 2009-09-26 20:56:02 +0200
++++ gzip.c 2009-10-07 07:59:53 +0200
+@@ -168,7 +168,7 @@
DECLARE(uch, inbuf, INBUFSIZ +INBUF_EXTRA);
DECLARE(uch, outbuf, OUTBUFSIZ+OUTBUF_EXTRA);
DECLARE(ush, d_buf, DIST_BUFSIZE);
@@ -22,8 +22,8 @@
- Infinite loop (CVE-2006-4338)
Index: gzip.h
---- gzip.h.orig 2007-03-20 06:09:51 +0100
-+++ gzip.h 2007-06-05 21:47:35 +0200
+--- gzip.h.orig 2009-09-26 20:43:28 +0200
++++ gzip.h 2009-10-07 07:59:53 +0200
@@ -223,6 +223,8 @@
extern int to_stdout; /* output to stdout (-c) */
extern int save_orig_name; /* set if original name must be saved */
@@ -34,9 +34,9 @@
#define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
Index: unlzh.c
---- unlzh.c.orig 2006-11-20 09:40:34 +0100
-+++ unlzh.c 2007-06-05 21:47:35 +0200
-@@ -145,12 +145,17 @@
+--- unlzh.c.orig 2009-09-26 20:20:40 +0200
++++ unlzh.c 2009-10-07 07:59:53 +0200
+@@ -141,12 +141,17 @@
unsigned i, k, len, ch, jutbits, avail, nextcode, mask;
for (i = 1; i <= 16; i++) count[i] = 0;
@@ -56,7 +56,7 @@
gzip_error ("Bad table\n");
jutbits = 16 - tablebits;
-@@ -165,15 +170,15 @@
+@@ -161,15 +166,15 @@
i = start[tablebits + 1] >> jutbits;
if (i != 0) {
@@ -75,7 +75,7 @@
if (len <= (unsigned)tablebits) {
if ((unsigned) 1 << tablebits < nextcode)
gzip_error ("Bad table\n");
-@@ -216,7 +221,7 @@
+@@ -212,7 +217,7 @@
for (i = 0; i < 256; i++) pt_table[i] = c;
} else {
i = 0;
@@ -84,7 +84,7 @@
c = bitbuf >> (BITBUFSIZ - 3);
if (c == 7) {
mask = (unsigned) 1 << (BITBUFSIZ - 1 - 3);
-@@ -228,7 +233,7 @@
+@@ -224,7 +229,7 @@
pt_len[i++] = c;
if (i == i_special) {
c = getbits(2);
@@ -93,7 +93,7 @@
}
}
while (i < nn) pt_len[i++] = 0;
-@@ -248,7 +253,7 @@
+@@ -244,7 +249,7 @@
for (i = 0; i < 4096; i++) c_table[i] = c;
} else {
i = 0;
@@ -102,7 +102,7 @@
c = pt_table[bitbuf >> (BITBUFSIZ - 8)];
if (c >= NT) {
mask = (unsigned) 1 << (BITBUFSIZ - 1 - 8);
-@@ -256,14 +261,14 @@
+@@ -252,14 +257,14 @@
if (bitbuf & mask) c = right[c];
else c = left [c];
mask >>= 1;
@@ -119,7 +119,7 @@
} else c_len[i++] = c - 2;
}
while (i < NC) c_len[i++] = 0;
-@@ -292,7 +297,7 @@
+@@ -288,7 +293,7 @@
if (bitbuf & mask) j = right[j];
else j = left [j];
mask >>= 1;
@@ -128,7 +128,7 @@
}
fillbuf((int) c_len[j]);
return j;
-@@ -309,7 +314,7 @@
+@@ -305,7 +310,7 @@
if (bitbuf & mask) j = right[j];
else j = left [j];
mask >>= 1;
@@ -137,7 +137,7 @@
}
fillbuf((int) pt_len[j]);
if (j != 0) j = ((unsigned) 1 << (j - 1)) + getbits((int) (j - 1));
-@@ -356,7 +361,7 @@
+@@ -352,7 +357,7 @@
while (--j >= 0) {
buffer[r] = buffer[i];
i = (i + 1) & (DICSIZ - 1);
@@ -146,7 +146,7 @@
}
for ( ; ; ) {
c = decode_c();
-@@ -366,14 +371,14 @@
+@@ -362,14 +367,14 @@
}
if (c <= UCHAR_MAX) {
buffer[r] = c;
@@ -164,9 +164,9 @@
}
}
Index: unpack.c
---- unpack.c.orig 2006-11-20 09:40:34 +0100
-+++ unpack.c 2007-06-05 21:47:35 +0200
-@@ -26,7 +26,6 @@
+--- unpack.c.orig 2009-09-26 20:43:28 +0200
++++ unpack.c 2009-10-07 07:59:53 +0200
+@@ -22,7 +22,6 @@
#include "gzip.h"
#include "crypt.h"
@@ -174,7 +174,7 @@
/* The arguments must not have side effects. */
#define MAX_BITLEN 25
-@@ -150,7 +149,7 @@
+@@ -146,7 +145,7 @@
/* Remember where the literals of this length start in literal[] : */
lit_base[len] = base;
/* And read the literals: */
@@ -183,7 +183,7 @@
literal[base++] = (uch)get_byte();
}
}
-@@ -186,7 +185,7 @@
+@@ -182,7 +181,7 @@
prefixp = &prefix_len[1<<peek_bits];
for (len = 1; len <= peek_bits; len++) {
int prefixes = leaves[len] << (peek_bits-len); /* may be 0 */
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
