Patch: update zlib/* to 1.1.3

Martin Pool mbp at samba.org
Mon Mar 11 14:15:00 EST 2002


On  5 Feb 2002, Jos Backus <josb at cncdsl.com> wrote:
> On Wed, Feb 06, 2002 at 02:30:51PM +1100, Martin Pool wrote:
> > rsync includes a slightly modified and incompatible version of zlib.
> > (PhD-project over-optimization...)  To update to a newer zlib would
> > require merging those changes across.
> 
> Just so I understand this correctly: does this patched version of zlib 1.1.2
> generate a compressed datastream which 1.1.3 cannot decompress, or
> vice versa?

Unfortunately, yes.  From rsync/src/zlib/README.rsync:

 ~ zlib has been adapted slightly for use in rsync. Please don't bother
 ~ the zlib authors with problems related to the use of zlib in rsync as
 ~ any bugs are likely to be our fault and not theirs.
 ~ 
 ~ Specific changes that have been made to zlib for rsync include:
 ~ 
 ~ - add Z_INSERT_ONLY to allow for efficient history updating without
 ~   actually emitting any data. This is used to compress the matched
 ~   blocks that don't cross the wire, which gives better compression
 ~   ratios on the literal data.
 ~ 
 ~ - fixed a number of minor compilation issues. (redefinition of MAX and
 ~   other such trivial things)
 ~ 
 ~ - include rsync.h to ensure that we get a consistent set of includes
 ~   for all C code in rsync and to take advantage of autoconf
 ~ 
 ~ --
 ~ Paul Mackerras and Andrew Tridgell

I'm going to do a three-way merge from 1.1.2->1.1.3 and 1.1.2->rsync,
and then perhaps send the patch to the upstream maintainers.  Whether
they will accept it is another matter.

-- 
Martin 




More information about the rsync mailing list