Skip to content
Permalink
Browse files
Moved to zlib 1.2.3 proper.
  • Loading branch information
icculus committed Jul 23, 2005
1 parent 1affc74 commit 5e0de7cc73d480d9e8f20eef6b2f902252c95437
@@ -5,6 +5,7 @@
-- stuff in the stable-1.0 branch, backported from 2.0.0 dev branch, etc ---

07232005 - Fixed bug in zip archiver (thanks, J�rg Walter!).
Updated zlib to 1.2.3, which properly includes the security fix.
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!).
@@ -6,33 +6,33 @@ libphysfsinclude_HEADERS = \

if BUILD_MACOSX

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
ZLIB_FILES = zlib123/adler32.c \
zlib123/compress.c \
zlib123/crc32.c \
zlib123/crc32.h \
zlib123/deflate.c \
zlib123/deflate.h \
zlib123/gzio.c \
zlib123/infback.c \
zlib123/inffast.c \
zlib123/inffast.h \
zlib123/inffixed.h \
zlib123/inflate.c \
zlib123/inflate.h \
zlib123/inftrees.c \
zlib123/inftrees.h \
zlib123/trees.c \
zlib123/trees.h \
zlib123/uncompr.c \
zlib123/zconf.h \
zlib123/zlib.h \
zlib123/zutil.c \
zlib123/zutil.h


if BUILD_ZLIB
ZLIB_SRC = $(ZLIB_FILES)
ZLIB_INC = -I$(top_srcdir)/zlib122
ZLIB_INC = -I$(top_srcdir)/zlib123
ZLIB_EXTRADIST =
else
ZLIB_SRC =
@@ -104,15 +104,15 @@ EXTRA_DIST = \

else

SUBDIRS = platform archivers zlib122 . test extras
SUBDIRS = platform archivers zlib123 . test extras

libphysfs_la_SOURCES = \
physfs.c \
physfs_internal.h \
physfs_byteorder.c

if BUILD_ZLIB
ZLIB_LIB = zlib122/libz.la
ZLIB_LIB = zlib123/libz.la
else
ZLIB_LIB =
endif
@@ -1,6 +1,6 @@
lib_LTLIBRARIES = libphysfs.la

SUBDIRS = platform archivers zlib122 . test extras
SUBDIRS = platform archivers zlib123 . test extras

libphysfsincludedir = $(includedir)
libphysfsinclude_HEADERS = \
@@ -12,7 +12,7 @@ libphysfs_la_SOURCES = \
physfs_byteorder.c

if BUILD_ZLIB
ZLIB_LIB = zlib122/libz.la
ZLIB_LIB = zlib123/libz.la
else
ZLIB_LIB =
endif
@@ -898,8 +898,8 @@
F8FDCE5D03AEDE1F01A8000A,
);
isa = PBXGroup;
name = zlib122;
path = ../zlib122;
name = zlib123;
path = ../zlib123;
refType = 2;
};
F8FDCE4303AEDE1F01A8000A = {
@@ -1,7 +1,7 @@
noinst_LTLIBRARIES = libarchivers.la

if BUILD_ZLIB
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/zlib122
INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/zlib123
else
INCLUDES = -I$(top_srcdir)
endif
@@ -531,7 +531,7 @@ AC_OUTPUT([
Makefile
archivers/Makefile
platform/Makefile
zlib122/Makefile
zlib123/Makefile
test/Makefile
extras/Makefile
physfs.spec
@@ -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. -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 set CFLAGS=%DEBUGFLAGS% -Wall -Werror -Zomf -Zmt -Zmtd -I. -Izlib123 -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. -Izlib123 -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 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
gcc %CFLAGS% -o bin/adler32.obj zlib123/adler32.c
gcc %CFLAGS% -o bin/compress.obj zlib123/compress.c
gcc %CFLAGS% -o bin/crc32.obj zlib123/crc32.c
gcc %CFLAGS% -o bin/deflate.obj zlib123/deflate.c
gcc %CFLAGS% -o bin/gzio.obj zlib123/gzio.c
gcc %CFLAGS% -o bin/infback.obj zlib123/infback.c
gcc %CFLAGS% -o bin/inffast.obj zlib123/inffast.c
gcc %CFLAGS% -o bin/inflate.obj zlib123/inflate.c
gcc %CFLAGS% -o bin/inftrees.obj zlib123/inftrees.c
gcc %CFLAGS% -o bin/trees.obj zlib123/trees.c
gcc %CFLAGS% -o bin/uncompr.obj zlib123/uncompr.c
gcc %CFLAGS% -o bin/zutil.obj zlib123/zutil.c
@echo off

:dolinking

Some generated files are not rendered by default. Learn more.

0 comments on commit 5e0de7c

Please sign in to comment.