Permalink
Browse files

zlib 1.2.3.9

  • Loading branch information...
madler committed Sep 10, 2011
1 parent e0ff940 commit 7751bd4c715ea8478113e34b49b5a794a4642e8e
Showing with 3,820 additions and 7,399 deletions.
  1. +16 −2 CMakeLists.txt
  2. +19 −0 ChangeLog
  3. +2 −3 INDEX
  4. +7 −7 Makefile.in
  5. +2 −2 README
  6. +1 −2 amiga/Makefile.pup
  7. +1 −2 amiga/Makefile.sas
  8. +4 −4 configure
  9. +0 −196 contrib/contrib/minizip/ioapi.h
  10. +0 −389 contrib/contrib/minizip/iowin32.c
  11. +0 −28 contrib/contrib/minizip/iowin32.h
  12. +0 −649 contrib/contrib/minizip/miniunz.c
  13. +0 −508 contrib/contrib/minizip/minizip.c
  14. +0 −881 contrib/contrib/vstudio/vc8/zlibstat.vcproj
  15. +2 −4 contrib/delphi/zlibd32.mak
  16. +2 −2 contrib/infback9/inftree9.c
  17. +1 −1 contrib/minizip/MiniZip64_Changes.txt
  18. +8 −13 contrib/minizip/MiniZip64_info.txt
  19. +6 −6 contrib/minizip/ioapi.c
  20. +27 −21 contrib/minizip/ioapi.h
  21. +4 −4 contrib/minizip/iowin32.c
  22. +5 −5 contrib/minizip/iowin32.h
  23. +2 −2 contrib/minizip/make_vms.com
  24. +23 −23 contrib/minizip/miniunz.c
  25. +24 −25 contrib/minizip/minizip.c
  26. +54 −52 contrib/minizip/unzip.c
  27. +11 −11 contrib/minizip/unzip.h
  28. +34 −33 contrib/minizip/zip.c
  29. +12 −12 contrib/minizip/zip.h
  30. +2 −4 contrib/pascal/zlibd32.mak
  31. +24 −3 contrib/vstudio/readme.txt
  32. +310 −0 contrib/vstudio/vc10/miniunz.vcxproj
  33. +22 −0 contrib/vstudio/vc10/miniunz.vcxproj.filters
  34. +3 −0 contrib/vstudio/vc10/miniunz.vcxproj.user
  35. +307 −0 contrib/vstudio/vc10/minizip.vcxproj
  36. +22 −0 contrib/vstudio/vc10/minizip.vcxproj.filters
  37. +3 −0 contrib/vstudio/vc10/minizip.vcxproj.user
  38. +428 −0 contrib/vstudio/vc10/testzlib.vcxproj
  39. +61 −0 contrib/vstudio/vc10/testzlib.vcxproj.filters
  40. +3 −0 contrib/vstudio/vc10/testzlib.vcxproj.user
  41. +310 −0 contrib/vstudio/vc10/testzlibdll.vcxproj
  42. +22 −0 contrib/vstudio/vc10/testzlibdll.vcxproj.filters
  43. +3 −0 contrib/vstudio/vc10/testzlibdll.vcxproj.user
  44. 0 contrib/vstudio/{vc8 → vc10}/zlib.rc
  45. +466 −0 contrib/vstudio/vc10/zlibstat.vcxproj
  46. +83 −0 contrib/vstudio/vc10/zlibstat.vcxproj.filters
  47. +3 −0 contrib/vstudio/vc10/zlibstat.vcxproj.user
  48. +19 −0 contrib/{contrib/vstudio/vc7 → vstudio/vc10}/zlibvc.def
  49. +135 −0 contrib/vstudio/vc10/zlibvc.sln
  50. +669 −0 contrib/vstudio/vc10/zlibvc.vcxproj
  51. +124 −0 contrib/vstudio/vc10/zlibvc.vcxproj.filters
  52. +3 −0 contrib/vstudio/vc10/zlibvc.vcxproj.user
  53. +0 −126 contrib/vstudio/vc7/miniunz.vcproj
  54. +0 −126 contrib/vstudio/vc7/minizip.vcproj
  55. +0 −126 contrib/vstudio/vc7/testzlib.vcproj
  56. +0 −258 contrib/vstudio/vc7/zlibstat.vcproj
  57. +22 −0 contrib/vstudio/vc7/zlibvc.def
  58. +0 −78 contrib/vstudio/vc7/zlibvc.sln
  59. +0 −457 contrib/vstudio/vc7/zlibvc.vcproj
  60. +22 −0 contrib/vstudio/vc8/zlibvc.def
  61. +0 −1,230 contrib/vstudio/vc8/zlibvc.vcproj
  62. +40 −41 contrib/vstudio/{vc8 → vc9}/miniunz.vcproj
  63. +41 −42 contrib/vstudio/{vc8 → vc9}/minizip.vcproj
  64. +94 −96 contrib/vstudio/{vc8 → vc9}/testzlib.vcproj
  65. +40 −42 contrib/vstudio/{vc8 → vc9}/testzlibdll.vcproj
  66. +4 −4 contrib/vstudio/{vc7 → vc9}/zlib.rc
  67. +72 −66 contrib/vstudio/{vc8 → vc9}/zlibstat.vcproj
  68. +19 −0 contrib/{contrib/vstudio/vc8 → vstudio/vc9}/zlibvc.def
  69. +2 −2 contrib/vstudio/{vc8 → vc9}/zlibvc.sln
  70. +102 −99 contrib/{contrib/vstudio/vc8 → vstudio/vc9}/zlibvc.vcproj
  71. +1 −1 deflate.c
  72. +0 −4 gzclose.c
  73. +0 −1,196 gzio.c
  74. +10 −12 gzlib.c
  75. +4 −12 gzread.c
  76. +2 −6 gzwrite.c
  77. +2 −2 inftrees.c
  78. +1 −4 make_vms.com
  79. +2 −4 msdos/Makefile.bor
  80. +1 −1 msdos/Makefile.dj2
  81. +1 −1 msdos/Makefile.emx
  82. +1 −3 msdos/Makefile.msc
  83. +2 −4 msdos/Makefile.tc
  84. 0 { → old}/as400/bndsrc
  85. 0 { → old}/as400/compile.clp
  86. 0 { → old}/as400/readme.txt
  87. +3 −3 { → old}/as400/zlib.inc
  88. +0 −4 projects/visualc6/zlib.dsp
  89. +5 −5 qnx/package.qpg
  90. +0 −5 treebuild.xml
  91. +5 −5 watcom/watcom_f.mak
  92. +5 −5 watcom/watcom_l.mak
  93. +2 −4 win32/Makefile.bor
  94. +1 −1 win32/Makefile.emx
  95. +1 −2 win32/Makefile.gcc
  96. +1 −2 win32/Makefile.gcc.old
  97. +1 −3 win32/Makefile.msc
  98. +6 −0 zconf.h → zconf.h.in
  99. +0 −412 zconf.in.h
  100. +2 −2 zlib.3
  101. +14 −8 zlib.h
  102. +0 −1 zlib.map
View
@@ -50,7 +50,7 @@ endif()
#
# Check for unistd.h
#
-check_include_file(unistd.h HAVE_UNISTD_H)
+check_include_file(unistd.h Z_HAVE_UNISTD_H)
#
# Check for errno.h
@@ -65,6 +65,21 @@ if(MSVC)
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
endif()
+if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
+ # If we're doing an out of source build and the user has a zconf.h
+ # in their source tree...
+ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
+ message(FATAL_ERROR "You must remove zconf.h from the source tree. This f
+ile is generated by the ./configure script shipped with zlib. CMake generates t
+his file for you automatically in the build directory")
+ endif()
+endif()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.in
+ ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h @ONLY)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
+
#============================================================================
# zlib
#============================================================================
@@ -90,7 +105,6 @@ set(ZLIB_SRCS
crc32.c
deflate.c
gzclose.c
- gzio.c
gzlib.c
gzread.c
gzwrite.c
View
@@ -1,6 +1,25 @@
ChangeLog file for zlib
+Changes in 1.2.3.9 (21 Feb 2010)
+- Expunge gzio.c
+- Move as400 build information to old
+- Fix updates in contrib/minizip and contrib/vstudio
+- Add const to vsnprintf test in configure to avoid warnings [Weigelt]
+- Delete zconf.h (made by configure) [Weigelt]
+- Change zconf.in.h to zconf.h.in per convention [Weigelt]
+- Check for NULL buf in gzgets()
+- Return empty string for gzgets() with len == 1 (like fgets())
+- Fix description of gzgets() in zlib.h for end-of-file, NULL return
+- Update minizip to 1.1 [Vollant]
+- Avoid MSVC loss of data warnings in gzread.c, gzwrite.c
+- Note in zlib.h that gzerror() should be used to distinguish from EOF
+- Remove use of snprintf() from gzlib.c
+- Fix bug in gzseek()
+- Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant]
+- Fix zconf.h generation in CMakeLists.txt [Lowman]
+- Improve comments in zconf.h where modified by configure
+
Changes in 1.2.3.8 (13 Feb 2010)
- Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer]
- Use z_off64_t in gz_zero() and gz_skip() to match state->skip
View
5 INDEX
@@ -7,7 +7,7 @@ README guess what
configure configure script for Unix
make_vms.com makefile for VMS
treebuild.xml XML description of source file dependencies
-zconf.in.h zconf.h template for configure
+zconf.h.in zconf.h template for configure
zlib.3 Man page for zlib
zlib.map Linux symbol information
zlib.pc.in Template for pkg-config descriptor
@@ -28,7 +28,7 @@ watcom/ makefiles for OpenWatcom
win32/ makefiles for Windows
zlib public header files (required for library use):
-zconf.h
+zconf.h (made by configure)
zlib.h
private source files used to build the zlib library:
@@ -40,7 +40,6 @@ deflate.c
deflate.h
gzclose.c
gzguts.h
-gzio.c
gzlib.c
gzread.c
gzwrite.c
View
@@ -32,7 +32,7 @@ CPP=$(CC) -E
STATICLIB=libz.a
SHAREDLIB=libz.so
-SHAREDLIBV=libz.so.1.2.3.8
+SHAREDLIBV=libz.so.1.2.3.9
SHAREDLIBM=libz.so.1
LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV)
@@ -50,10 +50,10 @@ mandir = ${prefix}/share/man
man3dir = ${mandir}/man3
pkgconfigdir = ${libdir}/pkgconfig
-OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzio.o gzlib.o gzread.o \
+OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \
gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o
-PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzio.lo gzlib.lo gzread.lo \
+PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzlib.lo gzread.lo \
gzwrite.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo
# to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo
@@ -204,8 +204,8 @@ clean:
maintainer-clean: distclean
distclean: clean
- cp -p zconf.in.h zconf.h
- rm -f zlib.pc .DS_Store
+ rm -f Makefile zconf.h zlib.pc
+ -@rm -f .DS_Store
-@printf 'all:\n\t-@echo "Use ./configure first. Thank you."\n' > Makefile
-@touch -r Makefile.in Makefile
@@ -217,7 +217,7 @@ depend:
# DO NOT DELETE THIS LINE -- make depend depends on it.
-adler32.o gzio.o zutil.o: zutil.h zlib.h zconf.h
+adler32.o zutil.o: zutil.h zlib.h zconf.h
gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
crc32.o: zutil.h zlib.h zconf.h crc32.h
@@ -227,7 +227,7 @@ inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
inftrees.o: zutil.h zlib.h zconf.h inftrees.h
trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
-adler32.lo gzio.lo zutil.lo: zutil.h zlib.h zconf.h
+adler32.lo zutil.lo: zutil.h zlib.h zconf.h
gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h
compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h
crc32.lo: zutil.h zlib.h zconf.h crc32.h
View
4 README
@@ -1,6 +1,6 @@
ZLIB DATA COMPRESSION LIBRARY
-zlib 1.2.3.8 is a general purpose data compression library. All the code is
+zlib 1.2.3.9 is a general purpose data compression library. All the code is
thread safe. The data format used by the zlib library is described by RFCs
(Request for Comments) 1950 to 1952 in the files
http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -33,7 +33,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997
issue of Dr. Dobb's Journal; a copy of the article is available in
http://dogma.net/markn/articles/zlibtool/zlibtool.htm
-The changes made in version 1.2.3.8 are documented in the file ChangeLog.
+The changes made in version 1.2.3.9 are documented in the file ChangeLog.
Unsupported third party contributions are provided in directory "contrib".
View
@@ -14,7 +14,7 @@ LDFLAGS = -o
LDLIBS = LIB:scppc.a LIB:end.o
RM = delete quiet
-OBJS = adler32.o compress.o crc32.o gzclose.o gzio.o gzlib.o gzread.o gzwrite.o \
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
TEST_OBJS = example.o minigzip.o
@@ -56,7 +56,6 @@ crc32.o: crc32.h zlib.h zconf.h
deflate.o: deflate.h zutil.h zlib.h zconf.h
example.o: zlib.h zconf.h
gzclose.o: zlib.h zconf.h gzguts.h
-gzio.o: zutil.h zlib.h zconf.h
gzlib.o: zlib.h zconf.h gzguts.h
gzread.o: zlib.h zconf.h gzguts.h
gzwrite.o: zlib.h zconf.h gzguts.h
View
@@ -13,7 +13,7 @@ SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \
NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \
DEF=POSTINC
-OBJS = adler32.o compress.o crc32.o gzclose.o gzio.o gzlib.o gzread.o gzwrite.o \
+OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \
uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o
TEST_OBJS = example.o minigzip.o
@@ -55,7 +55,6 @@ crc32.o: crc32.h zlib.h zconf.h
deflate.o: deflate.h zutil.h zlib.h zconf.h
example.o: zlib.h zconf.h
gzclose.o: zlib.h zconf.h gzguts.h
-gzio.o: zutil.h zlib.h zconf.h
gzlib.o: zlib.h zconf.h gzguts.h
gzread.o: zlib.h zconf.h gzguts.h
gzwrite.o: zlib.h zconf.h gzguts.h
View
@@ -250,22 +250,22 @@ EOF
fi
fi
-cp -p zconf.in.h zconf.h
+sed "/^#cmakedefine/D" < zconf.h.in > zconf.h
cat > $test.c <<EOF
#include <unistd.h>
int main() { return 0; }
EOF
if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then
- sed < zconf.h "/#ifdef HAVE_UNISTD_H/s/def HAVE_UNISTD_H/ 1/" > zconf.temp.h
+ sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf.temp.h
mv zconf.temp.h zconf.h
echo "Checking for unistd.h... Yes."
else
echo "Checking for unistd.h... No."
fi
if test $zprefix -eq 1; then
- sed < zconf.h "/#ifdef Z_PREFIX/s/def Z_PREFIX/ 1/" > zconf.temp.h
+ sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h
mv zconf.temp.h zconf.h
echo "Using z_ prefix on all symbols."
fi
@@ -316,7 +316,7 @@ EOF
#include <stdio.h>
#include <stdarg.h>
-int mytest(char *fmt, ...)
+int mytest(const char *fmt, ...)
{
int n;
char buf[20];
Oops, something went wrong.

0 comments on commit 7751bd4

Please sign in to comment.