3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson$FreeBSD$

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilsonZLib 1.2.2

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilsonOriginal distribution from http://www.gzip.org/zlib/

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilsonVendor files removed from distribution before import:

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson INDEX configure qnx/

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson Makefile contrib/ win32/

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson Makefile.in msdos/ zconf.in.h

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson amiga/ old/

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson as400/ projects/

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilsonVendor files imported:

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson ChangeLog example.c minigzip.c

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson FAQ gzio.c trees.c

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson README infback.c trees.h

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson adler32.c inffast.c uncompr.c

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson algorithm.txt inffast.h zconf.h

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson compress.c inffixed.h zlib.3

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson crc32.c inflate.c zlib.h

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson crc32.h inflate.h zutil.c

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson deflate.c inftrees.c zutil.h

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson deflate.h inftrees.h

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson

a3d3ab94806056d2355afea6fe8daac41059b9fbludovicpAs of April, 2005, only the following three vendor files

0f8553e2af5fc49a510ecfcfc93e66d06713f631ludohad non-trivial local changes:

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson gzio.c minigzip.c zconf.h

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilsonAdded files (not from vendor):

0f8553e2af5fc49a510ecfcfc93e66d06713f631ludo Makefile zopen.c FREEBSD-upgrade

27f8adec83293fb8bd3bfa37175322b0ee3bb933jvergara

0f8553e2af5fc49a510ecfcfc93e66d06713f631ludoTo Update:

2f0f7926326cc76419b074fd91a589cb68980ffbdugan 1) Unpack vendor sources into a clean directory.

3ec8ffa3cd3bf9f3ed0d3f3ddb73b28a99b79f62neil_a_wilson 2) Delete unnecessary files.

3) Import onto the vendor branch. The 1.2.2 import was done like this:

cvs -d <CVSROOT> import -ko -m "ZLib 1.2.2" src/lib/libz ZLIB v1_2_2

4) In a clean directory, check out a fresh copy of HEAD,

merging in vendor changes since the last import.

cvs -d <CVSROOT> co -jZLIB:yesterday -jZLIB src/lib/libz

5) Resolve any conflicts and commit them.

6) Update this file with any changes to the file list or update procedure.

kientzle@FreeBSD.org