This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 780664ccf1fbe52617de464c147361cd1d9e33bf (commit)
from a27324ba2fad5539093ff44199b2cf651b7bf1e7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 780664ccf1fbe52617de464c147361cd1d9e33bf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Mar 29 12:48:51 2016 +0100
gzip: Update to 1.7
Fixes #11082
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
gzip/gzip.nm | 2 +-
gzip/patches/gzip-1.3.10-zgreppipe.patch | 12 -
gzip/patches/gzip-1.3.12-openbsd-owl-tmp.patch | 45 ----
gzip/patches/gzip-1.3.13-cve-2006-4337.patch | 118 ----------
gzip/patches/gzip-1.3.13-rsync.patch | 286 ------------------------
gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch | 11 -
gzip/patches/gzip-1.3.5-cve-2006-4338.patch | 29 ---
gzip/patches/gzip-1.3.5-zforce.patch | 12 -
8 files changed, 1 insertion(+), 514 deletions(-)
delete mode 100644 gzip/patches/gzip-1.3.10-zgreppipe.patch
delete mode 100644 gzip/patches/gzip-1.3.12-openbsd-owl-tmp.patch
delete mode 100644 gzip/patches/gzip-1.3.13-cve-2006-4337.patch
delete mode 100644 gzip/patches/gzip-1.3.13-rsync.patch
delete mode 100644 gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch
delete mode 100644 gzip/patches/gzip-1.3.5-cve-2006-4338.patch
delete mode 100644 gzip/patches/gzip-1.3.5-zforce.patch
Difference in files:
diff --git a/gzip/gzip.nm b/gzip/gzip.nm
index 20c389b..1ba2326 100644
--- a/gzip/gzip.nm
+++ b/gzip/gzip.nm
@@ -4,7 +4,7 @@
###############################################################################
name = gzip
-version = 1.6
+version = 1.7
release = 1
groups = Applications/Compression
diff --git a/gzip/patches/gzip-1.3.10-zgreppipe.patch b/gzip/patches/gzip-1.3.10-zgreppipe.patch
deleted file mode 100644
index 7797eef..0000000
--- a/gzip/patches/gzip-1.3.10-zgreppipe.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gzip-1.3.10/zgrep.in.pom 2006-12-30 04:01:51.000000000 +0100
-+++ gzip-1.3.10/zgrep.in 2007-02-06 10:54:33.000000000 +0100
-
-@@ -190,5 +190,8 @@
- r=$?
- test "$gzip_status" -eq 0 || test "$gzip_status" -eq 2 || r=2
- test $res -lt $r && res=$r
-+ # SIGPIPE + 128
-+ test "$r" -eq 141 && exit $res
- done
-+trap - SIGPIPE
- exit $res
diff --git a/gzip/patches/gzip-1.3.12-openbsd-owl-tmp.patch b/gzip/patches/gzip-1.3.12-openbsd-owl-tmp.patch
deleted file mode 100644
index 423c667..0000000
--- a/gzip/patches/gzip-1.3.12-openbsd-owl-tmp.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- gzip-1.3.12/znew.in.owl-tmp 2007-06-04 09:15:11.000000000 +0200
-+++ gzip-1.3.12/znew.in 2007-06-04 09:23:18.000000000 +0200
-@@ -55,28 +55,27 @@
- # block is the disk block size (best guess, need not be exact)
-
- warn="(does not preserve modes and timestamp)"
--tmp=${TMPDIR-/tmp}/zfoo.$$
--set -C
--echo hi > $tmp || exit
--if test -z "`(${CPMOD-cpmod} $tmp $tmp) 2>&1`"; then
-- cpmod=${CPMOD-cpmod}
-+cpmod=
-+cpmodarg=
-+if type ${CPMOD:-cpmod} 2>/dev/null; then
-+ cpmod=${CPMOD:-cpmod}
- warn=""
- fi
-
--if test -z "$cpmod" && ${TOUCH-touch} -r $tmp $tmp 2>/dev/null; then
-- cpmod="${TOUCH-touch}"
-+if test -z "$cpmod"; then
-+ cpmod=touch
- cpmodarg="-r"
- warn="(does not preserve file modes)"
- fi
-
--# check if GZIP env. variable uses -S or --suffix
--gzip -q $tmp
--ext=`echo $tmp* | sed "s|$tmp||"`
--rm -f $tmp*
--if test -z "$ext"; then
-- echo znew: error determining gzip extension
-- exit 1
--fi
-+case "$GZIP" in
-+ *-S*) ext=`echo "$GZIP" | sed 's/^.*-S[[:space:]]*\([^[:space:]]*\).*$/\1/'`
-+ ;;
-+ *-suffix*) ext=`echo "$GZIP" | sed 's/^.*--suffix=\([^[:space:]]*\).*$/\1/'`
-+ ;;
-+ *) ext='.gz'
-+ ;;
-+esac
- if test "$ext" = ".Z"; then
- echo znew: cannot use .Z as gzip extension.
- exit 1
diff --git a/gzip/patches/gzip-1.3.13-cve-2006-4337.patch b/gzip/patches/gzip-1.3.13-cve-2006-4337.patch
deleted file mode 100644
index 5855d2b..0000000
--- a/gzip/patches/gzip-1.3.13-cve-2006-4337.patch
+++ /dev/null
@@ -1,118 +0,0 @@
---- gzip-1.3.9/unlzh.c.4337 2007-01-15 16:31:53.000000000 +0100
-+++ gzip-1.3.9/unlzh.c 2007-01-15 16:38:08.000000000 +0100
-@@ -146,8 +146,8 @@
- 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++) {
-@@ -161,15 +162,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) {
- if ((unsigned) 1 << tablebits < nextcode)
- gzip_error ("Bad table\n");
-@@ -212,7 +213,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);
-@@ -224,7 +225,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;
-@@ -244,7 +245,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);
-@@ -259,7 +260,7 @@
- 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;
-@@ -352,7 +353,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();
-@@ -362,14 +363,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.9/gzip.h.4337 2007-01-15 16:31:53.000000000 +0100
-+++ gzip-1.3.9/gzip.h 2007-01-15 16:38:52.000000000 +0100
-@@ -224,6 +224,8 @@
- #define get_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(0))
- #define try_byte() (inptr < insize ? inbuf[inptr++] : fill_inbuf(1))
-
-+#define MIN(a,b) ((a) <= (b) ? (a) : (b))
-+
- /* put_byte is used for the compressed output, put_ubyte for the
- * uncompressed output. However unlzw() uses window for its
- * suffix table instead of its output buffer, so it does not use put_ubyte
---- gzip-1.3.9/unpack.c.4337 2007-01-15 16:31:53.000000000 +0100
-+++ gzip-1.3.9/unpack.c 2007-01-15 16:39:12.000000000 +0100
-@@ -21,9 +21,6 @@
- #include "tailor.h"
- #include "gzip.h"
-
--#define MIN(a,b) ((a) <= (b) ? (a) : (b))
--/* The arguments must not have side effects. */
--
- #define MAX_BITLEN 25
- /* Maximum length of Huffman codes. (Minor modifications to the code
- * would be needed to support 32 bits codes, but pack never generates
-
diff --git a/gzip/patches/gzip-1.3.13-rsync.patch b/gzip/patches/gzip-1.3.13-rsync.patch
deleted file mode 100644
index 30a83a4..0000000
--- a/gzip/patches/gzip-1.3.13-rsync.patch
+++ /dev/null
@@ -1,286 +0,0 @@
-diff -up gzip-1.3.13/deflate.c.rsync gzip-1.3.13/deflate.c
---- gzip-1.3.13/deflate.c.rsync 2009-09-26 20:43:28.000000000 +0200
-+++ gzip-1.3.13/deflate.c 2009-12-01 16:14:24.656387546 +0100
-@@ -131,6 +131,14 @@
- #endif
- /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-+#ifndef RSYNC_WIN
-+# define RSYNC_WIN 4096
-+#endif
-+/* Size of rsync window, must be < MAX_DIST */
-+
-+#define RSYNC_SUM_MATCH(sum) ((sum) % RSYNC_WIN == 0)
-+/* Whether window sum matches magic value */
-+
- /* ===========================================================================
- * Local data used by the "longest match" routines.
- */
-@@ -212,6 +220,8 @@ local int compr_level;
- unsigned good_match;
- /* Use a faster search when the previous match is longer than this */
-
-+local ulg rsync_sum; /* rolling sum of rsync window */
-+local ulg rsync_chunk_end; /* next rsync sequence point */
-
- /* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
-@@ -310,6 +320,10 @@ void lm_init (pack_level, flags)
- #endif
- /* prev will be initialized on the fly */
-
-+ /* rsync params */
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ rsync_sum = 0;
-+
- /* Set the default configuration parameters:
- */
- max_lazy_match = configuration_table[pack_level].max_lazy;
-@@ -546,6 +560,8 @@ local void fill_window()
- memcpy((char*)window, (char*)window+WSIZE, (unsigned)WSIZE);
- match_start -= WSIZE;
- strstart -= WSIZE; /* we now have strstart >= MAX_DIST: */
-+ if (rsync_chunk_end != 0xFFFFFFFFUL)
-+ rsync_chunk_end -= WSIZE;
-
- block_start -= (long) WSIZE;
-
-@@ -573,13 +589,46 @@ local void fill_window()
- }
- }
-
-+local void rsync_roll(start, num)
-+ unsigned start;
-+ unsigned num;
-+{
-+ unsigned i;
-+
-+ if (start < RSYNC_WIN) {
-+ /* before window fills. */
-+ for (i = start; i < RSYNC_WIN; i++) {
-+ if (i == start + num) return;
-+ rsync_sum += (ulg)window[i];
-+ }
-+ num -= (RSYNC_WIN - start);
-+ start = RSYNC_WIN;
-+ }
-+
-+ /* buffer after window full */
-+ for (i = start; i < start+num; i++) {
-+ /* New character in */
-+ rsync_sum += (ulg)window[i];
-+ /* Old character out */
-+ rsync_sum -= (ulg)window[i - RSYNC_WIN];
-+ if (rsync_chunk_end == 0xFFFFFFFFUL && RSYNC_SUM_MATCH(rsync_sum))
-+ rsync_chunk_end = i;
-+ }
-+}
-+
-+/* ===========================================================================
-+ * Set rsync_chunk_end if window sum matches magic value.
-+ */
-+#define RSYNC_ROLL(s, n) \
-+ do { if (rsync) rsync_roll((s), (n)); } while(0)
-+
- /* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
- #define FLUSH_BLOCK(eof) \
- flush_block(block_start >= 0L ? (char*)&window[(unsigned)block_start] : \
-- (char*)NULL, (long)strstart - block_start, (eof))
-+ (char*)NULL, (long)strstart - block_start, flush-1, (eof))
-
- /* ===========================================================================
- * Processes a new input file and return its compressed length. This
-@@ -590,7 +639,7 @@ local void fill_window()
- local off_t deflate_fast()
- {
- IPos hash_head; /* head of the hash chain */
-- int flush; /* set if current block must be flushed */
-+ int flush; /* set if current block must be flushed, 2=>and padded */
- unsigned match_length = 0; /* length of best match */
-
- prev_length = MIN_MATCH-1;
-@@ -674,7 +674,8 @@
- flush = ct_tally(strstart-match_start, match_length - MIN_MATCH);
-
- lookahead -= match_length;
--
-+
-+ RSYNC_ROLL(strstart, match_length);
- /* Insert new strings in the hash table only if the match length
- * is not too large. This saves time but degrades compression.
- */
-@@ -703,9 +704,14 @@
- /* No match, output a literal byte */
- Tracevv((stderr,"%c",window[strstart]));
- flush = ct_tally (0, window[strstart]);
-+ RSYNC_ROLL(strstart, 1);
- lookahead--;
- strstart++;
- }
-+ if (rsync && strstart > rsync_chunk_end) {
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 2;
-+ }
- if (flush) FLUSH_BLOCK(0), block_start = strstart;
-
- /* Make sure that we always have enough lookahead, except
-@@ -724,6 +779,7 @@ off_t deflate()
- */
- lookahead -= prev_length-1;
- prev_length -= 2;
-+ RSYNC_ROLL(strstart, prev_length+1);
- do {
- strstart++;
- INSERT_STRING(strstart, hash_head);
-@@ -736,24 +792,40 @@ off_t deflate()
- match_available = 0;
- match_length = MIN_MATCH-1;
- strstart++;
-- if (flush) FLUSH_BLOCK(0), block_start = strstart;
-
-+ if (rsync && strstart > rsync_chunk_end) {
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 2;
-+ }
-+ if (flush) FLUSH_BLOCK(0), block_start = strstart;
- } else if (match_available) {
- /* If there was no match at the previous position, output a
- * single literal. If there was a match but the current match
- * is longer, truncate the previous match to a single literal.
- */
- Tracevv((stderr,"%c",window[strstart-1]));
-- if (ct_tally (0, window[strstart-1])) {
-- FLUSH_BLOCK(0), block_start = strstart;
-+ flush = ct_tally (0, window[strstart-1]);
-+ if (rsync && strstart > rsync_chunk_end) {
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 2;
- }
-+ if (flush) FLUSH_BLOCK(0), block_start = strstart;
-+ RSYNC_ROLL(strstart, 1);
- strstart++;
- lookahead--;
- } else {
- /* There is no previous match to compare with, wait for
- * the next step to decide.
- */
-+ if (rsync && strstart > rsync_chunk_end) {
-+ /* Reset huffman tree */
-+ rsync_chunk_end = 0xFFFFFFFFUL;
-+ flush = 2;
-+ FLUSH_BLOCK(0), block_start = strstart;
-+ }
-+
- match_available = 1;
-+ RSYNC_ROLL(strstart, 1);
- strstart++;
- lookahead--;
- }
-diff -up gzip-1.3.13/doc/gzip.texi.rsync gzip-1.3.13/doc/gzip.texi
---- gzip-1.3.13/doc/gzip.texi.rsync 2009-09-28 11:08:16.000000000 +0200
-+++ gzip-1.3.13/doc/gzip.texi 2009-12-01 16:14:24.664394713 +0100
-@@ -353,6 +353,14 @@ specified on the command line are direct
- into the directory and compress all the files it finds there (or
- decompress them in the case of @command{gunzip}).
-
-+@item --rsyncable
-+While compressing, synchronize the output occasionally based on the
-+input. This reduces compression by about 1 percent most cases, but
-+means that the @code{rsync} program can take advantage of similarities
-+in the uncompressed input when syncronizing two files compressed with
-+this flag. @code{gunzip} cannot tell the difference between a
-+compressed file created with this option, and one created without it.
-+
- @item --suffix @var{suf}
- @itemx -S @var{suf}
- Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be
-diff -up gzip-1.3.13/gzip.c.rsync gzip-1.3.13/gzip.c
---- gzip-1.3.13/gzip.c.rsync 2009-09-26 20:56:02.000000000 +0200
-+++ gzip-1.3.13/gzip.c 2009-12-01 16:18:17.121387126 +0100
-@@ -229,6 +229,7 @@ int ofd; /* output fil
- unsigned insize; /* valid bytes in inbuf */
- unsigned inptr; /* index of next byte to be processed in inbuf */
- unsigned outcnt; /* bytes in output buffer */
-+int rsync = 0; /* make ryncable chunks */
-
- static int handled_sig[] =
- {
-@@ -271,7 +271,7 @@ static const struct option longopts[] =
- {"best", 0, 0, '9'}, /* compress better */
- {"lzw", 0, 0, 'Z'}, /* make output compatible with old compress */
- {"bits", 1, 0, 'b'}, /* max number of bits per code (implies -Z) */
--
-+ {"rsyncable", 0, 0, 'R'}, /* make rsync-friendly archive */
- { 0, 0, 0, 0 }
- };
-
-
-@@ -363,6 +365,7 @@ local void help()
- " -Z, --lzw produce output compatible with old compress",
- " -b, --bits=BITS max number of bits per code (implies -Z)",
- #endif
-+ " --rsyncable Make rsync-friendly archive",
- "",
- "With no FILE, or when FILE is -, read standard input.",
- "",
-@@ -484,6 +484,9 @@ int main (int argc, char **argv)
- recursive = 1;
- #endif
- break;
-+
-+ case 'R':
-+ rsync = 1; break;
- case 'S':
- #ifdef NO_MULTIPLE_DOTS
- if (*optarg == '.') optarg++;
-
-diff -up gzip-1.3.13/gzip.h.rsync gzip-1.3.13/gzip.h
---- gzip-1.3.13/gzip.h.rsync 2009-09-26 20:43:28.000000000 +0200
-+++ gzip-1.3.13/gzip.h 2009-12-01 16:14:24.664394713 +0100
-@@ -158,6 +158,7 @@ EXTERN(uch, window); /* Sliding
- extern unsigned insize; /* valid bytes in inbuf */
- extern unsigned inptr; /* index of next byte to be processed in inbuf */
- extern unsigned outcnt; /* bytes in output buffer */
-+extern int rsync; /* deflate into rsyncable chunks */
-
- extern off_t bytes_in; /* number of input bytes */
- extern off_t bytes_out; /* number of output bytes */
-@@ -288,7 +288,7 @@ extern off_t deflate (void);
- /* in trees.c */
- extern void ct_init (ush *attr, int *method);
- extern int ct_tally (int dist, int lc);
--extern off_t flush_block (char *buf, ulg stored_len, int eof);
-+extern off_t flush_block (char *buf, ulg stored_len, int pad, int eof);
-
- /* in bits.c */
- extern void bi_init (file_t zipfile);
-
-diff -up gzip-1.3.13/trees.c.rsync gzip-1.3.13/trees.c
---- gzip-1.3.13/trees.c.rsync 2009-09-26 20:43:28.000000000 +0200
-+++ gzip-1.3.13/trees.c 2009-12-01 16:14:24.655388257 +0100
-@@ -856,9 +856,10 @@ local void send_all_trees(lcodes, dcodes
- * trees or store, and output the encoded block to the zip file. This function
- * returns the total compressed length for the file so far.
- */
--off_t flush_block(buf, stored_len, eof)
-+off_t flush_block(buf, stored_len, pad, eof)
- char *buf; /* input block, or NULL if too old */
- ulg stored_len; /* length of input block */
-+ int pad; /* pad output to byte boundary */
- int eof; /* true if this is the last block for a file */
- {
- ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-@@ -951,6 +952,10 @@ off_t flush_block(buf, stored_len, eof)
- Assert (input_len == bytes_in, "bad input size");
- bi_windup();
- compressed_len += 7; /* align on byte boundary */
-+ } else if (pad && (compressed_len % 8) != 0) {
-+ send_bits((STORED_BLOCK<<1)+eof, 3); /* send block type */
-+ compressed_len = (compressed_len + 3 + 7) & ~7L;
-+ copy_block(buf, 0, 1); /* with header */
- }
-
- return compressed_len >> 3;
diff --git a/gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch b/gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch
deleted file mode 100644
index 29fe598..0000000
--- a/gzip/patches/gzip-1.3.5-cve-2006-4337_len.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gzip-1.3.5/unlzh.c.len 2006-11-22 09:35:10.000000000 +0100
-+++ gzip-1.3.5/unlzh.c 2006-11-22 09:38:52.000000000 +0100
-@@ -189,7 +189,7 @@
- }
- *p = ch;
- }
-- start[len] = nextcode;
-+ start[len] = start[len] + weight[len];
- }
- }
-
diff --git a/gzip/patches/gzip-1.3.5-cve-2006-4338.patch b/gzip/patches/gzip-1.3.5-cve-2006-4338.patch
deleted file mode 100644
index 82ea61f..0000000
--- a/gzip/patches/gzip-1.3.5-cve-2006-4338.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- gzip-1.3.3/unlzh.c.4338 2006-09-07 10:49:31.000000000 +0200
-+++ gzip-1.3.3/unlzh.c 2006-09-07 11:37:53.000000000 +0200
-@@ -252,7 +252,7 @@ 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) {
-@@ -288,7 +288,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;
-@@ -305,7 +305,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));
diff --git a/gzip/patches/gzip-1.3.5-zforce.patch b/gzip/patches/gzip-1.3.5-zforce.patch
deleted file mode 100644
index b13c766..0000000
--- a/gzip/patches/gzip-1.3.5-zforce.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up gzip-1.3.12/zforce.in.zforce gzip-1.3.12/zforce.in
---- gzip-1.3.12/zforce.in.zforce 2007-02-05 21:54:26.000000000 +0100
-+++ gzip-1.3.12/zforce.in 2008-09-01 14:17:26.000000000 +0200
-@@ -58,7 +58,7 @@ for i do
- continue
- fi
-
-- if gzip -lv < "$i" 2>/dev/null | grep '^defl' > /dev/null; then
-+ if gzip -l < "$i" 2>/dev/null | grep 'compressed' > /dev/null; then
-
- new="$i.gz"
- if mv "$i" "$new"; then
hooks/post-receive
--
IPFire 3.x development tree
