573367 - Update mozilla/security/nss/lib/zlib to zlib 1.2.5

Status: RESOLVED FIXED

(NSS :: Libraries, enhancement, P2)

Description

[Daniel Jeter II]

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.3a6pre) Gecko/20100620 SeaMonkey/2.1a2pre
Build Identifier: Mozilla/5.0 (Windows; U; Windows NT 5.2; en-US; rv:1.9.3a6pre) Gecko/20100620 SeaMonkey/2.1a2pre

zlib 1.2.5 is available. These changes should be picked up.

Reproducible: Always

Comment 1

[Daniel Jeter II]

Attachment: Patch to upgrade to zlib-1.2.5

Comment 2

[Daniel Jeter II]

Attachment: Patch to upgrade to zlib-1.2.5, v2

The last patch was broken. This fixes that problem.

Comment 3

[Nelson Bolyard (seldom reads bugmail)]

Apart from generally using the latest versions, what problems does this 
change solve for NSS?

Comment 4

[Daniel Jeter II]

Looking through the bug list, I don't see anything right now that this update would solve in NSS.

Comment 5

[Wan-Teh Chang]

Attachment: NSS patch for zlib 1.2.3

Ignoring our recent changes to our copy of zlib to
remove VMS support (bug 491044) and fix misspellings
(bug 506041), I found that this is the only change
we've made to zlib 1.2.3.

In the future we should refrain from making cosmetic
changes to third-party code, and create patch files
for our local changes.  I will take care of these
as part of the zlib 1.2.5 update.

Comment 6

[Wan-Teh Chang]

Daniel, thanks for your patch.  This kind of patch
can't be reviewed by inspection.  I will review your
patch by duplicating your work and verifying that I
get the same results.

Comment 7

[Wan-Teh Chang]

Attachment: Diffs between mozilla/security/nss/lib/zlib and mozilla-central/src/modules/zlib/src

Comment 8

[Wan-Teh Chang]

Attachment: Diffs between the update results of djeter and wtc

I duplicated Daniel's work independently.  There are
only three differences.

1. Daniel added leading underscores (_) to lseek, open,
read, write, and close.  I believe he did that to fix
Visual C++ compiler warnings like this:

d:/wtc/nss-zlib-1.2.5/mozilla/security/nss/lib/zlib/gzlib.c(173) : warning C4996
: 'open': The POSIX name for this item is deprecated. Instead, use the ISO C++ c
onformant name: _open. See online help for details.
        C:\Program Files\Microsoft Visual Studio 8\VC\INCLUDE\io.h(328) : see de
claration of 'open'

The _open, _lseek, _read, _write, _close symbols will
cause unresolved symbol linker errors on Unix.  I
suggest we suppress these compiler warnings by compiling
with -D_CRT_NONSTDC_NO_WARNINGS.  I will attach a patch
for mozilla/security/coreconf/WIN32.mk next.

2. Cosmetic: I sorted the .c files in manifest.mn in
alphabetical order.

3. I applied NSS's local change for zutil.h (attachment
468041 [review]).

Comment 9

[Wan-Teh Chang]

Attachment: Compile with -D_CRT_NONSTDC_NO_WARNINGS on Windows (checked in)

This suppresses Visual C++ compiler warnings like these:

d:/wtc/nss-zlib-1.2.5/mozilla/security/nss/lib/zlib/gzread.c(31) : warning C4996
: 'read': The POSIX name for this item is deprecated. Instead, use the ISO C++ c
onformant name: _read. See online help for details.
        C:\Program Files\Microsoft Visual Studio 8\VC\INCLUDE\io.h(329) : see de
claration of 'read'
d:/wtc/nss-zlib-1.2.5/mozilla/security/nss/lib/zlib/gzread.c(650) : warning C499
6: 'close': The POSIX name for this item is deprecated. Instead, use the ISO C++
 conformant name: _close. See online help for details.
        C:\Program Files\Microsoft Visual Studio 8\VC\INCLUDE\io.h(318) : see de
claration of 'close'

Both Mozilla and NSPR are compiling with
-D_CRT_NONSTDC_NO_WARNINGS.  It's related to the
-D_CRT_SECURE_NO_WARNINGS flag that Nelson added.

Comment 10

[Wan-Teh Chang]

Attachment: Patch to upgrade to zlib-1.2.5, v3 by Daniel Jeter II (checked in)

I made the changes described in comment 8 to
Daniel Jeter II's patch and checked it in on
the NSS trunk (NSS 3.13).

Comment 11

[Wan-Teh Chang]

Attachment: cvs commit log of patch to upgrade to zlib-1.2.5

Comment 12

[Wan-Teh Chang]

Attachment: Add README.nss and patches to mozilla/security/nss/lib/zlib

Add the following to mozilla/security/nss/lib/zlib
to make it easier to update to new versions of zlib.

README.nss
patches (new directory)
patches/msvc-vsnprintf.patch
patches/prune-zlib.sh

Comment 13

[Wan-Teh Chang]

Attachment: Add README.nss and patches to mozilla/security/nss/lib/zlib, v2 (checked in)

Update the makefile target "test" to the shell commands
used in zlib 1.2.5.

Minor edits of README.nss.

Comment 14

[Wan-Teh Chang]

Comment on attachment 468061 [details] [diff] [review]
Compile with -D_CRT_NONSTDC_NO_WARNINGS on Windows (checked in)

Christophe, could you review this patch?  It's described in comment 9.

Please use these MXR queries to verify both Mozilla and NSPR use the
-D_CRT_NONSTDC_NO_WARNINGS flag.  Thanks.

http://mxr.mozilla.org/mozilla-central/search?string=_CRT_NONSTDC_NO_WARNINGS
http://mxr.mozilla.org/nspr/search?string=_CRT_NONSTDC_NO_WARNINGS

Comment 15

[Wan-Teh Chang]

Comment on attachment 468105 [details] [diff] [review]
Add README.nss and patches to mozilla/security/nss/lib/zlib, v2 (checked in)

Elio, please review this patch.  It's described in comment 12 and comment 13.
I want to create a convention for third-party code in NSS.  Thanks.

Comment 16

[Christophe Ravel]

Comment on attachment 468061 [details] [diff] [review]
Compile with -D_CRT_NONSTDC_NO_WARNINGS on Windows (checked in)

r=christophe

Comment 17

[Wan-Teh Chang]

Comment on attachment 468061 [details] [diff] [review]
Compile with -D_CRT_NONSTDC_NO_WARNINGS on Windows (checked in)

Patch checked in on the NSS trunk (NSS 3.13).

Checking in WIN32.mk;
/cvsroot/mozilla/security/coreconf/WIN32.mk,v  <--  WIN32.mk
new revision: 1.43; previous revision: 1.42
done

Comment 18

[Elio Maldonado]

Comment on attachment 468105 [details] [diff] [review]
Add README.nss and patches to mozilla/security/nss/lib/zlib, v2 (checked in)

>Index: mozilla/security/nss/lib/zlib/Makefile
>===================================================================
>RCS file: /cvsroot/mozilla/security/nss/lib/zlib/Makefile,v
>retrieving revision 1.6
>diff -u -r1.6 Makefile
>--- mozilla/security/nss/lib/zlib/Makefile	7 Nov 2009 01:13:10 -0000	1.6
>+++ mozilla/security/nss/lib/zlib/Makefile	22 Aug 2010 04:47:01 -0000
>@@ -79,10 +79,9 @@
> 
> test: $(PROGRAMS)
> 	@cd $(OBJDIR); \
>-	echo hello world | ./minigzip | ./minigzip -d || \
>-	  echo '		*** minigzip test FAILED ***' ; \
>-	if ./example; then \
>+	if echo hello world | ./minigzip | ./minigzip -d && ./example; then \
> 	  echo '		*** zlib test OK ***'; \
> 	else \
>-	  echo '		*** zlib test FAILED ***'; \
>+	  echo '		*** zlib test FAILED ***'; false; \
> 	fi
>+	-@rm -f foo.gz
>Index: mozilla/security/nss/lib/zlib/README.nss
>===================================================================
>RCS file: mozilla/security/nss/lib/zlib/README.nss
>diff -N mozilla/security/nss/lib/zlib/README.nss
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ mozilla/security/nss/lib/zlib/README.nss	22 Aug 2010 04:47:01 -0000
>@@ -0,0 +1,18 @@
>+zlib data compression library
>+
>+URL: http://zlib.net/
>+Version: 1.2.5
>+License: zlib License
>+License File: http://zlib.net/zlib_license.html
>+
>+Description:
>+
>+NSS uses zlib in libSSL (for the DEFLATE compression method), modutil, and
>+signtool.
>+
>+Local Modifications:
>+
>+- patches/prune-zlib.sh: run this shell script to remove unneeded files
>+  from the zlib distribution.
>+- patches/msvc-vsnprintf.patch: define HAVE_VSNPRINTF for Visual C++ 2008
>+  (9.0) and later.
>Index: mozilla/security/nss/lib/zlib/patches/msvc-vsnprintf.patch
>===================================================================
>RCS file: mozilla/security/nss/lib/zlib/patches/msvc-vsnprintf.patch
>diff -N mozilla/security/nss/lib/zlib/patches/msvc-vsnprintf.patch
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ mozilla/security/nss/lib/zlib/patches/msvc-vsnprintf.patch	22 Aug 2010 04:47:01 -0000
>@@ -0,0 +1,22 @@
>+--- zlib-1.2.5/zutil.h	2010-04-18 12:29:24 -0700
>++++ zlib/zutil.h	2010-08-21 18:07:03 -0700
>+@@ -172,17 +172,18 @@
>+ #endif
>+ 
>+ #ifndef F_OPEN
>+ #  define F_OPEN(name, mode) fopen((name), (mode))
>+ #endif
>+ 
>+          /* functions */
>+ 
>+-#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550)
>++#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) || \
>++   (defined(_MSC_VER) && _MSC_VER >= 1500)
>+ #  ifndef HAVE_VSNPRINTF
>+ #    define HAVE_VSNPRINTF
>+ #  endif
>+ #endif
>+ #if defined(__CYGWIN__)
>+ #  ifndef HAVE_VSNPRINTF
>+ #    define HAVE_VSNPRINTF
>+ #  endif
>Index: mozilla/security/nss/lib/zlib/patches/prune-zlib.sh
>===================================================================
>RCS file: mozilla/security/nss/lib/zlib/patches/prune-zlib.sh
>diff -N mozilla/security/nss/lib/zlib/patches/prune-zlib.sh
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ mozilla/security/nss/lib/zlib/patches/prune-zlib.sh	22 Aug 2010 04:47:01 -0000
>@@ -0,0 +1,30 @@
>+files_to_remove="
>+CMakeLists.txt
>+ChangeLog
>+FAQ
>+INDEX
>+Makefile
>+Makefile.in
>+amiga
>+configure
>+contrib
>+doc
>+examples
>+make_vms.com
>+msdos
>+nintendods
>+old
>+qnx
>+treebuild.xml
>+watcom
>+win32
>+zconf.h.cmakein
>+zconf.h.in
>+zlib.3
>+zlib.3.pdf
>+zlib.map
>+zlib.pc.in
>+zlib2ansi
>+"
>+
>+rm -rf $files_to_remove

Comment 19

[Elio Maldonado]

r+. only the first part of the patch was needed by now as other parts are already checked in, pardon for my delay.

Comment 20

[Wan-Teh Chang]

Comment on attachment 468105 [details] [diff] [review]
Add README.nss and patches to mozilla/security/nss/lib/zlib, v2 (checked in)

Patch checked in on the NSS trunk (NSS 3.13).

Checking in Makefile;
/cvsroot/mozilla/security/nss/lib/zlib/Makefile,v  <--  Makefile
new revision: 1.7; previous revision: 1.6
done
RCS file: /cvsroot/mozilla/security/nss/lib/zlib/README.nss,v
done
Checking in README.nss;
/cvsroot/mozilla/security/nss/lib/zlib/README.nss,v  <--  README.nss
initial revision: 1.1
done
RCS file: /cvsroot/mozilla/security/nss/lib/zlib/patches/msvc-vsnprintf.patch,v
done
Checking in patches/msvc-vsnprintf.patch;
/cvsroot/mozilla/security/nss/lib/zlib/patches/msvc-vsnprintf.patch,v  <--  msvc
-vsnprintf.patch
initial revision: 1.1
done
RCS file: /cvsroot/mozilla/security/nss/lib/zlib/patches/prune-zlib.sh,v
done
Checking in patches/prune-zlib.sh;
/cvsroot/mozilla/security/nss/lib/zlib/patches/prune-zlib.sh,v  <--  prune-zlib.
sh
initial revision: 1.1
done