Author: stewb
Date: Fri Feb 2 13:58:33 2007
New Revision: 115909
Added:
packages/cooker/gzip/current/SOURCES/gzip-1.3.10-goo-sec.diff
packages/cooker/gzip/current/SOURCES/gzip-1.3.10-znew.patch
packages/cooker/gzip/current/SOURCES/gzip-1.3.10.tar.bz2 (contents, props
changed)
Log:
- try to add the sources again
Added: packages/cooker/gzip/current/SOURCES/gzip-1.3.10-goo-sec.diff
==============================================================================
--- (empty file)
+++ packages/cooker/gzip/current/SOURCES/gzip-1.3.10-goo-sec.diff Fri Feb
2 13:58:33 2007
@@ -0,0 +1,169 @@
+--- gzip-1.3.10/gzip.h.goo-sec 2006-12-11 19:54:39.000000000 +0100
++++ gzip-1.3.10/gzip.h 2007-02-02 13:06:21.000000000 +0100
+@@ -220,6 +220,8 @@ extern int test; /* check .z f
+ 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.10/unlzh.c.goo-sec 2006-11-20 09:40:34.000000000 +0100
++++ gzip-1.3.10/unlzh.c 2007-02-02 13:20:14.000000000 +0100
+@@ -145,13 +145,17 @@ local void make_table(nchar, bitlen, tab
+ 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)
+- gzip_error ("Bad table\n");
++ if ((start[17] & 0xffff) != 0 || tablebits > 16) /* 16 for weight below */
++ gzip_error ("Bad table (case b)\n");
+
+ jutbits = 16 - tablebits;
+ for (i = 1; i <= (unsigned)tablebits; i++) {
+@@ -165,15 +169,15 @@ local void make_table(nchar, bitlen, tab
+
+ 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) {
+ if ((unsigned) 1 << tablebits < nextcode)
+ gzip_error ("Bad table\n");
+@@ -216,7 +220,7 @@ local void read_pt_len(nn, nbit, i_speci
+ 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 @@ local void read_pt_len(nn, nbit, i_speci
+ 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 @@ local void read_c_len()
+ 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 @@ local void read_c_len()
+ 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 @@ local unsigned decode_c()
+ 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 @@ local unsigned decode_p()
+ 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 @@ local unsigned decode(count, buffer)
+ 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 @@ local unsigned decode(count, buffer)
+ }
+ 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.10/unpack.c.goo-sec 2006-11-20 09:40:34.000000000 +0100
++++ gzip-1.3.10/unpack.c 2007-02-02 13:06:21.000000000 +0100
+@@ -26,7 +26,6 @@ static char rcsid[] = "$Id: unpack.c,v 1
+ #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
+@@ -150,7 +149,7 @@ local void read_tree()
+ /* 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();
+ }
+ }
+@@ -186,7 +185,7 @@ local void build_tree()
+ 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;
Added: packages/cooker/gzip/current/SOURCES/gzip-1.3.10-znew.patch
==============================================================================
--- (empty file)
+++ packages/cooker/gzip/current/SOURCES/gzip-1.3.10-znew.patch Fri Feb 2
13:58:33 2007
@@ -0,0 +1,83 @@
+--- gzip-1.3.10/znew.in.znew 2006-12-09 05:25:56.000000000 +0100
++++ gzip-1.3.10/znew.in 2007-02-02 12:33:57.000000000 +0100
+@@ -54,11 +54,15 @@ new=0
+ block=1024
+ # block is the disk block size (best guess, need not be exact)
+
++# set noclobber to prevent overwriting existing files
++set -o noclobber
++
+ warn="(does not preserve modes and timestamp)"
+-tmp=/tmp/zfoo.$$
++tmp=`mktemp /tmp/zfoo.XXXXXX`
+ set -C
+-echo hi > $tmp || exit
+-if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then
++echo hi > $tmp.1 || exit 1
++echo hi > $tmp.2 || exit 1
++if test -z "`(${CPMOD-cpmod} $tmp.1 $tmp.2) 2>&1`"; then
+ cpmod=${CPMOD-cpmod}
+ warn=""
+ fi
+@@ -113,6 +117,7 @@ fi
+
+ for i do
+ n=`echo $i | sed 's/.Z$//'`
++ ntmp=`mktemp $n.XXXXXX`
+ if test ! -f "$n.Z" ; then
+ echo $n.Z not found
+ res=1; continue
+@@ -128,7 +133,7 @@ for i do
+ fi
+ else
+ if test $check -eq 1; then
+- if cp -p "$n.Z" "$n.$$" 2> /dev/null || cp "$n.Z" "$n.$$"; then
++ if cp -p "$n.Z" "$ntmp" 2> /dev/null || cp "$n.Z" "$ntmp"; then
+ :
+ else
+ echo cannot backup "$n.Z"
+@@ -138,7 +143,7 @@ for i do
+ if gzip -d "$n.Z"; then
+ :
+ else
+- test $check -eq 1 && mv "$n.$$" "$n.Z"
++ test $check -eq 1 && mv "$ntmp" "$n.Z"
+ echo error while uncompressing $n.Z
+ res=1; continue
+ fi
+@@ -146,7 +151,7 @@ for i do
+ :
+ else
+ if test $check -eq 1; then
+- mv "$n.$$" "$n.Z" && rm -f "$n"
++ mv "$ntmp" "$n.Z" && rm -f "$n"
+ echo error while recompressing $n
+ else
+ # compress $n (might be dangerous if disk full)
+@@ -161,7 +166,7 @@ for i do
+ if test $pipe -eq 1; then
+ rm -f "$n$ext"
+ elif test $check -eq 1; then
+- mv "$n.$$" "$n.Z" && rm -f "$n$ext"
++ mv "$ntmp" "$n.Z" && rm -f "$n$ext"
+ else
+ gzip -d "$n$ext" && compress "$n" && rm -f "$n$ext"
+ fi
+@@ -169,9 +174,9 @@ for i do
+
+ elif test $check -eq 1; then
+ if gzip -t "$n$ext" ; then
+- rm -f "$n.$$" "$n.Z"
++ rm -f "$ntmp" "$n.Z"
+ else
+- test $pipe -eq 0 && mv "$n.$$" "$n.Z"
++ test $pipe -eq 0 && mv "$ntmp" "$n.Z"
+ rm -f "$n$ext"
+ echo error while testing $n$ext, $n.Z unchanged
+ res=1; continue
+@@ -180,4 +185,5 @@ for i do
+ rm -f "$n.Z"
+ fi
+ done
++rm -f "$ntmp"
+ exit $res
Added: packages/cooker/gzip/current/SOURCES/gzip-1.3.10.tar.bz2
==============================================================================
Binary file. No diff available.
