FREEBSD-upgrade revision 199767f8919635c4928607450d9e0abb932109ce
199767f8919635c4928607450d9e0abb932109ceToomas Soome$FreeBSD$
199767f8919635c4928607450d9e0abb932109ceToomas Soome
199767f8919635c4928607450d9e0abb932109ceToomas SoomeZLib 1.2.2
199767f8919635c4928607450d9e0abb932109ceToomas Soome
199767f8919635c4928607450d9e0abb932109ceToomas SoomeOriginal distribution from http://www.gzip.org/zlib/
199767f8919635c4928607450d9e0abb932109ceToomas Soome
199767f8919635c4928607450d9e0abb932109ceToomas SoomeVendor files removed from distribution before import:
199767f8919635c4928607450d9e0abb932109ceToomas Soome INDEX configure qnx/
199767f8919635c4928607450d9e0abb932109ceToomas Soome Makefile contrib/ win32/
199767f8919635c4928607450d9e0abb932109ceToomas Soome Makefile.in msdos/ zconf.in.h
199767f8919635c4928607450d9e0abb932109ceToomas Soome amiga/ old/
199767f8919635c4928607450d9e0abb932109ceToomas Soome as400/ projects/
199767f8919635c4928607450d9e0abb932109ceToomas Soome
199767f8919635c4928607450d9e0abb932109ceToomas SoomeVendor files imported:
199767f8919635c4928607450d9e0abb932109ceToomas Soome ChangeLog example.c minigzip.c
199767f8919635c4928607450d9e0abb932109ceToomas Soome FAQ gzio.c trees.c
199767f8919635c4928607450d9e0abb932109ceToomas Soome README infback.c trees.h
199767f8919635c4928607450d9e0abb932109ceToomas Soome adler32.c inffast.c uncompr.c
199767f8919635c4928607450d9e0abb932109ceToomas Soome algorithm.txt inffast.h zconf.h
199767f8919635c4928607450d9e0abb932109ceToomas Soome compress.c inffixed.h zlib.3
199767f8919635c4928607450d9e0abb932109ceToomas Soome crc32.c inflate.c zlib.h
199767f8919635c4928607450d9e0abb932109ceToomas Soome crc32.h inflate.h zutil.c
199767f8919635c4928607450d9e0abb932109ceToomas Soome deflate.c inftrees.c zutil.h
199767f8919635c4928607450d9e0abb932109ceToomas Soome deflate.h inftrees.h
199767f8919635c4928607450d9e0abb932109ceToomas Soome
199767f8919635c4928607450d9e0abb932109ceToomas SoomeAs of April, 2005, only the following three vendor files
199767f8919635c4928607450d9e0abb932109ceToomas Soomehad non-trivial local changes:
199767f8919635c4928607450d9e0abb932109ceToomas Soome gzio.c minigzip.c zconf.h
199767f8919635c4928607450d9e0abb932109ceToomas Soome
199767f8919635c4928607450d9e0abb932109ceToomas SoomeAdded files (not from vendor):
199767f8919635c4928607450d9e0abb932109ceToomas Soome Makefile zopen.c FREEBSD-upgrade
199767f8919635c4928607450d9e0abb932109ceToomas Soome
199767f8919635c4928607450d9e0abb932109ceToomas SoomeTo Update:
199767f8919635c4928607450d9e0abb932109ceToomas Soome 1) Unpack vendor sources into a clean directory.
199767f8919635c4928607450d9e0abb932109ceToomas Soome 2) Delete unnecessary files.
199767f8919635c4928607450d9e0abb932109ceToomas Soome 3) Import onto the vendor branch. The 1.2.2 import was done like this:
199767f8919635c4928607450d9e0abb932109ceToomas Soome cvs -d <CVSROOT> import -ko -m "ZLib 1.2.2" src/lib/libz ZLIB v1_2_2
199767f8919635c4928607450d9e0abb932109ceToomas Soome 4) In a clean directory, check out a fresh copy of HEAD,
199767f8919635c4928607450d9e0abb932109ceToomas Soome merging in vendor changes since the last import.
199767f8919635c4928607450d9e0abb932109ceToomas Soome cvs -d <CVSROOT> co -jZLIB:yesterday -jZLIB src/lib/libz
199767f8919635c4928607450d9e0abb932109ceToomas Soome 5) Resolve any conflicts and commit them.
199767f8919635c4928607450d9e0abb932109ceToomas Soome 6) Update this file with any changes to the file list or update procedure.
199767f8919635c4928607450d9e0abb932109ceToomas Soome
199767f8919635c4928607450d9e0abb932109ceToomas Soomekientzle@FreeBSD.org