301646 - zlib-1.2.3 has been released

Status: VERIFIED FIXED

(Core :: Graphics: ImageLib, enhancement)

Description

[Glenn Randers-Pehrson]

zlib-1.2.3 has been released.  We should upgrade.

Comment 1

[Glenn Randers-Pehrson]

Attachment: upgrade-to-zlib-1.2.3.diff

patch to upgrade modules/zlib to version 1.2.3

Comment 2

[Glenn Randers-Pehrson]

Comment on attachment 190090 [details] [diff] [review]
upgrade-to-zlib-1.2.3.diff

tor: r?

Comment 3

[Glenn Randers-Pehrson]

I inadvertently included several files that don't belong in the patch:
example.c, minigzip.c, and zconf.in.h.  I'll produce a new patch without
them.

Comment 4

[Glenn Randers-Pehrson]

Attachment: zlib upgrade without example.c etc

Patch without example.c, minigzip.c, and zconf.in.h

tor: r?

Comment 5

[tor]

There appear to be a dozen or so zlib symbols not prefixed with MOZ_Z_.

Comment 6

[Glenn Randers-Pehrson]

Re comment #5: I ran "strings *.so" in modules/zlib/src and got this, after
removing the MOZ_Z prefixed symbols and some other junk that was obviously not
exported symbols:

_DYNAMIC
_GLOBAL_OFFSET_TABLE_
_fini
__cxa_finalize
__deregister_frame_info
__register_frame_info
_Jv_RegisterClasses
memcpy
memset
malloc
strcpy
__error
fopen
fdopen
fprintf
ftell
sprintf
fwrite
fread
__isthreaded
ferror
fclose
vsnprintf
fflush
fseek
fputc
strerror
strcat

Of these, the first seven (and "__isthreaded") don't appear in the zlib source
(*.c, *.h) and the rest look to me like things exported by system libraries, not
by zlib.

What did I miss?

GLenn

Comment 7

[tor]

Your path removes the following chunk from zconf.h, which is needed by mozilla
on newer versions of gcc:

#ifdef HAVE_VISIBILITY_PRAGMA
#define ZEXTERN __attribute__((visibility ("default"))) extern
#endif

With that the confusion about symbols is gone and that looks fine.

Comment 8

[tor]

I'm not that familiar with win32 dll creation/linkage, but shouldn't the new
functions listed in mozzconf.h be added to zlib.def?

Comment 9

[Glenn Randers-Pehrson]

Re: comment #7, shouldn't that snippet go in mozzconf.h rather than zconf.h?
It's less likely to get accidentally removed that way.

Comment 10

[Glenn Randers-Pehrson]

Re: comment #8, zlib is no longer distributing zlib.def so it should be
removed.

Comment 11

[Glenn Randers-Pehrson]

Attachment: zlib upgrade with HAVE_VISIBILITY_PRAGMA, without zlib.def

Revised patch with HAVE_VISIBILITY_PRAGMA treatment and without zlib.def

Comment 12

[tor]

zlib.def is still used by the mozilla build system.

Comment 13

[Glenn Randers-Pehrson]

There are in fact *two* instances of zlib.def in subdirectories of the zlib
distribution, but they are even older and more decrepit than the one that was
removed from the top level.

Comment 14

[Glenn Randers-Pehrson]

Attachment: zlib upgrade patch with updated zlib.def

zlib.def restored and updated with new symbols.  Would it be better to call it
mozzlib.def?  Same goes for zlib.pkg which is also not distributed with zlib.

Comment 15

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 190351 [details] [diff] [review]
zlib upgrade patch with updated zlib.def

sorry... I'm not a super-reviewer

Comment 16

[Glenn Randers-Pehrson]

Attachment: zlib-1.2.3 upgrade patch accounting for bug 300349 checkin

The security patch for bug #300349 has been checked in.  That breaks this patch
so here is a revised one.  The checkin also eliminates the dependency of bug
#300349 on this one, so I'll remove the dependency flag.

Comment 17

[Glenn Randers-Pehrson]

dveditz: sr?

Comment 18

[Daniel Veditz [:dveditz]]

Comment on attachment 190647 [details] [diff] [review]
zlib-1.2.3 upgrade patch accounting for bug 300349 checkin

sr=dveditz

Comment 19

[tor]

Checked in.