SF.net SVN: gar:[23071] csw/mgar/pkg/gzip/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Tue Feb 25 10:51:35 CET 2014


Revision: 23071
          http://sourceforge.net/p/gar/code/23071
Author:   dmichelsen
Date:     2014-02-25 09:51:27 +0000 (Tue, 25 Feb 2014)
Log Message:
-----------
gzip/trunk: Update to 1.6 and forward-port rsyncable, still one open bug

Modified Paths:
--------------
    csw/mgar/pkg/gzip/trunk/Makefile
    csw/mgar/pkg/gzip/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch
    csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff

Removed Paths:
-------------
    csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch
    csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2

Modified: csw/mgar/pkg/gzip/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gzip/trunk/Makefile	2014-02-23 20:45:47 UTC (rev 23070)
+++ csw/mgar/pkg/gzip/trunk/Makefile	2014-02-25 09:51:27 UTC (rev 23071)
@@ -1,5 +1,9 @@
+# TBD:
+# ! Transformation from 'z' to 'gz' prefix does not apply to invocations:
+#     http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16876
+
 NAME = gzip
-VERSION = 1.4
+VERSION = 1.6
 GARTYPE = v2
 
 DESCRIPTION = GNU zip
@@ -13,7 +17,7 @@
 
 MASTER_SITES = $(GNU_MIRROR)
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
-PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
+#PATCHFILES = 0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
 
 # From TODO:
 # - Add a block size (-b) option to improve error recovery in case of
@@ -22,32 +26,31 @@
 # 
 # For one possible approach to this, please see:
 #   http://www.samba.org/netfilter/diary/gzip.rsync.patch
-#
-# Update patch from
-#  http://cvs.fedoraproject.org/viewvc/rpms/gzip/F-12/gzip-1.3.9-rsync.patch?revision=1.2&content-type=text%2Fplain&view=co
-PATCHFILES += gzip-1.3.9-rsync.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+# Reformatted version of debian_patches_rsyncable.diff
+PATCHFILES += 0001-Debian-patch-for-rsyncable.patch
 
-PACKAGES = CSWgzip CSWgzipextras
-
-CATALOGNAME_CSWgzip       = gzip
-CATALOGNAME_CSWgzipextras = gzip_extras
-
-SPKG_DESC_CSWgzip       = GNU zip
-SPKG_DESC_CSWgzipextras = GNU zip additional tools
-
-RUNTIME_DEP_PKGS_CSWgzipextras = CSWgzip CSWggrep
-
-CONFIGURE_ARGS = $(DIRPATHS)
-
-EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
-
+PACKAGES += CSWgzip
+CATALOGNAME_CSWgzip = gzip
+SPKG_DESC_CSWgzip = GNU zip
 PKGFILES_CSWgzip  = $(bindir)/gzip
 PKGFILES_CSWgzip += $(bindir)/gunzip
 PKGFILES_CSWgzip += $(bindir)/uncompress
 PKGFILES_CSWgzip += $(mandir)/man1/gzip\.1
 PKGFILES_CSWgzip += $(mandir)/man1/gunzip\.1
 
+PACKAGES += CSWgzip-extras
+SPKG_DESC_CSWgzip-extras = GNU zip additional tools
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWgzip-extras += CSWgzip
+RUNTIME_DEP_PKGS_CSWgzip-extras += CSWggrep
+OBSOLETED_BY_CSWgzip-extras = CSWgzipextras
+CATALOGNAME_CSWgzipextras = gzip_extras_stub
+
+EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/charset.alias
+
+# The 'z'-prefix commands now belong to zutils whereas the gzip-commands are prefixed with 'gz' instead:
+#   http://lists.nongnu.org/archive/html/zutils-bug/2012-10/msg00002.html
+EXTRA_CONFIGURE_ARGS += --program-transform-name='s/^z/gz/'
+
 include gar/category.mk

Modified: csw/mgar/pkg/gzip/trunk/checksums
===================================================================
--- csw/mgar/pkg/gzip/trunk/checksums	2014-02-23 20:45:47 UTC (rev 23070)
+++ csw/mgar/pkg/gzip/trunk/checksums	2014-02-25 09:51:27 UTC (rev 23071)
@@ -1,3 +1 @@
-54776a402c7f43e4ece76c96a8e6518d  0001-Force-ggrep-as-Solaris-grep-doesn-t-understand-the-f.patch
-d2e81e20767a85f799f56812d74b547a  gzip-1.3.9-rsync.patch
-e381b8506210c794278f5527cba0e765  gzip-1.4.tar.gz
+38603cb2843bf5681ff41aab3bcd6a20  gzip-1.6.tar.gz

Added: csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch	                        (rev 0)
+++ csw/mgar/pkg/gzip/trunk/files/0001-Debian-patch-for-rsyncable.patch	2014-02-25 09:51:27 UTC (rev 23071)
@@ -0,0 +1,332 @@
+From aa32d7c565dd4aa13c5fa0f12e93f9851be6cc20 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Tue, 25 Feb 2014 10:21:27 +0100
+Subject: [PATCH] Debian patch for rsyncable
+
+---
+ deflate.c     | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
+ doc/gzip.texi | 25 +++++++++++++++
+ gzip.1        | 11 +++++++
+ gzip.c        | 11 +++++--
+ gzip.h        |  1 +
+ 5 files changed, 138 insertions(+), 8 deletions(-)
+
+diff --git a/deflate.c b/deflate.c
+index f0f2394..8e539d2 100644
+--- a/deflate.c
++++ b/deflate.c
+@@ -131,6 +131,14 @@
+ #endif
+ /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+ 
++#ifndef RSYNC_WIN
++#  define RSYNC_WIN 8192
++#endif
++/* Size of rsync window, must be < MAX_DIST */
++
++#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 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
+@@ -314,6 +324,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;
+@@ -331,6 +345,7 @@ void lm_init (pack_level, flags)
+ 
+     strstart = 0;
+     block_start = 0L;
++    rsync_chunk_end = 0xFFFFFFFFUL;
+ #ifdef ASMV
+     match_init(); /* initialize the asm code */
+ #endif
+@@ -550,6 +565,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;
+ 
+@@ -579,6 +596,39 @@ 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.
+@@ -626,7 +676,8 @@ local off_t deflate_fast()
+ 
+             lookahead -= match_length;
+ 
+-            /* Insert new strings in the hash table only if the 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.
+              */
+             if (match_length <= max_insert_length) {
+@@ -654,9 +705,18 @@ local off_t deflate_fast()
+             /* 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) {
++            ush  attr = 0;          /* ascii/binary flag */
++
++            flush = 1;
++            /* Reset huffman tree */
++            ct_init(&attr, &method);
++            rsync_chunk_end = 0xFFFFFFFFUL;
++        }
+         if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
+         /* Make sure that we always have enough lookahead, except
+@@ -730,6 +790,7 @@ off_t deflate()
+              */
+             lookahead -= prev_length-1;
+             prev_length -= 2;
++	    RSYNC_ROLL(strstart, prev_length+1);
+             do {
+                 strstart++;
+                 INSERT_STRING(strstart, hash_head);
+@@ -742,24 +803,51 @@ 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) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++		flush = 1;
++	    }
++            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) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++
++		flush = 1;
++	    }
++            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) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++
++		FLUSH_BLOCK(0), block_start = strstart;
++	    }
+             match_available = 1;
++	    RSYNC_ROLL(strstart, 1);
+             strstart++;
+             lookahead--;
+         }
+diff --git a/doc/gzip.texi b/doc/gzip.texi
+index 3de3063..7ff37ad 100644
+--- a/doc/gzip.texi
++++ b/doc/gzip.texi
+@@ -208,6 +208,7 @@ Mandatory arguments to long options are mandatory for short options too.
+   -V, --version     display version number
+   -1, --fast        compress faster
+   -9, --best        compress better
++    --rsyncable   Make rsync-friendly archive
+ 
+ With no FILE, or when FILE is -, read standard input.
+ 
+@@ -358,6 +359,30 @@ specified on the command line are directories, @command{gzip} will descend
+ into the directory and compress all the files it finds there (or
+ decompress them in the case of @command{gunzip}).
+ 
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This can reduce the compression slightly in some 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.
++
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on
++the input.  This increases size by less than 1 percent most
++cases, but means that the @command{rsync} program can much more efficiently
++synchronize files compressed with this flag.  @command{gunzip}
++cannot tell the difference between a compressed file created
++with this option, and one created without it.
++
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This can reduce the compression slightly in some 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 --git a/gzip.1 b/gzip.1
+index 71e097c..faee860 100644
+--- a/gzip.1
++++ b/gzip.1
+@@ -5,6 +5,7 @@ gzip, gunzip, zcat \- compress or expand files
+ .ll +8
+ .B gzip
+ .RB [ " \-acdfhklLnNrtvV19 " ]
++.RB [ --rsyncable ]
+ .RB [ \-S\ suffix ]
+ [
+ .I "name \&..."
+@@ -287,6 +288,16 @@ will descend into the directory and compress all the files it finds there
+ .I gunzip
+ ).
+ .TP
++.B --rsyncable
++While compressing, synchronize the output occasionally based on the input.
++This increases size by less than 1 percent most cases, but means that the
++.BR rsync (1)
++program can take advantage of similarities in the uncompressed input
++when syncronizing two files compressed with this flag.
++.I gunzip
++cannot tell the difference between a compressed file created with this option,
++and one created without it.
++.TP
+ .B \-S .suf   --suffix .suf
+ When compressing, use suffix .suf instead of .gz.
+ Any non-empty suffix can be given, but suffixes
+diff --git a/gzip.c b/gzip.c
+index 93cc738..971d3f0 100644
+--- a/gzip.c
++++ b/gzip.c
+@@ -215,6 +215,7 @@ int  ofd;                  /* output file descriptor */
+ 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[] =
+   {
+@@ -275,7 +276,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 }
+ };
+ 
+@@ -359,6 +360,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.",
+  "",
+@@ -489,8 +491,11 @@ int main (int argc, char **argv)
+ #else
+             recursive = 1;
+ #endif
+-            break;
+-        case 'S':
++	    break;
++        case 'R':
++	    rsync = 1; break;
++
++	case 'S':
+ #ifdef NO_MULTIPLE_DOTS
+             if (*optarg == '.') optarg++;
+ #endif
+diff --git a/gzip.h b/gzip.h
+index 648073e..70ccaa9 100644
+--- a/gzip.h
++++ b/gzip.h
+@@ -140,6 +140,7 @@ EXTERN(uch, window);         /* Sliding window and suffix table (unlzw) */
+ 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 */
+-- 
+1.8.4.1
+

Copied: csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff (from rev 23055, csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch)
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff	                        (rev 0)
+++ csw/mgar/pkg/gzip/trunk/files/debian_patches_rsyncable.diff	2014-02-25 09:51:27 UTC (rev 23071)
@@ -0,0 +1,311 @@
+diff -u -r gzip-1.5/deflate.c /home/bdale/debian/gzip/deflate.c
+--- gzip-1.5/deflate.c	2012-04-24 10:25:28.000000000 -0600
++++ /home/bdale/debian/gzip/deflate.c	2012-06-19 14:01:41.885498670 -0600
+@@ -131,6 +131,14 @@
+ #endif
+ /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
+ 
++#ifndef RSYNC_WIN
++#  define RSYNC_WIN 8192
++#endif
++/* Size of rsync window, must be < MAX_DIST */
++
++#define RSYNC_SUM_MATCH(sum) (((sum) & (RSYNC_WIN - 1)) == 0)
++/* Whether window sum matches magic value */
++
+ /* ===========================================================================
+  * Local data used by the "longest match" routines.
+  */
+@@ -212,6 +220,8 @@
+ 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
+@@ -314,6 +324,10 @@
+ #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;
+@@ -331,6 +345,7 @@
+ 
+     strstart = 0;
+     block_start = 0L;
++    rsync_chunk_end = 0xFFFFFFFFUL;
+ #ifdef ASMV
+     match_init(); /* initialize the asm code */
+ #endif
+@@ -550,6 +565,8 @@
+         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;
+ 
+@@ -579,6 +596,39 @@
+     }
+ }
+ 
++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.
+@@ -626,7 +676,8 @@
+ 
+             lookahead -= match_length;
+ 
+-            /* Insert new strings in the hash table only if the 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.
+              */
+             if (match_length <= max_insert_length) {
+@@ -654,9 +705,18 @@
+             /* 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) {
++            ush  attr = 0;          /* ascii/binary flag */
++
++            flush = 1;
++            /* Reset huffman tree */
++            ct_init(&attr, &method);
++            rsync_chunk_end = 0xFFFFFFFFUL;
++        }
+         if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
+         /* Make sure that we always have enough lookahead, except
+@@ -730,6 +790,7 @@
+              */
+             lookahead -= prev_length-1;
+             prev_length -= 2;
++	    RSYNC_ROLL(strstart, prev_length+1);
+             do {
+                 strstart++;
+                 INSERT_STRING(strstart, hash_head);
+@@ -742,24 +803,51 @@
+             match_available = 0;
+             match_length = MIN_MATCH-1;
+             strstart++;
+-            if (flush) FLUSH_BLOCK(0), block_start = strstart;
+ 
++	    if (rsync && strstart > rsync_chunk_end) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++		flush = 1;
++	    }
++            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) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++
++		flush = 1;
++	    }
++            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) {
++		ush  attr = 0;          /* ascii/binary flag */
++
++		/* Reset huffman tree */
++		ct_init(&attr, &method);
++		rsync_chunk_end = 0xFFFFFFFFUL;
++
++		FLUSH_BLOCK(0), block_start = strstart;
++	    }
+             match_available = 1;
++	    RSYNC_ROLL(strstart, 1);
+             strstart++;
+             lookahead--;
+         }
+diff -u -r gzip-1.5/doc/gzip.texi /home/bdale/debian/gzip/doc/gzip.texi
+--- gzip-1.5/doc/gzip.texi	2012-01-01 01:53:58.000000000 -0700
++++ /home/bdale/debian/gzip/doc/gzip.texi	2012-06-19 14:09:36.041559612 -0600
+@@ -207,6 +207,7 @@
+   -V, --version     display version number
+   -1, --fast        compress faster
+   -9, --best        compress better
++    --rsyncable   Make rsync-friendly archive
+ 
+ With no FILE, or when FILE is -, read standard input.
+ 
+@@ -353,6 +354,30 @@
+ into the directory and compress all the files it finds there (or
+ decompress them in the case of @command{gunzip}).
+ 
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This can reduce the compression slightly in some 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.
++
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on
++the input.  This increases size by less than 1 percent most
++cases, but means that the @command{rsync} program can much more efficiently
++synchronize files compressed with this flag.  @command{gunzip}
++cannot tell the difference between a compressed file created
++with this option, and one created without it.
++
++ at item --rsyncable
++While compressing, synchronize the output occasionally based on the
++input.  This can reduce the compression slightly in some 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
+--- gzip-1.5/gzip.c	2012-04-24 10:25:28.000000000 -0600
++++ /home/bdale/debian/gzip/gzip.c	2012-06-19 14:00:43.283873180 -0600
+@@ -213,6 +213,7 @@
+ 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[] =
+   {
+@@ -270,7 +271,7 @@
+     {"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 }
+ };
+ 
+@@ -353,6 +354,7 @@
+  "  -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.",
+  "",
+@@ -481,8 +483,11 @@
+ #else
+             recursive = 1;
+ #endif
+-            break;
+-        case 'S':
++	    break;
++        case 'R':
++	    rsync = 1; break;
++
++	case 'S':
+ #ifdef NO_MULTIPLE_DOTS
+             if (*optarg == '.') optarg++;
+ #endif
+diff -u -r gzip-1.5/gzip.h /home/bdale/debian/gzip/gzip.h
+--- gzip-1.5/gzip.h	2012-01-01 01:53:58.000000000 -0700
++++ /home/bdale/debian/gzip/gzip.h	2012-06-19 13:57:36.833883093 -0600
+@@ -140,6 +140,7 @@
+ 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 */
+diff --git a/gzip.1 b/gzip.1
+index 71e097c..faee860 100644
+--- a/gzip.1
++++ b/gzip.1
+@@ -5,6 +5,7 @@ gzip, gunzip, zcat \- compress or expand files
+ .ll +8
+ .B gzip
+ .RB [ " \-acdfhklLnNrtvV19 " ]
++.RB [ --rsyncable ]
+ .RB [ \-S\ suffix ]
+ [
+ .I "name \&..."
+@@ -287,6 +288,16 @@ will descend into the directory and compress all the files it finds there
+ .I gunzip
+ ).
+ .TP
++.B --rsyncable
++While compressing, synchronize the output occasionally based on the input.
++This increases size by less than 1 percent most cases, but means that the
++.BR rsync (1)
++program can take advantage of similarities in the uncompressed input
++when syncronizing two files compressed with this flag.
++.I gunzip
++cannot tell the difference between a compressed file created with this option,
++and one created without it.
++.TP
+ .B \-S .suf   --suffix .suf
+ When compressing, use suffix .suf instead of .gz.
+ Any non-empty suffix can be given, but suffixes

Deleted: csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch	2014-02-23 20:45:47 UTC (rev 23070)
+++ csw/mgar/pkg/gzip/trunk/files/gzip-1.3.9-rsync.patch	2014-02-25 09:51:27 UTC (rev 23071)
@@ -1,280 +0,0 @@
-diff -up gzip-1.3.12/trees.c.rsync gzip-1.3.12/trees.c
---- gzip-1.3.12/trees.c.rsync	2006-11-20 09:40:33.000000000 +0100
-+++ gzip-1.3.12/trees.c	2008-09-01 14:35:12.000000000 +0200
-@@ -860,9 +860,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 */
-@@ -955,6 +956,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 -up gzip-1.3.12/deflate.c.rsync gzip-1.3.12/deflate.c
---- gzip-1.3.12/deflate.c.rsync	2006-12-08 00:53:00.000000000 +0100
-+++ gzip-1.3.12/deflate.c	2008-09-01 14:35:12.000000000 +0200
-@@ -135,6 +135,14 @@ static char rcsid[] = "$Id: deflate.c,v 
- #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.
-  */
-@@ -216,6 +224,8 @@ local int compr_level;
- unsigned near 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
-@@ -314,6 +324,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;
-@@ -550,6 +564,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;
- 
-@@ -577,13 +593,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
-@@ -594,7 +643,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;
-@@ -624,6 +673,7 @@ local off_t deflate_fast()
- 
-             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.
-              */
-@@ -652,9 +702,14 @@ local off_t deflate_fast()
-             /* 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
-@@ -728,6 +783,7 @@ off_t deflate()
-              */
-             lookahead -= prev_length-1;
-             prev_length -= 2;
-+            RSYNC_ROLL(strstart, prev_length+1);
-             do {
-                 strstart++;
-                 INSERT_STRING(strstart, hash_head);
-@@ -740,24 +796,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.12/gzip.c.rsync gzip-1.3.12/gzip.c
---- gzip-1.3.12/gzip.c.rsync	2007-03-20 06:09:51.000000000 +0100
-+++ gzip-1.3.12/gzip.c	2008-09-01 14:35:12.000000000 +0200
-@@ -231,6 +231,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 */
- 
- struct option longopts[] =
- {
-@@ -260,6 +261,7 @@ 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 }
- };
- 
-@@ -341,6 +343,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.",
-  "",
-@@ -469,6 +472,9 @@ int main (argc, argv)
- 	    recursive = 1;
- #endif
- 	    break;
-+
-+        case 'R':
-+	    rsync = 1; break;
- 	case 'S':
- #ifdef NO_MULTIPLE_DOTS
-             if (*optarg == '.') optarg++;
-diff -up gzip-1.3.12/gzip.h.rsync gzip-1.3.12/gzip.h
---- gzip-1.3.12/gzip.h.rsync	2007-03-20 06:09:51.000000000 +0100
-+++ gzip-1.3.12/gzip.h	2008-09-01 14:35:12.000000000 +0200
-@@ -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 */
-@@ -306,7 +307,7 @@ off_t deflate OF((void));
-         /* in trees.c */
- void ct_init     OF((ush *attr, int *method));
- int  ct_tally    OF((int dist, int lc));
--off_t flush_block OF((char *buf, ulg stored_len, int eof));
-+off_t flush_block OF((char *buf, ulg stored_len, int pad, int eof)); 
- 
-         /* in bits.c */
- void     bi_init    OF((file_t zipfile));
-diff -up gzip-1.3.12/doc/gzip.texi.rsync gzip-1.3.12/doc/gzip.texi
---- gzip-1.3.12/doc/gzip.texi.rsync	2007-02-06 00:29:04.000000000 +0100
-+++ gzip-1.3.12/doc/gzip.texi	2008-09-01 14:35:12.000000000 +0200
-@@ -350,6 +350,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}).
- 
-+ at 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

Deleted: csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2
===================================================================
--- csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2	2014-02-23 20:45:47 UTC (rev 23070)
+++ csw/mgar/pkg/gzip/trunk/files/gzip.rsync.patch2	2014-02-25 09:51:27 UTC (rev 23071)
@@ -1,280 +0,0 @@
-diff -ur gzip-1.2.4.orig/deflate.c gzip-1.2.4-rsync/deflate.c
---- gzip-1.2.4.orig/deflate.c	Fri Aug 13 22:35:31 1993
-+++ gzip-1.2.4-rsync/deflate.c	Sat Dec 30 15:33:25 2000
-@@ -121,6 +121,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.
-  */
-@@ -202,6 +210,8 @@
- unsigned near 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
-@@ -300,6 +310,10 @@
- #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;
-@@ -536,6 +550,8 @@
-         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;
- 
-@@ -563,13 +579,46 @@
-     }
- }
- 
-+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
-@@ -580,7 +629,7 @@
- local ulg 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;
-@@ -609,6 +658,7 @@
- 
-             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.
-              */
-@@ -637,9 +687,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
-@@ -715,6 +770,7 @@
-              */
-             lookahead -= prev_length-1;
-             prev_length -= 2;
-+	    RSYNC_ROLL(strstart, prev_length+1);
-             do {
-                 strstart++;
-                 INSERT_STRING(strstart, hash_head);
-@@ -727,24 +783,39 @@
-             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 -ur gzip-1.2.4.orig/gzip.c gzip-1.2.4-rsync/gzip.c
---- gzip-1.2.4.orig/gzip.c	Thu Aug 19 23:39:43 1993
-+++ gzip-1.2.4-rsync/gzip.c	Fri Dec 29 21:20:54 2000
-@@ -239,6 +239,7 @@
- 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 */
- 
- struct option longopts[] =
- {
-@@ -268,6 +269,7 @@
-     {"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 }
- };
- 
-@@ -357,6 +359,7 @@
-  " -Z --lzw         produce output compatible with old compress",
-  " -b --bits maxbits   max number of bits per code (implies -Z)",
- #endif
-+ "    --rsyncable   Make rsync-friendly archive",
-  " file...          files to (de)compress. If none given, use standard input.",
-   0};
-     char **p = help_msg;
-@@ -516,6 +519,9 @@
- #else
- 	    recursive = 1; break;
- #endif
-+	case 'R':
-+	    rsync = 1; break;
-+
- 	case 'S':
- #ifdef NO_MULTIPLE_DOTS
-             if (*optarg == '.') optarg++;
-diff -ur gzip-1.2.4.orig/gzip.h gzip-1.2.4-rsync/gzip.h
---- gzip-1.2.4.orig/gzip.h	Fri Aug 13 22:35:33 1993
-+++ gzip-1.2.4-rsync/gzip.h	Sat Dec 30 15:26:56 2000
-@@ -131,6 +131,7 @@
- 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 long bytes_in;   /* number of input bytes */
- extern long bytes_out;  /* number of output bytes */
-@@ -282,7 +283,7 @@
-         /* in trees.c */
- void ct_init     OF((ush *attr, int *method));
- int  ct_tally    OF((int dist, int lc));
--ulg  flush_block OF((char *buf, ulg stored_len, int eof));
-+ulg  flush_block OF((char *buf, ulg stored_len, int pad, int eof));
- 
-         /* in bits.c */
- void     bi_init    OF((file_t zipfile));
-diff -ur gzip-1.2.4.orig/gzip.texi gzip-1.2.4-rsync/gzip.texi
---- gzip-1.2.4.orig/gzip.texi	Thu Aug 19 06:42:50 1993
-+++ gzip-1.2.4-rsync/gzip.texi	Fri Dec 29 21:20:54 2000
-@@ -316,6 +316,14 @@
- into the directory and compress all the files it finds there (or
- decompress them in the case of @code{gunzip}).
- 
-+ at 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 @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
-diff -ur gzip-1.2.4.orig/trees.c gzip-1.2.4-rsync/trees.c
---- gzip-1.2.4.orig/trees.c	Wed Aug 18 03:36:32 1993
-+++ gzip-1.2.4-rsync/trees.c	Sat Dec 30 15:37:00 2000
-@@ -850,9 +850,10 @@
-  * trees or store, and output the encoded block to the zip file. This function
-  * returns the total compressed length for the file so far.
-  */
--ulg flush_block(buf, stored_len, eof)
-+ulg 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 */
-@@ -944,6 +967,10 @@
-         Assert (input_len == isize, "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 */
-     }
-     Tracev((stderr,"\ncomprlen %lu(%lu) ", compressed_len>>3,
-            compressed_len-7*eof));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list