e59faf65ce864fe95dc00f5d52b8323cdbd0608aTimo Sirainen$FreeBSD$

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo SirainenZLib 1.2.2

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen

637ec4c33b4715737a41f7e58c9b6d1f693c27e2Timo SirainenOriginal distribution from http://www.gzip.org/zlib/

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo Sirainen

ec1a4f4306496380e9d96ee08a3718a669d0875aTimo SirainenVendor files removed from distribution before import:

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen INDEX configure qnx/

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen Makefile contrib/ win32/

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen Makefile.in msdos/ zconf.in.h

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen amiga/ old/

637ec4c33b4715737a41f7e58c9b6d1f693c27e2Timo Sirainen as400/ projects/

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo SirainenVendor files imported:

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo Sirainen ChangeLog example.c minigzip.c

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo Sirainen FAQ gzio.c trees.c

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen README infback.c trees.h

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen adler32.c inffast.c uncompr.c

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen algorithm.txt inffast.h zconf.h

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen compress.c inffixed.h zlib.3

4c104ff1cf1d5adbc7c20b650741dee364aa9234Timo Sirainen crc32.c inflate.c zlib.h

4c104ff1cf1d5adbc7c20b650741dee364aa9234Timo Sirainen crc32.h inflate.h zutil.c

4c104ff1cf1d5adbc7c20b650741dee364aa9234Timo Sirainen deflate.c inftrees.c zutil.h

4c104ff1cf1d5adbc7c20b650741dee364aa9234Timo Sirainen deflate.h inftrees.h

4c104ff1cf1d5adbc7c20b650741dee364aa9234Timo Sirainen

4c104ff1cf1d5adbc7c20b650741dee364aa9234Timo SirainenAs of April, 2005, only the following three vendor files

4c104ff1cf1d5adbc7c20b650741dee364aa9234Timo Sirainenhad non-trivial local changes:

4c104ff1cf1d5adbc7c20b650741dee364aa9234Timo Sirainen gzio.c minigzip.c zconf.h

08e7163a8d12979119fa56c92676af4ba6304f1aTimo Sirainen

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo SirainenAdded files (not from vendor):

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo Sirainen Makefile zopen.c FREEBSD-upgrade

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo Sirainen

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo SirainenTo Update:

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo Sirainen 1) Unpack vendor sources into a clean directory.

5d03d9f439e41c90215a3c938ffebe4c2a8ae257Timo Sirainen 2) Delete unnecessary files.

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

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

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

41942258112e4131de96b6a4399c1a8ac83a23cbTimo Sirainen merging in vendor changes since the last import.

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

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen 5) Resolve any conflicts and commit them.

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

41942258112e4131de96b6a4399c1a8ac83a23cbTimo Sirainen

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainenkientzle@FreeBSD.org

1358e2c58ce29231485a5cfa454756d429ad3d2cTimo Sirainen