Update zlib to 1.2.5.

Update zlib to 1.2.5.
This change applies upstream patches from 1.2.3 to 1.2.5.

BUG=30704, 39219
TEST=build and run Chrome without any valgrind errors.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113994

[agl, 2011-12-07 15:05:19]

lgtm

http://codereview.chromium.org/8806004/diff/1090/third_party/zlib/zlib.gyp
File third_party/zlib/zlib.gyp (right):

http://codereview.chromium.org/8806004/diff/1090/third_party/zlib/zlib.gyp#ne...
third_party/zlib/zlib.gyp:74: ['OS=="mac"', {
Needs a comment explaining what it does and why it's only needed on mac. (Even
if it's as simple as "OS X doesn't provide seek64 etc".)

[Brad Chen (chromium), 2011-12-07 19:09:09]

Thank you for working on this.

Are you sure any Linux builds are actually using this patch? I think it might be
worth doing some builds toggling use_system_zlib, and make sure everything still
builds and runs properly with the new version of zlib. Kudos to you if you've
already taken care of these issues, but I think it is what had complicated my
efforts when I was sidetracked. 

On 2011/12/07 15:05:19, agl wrote:
> lgtm
> 
> http://codereview.chromium.org/8806004/diff/1090/third_party/zlib/zlib.gyp
> File third_party/zlib/zlib.gyp (right):
> 
>
http://codereview.chromium.org/8806004/diff/1090/third_party/zlib/zlib.gyp#ne...
> third_party/zlib/zlib.gyp:74: ['OS=="mac"', {
> Needs a comment explaining what it does and why it's only needed on mac. (Even
> if it's as simple as "OS X doesn't provide seek64 etc".)

[Hironori Bono, 2011-12-08 07:16:47]

Greetings Brad,

Thanks for your suggestion.
Even though I have tried it once, I have uploaded
<http://codereview.chromium.org/8806004/#ps16014> (that set use_system_zlib to 0
on all platforms) again to show the build results on linux (both gcc and clang).
(The above change is just for build tests and I wll land a change that applied a
comment from agl, <http://codereview.chromium.org/8806004/#ps18011>.)

Regards,

Hironori Bono

On 2011/12/07 19:09:09, Brad Chen (chromium) wrote:
> Thank you for working on this.
> 
> Are you sure any Linux builds are actually using this patch? I think it might
be
> worth doing some builds toggling use_system_zlib, and make sure everything
still
> builds and runs properly with the new version of zlib. Kudos to you if you've
> already taken care of these issues, but I think it is what had complicated my
> efforts when I was sidetracked.

http://codereview.chromium.org/8806004/diff/1090/third_party/zlib/zlib.gyp
File third_party/zlib/zlib.gyp (right):

http://codereview.chromium.org/8806004/diff/1090/third_party/zlib/zlib.gyp#ne...
third_party/zlib/zlib.gyp:74: ['OS=="mac"', {
On 2011/12/07 15:05:19, agl wrote:
> Needs a comment explaining what it does and why it's only needed on mac. (Even
> if it's as simple as "OS X doesn't provide seek64 etc".)

Done. Thanks for reminding it. (I forgot adding it.)

[Brad Chen (chromium), 2011-12-08 17:08:47]

LGTM

On 2011/12/08 07:16:47, Hironori Bono wrote:
> Greetings Brad,
> 
> Thanks for your suggestion.
> Even though I have tried it once, I have uploaded
> <http://codereview.chromium.org/8806004/#ps16014> (that set use_system_zlib to
0
> on all platforms) again to show the build results on linux (both gcc and
clang).
> (The above change is just for build tests and I wll land a change that applied
a
> comment from agl, <http://codereview.chromium.org/8806004/#ps18011>.)
> 
> Regards,
> 
> Hironori Bono
> 
> On 2011/12/07 19:09:09, Brad Chen (chromium) wrote:
> > Thank you for working on this.
> > 
> > Are you sure any Linux builds are actually using this patch? I think it
might
> be
> > worth doing some builds toggling use_system_zlib, and make sure everything
> still
> > builds and runs properly with the new version of zlib. Kudos to you if
you've
> > already taken care of these issues, but I think it is what had complicated
my
> > efforts when I was sidetracked.
> 
> http://codereview.chromium.org/8806004/diff/1090/third_party/zlib/zlib.gyp
> File third_party/zlib/zlib.gyp (right):
> 
>
http://codereview.chromium.org/8806004/diff/1090/third_party/zlib/zlib.gyp#ne...
> third_party/zlib/zlib.gyp:74: ['OS=="mac"', {
> On 2011/12/07 15:05:19, agl wrote:
> > Needs a comment explaining what it does and why it's only needed on mac.
(Even
> > if it's as simple as "OS X doesn't provide seek64 etc".)
> 
> Done. Thanks for reminding it. (I forgot adding it.)

[commit-bot: I haz the power, 2011-12-09 07:24:18]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hbono@chromium.org/8806004/18011

[commit-bot: I haz the power, 2011-12-09 07:24:21]

Can't process patch for file third_party/zlib/trees.c.
File's status is None, patchset upload is incomplete.

[commit-bot: I haz the power, 2011-12-12 07:32:39]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/hbono@chromium.org/8806004/17121

[commit-bot: I haz the power, 2011-12-12 08:48:41]

Change committed as 113994

[scottmg, 2011-12-13 00:33:20]

Hi, there seems to be some intermittent (?) problems with linking on Windows
now. This seems related to a copy of adler32.c that looks forked from zlib 1.2.3
in sdch/open-vcdiff/src (and defines _adler32 there also).

I'm not clear on why it wasn't a problem before, so this may just be noise. But
if 1.2.5 fixes valid valgrind errors, perhaps that copy should be updated
anyway.

[Hironori Bono, 2011-12-13 01:50:15]

Greetings,

Sorry for this linker error. I'm building Chromium on my Win PC to reproduce
this error. Is it possible to give me the URL so I can investigate this error
while building it?

Regards,

Hironori Bono

[scottmg, 2011-12-13 01:59:17]

Unfortunately, it is not for everyone/bots, but we don't have the root
cause figured out yet. jbauman and rsleevi at least have been seeing it.

The best guess we have right now is that it's only happening when: static
(not happening in shared_library) *and* when using incremental linking
(supalink).

It's not clear why there was not an error before. Perhaps because the
definitions were identical so the linker was silently ignoring one.


On Mon, Dec 12, 2011 at 5:50 PM, <hbono@chromium.org> wrote:

> Greetings,
>
> Sorry for this linker error. I'm building Chromium on my Win PC to
> reproduce
> this error. Is it possible to give me the URL so I can investigate this
> error
> while building it?
>
> Regards,
>
> Hironori Bono
>
>
http://codereview.chromium.**org/8806004/<http://codereview.chromium.org/8806...
>

[Hironori Bono, 2011-12-13 02:52:32]

Greetings,

Many thanks for your update.
I notice this change forgot including "mozzconf.h" to mangle function names. I'm
creating a change that includes the file and mangles new functions introduced by
1.2.5.

Regards,

Hironori Bono