301212 - Upgrade mozilla/security/nss/cmd/zlib to zlib 1.2.3

Status: RESOLVED FIXED

(NSS :: Libraries, defect, P1)

Description

[Wan-Teh Chang]

zlib 1.2.3 is now available.  It contains some security vulnerability
fixes.  We should upgrade mozilla/security/nss/cmd/zlib to zlib 1.2.3.

See bug 131826 for our previous upgrade to zlib 1.2.2.  That bug contains
our local patch for zlib 1.2.2 (attachment 164666 [details] [diff] [review]) to use our own
implementation of errno for Windows CE.  We may want to apply that
patch again.

Comment 1

[Wan-Teh Chang]

Attachment: Patch to upgrade to zlib 1.2.3

This patch does not contain our local changes for Windows CE.
Please look at the new code in zutil.h and see if zlib's
handling of errno is satisfactory.  If it still isn't, we
can apply our local changes again.

Comment 2

[Wan-Teh Chang]

Attachment: Subset of the previous patch that's related to errno on WinCE

It's easier to see in this smaller patch what our local changes
were and what the new official code is.

The new official code defines 'errno' as a macro that expands
to a global variable named z_errno whose value is always 0.
It is done this way to simplify porting to WinCE and the value of
errno is not supposed to be used.

Comment 3

[Nelson Bolyard (seldom reads bugmail)]

Comment on attachment 189686 [details] [diff] [review]
Subset of the previous patch that's related to errno on WinCE

With regard to the question of WinCE support in zlib, 
IIRC, WinCE has nothing like a command line shell.  
Further, WinCE doesn't start programs at the "main" function.

It is possible to build and run the NSS commands by writing a 
special wrapper for main(), and I have done so to test 
strsclnt and selfserv.	But there is no (conventient) way to 
provide command line args that vary from run to run, so one
resorts to hard-coding command line args in that wrapper for
main.  

Consequently, past attempts to build NSS on WinCE have 
elected to exclude most NSS utility commands, including 
signtool - the only command that uses zlib, from the build.

So, I have no problem with letting zlib define errno as zero
for its own use on WinCE.

Comment 4

[Robert Relyea]

Comment on attachment 189683 [details] [diff] [review]
Patch to upgrade to zlib 1.2.3

r=rrelyea other than the wince change, our copy of zlib is essentially the same
as the official release. This patch appears to move us up to the latest
release.

Comment 5

[Nelson Bolyard (seldom reads bugmail)]

Is there an URL for a page describing what is fixed in this release?

We've been thinking about making a 3.10.1 to include various fixes, 
including the recent fix for zlib's inftrees.c.  I think we should 
hold that so we can include this newer zlib code.  

Comment 6

[Wan-Teh Chang]

Nelson: I heard about zlib 1.2.3 in bug 300349 comment 7.
It hasn't been announced yet.

You can find out what is fixed in this release in the
ChangeLog file in the zlib 1.2.3 distribution.  NSS is
using zlib 1.2.2 right now.

Comment 7

[Nelson Bolyard (seldom reads bugmail)]

Comment on attachment 189683 [details] [diff] [review]
Patch to upgrade to zlib 1.2.3

I'm removing myself from the superreview request.  Sorry, I just don't have
time to learn this library. 
If there are no other volunteers to review it, then I guess we should follow
precedent and check it in, knowing that it is the next official release of that
library.

Comment 8

[Wan-Teh Chang]

Comment on attachment 189683 [details] [diff] [review]
Patch to upgrade to zlib 1.2.3

Nelson: sorry, I should have explained what I asked the
reviewers to do.

What I need the reviewers to do is to approve the following:
drop in the .c and .h files from zlib 1.2.3 *with no local
changes*.  Please indicate your approval by marking review+
on this patch.

The only local changes we applied before are to use our
own "errno" implementation for WinCE.  In zlib 1.2.3, the
authors made an effort to prevent their dummy "errno"
implementation from conflicting with other "errno"
implementations, so I propose that we just use their
"errno" implementation.

Comment 9

[Wan-Teh Chang]

Attachment: Patch (for NSS trunk only) as checked in

The only difference from "Patch to upgrade to zlib 1.2.3" is
that I also updated the README file.

I checked in this patch on the NSS trunk for NSS 3.11.	Nelson,
Neil, if you need this in NSS 3.10.1, you need to check this
patch in on the NSS_3_10_BRANCH.

Checking in README;
/cvsroot/mozilla/security/nss/cmd/zlib/README,v  <--  README
new revision: 1.5; previous revision: 1.4
done
Checking in adler32.c;
/cvsroot/mozilla/security/nss/cmd/zlib/adler32.c,v  <--  adler32.c
new revision: 1.5; previous revision: 1.4
done
Checking in compress.c;
/cvsroot/mozilla/security/nss/cmd/zlib/compress.c,v  <--  compress.c
new revision: 1.5; previous revision: 1.4
done
Checking in crc32.c;
/cvsroot/mozilla/security/nss/cmd/zlib/crc32.c,v  <--  crc32.c
new revision: 1.5; previous revision: 1.4
done
Checking in deflate.c;
/cvsroot/mozilla/security/nss/cmd/zlib/deflate.c,v  <--  deflate.c
new revision: 1.5; previous revision: 1.4
done
Checking in deflate.h;
/cvsroot/mozilla/security/nss/cmd/zlib/deflate.h,v  <--  deflate.h
new revision: 1.5; previous revision: 1.4
done
Checking in example.c;
/cvsroot/mozilla/security/nss/cmd/zlib/example.c,v  <--  example.c
new revision: 1.5; previous revision: 1.4
done
Checking in gzio.c;
/cvsroot/mozilla/security/nss/cmd/zlib/gzio.c,v  <--  gzio.c
new revision: 1.5; previous revision: 1.4
done
Checking in infback.c;
/cvsroot/mozilla/security/nss/cmd/zlib/infback.c,v  <--  infback.c
new revision: 1.2; previous revision: 1.1
done
Checking in inffast.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inffast.c,v  <--  inffast.c
new revision: 1.5; previous revision: 1.4
done
Checking in inflate.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inflate.c,v  <--  inflate.c
new revision: 1.5; previous revision: 1.4
done
Checking in inflate.h;
/cvsroot/mozilla/security/nss/cmd/zlib/inflate.h,v  <--  inflate.h
new revision: 1.2; previous revision: 1.1
done
Checking in inftrees.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inftrees.c,v  <--  inftrees.c
new revision: 1.6; previous revision: 1.5
done
Checking in inftrees.h;
/cvsroot/mozilla/security/nss/cmd/zlib/inftrees.h,v  <--  inftrees.h
new revision: 1.5; previous revision: 1.4
done
Checking in minigzip.c;
/cvsroot/mozilla/security/nss/cmd/zlib/minigzip.c,v  <--  minigzip.c
new revision: 1.5; previous revision: 1.4
done
Checking in trees.c;
/cvsroot/mozilla/security/nss/cmd/zlib/trees.c,v  <--  trees.c
new revision: 1.5; previous revision: 1.4
done
Checking in uncompr.c;
/cvsroot/mozilla/security/nss/cmd/zlib/uncompr.c,v  <--  uncompr.c
new revision: 1.5; previous revision: 1.4
done
Checking in zconf.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zconf.h,v  <--  zconf.h
new revision: 1.6; previous revision: 1.5
done
Checking in zlib.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zlib.h,v  <--  zlib.h
new revision: 1.5; previous revision: 1.4
done
Checking in zutil.c;
/cvsroot/mozilla/security/nss/cmd/zlib/zutil.c,v  <--  zutil.c
new revision: 1.6; previous revision: 1.5
done
Checking in zutil.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zutil.h,v  <--  zutil.h
new revision: 1.6; previous revision: 1.5
done

Comment 10

[Wan-Teh Chang]

Comment on attachment 189936 [details] [diff] [review]
Patch (for NSS trunk only) as checked in

I found that this patch is missing a security fix that I already
checked in on the NSS trunk, so don't use this patch for the
NSS_3_10_BRANCH or earlier.  Alternatively, apply the patch in
bug 299445, and then apply this patch.

Comment 11

[Nelson Bolyard (seldom reads bugmail)]

Comment on attachment 189683 [details] [diff] [review]
Patch to upgrade to zlib 1.2.3

Yes, I'm OK with dropping our previous change for errno on WinCE.

To the the 3.10 branch, I'd suggest simply checking in the zlib
sources, as they are found on the trunk (now that this has been
checked in) onto the branch.

Comment 12

[Wan-Teh Chang]

I checked in the zlib 1.2.3 files onto the NSS_3_10_BRANCH for
NSS 3.10.1.

Checking in README;
/cvsroot/mozilla/security/nss/cmd/zlib/README,v  <--  README
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in adler32.c;
/cvsroot/mozilla/security/nss/cmd/zlib/adler32.c,v  <--  adler32.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in compress.c;
/cvsroot/mozilla/security/nss/cmd/zlib/compress.c,v  <--  compress.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in crc32.c;
/cvsroot/mozilla/security/nss/cmd/zlib/crc32.c,v  <--  crc32.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in deflate.c;
/cvsroot/mozilla/security/nss/cmd/zlib/deflate.c,v  <--  deflate.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in deflate.h;
/cvsroot/mozilla/security/nss/cmd/zlib/deflate.h,v  <--  deflate.h
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in example.c;
/cvsroot/mozilla/security/nss/cmd/zlib/example.c,v  <--  example.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in gzio.c;
/cvsroot/mozilla/security/nss/cmd/zlib/gzio.c,v  <--  gzio.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in infback.c;
/cvsroot/mozilla/security/nss/cmd/zlib/infback.c,v  <--  infback.c
new revision: 1.1.8.1; previous revision: 1.1
done
Checking in inffast.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inffast.c,v  <--  inffast.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in inflate.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inflate.c,v  <--  inflate.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in inflate.h;
/cvsroot/mozilla/security/nss/cmd/zlib/inflate.h,v  <--  inflate.h
new revision: 1.1.8.1; previous revision: 1.1
done
Checking in inftrees.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inftrees.c,v  <--  inftrees.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in inftrees.h;
/cvsroot/mozilla/security/nss/cmd/zlib/inftrees.h,v  <--  inftrees.h
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in minigzip.c;
/cvsroot/mozilla/security/nss/cmd/zlib/minigzip.c,v  <--  minigzip.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in trees.c;
/cvsroot/mozilla/security/nss/cmd/zlib/trees.c,v  <--  trees.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in uncompr.c;
/cvsroot/mozilla/security/nss/cmd/zlib/uncompr.c,v  <--  uncompr.c
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in zconf.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zconf.h,v  <--  zconf.h
new revision: 1.5.8.1; previous revision: 1.5
done
Checking in zlib.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zlib.h,v  <--  zlib.h
new revision: 1.4.8.1; previous revision: 1.4
done
Checking in zutil.c;
/cvsroot/mozilla/security/nss/cmd/zlib/zutil.c,v  <--  zutil.c
new revision: 1.5.8.1; previous revision: 1.5
done
Checking in zutil.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zutil.h,v  <--  zutil.h
new revision: 1.5.8.1; previous revision: 1.5
done

Comment 13

[Wan-Teh Chang]

QA could verify this bug as follows.

1. Check out mozilla/security/nss/cmd/zlib without RCS keyword
expansion.

Trunk:
   cvs co -A -kk mozilla/security/nss/cmd/zlib

NSS_3_10_BRANCH:

   cvs co -r NSS_3_10_BRANCH -kk mozilla/security/nss/cmd/zlib

2. Compare the *.c, *.h, and README file in the
mozilla/security/nss/cmd/zlib directory with the version in
zlib 1.2.3 and verify that they are the same.  You can run
a script like the following in mozilla/security/nss/cmd/zlib
to do that (replace /home/wtchang/zlib-1.2.3 by the actual
location of your zlib-1.2.3 source tree):

for file in *.c *.h README; do
    echo "diff /home/wtchang/zlib-1.2.3/$file $file"
    diff /home/wtchang/zlib-1.2.3/$file $file
done

3. NSS QA (all.sh) passed on all platforms.

Comment 14

[Christophe Ravel]

Attachment: Fix for NSS_3_3_4_1_BRANCH

Remove: (11 files)
< infblock.c
< infblock.h
< infcodes.c
< infcodes.h
< infutil.c
< infutil.h
< makefile.win
< netscape_mods.doc
< stubs.c
< zip16.def
< zip_nodl.c

Add: (5 files)
> crc32.h
> infback.c
> inffixed.h
> inflate.h
> trees.h

Comment 15

[Neil Williams]

Comment on attachment 192101 [details] [diff] [review]
Fix for NSS_3_3_4_1_BRANCH

This patch is hard to review but based on the fact that it is a wholesale
replacement and it passes all.sh I'm giving it a go.

Comment 16

[Julien Pierre]

Christophe,

Which tags or branch is supposed to already have the latest zlib ?
I pulled out NSS_3_3_4_1_BRANCH and applied your patch.
I tried to cvs diff -r NSS_3_10_1_BRANCH and -r NSS_3_10_BRANCH .
There were a lot of differences. Shouldn't the zlib source files now be the same
between all these branches, if we updated them all to the latest zlib version ?

Comment 17

[Glenn Randers-Pehrson]

Trunk (mozilla/security/nss/cmd/zlib) seems to be still at zlib-1.2.2, November
2004.

Comment 18

[Wan-Teh Chang]

Glenn: you were looking at the version of NSS in Mozilla's trunk.
That's NSS 3.10.  It's not necessary to upgrade that because
Mozilla doesn't use that code.  That copy of zlib is only used
by the NSS command-line tools modutil and signtool.

The zlib in NSS 3.10.1 and NSS trunk (which will be NSS 3.11) has
been upgraded to zlib 1.2.3.

Comment 19

[Nelson Bolyard (seldom reads bugmail)]

(In reply to comment #16)
> Christophe,
> 
> Which tags or branch is supposed to already have the latest zlib ?
> I pulled out NSS_3_3_4_1_BRANCH and applied your patch.
> I tried to cvs diff -r NSS_3_10_1_BRANCH and -r NSS_3_10_BRANCH .
> There were a lot of differences. Shouldn't the zlib source files now be 
> the same
> between all these branches, if we updated them all to the latest zlib 
> version ?
> 

Christophe didn't see Julien's previous comment, because he wasn't added to
the cc list.  Perhaps that comment belonged in a different bug?

Comment 20

[Nelson Bolyard (seldom reads bugmail)]

(In reply to comment #18)
> Glenn: you were looking at the version of NSS in Mozilla's trunk.
> That's NSS 3.10. [snip]

> The zlib in NSS 3.10.1 and NSS trunk (which will be NSS 3.11) has
> been upgraded to zlib 1.2.3.

Are there now two CVS repositories for NSS?  
AFAIK, in any given CVS repository there is only one trunk.
Therefore, it's not clear how mozilla can have a separate cvs trunk for NSS
from NSS's own trunk in the same repository.
Or does Mozilla apply the name "trunk" to some branch of theirs?

Comment 21

[Wan-Teh Chang]

There is only one CVS repository.

Mozilla trunk, which pulls NSS with the NSS_CLIENT_TAG CVS tag:
http://lxr.mozilla.org/seamonkey/source/security/nss/cmd/zlib/zlib.h

NSS trunk:
http://lxr.mozilla.org/security/source/security/nss/cmd/zlib/zlib.h

NSS_CLIENT_TAG is a floating CVS tag.  It currently coincides
with NSS_3_10_RTM (plus some build system enhancements)

Comment 22

[Christophe Ravel]

(In reply to comment #16)
> Christophe,
> 
> Which tags or branch is supposed to already have the latest zlib ?
> I pulled out NSS_3_3_4_1_BRANCH and applied your patch.
> I tried to cvs diff -r NSS_3_10_1_BRANCH and -r NSS_3_10_BRANCH .
> There were a lot of differences. Shouldn't the zlib source files now be the same
> between all these branches, if we updated them all to the latest zlib version ?
> 


First, I checked that we have the same Zlib content on the trunk, the
NSS_3_10_BRANCH and the NSS_3_10_1_BRANCH. Good news: these 3 branches are
identical for mozilla/security/nss/cmd/zlib.

In the comment of the patch for NSS_3_3_4_1_BRANCH, I mentionned that there are
11 files to remove and 5 files to add. Did you do this too before checking the
diffs ?
Could you send me the differences you are seeing ?

From my side, the files that should be different between NSS_3_3_4_1_BRANCH and
the trunk are:
mozilla/security/nss/cmd/zlib/manifest.mn
mozilla/security/nss/cmd/zlib/config.mk
mozilla/security/nss/cmd/zlib/Makefile

The differences are due to:
- Mozilla Copyright
- Build variables
But all the .c, .h and README files (the Zlib files) should have no difference
(this is the case in my workspace).

Comment 23

[Christophe Ravel]

Comment on attachment 192101 [details] [diff] [review]
Fix for NSS_3_3_4_1_BRANCH

I am going to send a new patch with the new files in the patch.

Comment 24

[Christophe Ravel]

Attachment: Fix for NSS_3_3_4_1_BRANCH (enhanced patch)

This new patch uses "cvs diff -Nu" for creation. It contains the new files.

In addition, you have to manually remove the following files from
NSS_3_3_4_1_BRANCH (11 files):
< infblock.c
< infblock.h
< infcodes.c
< infcodes.h
< infutil.c
< infutil.h
< makefile.win
< netscape_mods.doc
< stubs.c
< zip16.def
< zip_nodl.c

Comment 25

[Christophe Ravel]

Comment on attachment 192422 [details] [diff] [review]
Fix for NSS_3_3_4_1_BRANCH (enhanced patch)

Committed on NSS_3_3_4_1_BRANCH.

Checking in README;
/cvsroot/mozilla/security/nss/cmd/zlib/README,v  <--  README
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in adler32.c;
/cvsroot/mozilla/security/nss/cmd/zlib/adler32.c,v  <--  adler32.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in compress.c;
/cvsroot/mozilla/security/nss/cmd/zlib/compress.c,v  <--  compress.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in crc32.c;
/cvsroot/mozilla/security/nss/cmd/zlib/crc32.c,v  <--  crc32.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in crc32.h;
/cvsroot/mozilla/security/nss/cmd/zlib/crc32.h,v  <--  crc32.h
new revision: 1.1.18.2; previous revision: 1.1.18.1
done
Checking in deflate.c;
/cvsroot/mozilla/security/nss/cmd/zlib/deflate.c,v  <--  deflate.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in deflate.h;
/cvsroot/mozilla/security/nss/cmd/zlib/deflate.h,v  <--  deflate.h
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in example.c;
/cvsroot/mozilla/security/nss/cmd/zlib/example.c,v  <--  example.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in gzio.c;
/cvsroot/mozilla/security/nss/cmd/zlib/gzio.c,v  <--  gzio.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in infback.c;
/cvsroot/mozilla/security/nss/cmd/zlib/infback.c,v  <--  infback.c
new revision: 1.2.2.2; previous revision: 1.2.2.1
done
Removing infblock.c;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/infblock.c,v  <--	infblock.c
new revision: delete; previous revision: 1.1
done
Removing infblock.h;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/infblock.h,v  <--	infblock.h
new revision: delete; previous revision: 1.1
done
Removing infcodes.c;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/infcodes.c,v  <--	infcodes.c
new revision: delete; previous revision: 1.1
done
Removing infcodes.h;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/infcodes.h,v  <--	infcodes.h
new revision: delete; previous revision: 1.1
done
Checking in inffast.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inffast.c,v  <--  inffast.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in inffast.h;
/cvsroot/mozilla/security/nss/cmd/zlib/inffast.h,v  <--  inffast.h
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in inffixed.h;
/cvsroot/mozilla/security/nss/cmd/zlib/inffixed.h,v  <--  inffixed.h
new revision: 1.3.18.2; previous revision: 1.3.18.1
done
Checking in inflate.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inflate.c,v  <--  inflate.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in inflate.h;
/cvsroot/mozilla/security/nss/cmd/zlib/inflate.h,v  <--  inflate.h
new revision: 1.2.2.2; previous revision: 1.2.2.1
done
Checking in inftrees.c;
/cvsroot/mozilla/security/nss/cmd/zlib/inftrees.c,v  <--  inftrees.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in inftrees.h;
/cvsroot/mozilla/security/nss/cmd/zlib/inftrees.h,v  <--  inftrees.h
new revision: 1.1.238.1; previous revision: 1.1
done
Removing infutil.c;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/infutil.c,v  <--  infutil.c
new revision: delete; previous revision: 1.1
done
Removing infutil.h;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/infutil.h,v  <--  infutil.h
new revision: delete; previous revision: 1.1
done
Removing makefile.win;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/makefile.win,v  <--  makefile.win
new revision: delete; previous revision: 1.1
done
Checking in manifest.mn;
/cvsroot/mozilla/security/nss/cmd/zlib/manifest.mn,v  <--  manifest.mn
new revision: 1.3.172.1; previous revision: 1.3
done
Checking in minigzip.c;
/cvsroot/mozilla/security/nss/cmd/zlib/minigzip.c,v  <--  minigzip.c
new revision: 1.1.238.1; previous revision: 1.1
done
Removing netscape_mods.doc;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/netscape_mods.doc,v  <-- 
netscape_mods.doc
new revision: delete; previous revision: 1.1
done
Removing stubs.c;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/stubs.c,v	<--  stubs.c
new revision: delete; previous revision: 1.1
done
Checking in trees.c;
/cvsroot/mozilla/security/nss/cmd/zlib/trees.c,v  <--  trees.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in trees.h;
/cvsroot/mozilla/security/nss/cmd/zlib/trees.h,v  <--  trees.h
new revision: 1.2.92.2; previous revision: 1.2.92.1
done
Checking in uncompr.c;
/cvsroot/mozilla/security/nss/cmd/zlib/uncompr.c,v  <--  uncompr.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in zconf.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zconf.h,v  <--  zconf.h
new revision: 1.2.200.1; previous revision: 1.2
done
Removing zip16.def;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/zip16.def,v  <--  zip16.def
new revision: delete; previous revision: 1.1
done
Removing zip_nodl.c;
/cvsroot/mozilla/security/nss/cmd/zlib/Attic/zip_nodl.c,v  <--	zip_nodl.c
new revision: delete; previous revision: 1.1
done
Checking in zlib.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zlib.h,v  <--  zlib.h
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in zutil.c;
/cvsroot/mozilla/security/nss/cmd/zlib/zutil.c,v  <--  zutil.c
new revision: 1.1.238.1; previous revision: 1.1
done
Checking in zutil.h;
/cvsroot/mozilla/security/nss/cmd/zlib/zutil.h,v  <--  zutil.h
new revision: 1.1.174.1; previous revision: 1.1
done