Moved to zlib122 and security fix discussed here:

http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-2096
icculus · Jul 13, 2005 · 68f832b · 68f832b
1 parent 12353f5
commit 68f832b
Show file tree

Hide file tree

Showing 33 changed files with 260 additions and 236 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -4,6 +4,8 @@
 
 -- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---
 
+07132005 - Moved to zlib122, and security fix discussed here:
+           http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2005-2096
 06122005 - Added support for mingw to Unix build process (thanks, Matze!).
 03162005 - Readded Spanish translation. Added Brazillian Portguese translation
            and fixed unlocalized string in wad.c (thanks Danny!). Some MacOS

diff --git a/Makefile.am.newautomake b/Makefile.am.newautomake
@@ -6,33 +6,33 @@ libphysfsinclude_HEADERS =	\
 
 if BUILD_MACOSX
 
-ZLIB_FILES = zlib121/adler32.c		\
-             zlib121/compress.c		\
-             zlib121/crc32.c		\
-             zlib121/crc32.h		\
-             zlib121/deflate.c		\
-             zlib121/deflate.h		\
-             zlib121/gzio.c		\
-             zlib121/infback.c		\
-             zlib121/inffast.c		\
-             zlib121/inffast.h		\
-             zlib121/inffixed.h		\
-             zlib121/inflate.c		\
-             zlib121/inflate.h		\
-             zlib121/inftrees.c		\
-             zlib121/inftrees.h		\
-             zlib121/trees.c		\
-             zlib121/trees.h		\
-             zlib121/uncompr.c		\
-             zlib121/zconf.h		\
-             zlib121/zlib.h		\
-             zlib121/zutil.c		\
-             zlib121/zutil.h
+ZLIB_FILES = zlib122/adler32.c		\
+             zlib122/compress.c		\
+             zlib122/crc32.c		\
+             zlib122/crc32.h		\
+             zlib122/deflate.c		\
+             zlib122/deflate.h		\
+             zlib122/gzio.c		\
+             zlib122/infback.c		\
+             zlib122/inffast.c		\
+             zlib122/inffast.h		\
+             zlib122/inffixed.h		\
+             zlib122/inflate.c		\
+             zlib122/inflate.h		\
+             zlib122/inftrees.c		\
+             zlib122/inftrees.h		\
+             zlib122/trees.c		\
+             zlib122/trees.h		\
+             zlib122/uncompr.c		\
+             zlib122/zconf.h		\
+             zlib122/zlib.h		\
+             zlib122/zutil.c		\
+             zlib122/zutil.h
 
 
 if BUILD_ZLIB
   ZLIB_SRC = $(ZLIB_FILES)
-  ZLIB_INC = -I$(top_srcdir)/zlib121
+  ZLIB_INC = -I$(top_srcdir)/zlib122
   ZLIB_EXTRADIST =
 else
   ZLIB_SRC =
@@ -104,15 +104,15 @@ EXTRA_DIST =	\
 
 else
 
-SUBDIRS = platform archivers zlib121 . test extras
+SUBDIRS = platform archivers zlib122 . test extras
 
 libphysfs_la_SOURCES =	\
 	physfs.c	\
 	physfs_internal.h	\
 	physfs_byteorder.c
 
 if BUILD_ZLIB
-ZLIB_LIB = zlib121/libz.la
+ZLIB_LIB = zlib122/libz.la
 else
 ZLIB_LIB =
 endif

diff --git a/Makefile.am.oldautomake b/Makefile.am.oldautomake
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libphysfs.la
 
-SUBDIRS = platform archivers zlib121 . test extras
+SUBDIRS = platform archivers zlib122 . test extras
 
 libphysfsincludedir = $(includedir)
 libphysfsinclude_HEADERS =	\
@@ -12,7 +12,7 @@ libphysfs_la_SOURCES =	\
 	physfs_byteorder.c
 
 if BUILD_ZLIB
-ZLIB_LIB = zlib121/libz.la
+ZLIB_LIB = zlib122/libz.la
 else
 ZLIB_LIB =
 endif

diff --git a/PBProjects/physfs.pbproj/project.pbxproj b/PBProjects/physfs.pbproj/project.pbxproj
@@ -898,8 +898,8 @@
 				F8FDCE5D03AEDE1F01A8000A,
 			);
 			isa = PBXGroup;
-			name = zlib121;
-			path = ../zlib121;
+			name = zlib122;
+			path = ../zlib122;
 			refType = 2;
 		};
 		F8FDCE4303AEDE1F01A8000A = {

diff --git a/archivers/Makefile.am b/archivers/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libarchivers.la
 
 if BUILD_ZLIB
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/zlib121
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/zlib122
 else
 INCLUDES = -I$(top_srcdir)
 endif

diff --git a/configure.in b/configure.in
@@ -531,7 +531,7 @@ AC_OUTPUT([
 Makefile
 archivers/Makefile
 platform/Makefile
-zlib121/Makefile
+zlib122/Makefile
 test/Makefile
 extras/Makefile
 physfs.spec

diff --git a/makeos2.cmd b/makeos2.cmd
@@ -7,8 +7,8 @@ rem  Patches go to icculus@clutteredmind.org ...
 
 set PHYSFSLANG=PHYSFS_LANG_ENGLISH
 set DEBUGFLAGS=-D_NDEBUG -O2 -s
-rem set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib121 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H
-set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib121 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DHAVE_ASSERT_H
+rem set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib122 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DPHYSFS_LANG=%PHYSFSLANG% -DHAVE_ASSERT_H
+set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib122 -c -D__ST_MT_ERRNO__ -DOS2 -DZ_PREFIX -DPHYSFS_SUPPORTS_ZIP -DPHYSFS_SUPPORTS_GRP -DPHYSFS_SUPPORTS_WAD -DPHYSFS_SUPPORTS_QPAK -DPHYSFS_SUPPORTS_HOG -DPHYSFS_SUPPORTS_MVL -DHAVE_ASSERT_H
 
 rem goto :dolinking
 
@@ -120,18 +120,18 @@ gcc %CFLAGS% -o bin/zip.obj archivers/zip.c
 gcc %CFLAGS% -o bin/qpak.obj archivers/qpak.c
 gcc %CFLAGS% -o bin/hog.obj archivers/hog.c
 gcc %CFLAGS% -o bin/mvl.obj archivers/mvl.c
-gcc %CFLAGS% -o bin/adler32.obj zlib121/adler32.c
-gcc %CFLAGS% -o bin/compress.obj zlib121/compress.c
-gcc %CFLAGS% -o bin/crc32.obj zlib121/crc32.c
-gcc %CFLAGS% -o bin/deflate.obj zlib121/deflate.c
-gcc %CFLAGS% -o bin/gzio.obj zlib121/gzio.c
-gcc %CFLAGS% -o bin/infback.obj zlib121/infback.c
-gcc %CFLAGS% -o bin/inffast.obj zlib121/inffast.c
-gcc %CFLAGS% -o bin/inflate.obj zlib121/inflate.c
-gcc %CFLAGS% -o bin/inftrees.obj zlib121/inftrees.c
-gcc %CFLAGS% -o bin/trees.obj zlib121/trees.c
-gcc %CFLAGS% -o bin/uncompr.obj zlib121/uncompr.c
-gcc %CFLAGS% -o bin/zutil.obj zlib121/zutil.c
+gcc %CFLAGS% -o bin/adler32.obj zlib122/adler32.c
+gcc %CFLAGS% -o bin/compress.obj zlib122/compress.c
+gcc %CFLAGS% -o bin/crc32.obj zlib122/crc32.c
+gcc %CFLAGS% -o bin/deflate.obj zlib122/deflate.c
+gcc %CFLAGS% -o bin/gzio.obj zlib122/gzio.c
+gcc %CFLAGS% -o bin/infback.obj zlib122/infback.c
+gcc %CFLAGS% -o bin/inffast.obj zlib122/inffast.c
+gcc %CFLAGS% -o bin/inflate.obj zlib122/inflate.c
+gcc %CFLAGS% -o bin/inftrees.obj zlib122/inftrees.c
+gcc %CFLAGS% -o bin/trees.obj zlib122/trees.c
+gcc %CFLAGS% -o bin/uncompr.obj zlib122/uncompr.c
+gcc %CFLAGS% -o bin/zutil.obj zlib122/zutil.c
 @echo off
 
 :dolinking

diff --git a/physfs.dsp b/physfs.dsp