64ce68d590e… — Fossil SCM

M compat/zlib/CMakeLists.txt

+24 -19

		--- compat/zlib/CMakeLists.txt
		+++ compat/zlib/CMakeLists.txt
		@@ -1,11 +1,13 @@
1	1	cmake_minimum_required(VERSION 2.4.4...3.15.0)
2	2	set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3	3
4	4	project(zlib C)
5	5
6		-set(VERSION "1.3")
	6	+set(VERSION "1.3.1")
	7	+
	8	+option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
7	9
8	10	set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
9	11	set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
10	12	set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
11	13	set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
		@@ -146,11 +148,13 @@
146	148	-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
147	149	set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
148	150	endif(MINGW)
149	151
150	152	add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
	153	+target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
151	154	add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
	155	+target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
152	156	set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
153	157	set_target_properties(zlib PROPERTIES SOVERSION 1)
154	158
155	159	if(NOT CYGWIN)
156	160	# This property causes shared libraries on Linux to have the full version
		@@ -164,11 +168,11 @@
164	168	endif()
165	169
166	170	if(UNIX)
167	171	# On unix-like platforms the library is almost always called libz
168	172	set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
169		- if(NOT APPLE)
	173	+ if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
170	174	set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
171	175	endif()
172	176	elseif(BUILD_SHARED_LIBS AND WIN32)
173	177	# Creates zlib1.dll when building shared library version
174	178	set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
		@@ -191,23 +195,24 @@
191	195	endif()
192	196
193	197	#============================================================================
194	198	# Example binaries
195	199	#============================================================================
196		-
197		-add_executable(example test/example.c)
198		-target_link_libraries(example zlib)
199		-add_test(example example)
200		-
201		-add_executable(minigzip test/minigzip.c)
202		-target_link_libraries(minigzip zlib)
203		-
204		-if(HAVE_OFF64_T)
205		- add_executable(example64 test/example.c)
206		- target_link_libraries(example64 zlib)
207		- set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
208		- add_test(example64 example64)
209		-
210		- add_executable(minigzip64 test/minigzip.c)
211		- target_link_libraries(minigzip64 zlib)
212		- set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
	200	+if(ZLIB_BUILD_EXAMPLES)
	201	+ add_executable(example test/example.c)
	202	+ target_link_libraries(example zlib)
	203	+ add_test(example example)
	204	+
	205	+ add_executable(minigzip test/minigzip.c)
	206	+ target_link_libraries(minigzip zlib)
	207	+
	208	+ if(HAVE_OFF64_T)
	209	+ add_executable(example64 test/example.c)
	210	+ target_link_libraries(example64 zlib)
	211	+ set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
	212	+ add_test(example64 example64)
	213	+
	214	+ add_executable(minigzip64 test/minigzip.c)
	215	+ target_link_libraries(minigzip64 zlib)
	216	+ set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
	217	+ endif()
213	218	endif()
214	219

	--- compat/zlib/CMakeLists.txt
	+++ compat/zlib/CMakeLists.txt
	@@ -1,11 +1,13 @@
1	cmake_minimum_required(VERSION 2.4.4...3.15.0)
2	set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3
4	project(zlib C)
5
6	set(VERSION "1.3")


7
8	set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
9	set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
10	set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
11	set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
	@@ -146,11 +148,13 @@
146	-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
147	set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
148	endif(MINGW)
149
150	add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})

151	add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})

152	set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
153	set_target_properties(zlib PROPERTIES SOVERSION 1)
154
155	if(NOT CYGWIN)
156	# This property causes shared libraries on Linux to have the full version
	@@ -164,11 +168,11 @@
164	endif()
165
166	if(UNIX)
167	# On unix-like platforms the library is almost always called libz
168	set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
169	if(NOT APPLE)
170	set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
171	endif()
172	elseif(BUILD_SHARED_LIBS AND WIN32)
173	# Creates zlib1.dll when building shared library version
174	set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
	@@ -191,23 +195,24 @@
191	endif()
192
193	#============================================================================
194	# Example binaries
195	#============================================================================
196
197	add_executable(example test/example.c)
198	target_link_libraries(example zlib)
199	add_test(example example)
200
201	add_executable(minigzip test/minigzip.c)
202	target_link_libraries(minigzip zlib)
203
204	if(HAVE_OFF64_T)
205	add_executable(example64 test/example.c)
206	target_link_libraries(example64 zlib)
207	set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
208	add_test(example64 example64)
209
210	add_executable(minigzip64 test/minigzip.c)
211	target_link_libraries(minigzip64 zlib)
212	set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")

213	endif()
214

	--- compat/zlib/CMakeLists.txt
	+++ compat/zlib/CMakeLists.txt
	@@ -1,11 +1,13 @@
1	cmake_minimum_required(VERSION 2.4.4...3.15.0)
2	set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
3
4	project(zlib C)
5
6	set(VERSION "1.3.1")
7
8	option(ZLIB_BUILD_EXAMPLES "Enable Zlib Examples" ON)
9
10	set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
11	set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
12	set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")
13	set(INSTALL_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE PATH "Installation directory for manual pages")
	@@ -146,11 +148,13 @@
148	-i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc)
149	set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj)
150	endif(MINGW)
151
152	add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
153	target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
154	add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
155	target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
156	set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL)
157	set_target_properties(zlib PROPERTIES SOVERSION 1)
158
159	if(NOT CYGWIN)
160	# This property causes shared libraries on Linux to have the full version
	@@ -164,11 +168,11 @@
168	endif()
169
170	if(UNIX)
171	# On unix-like platforms the library is almost always called libz
172	set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z)
173	if(NOT APPLE AND NOT(CMAKE_SYSTEM_NAME STREQUAL AIX))
174	set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"")
175	endif()
176	elseif(BUILD_SHARED_LIBS AND WIN32)
177	# Creates zlib1.dll when building shared library version
178	set_target_properties(zlib PROPERTIES SUFFIX "1.dll")
	@@ -191,23 +195,24 @@
195	endif()
196
197	#============================================================================
198	# Example binaries
199	#============================================================================
200	if(ZLIB_BUILD_EXAMPLES)
201	add_executable(example test/example.c)
202	target_link_libraries(example zlib)
203	add_test(example example)
204
205	add_executable(minigzip test/minigzip.c)
206	target_link_libraries(minigzip zlib)
207
208	if(HAVE_OFF64_T)
209	add_executable(example64 test/example.c)
210	target_link_libraries(example64 zlib)
211	set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
212	add_test(example64 example64)
213
214	add_executable(minigzip64 test/minigzip.c)
215	target_link_libraries(minigzip64 zlib)
216	set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64")
217	endif()
218	endif()
219

M compat/zlib/ChangeLog

+10

		--- compat/zlib/ChangeLog
		+++ compat/zlib/ChangeLog
		@@ -1,8 +1,18 @@
1	1
2	2	ChangeLog file for zlib
3	3
	4	+Changes in 1.3.1 (22 Jan 2024)
	5	+- Reject overflows of zip header fields in minizip
	6	+- Fix bug in inflateSync() for data held in bit buffer
	7	+- Add LIT_MEM define to use more memory for a small deflate speedup
	8	+- Fix decision on the emission of Zip64 end records in minizip
	9	+- Add bounds checking to ERR_MSG() macro, used by zError()
	10	+- Neutralize zip file traversal attacks in miniunz
	11	+- Fix a bug in ZLIB_DEBUG compiles in check_match()
	12	+- Various portability and appearance improvements
	13	+
4	14	Changes in 1.3 (18 Aug 2023)
5	15	- Remove K&R function definitions and zlib2ansi
6	16	- Fix bug in deflateBound() for level 0 and memLevel 9
7	17	- Fix bug when gzungetc() is used immediately after gzopen()
8	18	- Fix bug when using gzflush() with a very small buffer
9	19

	--- compat/zlib/ChangeLog
	+++ compat/zlib/ChangeLog
	@@ -1,8 +1,18 @@
1
2	ChangeLog file for zlib
3










4	Changes in 1.3 (18 Aug 2023)
5	- Remove K&R function definitions and zlib2ansi
6	- Fix bug in deflateBound() for level 0 and memLevel 9
7	- Fix bug when gzungetc() is used immediately after gzopen()
8	- Fix bug when using gzflush() with a very small buffer
9

	--- compat/zlib/ChangeLog
	+++ compat/zlib/ChangeLog
	@@ -1,8 +1,18 @@
1
2	ChangeLog file for zlib
3
4	Changes in 1.3.1 (22 Jan 2024)
5	- Reject overflows of zip header fields in minizip
6	- Fix bug in inflateSync() for data held in bit buffer
7	- Add LIT_MEM define to use more memory for a small deflate speedup
8	- Fix decision on the emission of Zip64 end records in minizip
9	- Add bounds checking to ERR_MSG() macro, used by zError()
10	- Neutralize zip file traversal attacks in miniunz
11	- Fix a bug in ZLIB_DEBUG compiles in check_match()
12	- Various portability and appearance improvements
13
14	Changes in 1.3 (18 Aug 2023)
15	- Remove K&R function definitions and zlib2ansi
16	- Fix bug in deflateBound() for level 0 and memLevel 9
17	- Fix bug when gzungetc() is used immediately after gzopen()
18	- Fix bug when using gzflush() with a very small buffer
19

M compat/zlib/FAQ

+1 -2

		--- compat/zlib/FAQ
		+++ compat/zlib/FAQ
		@@ -12,12 +12,11 @@
12	12	Yes. zlib doesn't handle dates.
13	13
14	14	2. Where can I get a Windows DLL version?
15	15
16	16	The zlib sources can be compiled without change to produce a DLL. See the
17		- file win32/DLL_FAQ.txt in the zlib distribution. Pointers to the
18		- precompiled DLL are found in the zlib web site at http://zlib.net/ .
	17	+ file win32/DLL_FAQ.txt in the zlib distribution.
19	18
20	19	3. Where can I get a Visual Basic interface to zlib?
21	20
22	21	See
23	22	* http://marknelson.us/1997/01/01/zlib-engine/
24	23

	--- compat/zlib/FAQ
	+++ compat/zlib/FAQ
	@@ -12,12 +12,11 @@
12	Yes. zlib doesn't handle dates.
13
14	2. Where can I get a Windows DLL version?
15
16	The zlib sources can be compiled without change to produce a DLL. See the
17	file win32/DLL_FAQ.txt in the zlib distribution. Pointers to the
18	precompiled DLL are found in the zlib web site at http://zlib.net/ .
19
20	3. Where can I get a Visual Basic interface to zlib?
21
22	See
23	* http://marknelson.us/1997/01/01/zlib-engine/
24

	--- compat/zlib/FAQ
	+++ compat/zlib/FAQ
	@@ -12,12 +12,11 @@
12	Yes. zlib doesn't handle dates.
13
14	2. Where can I get a Windows DLL version?
15
16	The zlib sources can be compiled without change to produce a DLL. See the
17	file win32/DLL_FAQ.txt in the zlib distribution.

18
19	3. Where can I get a Visual Basic interface to zlib?
20
21	See
22	* http://marknelson.us/1997/01/01/zlib-engine/
23

M compat/zlib/Makefile.in

+8 -8

		--- compat/zlib/Makefile.in
		+++ compat/zlib/Makefile.in
		@@ -1,7 +1,7 @@
1	1	# Makefile for zlib
2		-# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
	2	+# Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	3	# For conditions of distribution and use, see copyright notice in zlib.h
4	4
5	5	# To compile and test, type:
6	6	# ./configure; make test
7	7	# Normally configure builds both a static and a shared library.
		@@ -20,17 +20,17 @@
20	20	#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
21	21	# -Wstrict-prototypes -Wmissing-prototypes
22	22
23	23	SFLAGS=-O
24	24	LDFLAGS=
25		-TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
	25	+TEST_LIBS=-L. libz.a
26	26	LDSHARED=$(CC)
27	27	CPP=$(CC) -E
28	28
29	29	STATICLIB=libz.a
30	30	SHAREDLIB=libz.so
31		-SHAREDLIBV=libz.so.1.3
	31	+SHAREDLIBV=libz.so.1.3.1
32	32	SHAREDLIBM=libz.so.1
33	33	LIBS=$(STATICLIB) $(SHAREDLIBV)
34	34
35	35	AR=ar
36	36	ARFLAGS=rc
		@@ -280,26 +280,26 @@
280	280	ln -s $@ $(SHAREDLIB)
281	281	ln -s $@ $(SHAREDLIBM)
282	282	-@rmdir objs
283	283
284	284	example$(EXE): example.o $(STATICLIB)
285		- $(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
	285	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ example.o $(TEST_LIBS)
286	286
287	287	minigzip$(EXE): minigzip.o $(STATICLIB)
288		- $(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
	288	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ minigzip.o $(TEST_LIBS)
289	289
290	290	examplesh$(EXE): example.o $(SHAREDLIBV)
291	291	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
292	292
293	293	minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
294	294	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
295	295
296	296	example64$(EXE): example64.o $(STATICLIB)
297		- $(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
	297	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ example64.o $(TEST_LIBS)
298	298
299	299	minigzip64$(EXE): minigzip64.o $(STATICLIB)
300		- $(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
	300	+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ minigzip64.o $(TEST_LIBS)
301	301
302	302	install-libs: $(LIBS)
303	303	-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
304	304	-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
305	305	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
		@@ -358,11 +358,11 @@
358	358
359	359	zconf: $(SRCDIR)zconf.h.in
360	360	cp -p $(SRCDIR)zconf.h.in zconf.h
361	361
362	362	minizip-test: static
363		- cd contrib/minizip && { CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
	363	+ cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
364	364
365	365	minizip-clean:
366	366	cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; }
367	367
368	368	mostlyclean: clean
369	369

	--- compat/zlib/Makefile.in
	+++ compat/zlib/Makefile.in
	@@ -1,7 +1,7 @@
1	# Makefile for zlib
2	# Copyright (C) 1995-2017 Jean-loup Gailly, Mark Adler
3	# For conditions of distribution and use, see copyright notice in zlib.h
4
5	# To compile and test, type:
6	# ./configure; make test
7	# Normally configure builds both a static and a shared library.
	@@ -20,17 +20,17 @@
20	#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
21	# -Wstrict-prototypes -Wmissing-prototypes
22
23	SFLAGS=-O
24	LDFLAGS=
25	TEST_LDFLAGS=$(LDFLAGS) -L. libz.a
26	LDSHARED=$(CC)
27	CPP=$(CC) -E
28
29	STATICLIB=libz.a
30	SHAREDLIB=libz.so
31	SHAREDLIBV=libz.so.1.3
32	SHAREDLIBM=libz.so.1
33	LIBS=$(STATICLIB) $(SHAREDLIBV)
34
35	AR=ar
36	ARFLAGS=rc
	@@ -280,26 +280,26 @@
280	ln -s $@ $(SHAREDLIB)
281	ln -s $@ $(SHAREDLIBM)
282	-@rmdir objs
283
284	example$(EXE): example.o $(STATICLIB)
285	$(CC) $(CFLAGS) -o $@ example.o $(TEST_LDFLAGS)
286
287	minigzip$(EXE): minigzip.o $(STATICLIB)
288	$(CC) $(CFLAGS) -o $@ minigzip.o $(TEST_LDFLAGS)
289
290	examplesh$(EXE): example.o $(SHAREDLIBV)
291	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
292
293	minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
294	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
295
296	example64$(EXE): example64.o $(STATICLIB)
297	$(CC) $(CFLAGS) -o $@ example64.o $(TEST_LDFLAGS)
298
299	minigzip64$(EXE): minigzip64.o $(STATICLIB)
300	$(CC) $(CFLAGS) -o $@ minigzip64.o $(TEST_LDFLAGS)
301
302	install-libs: $(LIBS)
303	-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
304	-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
305	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
	@@ -358,11 +358,11 @@
358
359	zconf: $(SRCDIR)zconf.h.in
360	cp -p $(SRCDIR)zconf.h.in zconf.h
361
362	minizip-test: static
363	cd contrib/minizip && { CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
364
365	minizip-clean:
366	cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; }
367
368	mostlyclean: clean
369

	--- compat/zlib/Makefile.in
	+++ compat/zlib/Makefile.in
	@@ -1,7 +1,7 @@
1	# Makefile for zlib
2	# Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	# For conditions of distribution and use, see copyright notice in zlib.h
4
5	# To compile and test, type:
6	# ./configure; make test
7	# Normally configure builds both a static and a shared library.
	@@ -20,17 +20,17 @@
20	#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
21	# -Wstrict-prototypes -Wmissing-prototypes
22
23	SFLAGS=-O
24	LDFLAGS=
25	TEST_LIBS=-L. libz.a
26	LDSHARED=$(CC)
27	CPP=$(CC) -E
28
29	STATICLIB=libz.a
30	SHAREDLIB=libz.so
31	SHAREDLIBV=libz.so.1.3.1
32	SHAREDLIBM=libz.so.1
33	LIBS=$(STATICLIB) $(SHAREDLIBV)
34
35	AR=ar
36	ARFLAGS=rc
	@@ -280,26 +280,26 @@
280	ln -s $@ $(SHAREDLIB)
281	ln -s $@ $(SHAREDLIBM)
282	-@rmdir objs
283
284	example$(EXE): example.o $(STATICLIB)
285	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ example.o $(TEST_LIBS)
286
287	minigzip$(EXE): minigzip.o $(STATICLIB)
288	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ minigzip.o $(TEST_LIBS)
289
290	examplesh$(EXE): example.o $(SHAREDLIBV)
291	$(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS) -L. $(SHAREDLIBV)
292
293	minigzipsh$(EXE): minigzip.o $(SHAREDLIBV)
294	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS) -L. $(SHAREDLIBV)
295
296	example64$(EXE): example64.o $(STATICLIB)
297	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ example64.o $(TEST_LIBS)
298
299	minigzip64$(EXE): minigzip64.o $(STATICLIB)
300	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ minigzip64.o $(TEST_LIBS)
301
302	install-libs: $(LIBS)
303	-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
304	-@if [ ! -d $(DESTDIR)$(libdir) ]; then mkdir -p $(DESTDIR)$(libdir); fi
305	-@if [ ! -d $(DESTDIR)$(sharedlibdir) ]; then mkdir -p $(DESTDIR)$(sharedlibdir); fi
	@@ -358,11 +358,11 @@
358
359	zconf: $(SRCDIR)zconf.h.in
360	cp -p $(SRCDIR)zconf.h.in zconf.h
361
362	minizip-test: static
363	cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; }
364
365	minizip-clean:
366	cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; }
367
368	mostlyclean: clean
369

M compat/zlib/README

+3 -3

		--- compat/zlib/README
		+++ compat/zlib/README
		@@ -1,8 +1,8 @@
1	1	ZLIB DATA COMPRESSION LIBRARY
2	2
3		-zlib 1.3 is a general purpose data compression library. All the code is
	3	+zlib 1.3.1 is a general purpose data compression library. All the code is
4	4	thread safe. The data format used by the zlib library is described by RFCs
5	5	(Request for Comments) 1950 to 1952 in the files
6	6	http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
7	7	rfc1952 (gzip format).
8	8
		@@ -29,11 +29,11 @@
29	29
30	30	Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
31	31	issue of Dr. Dobb's Journal; a copy of the article is available at
32	32	https://marknelson.us/posts/1997/01/01/zlib-engine.html .
33	33
34		-The changes made in version 1.3 are documented in the file ChangeLog.
	34	+The changes made in version 1.3.1 are documented in the file ChangeLog.
35	35
36	36	Unsupported third party contributions are provided in directory contrib/ .
37	37
38	38	zlib is available in Java using the java.util.zip package. Follow the API
39	39	Documentation link at: https://docs.oracle.com/search/?q=java.util.zip .
		@@ -81,11 +81,11 @@
81	81	people who reported problems and suggested various improvements in zlib; they
82	82	are too numerous to cite here.
83	83
84	84	Copyright notice:
85	85
86		- (C) 1995-2023 Jean-loup Gailly and Mark Adler
	86	+ (C) 1995-2024 Jean-loup Gailly and Mark Adler
87	87
88	88	This software is provided 'as-is', without any express or implied
89	89	warranty. In no event will the authors be held liable for any damages
90	90	arising from the use of this software.
91	91
92	92

	--- compat/zlib/README
	+++ compat/zlib/README
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.3 is a general purpose data compression library. All the code is
4	thread safe. The data format used by the zlib library is described by RFCs
5	(Request for Comments) 1950 to 1952 in the files
6	http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
7	rfc1952 (gzip format).
8
	@@ -29,11 +29,11 @@
29
30	Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
31	issue of Dr. Dobb's Journal; a copy of the article is available at
32	https://marknelson.us/posts/1997/01/01/zlib-engine.html .
33
34	The changes made in version 1.3 are documented in the file ChangeLog.
35
36	Unsupported third party contributions are provided in directory contrib/ .
37
38	zlib is available in Java using the java.util.zip package. Follow the API
39	Documentation link at: https://docs.oracle.com/search/?q=java.util.zip .
	@@ -81,11 +81,11 @@
81	people who reported problems and suggested various improvements in zlib; they
82	are too numerous to cite here.
83
84	Copyright notice:
85
86	(C) 1995-2023 Jean-loup Gailly and Mark Adler
87
88	This software is provided 'as-is', without any express or implied
89	warranty. In no event will the authors be held liable for any damages
90	arising from the use of this software.
91
92

	--- compat/zlib/README
	+++ compat/zlib/README
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.3.1 is a general purpose data compression library. All the code is
4	thread safe. The data format used by the zlib library is described by RFCs
5	(Request for Comments) 1950 to 1952 in the files
6	http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
7	rfc1952 (gzip format).
8
	@@ -29,11 +29,11 @@
29
30	Mark Nelson <[email protected]> wrote an article about zlib for the Jan. 1997
31	issue of Dr. Dobb's Journal; a copy of the article is available at
32	https://marknelson.us/posts/1997/01/01/zlib-engine.html .
33
34	The changes made in version 1.3.1 are documented in the file ChangeLog.
35
36	Unsupported third party contributions are provided in directory contrib/ .
37
38	zlib is available in Java using the java.util.zip package. Follow the API
39	Documentation link at: https://docs.oracle.com/search/?q=java.util.zip .
	@@ -81,11 +81,11 @@
81	people who reported problems and suggested various improvements in zlib; they
82	are too numerous to cite here.
83
84	Copyright notice:
85
86	(C) 1995-2024 Jean-loup Gailly and Mark Adler
87
88	This software is provided 'as-is', without any express or implied
89	warranty. In no event will the authors be held liable for any damages
90	arising from the use of this software.
91
92

M compat/zlib/configure

+5 -4

		--- compat/zlib/configure
		+++ compat/zlib/configure
		@@ -23,11 +23,11 @@
23	23	if test $SRCDIR = "."; then
24	24	ZINC=""
25	25	ZINCOUT="-I."
26	26	SRCDIR=""
27	27	else
28		- ZINC='-include zconf.h'
	28	+ ZINC='-I. -include zconf.h'
29	29	ZINCOUT='-I. -I$(SRCDIR)'
30	30	SRCDIR="$SRCDIR/"
31	31	fi
32	32
33	33	# set command prefix for cross-compilation
		@@ -42,11 +42,12 @@
42	42	# destination name for static library
43	43	STATICLIB=libz.a
44	44
45	45	# extract zlib version numbers from zlib.h
46	46	VER=`sed -n -e '/VERSION "/s/."$.$".*/\1/p' < ${SRCDIR}zlib.h`
47		-VER1=`sed -n -e '/VERSION "/s/."$[0-9]$\\..*/\1/p' < ${SRCDIR}zlib.h`
	47	+VER3=`echo ${VER}\|sed -n -e 's/$[0-9]\{1,\}\(\\.[0-9]\{1,\}$\{1,2\}\).*/\1/p'`
	48	+VER1=`echo ${VER}\|sed -n -e 's/$[0-9]\{1,\}$\\..*/\1/p'`
48	49
49	50	# establish commands for library building
50	51	if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null \|\| test $? -lt 126; then
51	52	AR=${AR-"${CROSS_PREFIX}ar"}
52	53	test -n "${CROSS_PREFIX}" && echo Using ${AR} \| tee -a configure.log
		@@ -261,11 +262,11 @@
261	262	Darwin* \| darwin* \| -darwin)
262	263	shared_ext='.dylib'
263	264	SHAREDLIB=libz$shared_ext
264	265	SHAREDLIBV=libz.$VER$shared_ext
265	266	SHAREDLIBM=libz.$VER1$shared_ext
266		- LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"}
	267	+ LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
267	268	if "${CROSS_PREFIX}libtool" -V 2>&1 \| grep Apple > /dev/null; then
268	269	AR="${CROSS_PREFIX}libtool"
269	270	elif libtool -V 2>&1 \| grep Apple > /dev/null; then
270	271	AR="libtool"
271	272	else
		@@ -439,11 +440,11 @@
439	440	int hello() {return getchar();}
440	441	EOF
441	442	if test $shared -eq 1; then
442	443	echo Checking for shared library support... \| tee -a configure.log
443	444	# we must test in two steps (cc then ld), required at least on SunOS 4.x
444		- if try $CC -w -c $SFLAGS $test.c &&
	445	+ if try $CC -c $SFLAGS $test.c &&
445	446	try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
446	447	echo Building shared library $SHAREDLIBV with $CC. \| tee -a configure.log
447	448	elif test -z "$old_cc" -a -z "$old_cflags"; then
448	449	echo No shared library support. \| tee -a configure.log
449	450	shared=0;
450	451

	--- compat/zlib/configure
	+++ compat/zlib/configure
	@@ -23,11 +23,11 @@
23	if test $SRCDIR = "."; then
24	ZINC=""
25	ZINCOUT="-I."
26	SRCDIR=""
27	else
28	ZINC='-include zconf.h'
29	ZINCOUT='-I. -I$(SRCDIR)'
30	SRCDIR="$SRCDIR/"
31	fi
32
33	# set command prefix for cross-compilation
	@@ -42,11 +42,12 @@
42	# destination name for static library
43	STATICLIB=libz.a
44
45	# extract zlib version numbers from zlib.h
46	VER=`sed -n -e '/VERSION "/s/."$.$".*/\1/p' < ${SRCDIR}zlib.h`
47	VER1=`sed -n -e '/VERSION "/s/."$[0-9]$\\..*/\1/p' < ${SRCDIR}zlib.h`

48
49	# establish commands for library building
50	if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null \|\| test $? -lt 126; then
51	AR=${AR-"${CROSS_PREFIX}ar"}
52	test -n "${CROSS_PREFIX}" && echo Using ${AR} \| tee -a configure.log
	@@ -261,11 +262,11 @@
261	Darwin* \| darwin* \| -darwin)
262	shared_ext='.dylib'
263	SHAREDLIB=libz$shared_ext
264	SHAREDLIBV=libz.$VER$shared_ext
265	SHAREDLIBM=libz.$VER1$shared_ext
266	LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER"}
267	if "${CROSS_PREFIX}libtool" -V 2>&1 \| grep Apple > /dev/null; then
268	AR="${CROSS_PREFIX}libtool"
269	elif libtool -V 2>&1 \| grep Apple > /dev/null; then
270	AR="libtool"
271	else
	@@ -439,11 +440,11 @@
439	int hello() {return getchar();}
440	EOF
441	if test $shared -eq 1; then
442	echo Checking for shared library support... \| tee -a configure.log
443	# we must test in two steps (cc then ld), required at least on SunOS 4.x
444	if try $CC -w -c $SFLAGS $test.c &&
445	try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
446	echo Building shared library $SHAREDLIBV with $CC. \| tee -a configure.log
447	elif test -z "$old_cc" -a -z "$old_cflags"; then
448	echo No shared library support. \| tee -a configure.log
449	shared=0;
450

	--- compat/zlib/configure
	+++ compat/zlib/configure
	@@ -23,11 +23,11 @@
23	if test $SRCDIR = "."; then
24	ZINC=""
25	ZINCOUT="-I."
26	SRCDIR=""
27	else
28	ZINC='-I. -include zconf.h'
29	ZINCOUT='-I. -I$(SRCDIR)'
30	SRCDIR="$SRCDIR/"
31	fi
32
33	# set command prefix for cross-compilation
	@@ -42,11 +42,12 @@
42	# destination name for static library
43	STATICLIB=libz.a
44
45	# extract zlib version numbers from zlib.h
46	VER=`sed -n -e '/VERSION "/s/."$.$".*/\1/p' < ${SRCDIR}zlib.h`
47	VER3=`echo ${VER}\|sed -n -e 's/$[0-9]\{1,\}\(\\.[0-9]\{1,\}$\{1,2\}\).*/\1/p'`
48	VER1=`echo ${VER}\|sed -n -e 's/$[0-9]\{1,\}$\\..*/\1/p'`
49
50	# establish commands for library building
51	if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null \|\| test $? -lt 126; then
52	AR=${AR-"${CROSS_PREFIX}ar"}
53	test -n "${CROSS_PREFIX}" && echo Using ${AR} \| tee -a configure.log
	@@ -261,11 +262,11 @@
262	Darwin* \| darwin* \| -darwin)
263	shared_ext='.dylib'
264	SHAREDLIB=libz$shared_ext
265	SHAREDLIBV=libz.$VER$shared_ext
266	SHAREDLIBM=libz.$VER1$shared_ext
267	LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"}
268	if "${CROSS_PREFIX}libtool" -V 2>&1 \| grep Apple > /dev/null; then
269	AR="${CROSS_PREFIX}libtool"
270	elif libtool -V 2>&1 \| grep Apple > /dev/null; then
271	AR="libtool"
272	else
	@@ -439,11 +440,11 @@
440	int hello() {return getchar();}
441	EOF
442	if test $shared -eq 1; then
443	echo Checking for shared library support... \| tee -a configure.log
444	# we must test in two steps (cc then ld), required at least on SunOS 4.x
445	if try $CC -c $SFLAGS $test.c &&
446	try $LDSHARED $SFLAGS -o $test$shared_ext $test.o; then
447	echo Building shared library $SHAREDLIBV with $CC. \| tee -a configure.log
448	elif test -z "$old_cc" -a -z "$old_cflags"; then
449	echo No shared library support. \| tee -a configure.log
450	shared=0;
451

M compat/zlib/contrib/delphi/ZLib.pas

+1 -1

		--- compat/zlib/contrib/delphi/ZLib.pas
		+++ compat/zlib/contrib/delphi/ZLib.pas
		@@ -150,11 +150,11 @@
150	150	BufSize = number of bytes in OutBuf }
151	151	procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152	152	const OutBuf: Pointer; BufSize: Integer);
153	153
154	154	const
155		- zlib_version = '1.3.0';
	155	+ zlib_version = '1.3.1';
156	156
157	157	type
158	158	EZlibError = class(Exception);
159	159	ECompressionError = class(EZlibError);
160	160	EDecompressionError = class(EZlibError);
161	161

	--- compat/zlib/contrib/delphi/ZLib.pas
	+++ compat/zlib/contrib/delphi/ZLib.pas
	@@ -150,11 +150,11 @@
150	BufSize = number of bytes in OutBuf }
151	procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152	const OutBuf: Pointer; BufSize: Integer);
153
154	const
155	zlib_version = '1.3.0';
156
157	type
158	EZlibError = class(Exception);
159	ECompressionError = class(EZlibError);
160	EDecompressionError = class(EZlibError);
161

	--- compat/zlib/contrib/delphi/ZLib.pas
	+++ compat/zlib/contrib/delphi/ZLib.pas
	@@ -150,11 +150,11 @@
150	BufSize = number of bytes in OutBuf }
151	procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
152	const OutBuf: Pointer; BufSize: Integer);
153
154	const
155	zlib_version = '1.3.1';
156
157	type
158	EZlibError = class(Exception);
159	ECompressionError = class(EZlibError);
160	EDecompressionError = class(EZlibError);
161

M compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs

+1 -1

		--- compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
		+++ compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
		@@ -32,11 +32,11 @@
32	32	{
33	33	_current = 0;
34	34	}
35	35
36	36	/// <summary>
37		- /// Initializes a new instance of the checksum generator basewith a specified value
	37	+ /// Initializes a new instance of the checksum generator base with a specified value
38	38	/// </summary>
39	39	/// <param name="initialValue">The value to set the current checksum to</param>
40	40	public ChecksumGeneratorBase(uint initialValue)
41	41	{
42	42	_current = initialValue;
43	43

	--- compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
	+++ compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
	@@ -32,11 +32,11 @@
32	{
33	_current = 0;
34	}
35
36	/// <summary>
37	/// Initializes a new instance of the checksum generator basewith a specified value
38	/// </summary>
39	/// <param name="initialValue">The value to set the current checksum to</param>
40	public ChecksumGeneratorBase(uint initialValue)
41	{
42	_current = initialValue;
43

	--- compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
	+++ compat/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs
	@@ -32,11 +32,11 @@
32	{
33	_current = 0;
34	}
35
36	/// <summary>
37	/// Initializes a new instance of the checksum generator base with a specified value
38	/// </summary>
39	/// <param name="initialValue">The value to set the current checksum to</param>
40	public ChecksumGeneratorBase(uint initialValue)
41	{
42	_current = initialValue;
43

M compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs

+1 -1

		--- compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
		+++ compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
		@@ -154,11 +154,11 @@
154	154	#region Info tests
155	155	[Test]
156	156	public void Info_Version()
157	157	{
158	158	Info info = new Info();
159		- Assert.AreEqual("1.3.0", Info.Version);
	159	+ Assert.AreEqual("1.3.1", Info.Version);
160	160	Assert.AreEqual(32, info.SizeOfUInt);
161	161	Assert.AreEqual(32, info.SizeOfULong);
162	162	Assert.AreEqual(32, info.SizeOfPointer);
163	163	Assert.AreEqual(32, info.SizeOfOffset);
164	164	}
165	165

	--- compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	+++ compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	@@ -154,11 +154,11 @@
154	#region Info tests
155	[Test]
156	public void Info_Version()
157	{
158	Info info = new Info();
159	Assert.AreEqual("1.3.0", Info.Version);
160	Assert.AreEqual(32, info.SizeOfUInt);
161	Assert.AreEqual(32, info.SizeOfULong);
162	Assert.AreEqual(32, info.SizeOfPointer);
163	Assert.AreEqual(32, info.SizeOfOffset);
164	}
165

	--- compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	+++ compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs
	@@ -154,11 +154,11 @@
154	#region Info tests
155	[Test]
156	public void Info_Version()
157	{
158	Info info = new Info();
159	Assert.AreEqual("1.3.1", Info.Version);
160	Assert.AreEqual(32, info.SizeOfUInt);
161	Assert.AreEqual(32, info.SizeOfULong);
162	Assert.AreEqual(32, info.SizeOfPointer);
163	Assert.AreEqual(32, info.SizeOfOffset);
164	}
165

M compat/zlib/contrib/infback9/inftree9.c

+3 -3

		--- compat/zlib/contrib/infback9/inftree9.c
		+++ compat/zlib/contrib/infback9/inftree9.c
		@@ -1,17 +1,17 @@
1	1	/* inftree9.c -- generate Huffman trees for efficient decoding
2		- * Copyright (C) 1995-2023 Mark Adler
	2	+ * Copyright (C) 1995-2024 Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	#include "zutil.h"
7	7	#include "inftree9.h"
8	8
9	9	#define MAXBITS 15
10	10
11	11	const char inflate9_copyright[] =
12		- " inflate9 1.3 Copyright 1995-2023 Mark Adler ";
	12	+ " inflate9 1.3.1 Copyright 1995-2024 Mark Adler ";
13	13	/*
14	14	If you use the zlib library in a product, an acknowledgment is welcome
15	15	in the documentation of your product. If for some reason you cannot
16	16	include such an acknowledgment, I would appreciate that you keep this
17	17	copyright string in the executable of your product.
		@@ -57,11 +57,11 @@
57	57	19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
58	58	131, 163, 195, 227, 3, 0, 0};
59	59	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
60	60	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
61	61	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
62		- 133, 133, 133, 133, 144, 198, 203};
	62	+ 133, 133, 133, 133, 144, 203, 77};
63	63	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
64	64	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65	65	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
66	66	4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
67	67	static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
68	68

	--- compat/zlib/contrib/infback9/inftree9.c
	+++ compat/zlib/contrib/infback9/inftree9.c
	@@ -1,17 +1,17 @@
1	/* inftree9.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-2023 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "zutil.h"
7	#include "inftree9.h"
8
9	#define MAXBITS 15
10
11	const char inflate9_copyright[] =
12	" inflate9 1.3 Copyright 1995-2023 Mark Adler ";
13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot
16	include such an acknowledgment, I would appreciate that you keep this
17	copyright string in the executable of your product.
	@@ -57,11 +57,11 @@
57	19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
58	131, 163, 195, 227, 3, 0, 0};
59	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
60	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
61	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
62	133, 133, 133, 133, 144, 198, 203};
63	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
64	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
66	4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
67	static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
68

	--- compat/zlib/contrib/infback9/inftree9.c
	+++ compat/zlib/contrib/infback9/inftree9.c
	@@ -1,17 +1,17 @@
1	/* inftree9.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-2024 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "zutil.h"
7	#include "inftree9.h"
8
9	#define MAXBITS 15
10
11	const char inflate9_copyright[] =
12	" inflate9 1.3.1 Copyright 1995-2024 Mark Adler ";
13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot
16	include such an acknowledgment, I would appreciate that you keep this
17	copyright string in the executable of your product.
	@@ -57,11 +57,11 @@
57	19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
58	131, 163, 195, 227, 3, 0, 0};
59	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
60	128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
61	130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
62	133, 133, 133, 133, 144, 203, 77};
63	static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
64	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
65	65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
66	4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
67	static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
68

M compat/zlib/contrib/infback9/inftree9.h

+2 -2

		--- compat/zlib/contrib/infback9/inftree9.h
		+++ compat/zlib/contrib/infback9/inftree9.h
		@@ -39,12 +39,12 @@
39	39	1446, which is the sum of 852 for literal/length codes and 594 for distance
40	40	codes. These values were found by exhaustive searches using the program
41	41	examples/enough.c found in the zlib distribution. The arguments to that
42	42	program are the number of symbols, the initial root table size, and the
43	43	maximum bit length of a code. "enough 286 9 15" for literal/length codes
44		- returns returns 852, and "enough 32 6 15" for distance codes returns 594.
45		- The initial root table size (9 or 6) is found in the fifth argument of the
	44	+ returns 852, and "enough 32 6 15" for distance codes returns 594. The
	45	+ initial root table size (9 or 6) is found in the fifth argument of the
46	46	inflate_table() calls in infback9.c. If the root table size is changed,
47	47	then these maximum sizes would be need to be recalculated and updated. */
48	48	#define ENOUGH_LENS 852
49	49	#define ENOUGH_DISTS 594
50	50	#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
51	51

	--- compat/zlib/contrib/infback9/inftree9.h
	+++ compat/zlib/contrib/infback9/inftree9.h
	@@ -39,12 +39,12 @@
39	1446, which is the sum of 852 for literal/length codes and 594 for distance
40	codes. These values were found by exhaustive searches using the program
41	examples/enough.c found in the zlib distribution. The arguments to that
42	program are the number of symbols, the initial root table size, and the
43	maximum bit length of a code. "enough 286 9 15" for literal/length codes
44	returns returns 852, and "enough 32 6 15" for distance codes returns 594.
45	The initial root table size (9 or 6) is found in the fifth argument of the
46	inflate_table() calls in infback9.c. If the root table size is changed,
47	then these maximum sizes would be need to be recalculated and updated. */
48	#define ENOUGH_LENS 852
49	#define ENOUGH_DISTS 594
50	#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
51

	--- compat/zlib/contrib/infback9/inftree9.h
	+++ compat/zlib/contrib/infback9/inftree9.h
	@@ -39,12 +39,12 @@
39	1446, which is the sum of 852 for literal/length codes and 594 for distance
40	codes. These values were found by exhaustive searches using the program
41	examples/enough.c found in the zlib distribution. The arguments to that
42	program are the number of symbols, the initial root table size, and the
43	maximum bit length of a code. "enough 286 9 15" for literal/length codes
44	returns 852, and "enough 32 6 15" for distance codes returns 594. The
45	initial root table size (9 or 6) is found in the fifth argument of the
46	inflate_table() calls in infback9.c. If the root table size is changed,
47	then these maximum sizes would be need to be recalculated and updated. */
48	#define ENOUGH_LENS 852
49	#define ENOUGH_DISTS 594
50	#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS)
51

M compat/zlib/contrib/iostream3/zfstream.h

+2 -2

		--- compat/zlib/contrib/iostream3/zfstream.h
		+++ compat/zlib/contrib/iostream3/zfstream.h
		@@ -411,11 +411,11 @@
411	411	*/
412	412	template<typename T1, typename T2>
413	413	class gzomanip2
414	414	{
415	415	public:
416		- // Allows insertor to peek at internals
	416	+ // Allows inserter to peek at internals
417	417	template <typename Ta, typename Tb>
418	418	friend gzofstream&
419	419	operator<<(gzofstream&,
420	420	const gzomanip2<Ta,Tb>&);
421	421
		@@ -450,11 +450,11 @@
450	450	T1 v1,
451	451	T2 v2)
452	452	: func(f), val1(v1), val2(v2)
453	453	{ }
454	454
455		-// Insertor applies underlying manipulator function to stream
	455	+// Inserter applies underlying manipulator function to stream
456	456	template<typename T1, typename T2>
457	457	inline gzofstream&
458	458	operator<<(gzofstream& s, const gzomanip2<T1,T2>& m)
459	459	{ return (*m.func)(s, m.val1, m.val2); }
460	460
461	461

	--- compat/zlib/contrib/iostream3/zfstream.h
	+++ compat/zlib/contrib/iostream3/zfstream.h
	@@ -411,11 +411,11 @@
411	*/
412	template<typename T1, typename T2>
413	class gzomanip2
414	{
415	public:
416	// Allows insertor to peek at internals
417	template <typename Ta, typename Tb>
418	friend gzofstream&
419	operator<<(gzofstream&,
420	const gzomanip2<Ta,Tb>&);
421
	@@ -450,11 +450,11 @@
450	T1 v1,
451	T2 v2)
452	: func(f), val1(v1), val2(v2)
453	{ }
454
455	// Insertor applies underlying manipulator function to stream
456	template<typename T1, typename T2>
457	inline gzofstream&
458	operator<<(gzofstream& s, const gzomanip2<T1,T2>& m)
459	{ return (*m.func)(s, m.val1, m.val2); }
460
461

	--- compat/zlib/contrib/iostream3/zfstream.h
	+++ compat/zlib/contrib/iostream3/zfstream.h
	@@ -411,11 +411,11 @@
411	*/
412	template<typename T1, typename T2>
413	class gzomanip2
414	{
415	public:
416	// Allows inserter to peek at internals
417	template <typename Ta, typename Tb>
418	friend gzofstream&
419	operator<<(gzofstream&,
420	const gzomanip2<Ta,Tb>&);
421
	@@ -450,11 +450,11 @@
450	T1 v1,
451	T2 v2)
452	: func(f), val1(v1), val2(v2)
453	{ }
454
455	// Inserter applies underlying manipulator function to stream
456	template<typename T1, typename T2>
457	inline gzofstream&
458	operator<<(gzofstream& s, const gzomanip2<T1,T2>& m)
459	{ return (*m.func)(s, m.val1, m.val2); }
460
461

M compat/zlib/contrib/minizip/Makefile

+1 -1

		--- compat/zlib/contrib/minizip/Makefile
		+++ compat/zlib/contrib/minizip/Makefile
		@@ -1,6 +1,6 @@
1		-CC=cc
	1	+CC?=cc
2	2	CFLAGS := $(CFLAGS) -O -I../..
3	3
4	4	UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
5	5	ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a
6	6
7	7

	--- compat/zlib/contrib/minizip/Makefile
	+++ compat/zlib/contrib/minizip/Makefile
	@@ -1,6 +1,6 @@
1	CC=cc
2	CFLAGS := $(CFLAGS) -O -I../..
3
4	UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
5	ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a
6
7

	--- compat/zlib/contrib/minizip/Makefile
	+++ compat/zlib/contrib/minizip/Makefile
	@@ -1,6 +1,6 @@
1	CC?=cc
2	CFLAGS := $(CFLAGS) -O -I../..
3
4	UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a
5	ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a
6
7

M compat/zlib/contrib/minizip/configure.ac

+1 -1

		--- compat/zlib/contrib/minizip/configure.ac
		+++ compat/zlib/contrib/minizip/configure.ac
		@@ -1,9 +1,9 @@
1	1	# -- Autoconf --
2	2	# Process this file with autoconf to produce a configure script.
3	3
4		-AC_INIT([minizip], [1.3.0], [bugzilla.redhat.com])
	4	+AC_INIT([minizip], [1.3.1], [bugzilla.redhat.com])
5	5	AC_CONFIG_SRCDIR([minizip.c])
6	6	AM_INIT_AUTOMAKE([foreign])
7	7	LT_INIT
8	8
9	9	AC_MSG_CHECKING([whether to build example programs])
10	10

	--- compat/zlib/contrib/minizip/configure.ac
	+++ compat/zlib/contrib/minizip/configure.ac
	@@ -1,9 +1,9 @@
1	# -- Autoconf --
2	# Process this file with autoconf to produce a configure script.
3
4	AC_INIT([minizip], [1.3.0], [bugzilla.redhat.com])
5	AC_CONFIG_SRCDIR([minizip.c])
6	AM_INIT_AUTOMAKE([foreign])
7	LT_INIT
8
9	AC_MSG_CHECKING([whether to build example programs])
10

	--- compat/zlib/contrib/minizip/configure.ac
	+++ compat/zlib/contrib/minizip/configure.ac
	@@ -1,9 +1,9 @@
1	# -- Autoconf --
2	# Process this file with autoconf to produce a configure script.
3
4	AC_INIT([minizip], [1.3.1], [bugzilla.redhat.com])
5	AC_CONFIG_SRCDIR([minizip.c])
6	AM_INIT_AUTOMAKE([foreign])
7	LT_INIT
8
9	AC_MSG_CHECKING([whether to build example programs])
10

M compat/zlib/contrib/minizip/ioapi.h

+1 -1

		--- compat/zlib/contrib/minizip/ioapi.h
		+++ compat/zlib/contrib/minizip/ioapi.h
		@@ -142,11 +142,11 @@
142	142
143	143	typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream);
144	144	typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
145	145
146	146
147		-/* here is the "old" 32 bits structure structure */
	147	+/* here is the "old" 32 bits structure */
148	148	typedef struct zlib_filefunc_def_s
149	149	{
150	150	open_file_func zopen_file;
151	151	read_file_func zread_file;
152	152	write_file_func zwrite_file;
153	153

	--- compat/zlib/contrib/minizip/ioapi.h
	+++ compat/zlib/contrib/minizip/ioapi.h
	@@ -142,11 +142,11 @@
142
143	typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream);
144	typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
145
146
147	/* here is the "old" 32 bits structure structure */
148	typedef struct zlib_filefunc_def_s
149	{
150	open_file_func zopen_file;
151	read_file_func zread_file;
152	write_file_func zwrite_file;
153

	--- compat/zlib/contrib/minizip/ioapi.h
	+++ compat/zlib/contrib/minizip/ioapi.h
	@@ -142,11 +142,11 @@
142
143	typedef long (ZCALLBACK *tell_file_func) (voidpf opaque, voidpf stream);
144	typedef long (ZCALLBACK *seek_file_func) (voidpf opaque, voidpf stream, uLong offset, int origin);
145
146
147	/* here is the "old" 32 bits structure */
148	typedef struct zlib_filefunc_def_s
149	{
150	open_file_func zopen_file;
151	read_file_func zread_file;
152	write_file_func zwrite_file;
153

M compat/zlib/contrib/minizip/miniunz.c

+16 -2

		--- compat/zlib/contrib/minizip/miniunz.c
		+++ compat/zlib/contrib/minizip/miniunz.c
		@@ -77,11 +77,11 @@
77	77	*/
78	78
79	79
80	80	/* change_file_date : change the date/time of a file
81	81	filename : the filename of the file where date/time must be modified
82		- dosdate : the new date at the MSDos format (4 bytes)
	82	+ dosdate : the new date at the MSDOS format (4 bytes)
83	83	tmu_date : the SAME new date at the tm_unz format */
84	84	static void change_file_date(const char *filename, uLong dosdate, tm_unz tmu_date) {
85	85	#ifdef _WIN32
86	86	HANDLE hFile;
87	87	FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
		@@ -184,11 +184,11 @@
184	184	free(buffer);
185	185	return 1;
186	186	}
187	187
188	188	static void do_banner(void) {
189		- printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
	189	+ printf("MiniUnz 1.1, demo of zLib + Unz package written by Gilles Vollant\n");
190	190	printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
191	191	}
192	192
193	193	static void do_help(void) {
194	194	printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
		@@ -353,10 +353,24 @@
353	353
354	354	if ((*popt_extract_without_path)==0)
355	355	write_filename = filename_inzip;
356	356	else
357	357	write_filename = filename_withoutpath;
	358	+
	359	+ if (write_filename[0]!='\0')
	360	+ {
	361	+ const char* relative_check = write_filename;
	362	+ while (relative_check[1]!='\0')
	363	+ {
	364	+ if (relative_check[0]=='.' && relative_check[1]=='.')
	365	+ write_filename = relative_check;
	366	+ relative_check++;
	367	+ }
	368	+ }
	369	+
	370	+ while (write_filename[0]=='/' \|\| write_filename[0]=='.')
	371	+ write_filename++;
358	372
359	373	err = unzOpenCurrentFilePassword(uf,password);
360	374	if (err!=UNZ_OK)
361	375	{
362	376	printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
363	377

	--- compat/zlib/contrib/minizip/miniunz.c
	+++ compat/zlib/contrib/minizip/miniunz.c
	@@ -77,11 +77,11 @@
77	*/
78
79
80	/* change_file_date : change the date/time of a file
81	filename : the filename of the file where date/time must be modified
82	dosdate : the new date at the MSDos format (4 bytes)
83	tmu_date : the SAME new date at the tm_unz format */
84	static void change_file_date(const char *filename, uLong dosdate, tm_unz tmu_date) {
85	#ifdef _WIN32
86	HANDLE hFile;
87	FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
	@@ -184,11 +184,11 @@
184	free(buffer);
185	return 1;
186	}
187
188	static void do_banner(void) {
189	printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n");
190	printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
191	}
192
193	static void do_help(void) {
194	printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
	@@ -353,10 +353,24 @@
353
354	if ((*popt_extract_without_path)==0)
355	write_filename = filename_inzip;
356	else
357	write_filename = filename_withoutpath;














358
359	err = unzOpenCurrentFilePassword(uf,password);
360	if (err!=UNZ_OK)
361	{
362	printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
363

	--- compat/zlib/contrib/minizip/miniunz.c
	+++ compat/zlib/contrib/minizip/miniunz.c
	@@ -77,11 +77,11 @@
77	*/
78
79
80	/* change_file_date : change the date/time of a file
81	filename : the filename of the file where date/time must be modified
82	dosdate : the new date at the MSDOS format (4 bytes)
83	tmu_date : the SAME new date at the tm_unz format */
84	static void change_file_date(const char *filename, uLong dosdate, tm_unz tmu_date) {
85	#ifdef _WIN32
86	HANDLE hFile;
87	FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite;
	@@ -184,11 +184,11 @@
184	free(buffer);
185	return 1;
186	}
187
188	static void do_banner(void) {
189	printf("MiniUnz 1.1, demo of zLib + Unz package written by Gilles Vollant\n");
190	printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n");
191	}
192
193	static void do_help(void) {
194	printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \
	@@ -353,10 +353,24 @@
353
354	if ((*popt_extract_without_path)==0)
355	write_filename = filename_inzip;
356	else
357	write_filename = filename_withoutpath;
358
359	if (write_filename[0]!='\0')
360	{
361	const char* relative_check = write_filename;
362	while (relative_check[1]!='\0')
363	{
364	if (relative_check[0]=='.' && relative_check[1]=='.')
365	write_filename = relative_check;
366	relative_check++;
367	}
368	}
369
370	while (write_filename[0]=='/' \|\| write_filename[0]=='.')
371	write_filename++;
372
373	err = unzOpenCurrentFilePassword(uf,password);
374	if (err!=UNZ_OK)
375	{
376	printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err);
377

M compat/zlib/contrib/minizip/unzip.c

+4 -4

		--- compat/zlib/contrib/minizip/unzip.c
		+++ compat/zlib/contrib/minizip/unzip.c
		@@ -115,11 +115,11 @@
115	115
116	116
117	117	const char unz_copyright[] =
118	118	" unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
119	119
120		-/* unz_file_info_interntal contain internal info about a file in zipfile*/
	120	+/* unz_file_info64_internal contain internal info about a file in zipfile*/
121	121	typedef struct unz_file_info64_internal_s
122	122	{
123	123	ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
124	124	} unz_file_info64_internal;
125	125
		@@ -448,11 +448,11 @@
448	448
449	449	/* the signature, already checked */
450	450	if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
451	451	return CENTRALDIRINVALID;
452	452
453		- /* number of the disk with the start of the zip64 end of central directory */
	453	+ /* number of the disk with the start of the zip64 end of central directory */
454	454	if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
455	455	return CENTRALDIRINVALID;
456	456	if (uL != 0)
457	457	return CENTRALDIRINVALID;
458	458
		@@ -495,13 +495,13 @@
495	495	unz64_s us;
496	496	unz64_s *s;
497	497	ZPOS64_T central_pos;
498	498	uLong uL;
499	499
500		- uLong number_disk; /* number of the current dist, used for
	500	+ uLong number_disk; /* number of the current disk, used for
501	501	spanning ZIP, unsupported, always 0*/
502		- uLong number_disk_with_CD; /* number the the disk with central dir, used
	502	+ uLong number_disk_with_CD; /* number the disk with central dir, used
503	503	for spanning ZIP, unsupported, always 0*/
504	504	ZPOS64_T number_entry_CD; /* total number of entries in
505	505	the central dir
506	506	(same than number_entry on nospan) */
507	507
508	508

	--- compat/zlib/contrib/minizip/unzip.c
	+++ compat/zlib/contrib/minizip/unzip.c
	@@ -115,11 +115,11 @@
115
116
117	const char unz_copyright[] =
118	" unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
119
120	/* unz_file_info_interntal contain internal info about a file in zipfile*/
121	typedef struct unz_file_info64_internal_s
122	{
123	ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
124	} unz_file_info64_internal;
125
	@@ -448,11 +448,11 @@
448
449	/* the signature, already checked */
450	if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
451	return CENTRALDIRINVALID;
452
453	/* number of the disk with the start of the zip64 end of central directory */
454	if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
455	return CENTRALDIRINVALID;
456	if (uL != 0)
457	return CENTRALDIRINVALID;
458
	@@ -495,13 +495,13 @@
495	unz64_s us;
496	unz64_s *s;
497	ZPOS64_T central_pos;
498	uLong uL;
499
500	uLong number_disk; /* number of the current dist, used for
501	spanning ZIP, unsupported, always 0*/
502	uLong number_disk_with_CD; /* number the the disk with central dir, used
503	for spanning ZIP, unsupported, always 0*/
504	ZPOS64_T number_entry_CD; /* total number of entries in
505	the central dir
506	(same than number_entry on nospan) */
507
508

	--- compat/zlib/contrib/minizip/unzip.c
	+++ compat/zlib/contrib/minizip/unzip.c
	@@ -115,11 +115,11 @@
115
116
117	const char unz_copyright[] =
118	" unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
119
120	/* unz_file_info64_internal contain internal info about a file in zipfile*/
121	typedef struct unz_file_info64_internal_s
122	{
123	ZPOS64_T offset_curfile;/* relative offset of local header 8 bytes */
124	} unz_file_info64_internal;
125
	@@ -448,11 +448,11 @@
448
449	/* the signature, already checked */
450	if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
451	return CENTRALDIRINVALID;
452
453	/* number of the disk with the start of the zip64 end of central directory */
454	if (unz64local_getLong(pzlib_filefunc_def,filestream,&uL)!=UNZ_OK)
455	return CENTRALDIRINVALID;
456	if (uL != 0)
457	return CENTRALDIRINVALID;
458
	@@ -495,13 +495,13 @@
495	unz64_s us;
496	unz64_s *s;
497	ZPOS64_T central_pos;
498	uLong uL;
499
500	uLong number_disk; /* number of the current disk, used for
501	spanning ZIP, unsupported, always 0*/
502	uLong number_disk_with_CD; /* number the disk with central dir, used
503	for spanning ZIP, unsupported, always 0*/
504	ZPOS64_T number_entry_CD; /* total number of entries in
505	the central dir
506	(same than number_entry on nospan) */
507
508

M compat/zlib/contrib/minizip/unzip.h

+1 -1

		--- compat/zlib/contrib/minizip/unzip.h
		+++ compat/zlib/contrib/minizip/unzip.h
		@@ -304,11 +304,11 @@
304	304	uLong commentBufferSize);
305	305	/*
306	306	Get Info about the current file
307	307	if pfile_info!=NULL, the *pfile_info structure will contain some info about
308	308	the current file
309		- if szFileName!=NULL, the filemane string will be copied in szFileName
	309	+ if szFileName!=NULL, the filename string will be copied in szFileName
310	310	(fileNameBufferSize is the size of the buffer)
311	311	if extraField!=NULL, the extra field information will be copied in extraField
312	312	(extraFieldBufferSize is the size of the buffer).
313	313	This is the Central-header version of the extra field
314	314	if szComment!=NULL, the comment string of the file will be copied in szComment
315	315

	--- compat/zlib/contrib/minizip/unzip.h
	+++ compat/zlib/contrib/minizip/unzip.h
	@@ -304,11 +304,11 @@
304	uLong commentBufferSize);
305	/*
306	Get Info about the current file
307	if pfile_info!=NULL, the *pfile_info structure will contain some info about
308	the current file
309	if szFileName!=NULL, the filemane string will be copied in szFileName
310	(fileNameBufferSize is the size of the buffer)
311	if extraField!=NULL, the extra field information will be copied in extraField
312	(extraFieldBufferSize is the size of the buffer).
313	This is the Central-header version of the extra field
314	if szComment!=NULL, the comment string of the file will be copied in szComment
315

	--- compat/zlib/contrib/minizip/unzip.h
	+++ compat/zlib/contrib/minizip/unzip.h
	@@ -304,11 +304,11 @@
304	uLong commentBufferSize);
305	/*
306	Get Info about the current file
307	if pfile_info!=NULL, the *pfile_info structure will contain some info about
308	the current file
309	if szFileName!=NULL, the filename string will be copied in szFileName
310	(fileNameBufferSize is the size of the buffer)
311	if extraField!=NULL, the extra field information will be copied in extraField
312	(extraFieldBufferSize is the size of the buffer).
313	This is the Central-header version of the extra field
314	if szComment!=NULL, the comment string of the file will be copied in szComment
315

M compat/zlib/contrib/minizip/zip.c

+16 -5

		--- compat/zlib/contrib/minizip/zip.c
		+++ compat/zlib/contrib/minizip/zip.c
		@@ -573,11 +573,11 @@
573	573
574	574	/* the signature, already checked */
575	575	if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
576	576	return 0;
577	577
578		- /* number of the disk with the start of the zip64 end of central directory */
	578	+ /* number of the disk with the start of the zip64 end of central directory */
579	579	if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
580	580	return 0;
581	581	if (uL != 0)
582	582	return 0;
583	583
		@@ -612,13 +612,13 @@
612	612	ZPOS64_T size_central_dir; /* size of the central directory */
613	613	ZPOS64_T offset_central_dir; /* offset of start of central directory */
614	614	ZPOS64_T central_pos;
615	615	uLong uL;
616	616
617		- uLong number_disk; /* number of the current dist, used for
	617	+ uLong number_disk; /* number of the current disk, used for
618	618	spanning ZIP, unsupported, always 0*/
619		- uLong number_disk_with_CD; /* number the the disk with central dir, used
	619	+ uLong number_disk_with_CD; /* number of the disk with central dir, used
620	620	for spanning ZIP, unsupported, always 0*/
621	621	ZPOS64_T number_entry;
622	622	ZPOS64_T number_entry_CD; /* total number of entries in
623	623	the central dir
624	624	(same than number_entry on nospan) */
		@@ -1040,10 +1040,21 @@
1040	1040	return ZIP_PARAMERROR;
1041	1041	#else
1042	1042	if ((method!=0) && (method!=Z_DEFLATED))
1043	1043	return ZIP_PARAMERROR;
1044	1044	#endif
	1045	+
	1046	+ // The filename and comment length must fit in 16 bits.
	1047	+ if ((filename!=NULL) && (strlen(filename)>0xffff))
	1048	+ return ZIP_PARAMERROR;
	1049	+ if ((comment!=NULL) && (strlen(comment)>0xffff))
	1050	+ return ZIP_PARAMERROR;
	1051	+ // The extra field length must fit in 16 bits. If the member also requires
	1052	+ // a Zip64 extra block, that will also need to fit within that 16-bit
	1053	+ // length, but that will be checked for later.
	1054	+ if ((size_extrafield_local>0xffff) \|\| (size_extrafield_global>0xffff))
	1055	+ return ZIP_PARAMERROR;
1045	1056
1046	1057	zi = (zip64_internal*)file;
1047	1058
1048	1059	if (zi->in_opened_file_inzip == 1)
1049	1060	{
		@@ -1595,11 +1606,11 @@
1595	1606	{
1596	1607	char* p = NULL;
1597	1608
1598	1609	if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
1599	1610	{
1600		- // we can not write more data to the buffer that we have room for.
	1611	+ // we cannot write more data to the buffer that we have room for.
1601	1612	return ZIP_BADZIPFILE;
1602	1613	}
1603	1614
1604	1615	p = zi->ci.central_header + zi->ci.size_centralheader;
1605	1616
		@@ -1859,11 +1870,11 @@
1859	1870	}
1860	1871	}
1861	1872	free_linkedlist(&(zi->central_dir));
1862	1873
1863	1874	pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1864		- if(pos >= 0xffffffff \|\| zi->number_entry > 0xFFFF)
	1875	+ if(pos >= 0xffffffff \|\| zi->number_entry >= 0xFFFF)
1865	1876	{
1866	1877	ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
1867	1878	Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
1868	1879
1869	1880	Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
1870	1881

	--- compat/zlib/contrib/minizip/zip.c
	+++ compat/zlib/contrib/minizip/zip.c
	@@ -573,11 +573,11 @@
573
574	/* the signature, already checked */
575	if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
576	return 0;
577
578	/* number of the disk with the start of the zip64 end of central directory */
579	if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
580	return 0;
581	if (uL != 0)
582	return 0;
583
	@@ -612,13 +612,13 @@
612	ZPOS64_T size_central_dir; /* size of the central directory */
613	ZPOS64_T offset_central_dir; /* offset of start of central directory */
614	ZPOS64_T central_pos;
615	uLong uL;
616
617	uLong number_disk; /* number of the current dist, used for
618	spanning ZIP, unsupported, always 0*/
619	uLong number_disk_with_CD; /* number the the disk with central dir, used
620	for spanning ZIP, unsupported, always 0*/
621	ZPOS64_T number_entry;
622	ZPOS64_T number_entry_CD; /* total number of entries in
623	the central dir
624	(same than number_entry on nospan) */
	@@ -1040,10 +1040,21 @@
1040	return ZIP_PARAMERROR;
1041	#else
1042	if ((method!=0) && (method!=Z_DEFLATED))
1043	return ZIP_PARAMERROR;
1044	#endif











1045
1046	zi = (zip64_internal*)file;
1047
1048	if (zi->in_opened_file_inzip == 1)
1049	{
	@@ -1595,11 +1606,11 @@
1595	{
1596	char* p = NULL;
1597
1598	if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
1599	{
1600	// we can not write more data to the buffer that we have room for.
1601	return ZIP_BADZIPFILE;
1602	}
1603
1604	p = zi->ci.central_header + zi->ci.size_centralheader;
1605
	@@ -1859,11 +1870,11 @@
1859	}
1860	}
1861	free_linkedlist(&(zi->central_dir));
1862
1863	pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1864	if(pos >= 0xffffffff \|\| zi->number_entry > 0xFFFF)
1865	{
1866	ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
1867	Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
1868
1869	Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
1870

	--- compat/zlib/contrib/minizip/zip.c
	+++ compat/zlib/contrib/minizip/zip.c
	@@ -573,11 +573,11 @@
573
574	/* the signature, already checked */
575	if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
576	return 0;
577
578	/* number of the disk with the start of the zip64 end of central directory */
579	if (zip64local_getLong(pzlib_filefunc_def,filestream,&uL)!=ZIP_OK)
580	return 0;
581	if (uL != 0)
582	return 0;
583
	@@ -612,13 +612,13 @@
612	ZPOS64_T size_central_dir; /* size of the central directory */
613	ZPOS64_T offset_central_dir; /* offset of start of central directory */
614	ZPOS64_T central_pos;
615	uLong uL;
616
617	uLong number_disk; /* number of the current disk, used for
618	spanning ZIP, unsupported, always 0*/
619	uLong number_disk_with_CD; /* number of the disk with central dir, used
620	for spanning ZIP, unsupported, always 0*/
621	ZPOS64_T number_entry;
622	ZPOS64_T number_entry_CD; /* total number of entries in
623	the central dir
624	(same than number_entry on nospan) */
	@@ -1040,10 +1040,21 @@
1040	return ZIP_PARAMERROR;
1041	#else
1042	if ((method!=0) && (method!=Z_DEFLATED))
1043	return ZIP_PARAMERROR;
1044	#endif
1045
1046	// The filename and comment length must fit in 16 bits.
1047	if ((filename!=NULL) && (strlen(filename)>0xffff))
1048	return ZIP_PARAMERROR;
1049	if ((comment!=NULL) && (strlen(comment)>0xffff))
1050	return ZIP_PARAMERROR;
1051	// The extra field length must fit in 16 bits. If the member also requires
1052	// a Zip64 extra block, that will also need to fit within that 16-bit
1053	// length, but that will be checked for later.
1054	if ((size_extrafield_local>0xffff) \|\| (size_extrafield_global>0xffff))
1055	return ZIP_PARAMERROR;
1056
1057	zi = (zip64_internal*)file;
1058
1059	if (zi->in_opened_file_inzip == 1)
1060	{
	@@ -1595,11 +1606,11 @@
1606	{
1607	char* p = NULL;
1608
1609	if((uLong)(datasize + 4) > zi->ci.size_centralExtraFree)
1610	{
1611	// we cannot write more data to the buffer that we have room for.
1612	return ZIP_BADZIPFILE;
1613	}
1614
1615	p = zi->ci.central_header + zi->ci.size_centralheader;
1616
	@@ -1859,11 +1870,11 @@
1870	}
1871	}
1872	free_linkedlist(&(zi->central_dir));
1873
1874	pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
1875	if(pos >= 0xffffffff \|\| zi->number_entry >= 0xFFFF)
1876	{
1877	ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
1878	Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
1879
1880	Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
1881

M compat/zlib/contrib/minizip/zip.h

+2 -2

		--- compat/zlib/contrib/minizip/zip.h
		+++ compat/zlib/contrib/minizip/zip.h
		@@ -175,13 +175,13 @@
175	175	/*
176	176	Open a file in the ZIP for writing.
177	177	filename : the filename in zip (if NULL, '-' without quote will be used
178	178	*zipfi contain supplemental information
179	179	if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
180		- contains the extrafield data the the local header
	180	+ contains the extrafield data for the local header
181	181	if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
182		- contains the extrafield data the the local header
	182	+ contains the extrafield data for the global header
183	183	if comment != NULL, comment contain the comment string
184	184	method contain the compression method (0 for store, Z_DEFLATED for deflate)
185	185	level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
186	186	zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
187	187	this MUST be '1' if the uncompressed size is >= 0xffffffff.
188	188

	--- compat/zlib/contrib/minizip/zip.h
	+++ compat/zlib/contrib/minizip/zip.h
	@@ -175,13 +175,13 @@
175	/*
176	Open a file in the ZIP for writing.
177	filename : the filename in zip (if NULL, '-' without quote will be used
178	*zipfi contain supplemental information
179	if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
180	contains the extrafield data the the local header
181	if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
182	contains the extrafield data the the local header
183	if comment != NULL, comment contain the comment string
184	method contain the compression method (0 for store, Z_DEFLATED for deflate)
185	level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
186	zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
187	this MUST be '1' if the uncompressed size is >= 0xffffffff.
188

	--- compat/zlib/contrib/minizip/zip.h
	+++ compat/zlib/contrib/minizip/zip.h
	@@ -175,13 +175,13 @@
175	/*
176	Open a file in the ZIP for writing.
177	filename : the filename in zip (if NULL, '-' without quote will be used
178	*zipfi contain supplemental information
179	if extrafield_local!=NULL and size_extrafield_local>0, extrafield_local
180	contains the extrafield data for the local header
181	if extrafield_global!=NULL and size_extrafield_global>0, extrafield_global
182	contains the extrafield data for the global header
183	if comment != NULL, comment contain the comment string
184	method contain the compression method (0 for store, Z_DEFLATED for deflate)
185	level contain the level of compression (can be Z_DEFAULT_COMPRESSION)
186	zip64 is set to 1 if a zip64 extended information block should be added to the local file header.
187	this MUST be '1' if the uncompressed size is >= 0xffffffff.
188

M compat/zlib/contrib/pascal/zlibpas.pas

+1 -1

		--- compat/zlib/contrib/pascal/zlibpas.pas
		+++ compat/zlib/contrib/pascal/zlibpas.pas
		@@ -8,11 +8,11 @@
8	8	unit zlibpas;
9	9
10	10	interface
11	11
12	12	const
13		- ZLIB_VERSION = '1.3.0';
	13	+ ZLIB_VERSION = '1.3.1';
14	14	ZLIB_VERNUM = $12a0;
15	15
16	16	type
17	17	alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
18	18	cdecl;
19	19

	--- compat/zlib/contrib/pascal/zlibpas.pas
	+++ compat/zlib/contrib/pascal/zlibpas.pas
	@@ -8,11 +8,11 @@
8	unit zlibpas;
9
10	interface
11
12	const
13	ZLIB_VERSION = '1.3.0';
14	ZLIB_VERNUM = $12a0;
15
16	type
17	alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
18	cdecl;
19

	--- compat/zlib/contrib/pascal/zlibpas.pas
	+++ compat/zlib/contrib/pascal/zlibpas.pas
	@@ -8,11 +8,11 @@
8	unit zlibpas;
9
10	interface
11
12	const
13	ZLIB_VERSION = '1.3.1';
14	ZLIB_VERNUM = $12a0;
15
16	type
17	alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
18	cdecl;
19

M compat/zlib/contrib/puff/puff.c

+4 -4

		--- compat/zlib/contrib/puff/puff.c
		+++ compat/zlib/contrib/puff/puff.c
		@@ -591,14 +591,14 @@
591	591	*
592	592	* - The code lengths are stored in order for the symbols, so lengths are
593	593	* provided for each of the literal/length symbols, and for each of the
594	594	* distance symbols.
595	595	*
596		- * - If a symbol is not used in the block, this is represented by a zero as
597		- * as the code length. This does not mean a zero-length code, but rather
598		- * that no code should be created for this symbol. There is no way in the
599		- * deflate format to represent a zero-length code.
	596	+ * - If a symbol is not used in the block, this is represented by a zero as the
	597	+ * code length. This does not mean a zero-length code, but rather that no
	598	+ * code should be created for this symbol. There is no way in the deflate
	599	+ * format to represent a zero-length code.
600	600	*
601	601	* - The maximum number of bits in a code is 15, so the possible lengths for
602	602	* any code are 1..15.
603	603	*
604	604	* - The fact that a length of zero is not permitted for a code has an
605	605

	--- compat/zlib/contrib/puff/puff.c
	+++ compat/zlib/contrib/puff/puff.c
	@@ -591,14 +591,14 @@
591	*
592	* - The code lengths are stored in order for the symbols, so lengths are
593	* provided for each of the literal/length symbols, and for each of the
594	* distance symbols.
595	*
596	* - If a symbol is not used in the block, this is represented by a zero as
597	* as the code length. This does not mean a zero-length code, but rather
598	* that no code should be created for this symbol. There is no way in the
599	* deflate format to represent a zero-length code.
600	*
601	* - The maximum number of bits in a code is 15, so the possible lengths for
602	* any code are 1..15.
603	*
604	* - The fact that a length of zero is not permitted for a code has an
605

	--- compat/zlib/contrib/puff/puff.c
	+++ compat/zlib/contrib/puff/puff.c
	@@ -591,14 +591,14 @@
591	*
592	* - The code lengths are stored in order for the symbols, so lengths are
593	* provided for each of the literal/length symbols, and for each of the
594	* distance symbols.
595	*
596	* - If a symbol is not used in the block, this is represented by a zero as the
597	* code length. This does not mean a zero-length code, but rather that no
598	* code should be created for this symbol. There is no way in the deflate
599	* format to represent a zero-length code.
600	*
601	* - The maximum number of bits in a code is 15, so the possible lengths for
602	* any code are 1..15.
603	*
604	* - The fact that a length of zero is not permitted for a code has an
605

M compat/zlib/contrib/vstudio/readme.txt

+81 -68

		--- compat/zlib/contrib/vstudio/readme.txt
		+++ compat/zlib/contrib/vstudio/readme.txt
		@@ -1,75 +1,81 @@
1		-Building instructions for the DLL versions of Zlib 1.3.0
2		-========================================================
3		-
4		-This directory contains projects that build zlib and minizip using
5		-Microsoft Visual C++ 9.0/10.0.
6		-
7		-You don't need to build these projects yourself. You can download the
8		-binaries from:
9		- http://www.winimage.com/zLibDll
10		-
11		-More information can be found at this site.
12		-
13		-
14		-
15		-
16		-
17		-Build instructions for Visual Studio 2008 (32 bits or 64 bits)
		---------------------------------------------------------------
18		-- Decompress current zlib, including all contrib/* files
19		-- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
20		-- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release\|Win32"
21		-
22		-Build instructions for Visual Studio 2010 (32 bits or 64 bits)
		---------------------------------------------------------------
23		-- Decompress current zlib, including all contrib/* files
24		-- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
25		-
26		-Build instructions for Visual Studio 2012 (32 bits or 64 bits)
		---------------------------------------------------------------
27		-- Decompress current zlib, including all contrib/* files
28		-- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
29		-
30		-Build instructions for Visual Studio 2013 (32 bits or 64 bits)
		---------------------------------------------------------------
31		-- Decompress current zlib, including all contrib/* files
32		-- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
33		-
34		-Build instructions for Visual Studio 2015 (32 bits or 64 bits)
		---------------------------------------------------------------
35		-- Decompress current zlib, including all contrib/* files
36		-- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
37		-
38		-
39		-Important
		----------
40		-- To use zlibwapi.dll in your application, you must define the
41		- macro ZLIB_WINAPI when compiling your application's source files.
42		-
43		-
44		-Additional notes
		-----------------
45		-- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
46		- by Gilles Vollant from the zlib 1.1.x sources, and distributed at
47		- http://www.winimage.com/zLibDll
48		- It uses the WINAPI calling convention for the exported functions, and
49		- includes the minizip functionality. If your application needs that
50		- particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
51		-
52		-- The new DLL was renamed because there exist several incompatible
53		- versions of zlib.dll on the Internet.
54		-
55		-- There is also an official DLL build of zlib, named zlib1.dll. This one
56		- is exporting the functions using the CDECL convention. See the file
57		- win32\DLL_FAQ.txt found in this zlib distribution.
58		-
59		-- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
60		- has a slightly different effect. To avoid compatibility problems, do
61		- not define it here.
62		-
63		-
64		-Gilles Vollant
65		-[email protected]
66		-
67		-Visual Studio 2013 and 2015 Projects from Sean Hunt
68		-[email protected]
	1	+Building instructions for the DLL versions of Zlib 1.3.1
	2	+========================================================
	3	+
	4	+This directory contains projects that build zlib and minizip using
	5	+Microsoft Visual C++ 9.0/10.0.
	6	+
	7	+You don't need to build these projects yourself. You can download the
	8	+binaries from:
	9	+ http://www.winimage.com/zLibDll
	10	+
	11	+More information can be found at this site.
	12	+
	13	+
	14	+
	15	+
	16	+
	17	+Build instructions for Visual Studio 2008 (32 bits or 64 bits)
	18	+--------------------------------------------------------------
	19	+- Decompress current zlib, including all contrib/* files
	20	+- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
	21	+- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release\|Win32"
	22	+
	23	+Build instructions for Visual Studio 2010 (32 bits or 64 bits)
	24	+--------------------------------------------------------------
	25	+- Decompress current zlib, including all contrib/* files
	26	+- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
	27	+
	28	+Build instructions for Visual Studio 2012 (32 bits or 64 bits)
	29	+--------------------------------------------------------------
	30	+- Decompress current zlib, including all contrib/* files
	31	+- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
	32	+
	33	+Build instructions for Visual Studio 2013 (32 bits or 64 bits)
	34	+--------------------------------------------------------------
	35	+- Decompress current zlib, including all contrib/* files
	36	+- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
	37	+
	38	+Build instructions for Visual Studio 2015 (32 bits or 64 bits)
	39	+--------------------------------------------------------------
	40	+- Decompress current zlib, including all contrib/* files
	41	+- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
	42	+
	43	+Build instructions for Visual Studio 2022 (64 bits)
	44	+--------------------------------------------------------------
	45	+- Decompress current zlib, including all contrib/* files
	46	+- Open contrib\vstudio\vc143\zlibvc.sln with Microsoft Visual C++ 2022
	47	+
	48	+
	49	+
	50	+Important
	51	+---------
	52	+- To use zlibwapi.dll in your application, you must define the
	53	+ macro ZLIB_WINAPI when compiling your application's source files.
	54	+
	55	+
	56	+Additional notes
	57	+----------------
	58	+- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
	59	+ by Gilles Vollant from the zlib 1.1.x sources, and distributed at
	60	+ http://www.winimage.com/zLibDll
	61	+ It uses the WINAPI calling convention for the exported functions, and
	62	+ includes the minizip functionality. If your application needs that
	63	+ particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
	64	+
	65	+- The new DLL was renamed because there exist several incompatible
	66	+ versions of zlib.dll on the Internet.
	67	+
	68	+- There is also an official DLL build of zlib, named zlib1.dll. This one
	69	+ is exporting the functions using the CDECL convention. See the file
	70	+ win32\DLL_FAQ.txt found in this zlib distribution.
	71	+
	72	+- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
	73	+ has a slightly different effect. To avoid compatibility problems, do
	74	+ not define it here.
	75	+
	76	+
	77	+Gilles Vollant
	78	+[email protected]
	79	+
	80	+Visual Studio 2013, 2015, and 2022 Projects from Sean Hunt
	81	+[email protected]
69	82

	--- compat/zlib/contrib/vstudio/readme.txt
	+++ compat/zlib/contrib/vstudio/readme.txt
	@@ -1,75 +1,81 @@
1	Building instructions for the DLL versions of Zlib 1.3.0
2	========================================================
3
4	This directory contains projects that build zlib and minizip using
5	Microsoft Visual C++ 9.0/10.0.
6
7	You don't need to build these projects yourself. You can download the
8	binaries from:
9	http://www.winimage.com/zLibDll
10
11	More information can be found at this site.
12
13
14
15
16
17	Build instructions for Visual Studio 2008 (32 bits or 64 bits)
	---------------------------------------------------------------
18	- Decompress current zlib, including all contrib/* files
19	- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
20	- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release\|Win32"
21
22	Build instructions for Visual Studio 2010 (32 bits or 64 bits)
	---------------------------------------------------------------
23	- Decompress current zlib, including all contrib/* files
24	- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
25
26	Build instructions for Visual Studio 2012 (32 bits or 64 bits)
	---------------------------------------------------------------
27	- Decompress current zlib, including all contrib/* files
28	- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
29
30	Build instructions for Visual Studio 2013 (32 bits or 64 bits)
	---------------------------------------------------------------
31	- Decompress current zlib, including all contrib/* files
32	- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
33
34	Build instructions for Visual Studio 2015 (32 bits or 64 bits)
	---------------------------------------------------------------
35	- Decompress current zlib, including all contrib/* files
36	- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
37
38
39	Important
	----------
40	- To use zlibwapi.dll in your application, you must define the
41	macro ZLIB_WINAPI when compiling your application's source files.
42
43
44	Additional notes
	-----------------
45	- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
46	by Gilles Vollant from the zlib 1.1.x sources, and distributed at
47	http://www.winimage.com/zLibDll
48	It uses the WINAPI calling convention for the exported functions, and
49	includes the minizip functionality. If your application needs that
50	particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
51
52	- The new DLL was renamed because there exist several incompatible
53	versions of zlib.dll on the Internet.
54
55	- There is also an official DLL build of zlib, named zlib1.dll. This one
56	is exporting the functions using the CDECL convention. See the file
57	win32\DLL_FAQ.txt found in this zlib distribution.
58
59	- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
60	has a slightly different effect. To avoid compatibility problems, do
61	not define it here.
62
63
64	Gilles Vollant
65	[email protected]
66
67	Visual Studio 2013 and 2015 Projects from Sean Hunt
68	[email protected]

























































69

	--- compat/zlib/contrib/vstudio/readme.txt
	+++ compat/zlib/contrib/vstudio/readme.txt
	@@ -1,75 +1,81 @@

















	---------------------------------------------------------------





	---------------------------------------------------------------




	---------------------------------------------------------------




	---------------------------------------------------------------




	---------------------------------------------------------------





	----------





	-----------------
1	Building instructions for the DLL versions of Zlib 1.3.1
2	========================================================
3
4	This directory contains projects that build zlib and minizip using
5	Microsoft Visual C++ 9.0/10.0.
6
7	You don't need to build these projects yourself. You can download the
8	binaries from:
9	http://www.winimage.com/zLibDll
10
11	More information can be found at this site.
12
13
14
15
16
17	Build instructions for Visual Studio 2008 (32 bits or 64 bits)
18	--------------------------------------------------------------
19	- Decompress current zlib, including all contrib/* files
20	- Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
21	- Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release\|Win32"
22
23	Build instructions for Visual Studio 2010 (32 bits or 64 bits)
24	--------------------------------------------------------------
25	- Decompress current zlib, including all contrib/* files
26	- Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
27
28	Build instructions for Visual Studio 2012 (32 bits or 64 bits)
29	--------------------------------------------------------------
30	- Decompress current zlib, including all contrib/* files
31	- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
32
33	Build instructions for Visual Studio 2013 (32 bits or 64 bits)
34	--------------------------------------------------------------
35	- Decompress current zlib, including all contrib/* files
36	- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
37
38	Build instructions for Visual Studio 2015 (32 bits or 64 bits)
39	--------------------------------------------------------------
40	- Decompress current zlib, including all contrib/* files
41	- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
42
43	Build instructions for Visual Studio 2022 (64 bits)
44	--------------------------------------------------------------
45	- Decompress current zlib, including all contrib/* files
46	- Open contrib\vstudio\vc143\zlibvc.sln with Microsoft Visual C++ 2022
47
48
49
50	Important
51	---------
52	- To use zlibwapi.dll in your application, you must define the
53	macro ZLIB_WINAPI when compiling your application's source files.
54
55
56	Additional notes
57	----------------
58	- This DLL, named zlibwapi.dll, is compatible to the old zlib.dll built
59	by Gilles Vollant from the zlib 1.1.x sources, and distributed at
60	http://www.winimage.com/zLibDll
61	It uses the WINAPI calling convention for the exported functions, and
62	includes the minizip functionality. If your application needs that
63	particular build of zlib.dll, you can rename zlibwapi.dll to zlib.dll.
64
65	- The new DLL was renamed because there exist several incompatible
66	versions of zlib.dll on the Internet.
67
68	- There is also an official DLL build of zlib, named zlib1.dll. This one
69	is exporting the functions using the CDECL convention. See the file
70	win32\DLL_FAQ.txt found in this zlib distribution.
71
72	- There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
73	has a slightly different effect. To avoid compatibility problems, do
74	not define it here.
75
76
77	Gilles Vollant
78	[email protected]
79
80	Visual Studio 2013, 2015, and 2022 Projects from Sean Hunt
81	[email protected]
82

M compat/zlib/contrib/vstudio/vc10/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc10/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc10/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5		- FILEVERSION 1, 3, 0, 0
6		- PRODUCTVERSION 1, 3, 0, 0
	5	+ FILEVERSION 1, 3, 1, 0
	6	+ PRODUCTVERSION 1, 3, 1, 0
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20		- VALUE "FileVersion", "1.3.0\0"
	20	+ VALUE "FileVersion", "1.3.1\0"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25		- VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
	25	+ VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc10/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc10/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 0, 0
6	PRODUCTVERSION 1, 3, 0, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.0\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc10/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc10/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 1, 0
6	PRODUCTVERSION 1, 3, 1, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.1\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc10/zlibvc.def

+1 -1

		--- compat/zlib/contrib/vstudio/vc10/zlibvc.def
		+++ compat/zlib/contrib/vstudio/vc10/zlibvc.def
		@@ -1,9 +1,9 @@
1	1	LIBRARY
2	2	; zlib data compression and ZIP file I/O library
3	3
4		-VERSION 1.3
	4	+VERSION 1.3.1
5	5
6	6	EXPORTS
7	7	adler32 @1
8	8	compress @2
9	9	crc32 @3
10	10

	--- compat/zlib/contrib/vstudio/vc10/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc10/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

	--- compat/zlib/contrib/vstudio/vc10/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc10/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3.1
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

M compat/zlib/contrib/vstudio/vc11/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc11/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc11/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5		- FILEVERSION 1, 3, 0, 0
6		- PRODUCTVERSION 1, 3, 0, 0
	5	+ FILEVERSION 1, 3, 1, 0
	6	+ PRODUCTVERSION 1, 3, 1, 0
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20		- VALUE "FileVersion", "1.3.0\0"
	20	+ VALUE "FileVersion", "1.3.1\0"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25		- VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
	25	+ VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc11/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc11/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 0, 0
6	PRODUCTVERSION 1, 3, 0, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.0\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc11/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc11/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 1, 0
6	PRODUCTVERSION 1, 3, 1, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.1\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc11/zlibvc.def

+1 -1

		--- compat/zlib/contrib/vstudio/vc11/zlibvc.def
		+++ compat/zlib/contrib/vstudio/vc11/zlibvc.def
		@@ -1,9 +1,9 @@
1	1	LIBRARY
2	2	; zlib data compression and ZIP file I/O library
3	3
4		-VERSION 1.3
	4	+VERSION 1.3.1
5	5
6	6	EXPORTS
7	7	adler32 @1
8	8	compress @2
9	9	crc32 @3
10	10

	--- compat/zlib/contrib/vstudio/vc11/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc11/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

	--- compat/zlib/contrib/vstudio/vc11/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc11/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3.1
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

M compat/zlib/contrib/vstudio/vc12/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc12/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc12/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5		- FILEVERSION 1, 3, 0, 0
6		- PRODUCTVERSION 1, 3, 0, 0
	5	+ FILEVERSION 1, 3, 1, 0
	6	+ PRODUCTVERSION 1, 3, 1, 0
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20		- VALUE "FileVersion", "1.3.0\0"
	20	+ VALUE "FileVersion", "1.3.1\0"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25		- VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
	25	+ VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc12/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc12/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 0, 0
6	PRODUCTVERSION 1, 3, 0, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.0\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc12/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc12/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 1, 0
6	PRODUCTVERSION 1, 3, 1, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.1\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc12/zlibvc.def

+1 -1

		--- compat/zlib/contrib/vstudio/vc12/zlibvc.def
		+++ compat/zlib/contrib/vstudio/vc12/zlibvc.def
		@@ -1,9 +1,9 @@
1	1	LIBRARY
2	2	; zlib data compression and ZIP file I/O library
3	3
4		-VERSION 1.3
	4	+VERSION 1.3.1
5	5
6	6	EXPORTS
7	7	adler32 @1
8	8	compress @2
9	9	crc32 @3
10	10

	--- compat/zlib/contrib/vstudio/vc12/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc12/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

	--- compat/zlib/contrib/vstudio/vc12/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc12/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3.1
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

M compat/zlib/contrib/vstudio/vc14/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc14/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc14/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5		- FILEVERSION 1, 3, 0, 0
6		- PRODUCTVERSION 1, 3, 0, 0
	5	+ FILEVERSION 1, 3, 1, 0
	6	+ PRODUCTVERSION 1, 3, 1, 0
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20		- VALUE "FileVersion", "1.3.0\0"
	20	+ VALUE "FileVersion", "1.3.1\0"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25		- VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
	25	+ VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc14/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc14/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 0, 0
6	PRODUCTVERSION 1, 3, 0, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.0\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc14/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc14/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 1, 0
6	PRODUCTVERSION 1, 3, 1, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.1\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc14/zlibvc.def

+1 -1

		--- compat/zlib/contrib/vstudio/vc14/zlibvc.def
		+++ compat/zlib/contrib/vstudio/vc14/zlibvc.def
		@@ -1,9 +1,9 @@
1	1	LIBRARY
2	2	; zlib data compression and ZIP file I/O library
3	3
4		-VERSION 1.3
	4	+VERSION 1.3.1
5	5
6	6	EXPORTS
7	7	adler32 @1
8	8	compress @2
9	9	crc32 @3
10	10

	--- compat/zlib/contrib/vstudio/vc14/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc14/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

	--- compat/zlib/contrib/vstudio/vc14/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc14/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3.1
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

M compat/zlib/contrib/vstudio/vc9/zlib.rc

+4 -4

		--- compat/zlib/contrib/vstudio/vc9/zlib.rc
		+++ compat/zlib/contrib/vstudio/vc9/zlib.rc
		@@ -1,11 +1,11 @@
1	1	#include <windows.h>
2	2
3	3	#define IDR_VERSION1 1
4	4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5		- FILEVERSION 1, 3, 0, 0
6		- PRODUCTVERSION 1, 3, 0, 0
	5	+ FILEVERSION 1, 3, 1, 0
	6	+ PRODUCTVERSION 1, 3, 1, 0
7	7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	8	FILEFLAGS 0
9	9	FILEOS VOS_DOS_WINDOWS32
10	10	FILETYPE VFT_DLL
11	11	FILESUBTYPE 0 // not used
		@@ -15,18 +15,18 @@
15	15	BLOCK "040904E4"
16	16	//language ID = U.S. English, char set = Windows, Multilingual
17	17
18	18	BEGIN
19	19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20		- VALUE "FileVersion", "1.3.0\0"
	20	+ VALUE "FileVersion", "1.3.1\0"
21	21	VALUE "InternalName", "zlib\0"
22	22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	23	VALUE "ProductName", "ZLib.DLL\0"
24	24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25		- VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
	25	+ VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	26	END
27	27	END
28	28	BLOCK "VarFileInfo"
29	29	BEGIN
30	30	VALUE "Translation", 0x0409, 1252
31	31	END
32	32	END
33	33

	--- compat/zlib/contrib/vstudio/vc9/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc9/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 0, 0
6	PRODUCTVERSION 1, 3, 0, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.0\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2023 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

	--- compat/zlib/contrib/vstudio/vc9/zlib.rc
	+++ compat/zlib/contrib/vstudio/vc9/zlib.rc
	@@ -1,11 +1,11 @@
1	#include <windows.h>
2
3	#define IDR_VERSION1 1
4	IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
5	FILEVERSION 1, 3, 1, 0
6	PRODUCTVERSION 1, 3, 1, 0
7	FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8	FILEFLAGS 0
9	FILEOS VOS_DOS_WINDOWS32
10	FILETYPE VFT_DLL
11	FILESUBTYPE 0 // not used
	@@ -15,18 +15,18 @@
15	BLOCK "040904E4"
16	//language ID = U.S. English, char set = Windows, Multilingual
17
18	BEGIN
19	VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
20	VALUE "FileVersion", "1.3.1\0"
21	VALUE "InternalName", "zlib\0"
22	VALUE "OriginalFilename", "zlibwapi.dll\0"
23	VALUE "ProductName", "ZLib.DLL\0"
24	VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
25	VALUE "LegalCopyright", "(C) 1995-2024 Jean-loup Gailly & Mark Adler\0"
26	END
27	END
28	BLOCK "VarFileInfo"
29	BEGIN
30	VALUE "Translation", 0x0409, 1252
31	END
32	END
33

M compat/zlib/contrib/vstudio/vc9/zlibvc.def

+1 -1

		--- compat/zlib/contrib/vstudio/vc9/zlibvc.def
		+++ compat/zlib/contrib/vstudio/vc9/zlibvc.def
		@@ -1,9 +1,9 @@
1	1	LIBRARY
2	2	; zlib data compression and ZIP file I/O library
3	3
4		-VERSION 1.3
	4	+VERSION 1.3.1
5	5
6	6	EXPORTS
7	7	adler32 @1
8	8	compress @2
9	9	crc32 @3
10	10

	--- compat/zlib/contrib/vstudio/vc9/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc9/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

	--- compat/zlib/contrib/vstudio/vc9/zlibvc.def
	+++ compat/zlib/contrib/vstudio/vc9/zlibvc.def
	@@ -1,9 +1,9 @@
1	LIBRARY
2	; zlib data compression and ZIP file I/O library
3
4	VERSION 1.3.1
5
6	EXPORTS
7	adler32 @1
8	compress @2
9	crc32 @3
10

M compat/zlib/deflate.c

+36 -11

		--- compat/zlib/deflate.c
		+++ compat/zlib/deflate.c
		@@ -1,7 +1,7 @@
1	1	/* deflate.c -- compress data using the deflation algorithm
2		- * Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
	2	+ * Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	/*
7	7	* ALGORITHM
		@@ -50,11 +50,11 @@
50	50	/* @(#) $Id$ */
51	51
52	52	#include "deflate.h"
53	53
54	54	const char deflate_copyright[] =
55		- " deflate 1.3 Copyright 1995-2023 Jean-loup Gailly and Mark Adler ";
	55	+ " deflate 1.3.1 Copyright 1995-2024 Jean-loup Gailly and Mark Adler ";
56	56	/*
57	57	If you use the zlib library in a product, an acknowledgment is welcome
58	58	in the documentation of your product. If for some reason you cannot
59	59	include such an acknowledgment, I would appreciate that you keep this
60	60	copyright string in the executable of your product.
		@@ -491,22 +491,28 @@
491	491	* Therefore its average symbol length is assured to be less than 31. So
492	492	* the compressed data for a dynamic block also cannot overwrite the
493	493	* symbols from which it is being constructed.
494	494	*/
495	495
496		- s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
	496	+ s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, LIT_BUFS);
497	497	s->pending_buf_size = (ulg)s->lit_bufsize * 4;
498	498
499	499	if (s->window == Z_NULL \|\| s->prev == Z_NULL \|\| s->head == Z_NULL \|\|
500	500	s->pending_buf == Z_NULL) {
501	501	s->status = FINISH_STATE;
502	502	strm->msg = ERR_MSG(Z_MEM_ERROR);
503	503	deflateEnd (strm);
504	504	return Z_MEM_ERROR;
505	505	}
	506	+#ifdef LIT_MEM
	507	+ s->d_buf = (ushf *)(s->pending_buf + (s->lit_bufsize << 1));
	508	+ s->l_buf = s->pending_buf + (s->lit_bufsize << 2);
	509	+ s->sym_end = s->lit_bufsize - 1;
	510	+#else
506	511	s->sym_buf = s->pending_buf + s->lit_bufsize;
507	512	s->sym_end = (s->lit_bufsize - 1) * 3;
	513	+#endif
508	514	/* We avoid equality with lit_bufsize*3 because of wraparound at 64K
509	515	* on 16 bit machines and because stored blocks are restricted to
510	516	* 64K-1 bytes.
511	517	*/
512	518
		@@ -718,13 +724,19 @@
718	724	deflate_state *s;
719	725	int put;
720	726
721	727	if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
722	728	s = strm->state;
	729	+#ifdef LIT_MEM
	730	+ if (bits < 0 \|\| bits > 16 \|\|
	731	+ (uchf *)s->d_buf < s->pending_out + ((Buf_size + 7) >> 3))
	732	+ return Z_BUF_ERROR;
	733	+#else
723	734	if (bits < 0 \|\| bits > 16 \|\|
724	735	s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
725	736	return Z_BUF_ERROR;
	737	+#endif
726	738	do {
727	739	put = Buf_size - s->bi_valid;
728	740	if (put > bits)
729	741	put = bits;
730	742	s->bi_buf \|= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
		@@ -1292,11 +1304,11 @@
1292	1304	ds->strm = dest;
1293	1305
1294	1306	ds->window = (Bytef ) ZALLOC(dest, ds->w_size, 2sizeof(Byte));
1295	1307	ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
1296	1308	ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
1297		- ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
	1309	+ ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, LIT_BUFS);
1298	1310
1299	1311	if (ds->window == Z_NULL \|\| ds->prev == Z_NULL \|\| ds->head == Z_NULL \|\|
1300	1312	ds->pending_buf == Z_NULL) {
1301	1313	deflateEnd (dest);
1302	1314	return Z_MEM_ERROR;
		@@ -1303,14 +1315,19 @@
1303	1315	}
1304	1316	/* following zmemcpy do not work for 16-bit MSDOS */
1305	1317	zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
1306	1318	zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
1307	1319	zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
1308		- zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
	1320	+ zmemcpy(ds->pending_buf, ss->pending_buf, ds->lit_bufsize * LIT_BUFS);
1309	1321
1310	1322	ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
	1323	+#ifdef LIT_MEM
	1324	+ ds->d_buf = (ushf *)(ds->pending_buf + (ds->lit_bufsize << 1));
	1325	+ ds->l_buf = ds->pending_buf + (ds->lit_bufsize << 2);
	1326	+#else
1311	1327	ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
	1328	+#endif
1312	1329
1313	1330	ds->l_desc.dyn_tree = ds->dyn_ltree;
1314	1331	ds->d_desc.dyn_tree = ds->dyn_dtree;
1315	1332	ds->bl_desc.dyn_tree = ds->bl_tree;
1316	1333
		@@ -1537,17 +1554,25 @@
1537	1554	/* ===========================================================================
1538	1555	* Check that the match at match_start is indeed a match.
1539	1556	*/
1540	1557	local void check_match(deflate_state *s, IPos start, IPos match, int length) {
1541	1558	/* check that the match is indeed a match */
1542		- if (zmemcmp(s->window + match,
1543		- s->window + start, length) != EQUAL) {
1544		- fprintf(stderr, " start %u, match %u, length %d\n",
1545		- start, match, length);
	1559	+ Bytef back = s->window + (int)match, here = s->window + start;
	1560	+ IPos len = length;
	1561	+ if (match == (IPos)-1) {
	1562	+ /* match starts one byte before the current window -- just compare the
	1563	+ subsequent length-1 bytes */
	1564	+ back++;
	1565	+ here++;
	1566	+ len--;
	1567	+ }
	1568	+ if (zmemcmp(back, here, len) != EQUAL) {
	1569	+ fprintf(stderr, " start %u, match %d, length %d\n",
	1570	+ start, (int)match, length);
1546	1571	do {
1547		- fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
1548		- } while (--length != 0);
	1572	+ fprintf(stderr, "(%02x %02x)", back++, here++);
	1573	+ } while (--len != 0);
1549	1574	z_error("invalid match");
1550	1575	}
1551	1576	if (z_verbose > 1) {
1552	1577	fprintf(stderr,"\\[%d,%d]", start - match, length);
1553	1578	do { putc(s->window[start++], stderr); } while (--length != 0);
1554	1579

	--- compat/zlib/deflate.c
	+++ compat/zlib/deflate.c
	@@ -1,7 +1,7 @@
1	/* deflate.c -- compress data using the deflation algorithm
2	* Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/*
7	* ALGORITHM
	@@ -50,11 +50,11 @@
50	/* @(#) $Id$ */
51
52	#include "deflate.h"
53
54	const char deflate_copyright[] =
55	" deflate 1.3 Copyright 1995-2023 Jean-loup Gailly and Mark Adler ";
56	/*
57	If you use the zlib library in a product, an acknowledgment is welcome
58	in the documentation of your product. If for some reason you cannot
59	include such an acknowledgment, I would appreciate that you keep this
60	copyright string in the executable of your product.
	@@ -491,22 +491,28 @@
491	* Therefore its average symbol length is assured to be less than 31. So
492	* the compressed data for a dynamic block also cannot overwrite the
493	* symbols from which it is being constructed.
494	*/
495
496	s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, 4);
497	s->pending_buf_size = (ulg)s->lit_bufsize * 4;
498
499	if (s->window == Z_NULL \|\| s->prev == Z_NULL \|\| s->head == Z_NULL \|\|
500	s->pending_buf == Z_NULL) {
501	s->status = FINISH_STATE;
502	strm->msg = ERR_MSG(Z_MEM_ERROR);
503	deflateEnd (strm);
504	return Z_MEM_ERROR;
505	}





506	s->sym_buf = s->pending_buf + s->lit_bufsize;
507	s->sym_end = (s->lit_bufsize - 1) * 3;

508	/* We avoid equality with lit_bufsize*3 because of wraparound at 64K
509	* on 16 bit machines and because stored blocks are restricted to
510	* 64K-1 bytes.
511	*/
512
	@@ -718,13 +724,19 @@
718	deflate_state *s;
719	int put;
720
721	if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
722	s = strm->state;





723	if (bits < 0 \|\| bits > 16 \|\|
724	s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
725	return Z_BUF_ERROR;

726	do {
727	put = Buf_size - s->bi_valid;
728	if (put > bits)
729	put = bits;
730	s->bi_buf \|= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
	@@ -1292,11 +1304,11 @@
1292	ds->strm = dest;
1293
1294	ds->window = (Bytef ) ZALLOC(dest, ds->w_size, 2sizeof(Byte));
1295	ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
1296	ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
1297	ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, 4);
1298
1299	if (ds->window == Z_NULL \|\| ds->prev == Z_NULL \|\| ds->head == Z_NULL \|\|
1300	ds->pending_buf == Z_NULL) {
1301	deflateEnd (dest);
1302	return Z_MEM_ERROR;
	@@ -1303,14 +1315,19 @@
1303	}
1304	/* following zmemcpy do not work for 16-bit MSDOS */
1305	zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
1306	zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
1307	zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
1308	zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
1309
1310	ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);




1311	ds->sym_buf = ds->pending_buf + ds->lit_bufsize;

1312
1313	ds->l_desc.dyn_tree = ds->dyn_ltree;
1314	ds->d_desc.dyn_tree = ds->dyn_dtree;
1315	ds->bl_desc.dyn_tree = ds->bl_tree;
1316
	@@ -1537,17 +1554,25 @@
1537	/* ===========================================================================
1538	* Check that the match at match_start is indeed a match.
1539	*/
1540	local void check_match(deflate_state *s, IPos start, IPos match, int length) {
1541	/* check that the match is indeed a match */
1542	if (zmemcmp(s->window + match,
1543	s->window + start, length) != EQUAL) {
1544	fprintf(stderr, " start %u, match %u, length %d\n",
1545	start, match, length);








1546	do {
1547	fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
1548	} while (--length != 0);
1549	z_error("invalid match");
1550	}
1551	if (z_verbose > 1) {
1552	fprintf(stderr,"\\[%d,%d]", start - match, length);
1553	do { putc(s->window[start++], stderr); } while (--length != 0);
1554

	--- compat/zlib/deflate.c
	+++ compat/zlib/deflate.c
	@@ -1,7 +1,7 @@
1	/* deflate.c -- compress data using the deflation algorithm
2	* Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/*
7	* ALGORITHM
	@@ -50,11 +50,11 @@
50	/* @(#) $Id$ */
51
52	#include "deflate.h"
53
54	const char deflate_copyright[] =
55	" deflate 1.3.1 Copyright 1995-2024 Jean-loup Gailly and Mark Adler ";
56	/*
57	If you use the zlib library in a product, an acknowledgment is welcome
58	in the documentation of your product. If for some reason you cannot
59	include such an acknowledgment, I would appreciate that you keep this
60	copyright string in the executable of your product.
	@@ -491,22 +491,28 @@
491	* Therefore its average symbol length is assured to be less than 31. So
492	* the compressed data for a dynamic block also cannot overwrite the
493	* symbols from which it is being constructed.
494	*/
495
496	s->pending_buf = (uchf *) ZALLOC(strm, s->lit_bufsize, LIT_BUFS);
497	s->pending_buf_size = (ulg)s->lit_bufsize * 4;
498
499	if (s->window == Z_NULL \|\| s->prev == Z_NULL \|\| s->head == Z_NULL \|\|
500	s->pending_buf == Z_NULL) {
501	s->status = FINISH_STATE;
502	strm->msg = ERR_MSG(Z_MEM_ERROR);
503	deflateEnd (strm);
504	return Z_MEM_ERROR;
505	}
506	#ifdef LIT_MEM
507	s->d_buf = (ushf *)(s->pending_buf + (s->lit_bufsize << 1));
508	s->l_buf = s->pending_buf + (s->lit_bufsize << 2);
509	s->sym_end = s->lit_bufsize - 1;
510	#else
511	s->sym_buf = s->pending_buf + s->lit_bufsize;
512	s->sym_end = (s->lit_bufsize - 1) * 3;
513	#endif
514	/* We avoid equality with lit_bufsize*3 because of wraparound at 64K
515	* on 16 bit machines and because stored blocks are restricted to
516	* 64K-1 bytes.
517	*/
518
	@@ -718,13 +724,19 @@
724	deflate_state *s;
725	int put;
726
727	if (deflateStateCheck(strm)) return Z_STREAM_ERROR;
728	s = strm->state;
729	#ifdef LIT_MEM
730	if (bits < 0 \|\| bits > 16 \|\|
731	(uchf *)s->d_buf < s->pending_out + ((Buf_size + 7) >> 3))
732	return Z_BUF_ERROR;
733	#else
734	if (bits < 0 \|\| bits > 16 \|\|
735	s->sym_buf < s->pending_out + ((Buf_size + 7) >> 3))
736	return Z_BUF_ERROR;
737	#endif
738	do {
739	put = Buf_size - s->bi_valid;
740	if (put > bits)
741	put = bits;
742	s->bi_buf \|= (ush)((value & ((1 << put) - 1)) << s->bi_valid);
	@@ -1292,11 +1304,11 @@
1304	ds->strm = dest;
1305
1306	ds->window = (Bytef ) ZALLOC(dest, ds->w_size, 2sizeof(Byte));
1307	ds->prev = (Posf *) ZALLOC(dest, ds->w_size, sizeof(Pos));
1308	ds->head = (Posf *) ZALLOC(dest, ds->hash_size, sizeof(Pos));
1309	ds->pending_buf = (uchf *) ZALLOC(dest, ds->lit_bufsize, LIT_BUFS);
1310
1311	if (ds->window == Z_NULL \|\| ds->prev == Z_NULL \|\| ds->head == Z_NULL \|\|
1312	ds->pending_buf == Z_NULL) {
1313	deflateEnd (dest);
1314	return Z_MEM_ERROR;
	@@ -1303,14 +1315,19 @@
1315	}
1316	/* following zmemcpy do not work for 16-bit MSDOS */
1317	zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
1318	zmemcpy((voidpf)ds->prev, (voidpf)ss->prev, ds->w_size * sizeof(Pos));
1319	zmemcpy((voidpf)ds->head, (voidpf)ss->head, ds->hash_size * sizeof(Pos));
1320	zmemcpy(ds->pending_buf, ss->pending_buf, ds->lit_bufsize * LIT_BUFS);
1321
1322	ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
1323	#ifdef LIT_MEM
1324	ds->d_buf = (ushf *)(ds->pending_buf + (ds->lit_bufsize << 1));
1325	ds->l_buf = ds->pending_buf + (ds->lit_bufsize << 2);
1326	#else
1327	ds->sym_buf = ds->pending_buf + ds->lit_bufsize;
1328	#endif
1329
1330	ds->l_desc.dyn_tree = ds->dyn_ltree;
1331	ds->d_desc.dyn_tree = ds->dyn_dtree;
1332	ds->bl_desc.dyn_tree = ds->bl_tree;
1333
	@@ -1537,17 +1554,25 @@
1554	/* ===========================================================================
1555	* Check that the match at match_start is indeed a match.
1556	*/
1557	local void check_match(deflate_state *s, IPos start, IPos match, int length) {
1558	/* check that the match is indeed a match */
1559	Bytef back = s->window + (int)match, here = s->window + start;
1560	IPos len = length;
1561	if (match == (IPos)-1) {
1562	/* match starts one byte before the current window -- just compare the
1563	subsequent length-1 bytes */
1564	back++;
1565	here++;
1566	len--;
1567	}
1568	if (zmemcmp(back, here, len) != EQUAL) {
1569	fprintf(stderr, " start %u, match %d, length %d\n",
1570	start, (int)match, length);
1571	do {
1572	fprintf(stderr, "(%02x %02x)", back++, here++);
1573	} while (--len != 0);
1574	z_error("invalid match");
1575	}
1576	if (z_verbose > 1) {
1577	fprintf(stderr,"\\[%d,%d]", start - match, length);
1578	do { putc(s->window[start++], stderr); } while (--length != 0);
1579

M compat/zlib/deflate.h

+33 -2

		--- compat/zlib/deflate.h
		+++ compat/zlib/deflate.h
		@@ -1,7 +1,7 @@
1	1	/* deflate.h -- internal compression state
2		- * Copyright (C) 1995-2018 Jean-loup Gailly
	2	+ * Copyright (C) 1995-2024 Jean-loup Gailly
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	/* WARNING: this file should not be used by applications. It is
7	7	part of the implementation of the compression library and is
		@@ -20,10 +20,14 @@
20	20	the crc code when it is not needed. For shared libraries, gzip encoding
21	21	should be left enabled. */
22	22	#ifndef NO_GZIP
23	23	# define GZIP
24	24	#endif
	25	+
	26	+/* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at
	27	+ the cost of a larger memory footprint */
	28	+/* #define LIT_MEM */
25	29
26	30	/* ===========================================================================
27	31	* Internal compression state.
28	32	*/
29	33
		@@ -215,11 +219,18 @@
215	219
216	220	uch depth[2*L_CODES+1];
217	221	/* Depth of each subtree used as tie breaker for trees of equal frequency
218	222	*/
219	223
	224	+#ifdef LIT_MEM
	225	+# define LIT_BUFS 5
	226	+ ushf d_buf; / buffer for distances */
	227	+ uchf l_buf; / buffer for literals/lengths */
	228	+#else
	229	+# define LIT_BUFS 4
220	230	uchf sym_buf; / buffer for distances and literals/lengths */
	231	+#endif
221	232
222	233	uInt lit_bufsize;
223	234	/* Size of match buffer for literals/lengths. There are 4 reasons for
224	235	* limiting lit_bufsize to 64K:
225	236	* - frequencies can be kept in 16 bit counters
		@@ -237,11 +248,11 @@
237	248	* fast adaptation but have of course the overhead of transmitting
238	249	* trees more frequently.
239	250	* - I can't count above 4
240	251	*/
241	252
242		- uInt sym_next; /* running index in sym_buf */
	253	+ uInt sym_next; /* running index in symbol buffer */
243	254	uInt sym_end; /* symbol table full when sym_next reaches this */
244	255
245	256	ulg opt_len; /* bit length of current block with optimal trees */
246	257	ulg static_len; /* bit length of current block with static trees */
247	258	uInt matches; /* number of string matches in current block */
		@@ -316,10 +327,29 @@
316	327	#else
317	328	extern const uch ZLIB_INTERNAL _length_code[];
318	329	extern const uch ZLIB_INTERNAL _dist_code[];
319	330	#endif
320	331
	332	+#ifdef LIT_MEM
	333	+# define _tr_tally_lit(s, c, flush) \
	334	+ { uch cc = (c); \
	335	+ s->d_buf[s->sym_next] = 0; \
	336	+ s->l_buf[s->sym_next++] = cc; \
	337	+ s->dyn_ltree[cc].Freq++; \
	338	+ flush = (s->sym_next == s->sym_end); \
	339	+ }
	340	+# define _tr_tally_dist(s, distance, length, flush) \
	341	+ { uch len = (uch)(length); \
	342	+ ush dist = (ush)(distance); \
	343	+ s->d_buf[s->sym_next] = dist; \
	344	+ s->l_buf[s->sym_next++] = len; \
	345	+ dist--; \
	346	+ s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
	347	+ s->dyn_dtree[d_code(dist)].Freq++; \
	348	+ flush = (s->sym_next == s->sym_end); \
	349	+ }
	350	+#else
321	351	# define _tr_tally_lit(s, c, flush) \
322	352	{ uch cc = (c); \
323	353	s->sym_buf[s->sym_next++] = 0; \
324	354	s->sym_buf[s->sym_next++] = 0; \
325	355	s->sym_buf[s->sym_next++] = cc; \
		@@ -335,12 +365,13 @@
335	365	dist--; \
336	366	s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
337	367	s->dyn_dtree[d_code(dist)].Freq++; \
338	368	flush = (s->sym_next == s->sym_end); \
339	369	}
	370	+#endif
340	371	#else
341	372	# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
342	373	# define _tr_tally_dist(s, distance, length, flush) \
343	374	flush = _tr_tally(s, distance, length)
344	375	#endif
345	376
346	377	#endif /* DEFLATE_H */
347	378

	--- compat/zlib/deflate.h
	+++ compat/zlib/deflate.h
	@@ -1,7 +1,7 @@
1	/* deflate.h -- internal compression state
2	* Copyright (C) 1995-2018 Jean-loup Gailly
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* WARNING: this file should not be used by applications. It is
7	part of the implementation of the compression library and is
	@@ -20,10 +20,14 @@
20	the crc code when it is not needed. For shared libraries, gzip encoding
21	should be left enabled. */
22	#ifndef NO_GZIP
23	# define GZIP
24	#endif




25
26	/* ===========================================================================
27	* Internal compression state.
28	*/
29
	@@ -215,11 +219,18 @@
215
216	uch depth[2*L_CODES+1];
217	/* Depth of each subtree used as tie breaker for trees of equal frequency
218	*/
219






220	uchf sym_buf; / buffer for distances and literals/lengths */

221
222	uInt lit_bufsize;
223	/* Size of match buffer for literals/lengths. There are 4 reasons for
224	* limiting lit_bufsize to 64K:
225	* - frequencies can be kept in 16 bit counters
	@@ -237,11 +248,11 @@
237	* fast adaptation but have of course the overhead of transmitting
238	* trees more frequently.
239	* - I can't count above 4
240	*/
241
242	uInt sym_next; /* running index in sym_buf */
243	uInt sym_end; /* symbol table full when sym_next reaches this */
244
245	ulg opt_len; /* bit length of current block with optimal trees */
246	ulg static_len; /* bit length of current block with static trees */
247	uInt matches; /* number of string matches in current block */
	@@ -316,10 +327,29 @@
316	#else
317	extern const uch ZLIB_INTERNAL _length_code[];
318	extern const uch ZLIB_INTERNAL _dist_code[];
319	#endif
320



















321	# define _tr_tally_lit(s, c, flush) \
322	{ uch cc = (c); \
323	s->sym_buf[s->sym_next++] = 0; \
324	s->sym_buf[s->sym_next++] = 0; \
325	s->sym_buf[s->sym_next++] = cc; \
	@@ -335,12 +365,13 @@
335	dist--; \
336	s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
337	s->dyn_dtree[d_code(dist)].Freq++; \
338	flush = (s->sym_next == s->sym_end); \
339	}

340	#else
341	# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
342	# define _tr_tally_dist(s, distance, length, flush) \
343	flush = _tr_tally(s, distance, length)
344	#endif
345
346	#endif /* DEFLATE_H */
347

	--- compat/zlib/deflate.h
	+++ compat/zlib/deflate.h
	@@ -1,7 +1,7 @@
1	/* deflate.h -- internal compression state
2	* Copyright (C) 1995-2024 Jean-loup Gailly
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* WARNING: this file should not be used by applications. It is
7	part of the implementation of the compression library and is
	@@ -20,10 +20,14 @@
20	the crc code when it is not needed. For shared libraries, gzip encoding
21	should be left enabled. */
22	#ifndef NO_GZIP
23	# define GZIP
24	#endif
25
26	/* define LIT_MEM to slightly increase the speed of deflate (order 1% to 2%) at
27	the cost of a larger memory footprint */
28	/* #define LIT_MEM */
29
30	/* ===========================================================================
31	* Internal compression state.
32	*/
33
	@@ -215,11 +219,18 @@
219
220	uch depth[2*L_CODES+1];
221	/* Depth of each subtree used as tie breaker for trees of equal frequency
222	*/
223
224	#ifdef LIT_MEM
225	# define LIT_BUFS 5
226	ushf d_buf; / buffer for distances */
227	uchf l_buf; / buffer for literals/lengths */
228	#else
229	# define LIT_BUFS 4
230	uchf sym_buf; / buffer for distances and literals/lengths */
231	#endif
232
233	uInt lit_bufsize;
234	/* Size of match buffer for literals/lengths. There are 4 reasons for
235	* limiting lit_bufsize to 64K:
236	* - frequencies can be kept in 16 bit counters
	@@ -237,11 +248,11 @@
248	* fast adaptation but have of course the overhead of transmitting
249	* trees more frequently.
250	* - I can't count above 4
251	*/
252
253	uInt sym_next; /* running index in symbol buffer */
254	uInt sym_end; /* symbol table full when sym_next reaches this */
255
256	ulg opt_len; /* bit length of current block with optimal trees */
257	ulg static_len; /* bit length of current block with static trees */
258	uInt matches; /* number of string matches in current block */
	@@ -316,10 +327,29 @@
327	#else
328	extern const uch ZLIB_INTERNAL _length_code[];
329	extern const uch ZLIB_INTERNAL _dist_code[];
330	#endif
331
332	#ifdef LIT_MEM
333	# define _tr_tally_lit(s, c, flush) \
334	{ uch cc = (c); \
335	s->d_buf[s->sym_next] = 0; \
336	s->l_buf[s->sym_next++] = cc; \
337	s->dyn_ltree[cc].Freq++; \
338	flush = (s->sym_next == s->sym_end); \
339	}
340	# define _tr_tally_dist(s, distance, length, flush) \
341	{ uch len = (uch)(length); \
342	ush dist = (ush)(distance); \
343	s->d_buf[s->sym_next] = dist; \
344	s->l_buf[s->sym_next++] = len; \
345	dist--; \
346	s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
347	s->dyn_dtree[d_code(dist)].Freq++; \
348	flush = (s->sym_next == s->sym_end); \
349	}
350	#else
351	# define _tr_tally_lit(s, c, flush) \
352	{ uch cc = (c); \
353	s->sym_buf[s->sym_next++] = 0; \
354	s->sym_buf[s->sym_next++] = 0; \
355	s->sym_buf[s->sym_next++] = cc; \
	@@ -335,12 +365,13 @@
365	dist--; \
366	s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
367	s->dyn_dtree[d_code(dist)].Freq++; \
368	flush = (s->sym_next == s->sym_end); \
369	}
370	#endif
371	#else
372	# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
373	# define _tr_tally_dist(s, distance, length, flush) \
374	flush = _tr_tally(s, distance, length)
375	#endif
376
377	#endif /* DEFLATE_H */
378

M compat/zlib/examples/gzlog.c

+2 -2

		--- compat/zlib/examples/gzlog.c
		+++ compat/zlib/examples/gzlog.c
		@@ -210,12 +210,12 @@
210	210	Recovery procedure:
211	211	- If not a replace recovery, read in the foo.add file, and provide that data
212	212	to the appropriate recovery below. If there is no foo.add file, provide
213	213	a zero data length to the recovery. In that case, the append recovery
214	214	restores the foo.gz to the previous compressed + uncompressed data state.
215		- For the the compress recovery, a missing foo.add file results in foo.gz
216		- being restored to the previous compressed-only data state.
	215	+ For the compress recovery, a missing foo.add file results in foo.gz being
	216	+ restored to the previous compressed-only data state.
217	217	- Append recovery:
218	218	- Pick up append at + step above
219	219	- Compress recovery:
220	220	- Pick up compress at * step above
221	221	- Replace recovery:
222	222

	--- compat/zlib/examples/gzlog.c
	+++ compat/zlib/examples/gzlog.c
	@@ -210,12 +210,12 @@
210	Recovery procedure:
211	- If not a replace recovery, read in the foo.add file, and provide that data
212	to the appropriate recovery below. If there is no foo.add file, provide
213	a zero data length to the recovery. In that case, the append recovery
214	restores the foo.gz to the previous compressed + uncompressed data state.
215	For the the compress recovery, a missing foo.add file results in foo.gz
216	being restored to the previous compressed-only data state.
217	- Append recovery:
218	- Pick up append at + step above
219	- Compress recovery:
220	- Pick up compress at * step above
221	- Replace recovery:
222

	--- compat/zlib/examples/gzlog.c
	+++ compat/zlib/examples/gzlog.c
	@@ -210,12 +210,12 @@
210	Recovery procedure:
211	- If not a replace recovery, read in the foo.add file, and provide that data
212	to the appropriate recovery below. If there is no foo.add file, provide
213	a zero data length to the recovery. In that case, the append recovery
214	restores the foo.gz to the previous compressed + uncompressed data state.
215	For the compress recovery, a missing foo.add file results in foo.gz being
216	restored to the previous compressed-only data state.
217	- Append recovery:
218	- Pick up append at + step above
219	- Compress recovery:
220	- Pick up compress at * step above
221	- Replace recovery:
222

M compat/zlib/examples/zran.c

+1 -1

		--- compat/zlib/examples/zran.c
		+++ compat/zlib/examples/zran.c
		@@ -265,11 +265,11 @@
265	265	k = 8; // now at a byte boundary
266	266	*++in = value;
267	267	}
268	268	}
269	269
270		-// Insert enough bits in the form of empty deflate blocks in front of the the
	270	+// Insert enough bits in the form of empty deflate blocks in front of the
271	271	// low bits bits of value, in order to bring the sequence to a byte boundary.
272	272	// Then feed that to inflate(). This does what inflatePrime() does, except that
273	273	// a negative value of bits is not supported. bits must be in 0..16. If the
274	274	// arguments are invalid, Z_STREAM_ERROR is returned. Otherwise the return
275	275	// value from inflate() is returned.
276	276

	--- compat/zlib/examples/zran.c
	+++ compat/zlib/examples/zran.c
	@@ -265,11 +265,11 @@
265	k = 8; // now at a byte boundary
266	*++in = value;
267	}
268	}
269
270	// Insert enough bits in the form of empty deflate blocks in front of the the
271	// low bits bits of value, in order to bring the sequence to a byte boundary.
272	// Then feed that to inflate(). This does what inflatePrime() does, except that
273	// a negative value of bits is not supported. bits must be in 0..16. If the
274	// arguments are invalid, Z_STREAM_ERROR is returned. Otherwise the return
275	// value from inflate() is returned.
276

	--- compat/zlib/examples/zran.c
	+++ compat/zlib/examples/zran.c
	@@ -265,11 +265,11 @@
265	k = 8; // now at a byte boundary
266	*++in = value;
267	}
268	}
269
270	// Insert enough bits in the form of empty deflate blocks in front of the
271	// low bits bits of value, in order to bring the sequence to a byte boundary.
272	// Then feed that to inflate(). This does what inflatePrime() does, except that
273	// a negative value of bits is not supported. bits must be in 0..16. If the
274	// arguments are invalid, Z_STREAM_ERROR is returned. Otherwise the return
275	// value from inflate() is returned.
276

M compat/zlib/gzguts.h

+2 -6

		--- compat/zlib/gzguts.h
		+++ compat/zlib/gzguts.h
		@@ -1,7 +1,7 @@
1	1	/* gzguts.h -- zlib internal header definitions for gz* operations
2		- * Copyright (C) 2004-2019 Mark Adler
	2	+ * Copyright (C) 2004-2024 Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	#ifdef _LARGEFILE64_SOURCE
7	7	# ifndef _LARGEFILE_SOURCE
		@@ -208,11 +208,7 @@
208	208	#endif
209	209
210	210	/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
211	211	value -- needed when comparing unsigned to z_off64_t, which is signed
212	212	(possible z_off64_t types off_t, off64_t, and long are all signed) */
213		-#ifdef INT_MAX
214		-# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
215		-#else
216	213	unsigned ZLIB_INTERNAL gz_intmax(void);
217		-# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
218		-#endif
	214	+#define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
219	215

	--- compat/zlib/gzguts.h
	+++ compat/zlib/gzguts.h
	@@ -1,7 +1,7 @@
1	/* gzguts.h -- zlib internal header definitions for gz* operations
2	* Copyright (C) 2004-2019 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#ifdef _LARGEFILE64_SOURCE
7	# ifndef _LARGEFILE_SOURCE
	@@ -208,11 +208,7 @@
208	#endif
209
210	/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
211	value -- needed when comparing unsigned to z_off64_t, which is signed
212	(possible z_off64_t types off_t, off64_t, and long are all signed) */
213	#ifdef INT_MAX
214	# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX)
215	#else
216	unsigned ZLIB_INTERNAL gz_intmax(void);
217	# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())
218	#endif
219

	--- compat/zlib/gzguts.h
	+++ compat/zlib/gzguts.h
	@@ -1,7 +1,7 @@
1	/* gzguts.h -- zlib internal header definitions for gz* operations
2	* Copyright (C) 2004-2024 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#ifdef _LARGEFILE64_SOURCE
7	# ifndef _LARGEFILE_SOURCE
	@@ -208,11 +208,7 @@
208	#endif
209
210	/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t
211	value -- needed when comparing unsigned to z_off64_t, which is signed
212	(possible z_off64_t types off_t, off64_t, and long are all signed) */



213	unsigned ZLIB_INTERNAL gz_intmax(void);
214	#define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax())

215

M compat/zlib/gzlib.c

+6 -6

		--- compat/zlib/gzlib.c
		+++ compat/zlib/gzlib.c
		@@ -1,7 +1,7 @@
1	1	/* gzlib.c -- zlib functions common to reading and writing gzip files
2		- * Copyright (C) 2004-2019 Mark Adler
	2	+ * Copyright (C) 2004-2024 Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	#include "gzguts.h"
7	7
		@@ -561,22 +561,22 @@
561	561	strcat(state->msg, ": ");
562	562	strcat(state->msg, msg);
563	563	#endif
564	564	}
565	565
566		-#ifndef INT_MAX
567	566	/* portably return maximum value for an int (when limits.h presumed not
568	567	available) -- we need to do this to cover cases where 2's complement not
569	568	used, since C standard permits 1's complement and sign-bit representations,
570	569	otherwise we could just use ((unsigned)-1) >> 1 */
571	570	unsigned ZLIB_INTERNAL gz_intmax(void) {
572		- unsigned p, q;
573		-
574		- p = 1;
	571	+#ifdef INT_MAX
	572	+ return INT_MAX;
	573	+#else
	574	+ unsigned p = 1, q;
575	575	do {
576	576	q = p;
577	577	p <<= 1;
578	578	p++;
579	579	} while (p > q);
580	580	return q >> 1;
581		-}
582	581	#endif
	582	+}
583	583

	--- compat/zlib/gzlib.c
	+++ compat/zlib/gzlib.c
	@@ -1,7 +1,7 @@
1	/* gzlib.c -- zlib functions common to reading and writing gzip files
2	* Copyright (C) 2004-2019 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "gzguts.h"
7
	@@ -561,22 +561,22 @@
561	strcat(state->msg, ": ");
562	strcat(state->msg, msg);
563	#endif
564	}
565
566	#ifndef INT_MAX
567	/* portably return maximum value for an int (when limits.h presumed not
568	available) -- we need to do this to cover cases where 2's complement not
569	used, since C standard permits 1's complement and sign-bit representations,
570	otherwise we could just use ((unsigned)-1) >> 1 */
571	unsigned ZLIB_INTERNAL gz_intmax(void) {
572	unsigned p, q;
573
574	p = 1;

575	do {
576	q = p;
577	p <<= 1;
578	p++;
579	} while (p > q);
580	return q >> 1;
581	}
582	#endif

583

	--- compat/zlib/gzlib.c
	+++ compat/zlib/gzlib.c
	@@ -1,7 +1,7 @@
1	/* gzlib.c -- zlib functions common to reading and writing gzip files
2	* Copyright (C) 2004-2024 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "gzguts.h"
7
	@@ -561,22 +561,22 @@
561	strcat(state->msg, ": ");
562	strcat(state->msg, msg);
563	#endif
564	}
565

566	/* portably return maximum value for an int (when limits.h presumed not
567	available) -- we need to do this to cover cases where 2's complement not
568	used, since C standard permits 1's complement and sign-bit representations,
569	otherwise we could just use ((unsigned)-1) >> 1 */
570	unsigned ZLIB_INTERNAL gz_intmax(void) {
571	#ifdef INT_MAX
572	return INT_MAX;
573	#else
574	unsigned p = 1, q;
575	do {
576	q = p;
577	p <<= 1;
578	p++;
579	} while (p > q);
580	return q >> 1;

581	#endif
582	}
583

M compat/zlib/inflate.c

+1 -1

		--- compat/zlib/inflate.c
		+++ compat/zlib/inflate.c
		@@ -1385,11 +1385,11 @@
1385	1385	if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
1386	1386
1387	1387	/* if first time, start search in bit buffer */
1388	1388	if (state->mode != SYNC) {
1389	1389	state->mode = SYNC;
1390		- state->hold <<= state->bits & 7;
	1390	+ state->hold >>= state->bits & 7;
1391	1391	state->bits -= state->bits & 7;
1392	1392	len = 0;
1393	1393	while (state->bits >= 8) {
1394	1394	buf[len++] = (unsigned char)(state->hold);
1395	1395	state->hold >>= 8;
1396	1396

	--- compat/zlib/inflate.c
	+++ compat/zlib/inflate.c
	@@ -1385,11 +1385,11 @@
1385	if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
1386
1387	/* if first time, start search in bit buffer */
1388	if (state->mode != SYNC) {
1389	state->mode = SYNC;
1390	state->hold <<= state->bits & 7;
1391	state->bits -= state->bits & 7;
1392	len = 0;
1393	while (state->bits >= 8) {
1394	buf[len++] = (unsigned char)(state->hold);
1395	state->hold >>= 8;
1396

	--- compat/zlib/inflate.c
	+++ compat/zlib/inflate.c
	@@ -1385,11 +1385,11 @@
1385	if (strm->avail_in == 0 && state->bits < 8) return Z_BUF_ERROR;
1386
1387	/* if first time, start search in bit buffer */
1388	if (state->mode != SYNC) {
1389	state->mode = SYNC;
1390	state->hold >>= state->bits & 7;
1391	state->bits -= state->bits & 7;
1392	len = 0;
1393	while (state->bits >= 8) {
1394	buf[len++] = (unsigned char)(state->hold);
1395	state->hold >>= 8;
1396

M compat/zlib/inftrees.c

+3 -3

		--- compat/zlib/inftrees.c
		+++ compat/zlib/inftrees.c
		@@ -1,17 +1,17 @@
1	1	/* inftrees.c -- generate Huffman trees for efficient decoding
2		- * Copyright (C) 1995-2023 Mark Adler
	2	+ * Copyright (C) 1995-2024 Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	#include "zutil.h"
7	7	#include "inftrees.h"
8	8
9	9	#define MAXBITS 15
10	10
11	11	const char inflate_copyright[] =
12		- " inflate 1.3 Copyright 1995-2023 Mark Adler ";
	12	+ " inflate 1.3.1 Copyright 1995-2024 Mark Adler ";
13	13	/*
14	14	If you use the zlib library in a product, an acknowledgment is welcome
15	15	in the documentation of your product. If for some reason you cannot
16	16	include such an acknowledgment, I would appreciate that you keep this
17	17	copyright string in the executable of your product.
		@@ -55,11 +55,11 @@
55	55	static const unsigned short lbase[31] = { /* Length codes 257..285 base */
56	56	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
57	57	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
58	58	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
59	59	16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
60		- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 198, 203};
	60	+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 77};
61	61	static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
62	62	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
63	63	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
64	64	8193, 12289, 16385, 24577, 0, 0};
65	65	static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
66	66

	--- compat/zlib/inftrees.c
	+++ compat/zlib/inftrees.c
	@@ -1,17 +1,17 @@
1	/* inftrees.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-2023 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "zutil.h"
7	#include "inftrees.h"
8
9	#define MAXBITS 15
10
11	const char inflate_copyright[] =
12	" inflate 1.3 Copyright 1995-2023 Mark Adler ";
13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot
16	include such an acknowledgment, I would appreciate that you keep this
17	copyright string in the executable of your product.
	@@ -55,11 +55,11 @@
55	static const unsigned short lbase[31] = { /* Length codes 257..285 base */
56	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
57	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
58	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
59	16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
60	19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 198, 203};
61	static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
62	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
63	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
64	8193, 12289, 16385, 24577, 0, 0};
65	static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
66

	--- compat/zlib/inftrees.c
	+++ compat/zlib/inftrees.c
	@@ -1,17 +1,17 @@
1	/* inftrees.c -- generate Huffman trees for efficient decoding
2	* Copyright (C) 1995-2024 Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	#include "zutil.h"
7	#include "inftrees.h"
8
9	#define MAXBITS 15
10
11	const char inflate_copyright[] =
12	" inflate 1.3.1 Copyright 1995-2024 Mark Adler ";
13	/*
14	If you use the zlib library in a product, an acknowledgment is welcome
15	in the documentation of your product. If for some reason you cannot
16	include such an acknowledgment, I would appreciate that you keep this
17	copyright string in the executable of your product.
	@@ -55,11 +55,11 @@
55	static const unsigned short lbase[31] = { /* Length codes 257..285 base */
56	3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
57	35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
58	static const unsigned short lext[31] = { /* Length codes 257..285 extra */
59	16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,
60	19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 203, 77};
61	static const unsigned short dbase[32] = { /* Distance codes 0..29 base */
62	1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
63	257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
64	8193, 12289, 16385, 24577, 0, 0};
65	static const unsigned short dext[32] = { /* Distance codes 0..29 extra */
66

M compat/zlib/inftrees.h

+2 -2

		--- compat/zlib/inftrees.h
		+++ compat/zlib/inftrees.h
		@@ -39,12 +39,12 @@
39	39	1444, which is the sum of 852 for literal/length codes and 592 for distance
40	40	codes. These values were found by exhaustive searches using the program
41	41	examples/enough.c found in the zlib distribution. The arguments to that
42	42	program are the number of symbols, the initial root table size, and the
43	43	maximum bit length of a code. "enough 286 9 15" for literal/length codes
44		- returns returns 852, and "enough 30 6 15" for distance codes returns 592.
45		- The initial root table size (9 or 6) is found in the fifth argument of the
	44	+ returns 852, and "enough 30 6 15" for distance codes returns 592. The
	45	+ initial root table size (9 or 6) is found in the fifth argument of the
46	46	inflate_table() calls in inflate.c and infback.c. If the root table size is
47	47	changed, then these maximum sizes would be need to be recalculated and
48	48	updated. */
49	49	#define ENOUGH_LENS 852
50	50	#define ENOUGH_DISTS 592
51	51

	--- compat/zlib/inftrees.h
	+++ compat/zlib/inftrees.h
	@@ -39,12 +39,12 @@
39	1444, which is the sum of 852 for literal/length codes and 592 for distance
40	codes. These values were found by exhaustive searches using the program
41	examples/enough.c found in the zlib distribution. The arguments to that
42	program are the number of symbols, the initial root table size, and the
43	maximum bit length of a code. "enough 286 9 15" for literal/length codes
44	returns returns 852, and "enough 30 6 15" for distance codes returns 592.
45	The initial root table size (9 or 6) is found in the fifth argument of the
46	inflate_table() calls in inflate.c and infback.c. If the root table size is
47	changed, then these maximum sizes would be need to be recalculated and
48	updated. */
49	#define ENOUGH_LENS 852
50	#define ENOUGH_DISTS 592
51

	--- compat/zlib/inftrees.h
	+++ compat/zlib/inftrees.h
	@@ -39,12 +39,12 @@
39	1444, which is the sum of 852 for literal/length codes and 592 for distance
40	codes. These values were found by exhaustive searches using the program
41	examples/enough.c found in the zlib distribution. The arguments to that
42	program are the number of symbols, the initial root table size, and the
43	maximum bit length of a code. "enough 286 9 15" for literal/length codes
44	returns 852, and "enough 30 6 15" for distance codes returns 592. The
45	initial root table size (9 or 6) is found in the fifth argument of the
46	inflate_table() calls in inflate.c and infback.c. If the root table size is
47	changed, then these maximum sizes would be need to be recalculated and
48	updated. */
49	#define ENOUGH_LENS 852
50	#define ENOUGH_DISTS 592
51

M compat/zlib/old/visual-basic.txt

+1 -1

		--- compat/zlib/old/visual-basic.txt
		+++ compat/zlib/old/visual-basic.txt
		@@ -113,11 +113,11 @@
113	113	SUCCESS Then
114	114	lngpvtPcnSml = (1# - (lngCprSiz / lngOriSiz)) * 100
115	115	ReDim Preserve bytaryCpr(lngCprSiz - 1)
116	116	Open strCprPth For Binary Access Write As #1
117	117	Put #1, , bytaryCpr()
118		- Put #1, , lngOriSiz 'Add the the original size value to the end
	118	+ Put #1, , lngOriSiz 'Add the original size value to the end
119	119	(last 4 bytes)
120	120	Close #1
121	121	Else
122	122	MsgBox "Compression error"
123	123	End If
124	124

	--- compat/zlib/old/visual-basic.txt
	+++ compat/zlib/old/visual-basic.txt
	@@ -113,11 +113,11 @@
113	SUCCESS Then
114	lngpvtPcnSml = (1# - (lngCprSiz / lngOriSiz)) * 100
115	ReDim Preserve bytaryCpr(lngCprSiz - 1)
116	Open strCprPth For Binary Access Write As #1
117	Put #1, , bytaryCpr()
118	Put #1, , lngOriSiz 'Add the the original size value to the end
119	(last 4 bytes)
120	Close #1
121	Else
122	MsgBox "Compression error"
123	End If
124

	--- compat/zlib/old/visual-basic.txt
	+++ compat/zlib/old/visual-basic.txt
	@@ -113,11 +113,11 @@
113	SUCCESS Then
114	lngpvtPcnSml = (1# - (lngCprSiz / lngOriSiz)) * 100
115	ReDim Preserve bytaryCpr(lngCprSiz - 1)
116	Open strCprPth For Binary Access Write As #1
117	Put #1, , bytaryCpr()
118	Put #1, , lngOriSiz 'Add the original size value to the end
119	(last 4 bytes)
120	Close #1
121	Else
122	MsgBox "Compression error"
123	End If
124

M compat/zlib/os400/README400

+1 -1

		--- compat/zlib/os400/README400
		+++ compat/zlib/os400/README400
		@@ -1,6 +1,6 @@
1		- ZLIB version 1.3.0 for OS/400 installation instructions
	1	+ ZLIB version 1.3.1 for OS/400 installation instructions
2	2
3	3	1) Download and unpack the zlib tarball to some IFS directory.
4	4	(i.e.: /path/to/the/zlib/ifs/source/directory)
5	5
6	6	If the installed IFS command supports gzip format, this is straightforward,
7	7

	--- compat/zlib/os400/README400
	+++ compat/zlib/os400/README400
	@@ -1,6 +1,6 @@
1	ZLIB version 1.3.0 for OS/400 installation instructions
2
3	1) Download and unpack the zlib tarball to some IFS directory.
4	(i.e.: /path/to/the/zlib/ifs/source/directory)
5
6	If the installed IFS command supports gzip format, this is straightforward,
7

	--- compat/zlib/os400/README400
	+++ compat/zlib/os400/README400
	@@ -1,6 +1,6 @@
1	ZLIB version 1.3.1 for OS/400 installation instructions
2
3	1) Download and unpack the zlib tarball to some IFS directory.
4	(i.e.: /path/to/the/zlib/ifs/source/directory)
5
6	If the installed IFS command supports gzip format, this is straightforward,
7

M compat/zlib/os400/zlib.inc

+3 -3

		--- compat/zlib/os400/zlib.inc
		+++ compat/zlib/os400/zlib.inc
		@@ -1,9 +1,9 @@
1	1	* ZLIB.INC - Interface to the general purpose compression library
2	2	*
3	3	* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4		- * Version 1.3.0
	4	+ * Version 1.3.1
5	5	*
6	6	*
7	7	* WARNING:
8	8	* Procedures inflateInit(), inflateInit2(), deflateInit(),
9	9	* deflateInit2() and inflateBackInit() need to be called with
		@@ -20,16 +20,16 @@
20	20	* Constants
21	21	**************************************************************************
22	22	*
23	23	* Versioning information.
24	24	*
25		- D ZLIB_VERSION C '1.3.0'
	25	+ D ZLIB_VERSION C '1.3.1'
26	26	D ZLIB_VERNUM C X'12a0'
27	27	D ZLIB_VER_MAJOR C 1
28	28	D ZLIB_VER_MINOR C 3
29	29	D ZLIB_VER_REVISION...
30		- D C 0
	30	+ D C 1
31	31	D ZLIB_VER_SUBREVISION...
32	32	D C 0
33	33	*
34	34	* Other equates.
35	35	*
36	36

	--- compat/zlib/os400/zlib.inc
	+++ compat/zlib/os400/zlib.inc
	@@ -1,9 +1,9 @@
1	* ZLIB.INC - Interface to the general purpose compression library
2	*
3	* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4	* Version 1.3.0
5	*
6	*
7	* WARNING:
8	* Procedures inflateInit(), inflateInit2(), deflateInit(),
9	* deflateInit2() and inflateBackInit() need to be called with
	@@ -20,16 +20,16 @@
20	* Constants
21	**************************************************************************
22	*
23	* Versioning information.
24	*
25	D ZLIB_VERSION C '1.3.0'
26	D ZLIB_VERNUM C X'12a0'
27	D ZLIB_VER_MAJOR C 1
28	D ZLIB_VER_MINOR C 3
29	D ZLIB_VER_REVISION...
30	D C 0
31	D ZLIB_VER_SUBREVISION...
32	D C 0
33	*
34	* Other equates.
35	*
36

	--- compat/zlib/os400/zlib.inc
	+++ compat/zlib/os400/zlib.inc
	@@ -1,9 +1,9 @@
1	* ZLIB.INC - Interface to the general purpose compression library
2	*
3	* ILE RPG400 version by Patrick Monnerat, DATASPHERE.
4	* Version 1.3.1
5	*
6	*
7	* WARNING:
8	* Procedures inflateInit(), inflateInit2(), deflateInit(),
9	* deflateInit2() and inflateBackInit() need to be called with
	@@ -20,16 +20,16 @@
20	* Constants
21	**************************************************************************
22	*
23	* Versioning information.
24	*
25	D ZLIB_VERSION C '1.3.1'
26	D ZLIB_VERNUM C X'12a0'
27	D ZLIB_VER_MAJOR C 1
28	D ZLIB_VER_MINOR C 3
29	D ZLIB_VER_REVISION...
30	D C 1
31	D ZLIB_VER_SUBREVISION...
32	D C 0
33	*
34	* Other equates.
35	*
36

M compat/zlib/qnx/package.qpg

+5 -5

		--- compat/zlib/qnx/package.qpg
		+++ compat/zlib/qnx/package.qpg
		@@ -23,14 +23,14 @@
23	23
24	24	<QPG:Values>
25	25	<QPG:Files>
26	26	<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27	27	<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28		- <QPG:Add file="../libz.so.1.3.0" install="/opt/lib/" user="root:bin" permission="644"/>
29		- <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.0"/>
30		- <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.0"/>
31		- <QPG:Add file="../libz.so.1.3.0" install="/opt/lib/" component="slib"/>
	28	+ <QPG:Add file="../libz.so.1.3.1" install="/opt/lib/" user="root:bin" permission="644"/>
	29	+ <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.1"/>
	30	+ <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.1"/>
	31	+ <QPG:Add file="../libz.so.1.3.1" install="/opt/lib/" component="slib"/>
32	32	</QPG:Files>
33	33
34	34	<QPG:PackageFilter>
35	35	<QPM:PackageManifest>
36	36	<QPM:PackageDescription>
		@@ -61,11 +61,11 @@
61	61	<QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
62	62	<QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
63	63	</QPM:ProductDescription>
64	64
65	65	<QPM:ReleaseDescription>
66		- <QPM:ReleaseVersion>1.3.0</QPM:ReleaseVersion>
	66	+ <QPM:ReleaseVersion>1.3.1</QPM:ReleaseVersion>
67	67	<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68	68	<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69	69	<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
70	70	<QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
71	71	<QPM:ExcludeCountries>
72	72

	--- compat/zlib/qnx/package.qpg
	+++ compat/zlib/qnx/package.qpg
	@@ -23,14 +23,14 @@
23
24	<QPG:Values>
25	<QPG:Files>
26	<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27	<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28	<QPG:Add file="../libz.so.1.3.0" install="/opt/lib/" user="root:bin" permission="644"/>
29	<QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.0"/>
30	<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.0"/>
31	<QPG:Add file="../libz.so.1.3.0" install="/opt/lib/" component="slib"/>
32	</QPG:Files>
33
34	<QPG:PackageFilter>
35	<QPM:PackageManifest>
36	<QPM:PackageDescription>
	@@ -61,11 +61,11 @@
61	<QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
62	<QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
63	</QPM:ProductDescription>
64
65	<QPM:ReleaseDescription>
66	<QPM:ReleaseVersion>1.3.0</QPM:ReleaseVersion>
67	<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68	<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69	<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
70	<QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
71	<QPM:ExcludeCountries>
72

	--- compat/zlib/qnx/package.qpg
	+++ compat/zlib/qnx/package.qpg
	@@ -23,14 +23,14 @@
23
24	<QPG:Values>
25	<QPG:Files>
26	<QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/>
27	<QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/>
28	<QPG:Add file="../libz.so.1.3.1" install="/opt/lib/" user="root:bin" permission="644"/>
29	<QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.3.1"/>
30	<QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.3.1"/>
31	<QPG:Add file="../libz.so.1.3.1" install="/opt/lib/" component="slib"/>
32	</QPG:Files>
33
34	<QPG:PackageFilter>
35	<QPM:PackageManifest>
36	<QPM:PackageDescription>
	@@ -61,11 +61,11 @@
61	<QPM:ProductDescriptionURL>http://www.gzip.org/zlib</QPM:ProductDescriptionURL>
62	<QPM:ProductDescriptionEmbedURL></QPM:ProductDescriptionEmbedURL>
63	</QPM:ProductDescription>
64
65	<QPM:ReleaseDescription>
66	<QPM:ReleaseVersion>1.3.1</QPM:ReleaseVersion>
67	<QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency>
68	<QPM:ReleaseStability>Stable</QPM:ReleaseStability>
69	<QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor>
70	<QPM:ReleaseNoteMajor></QPM:ReleaseNoteMajor>
71	<QPM:ExcludeCountries>
72

M compat/zlib/test/example.c

+13 -12

		--- compat/zlib/test/example.c
		+++ compat/zlib/test/example.c
		@@ -34,16 +34,16 @@
34	34	static const char dictionary[] = "hello";
35	35	static uLong dictId; /* Adler32 value of the dictionary */
36	36
37	37	#ifdef Z_SOLO
38	38
39		-void myalloc(void q, unsigned n, unsigned m) {
	39	+static void myalloc(void q, unsigned n, unsigned m) {
40	40	(void)q;
41	41	return calloc(n, m);
42	42	}
43	43
44		-void myfree(void q, void p) {
	44	+static void myfree(void q, void p) {
45	45	(void)q;
46	46	free(p);
47	47	}
48	48
49	49	static alloc_func zalloc = myalloc;
		@@ -55,11 +55,11 @@
55	55	static free_func zfree = (free_func)0;
56	56
57	57	/* ===========================================================================
58	58	* Test compress() and uncompress()
59	59	*/
60		-void test_compress(Byte compr, uLong comprLen, Byte uncompr,
	60	+static void test_compress(Byte compr, uLong comprLen, Byte uncompr,
61	61	uLong uncomprLen) {
62	62	int err;
63	63	uLong len = (uLong)strlen(hello)+1;
64	64
65	65	err = compress(compr, &comprLen, (const Bytef*)hello, len);
		@@ -79,11 +79,11 @@
79	79	}
80	80
81	81	/* ===========================================================================
82	82	* Test read/write of .gz files
83	83	*/
84		-void test_gzio(const char fname, Byte uncompr, uLong uncomprLen) {
	84	+static void test_gzio(const char fname, Byte uncompr, uLong uncomprLen) {
85	85	#ifdef NO_GZCOMPRESS
86	86	fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
87	87	#else
88	88	int err;
89	89	int len = (int)strlen(hello)+1;
		@@ -161,11 +161,11 @@
161	161	#endif /* Z_SOLO */
162	162
163	163	/* ===========================================================================
164	164	* Test deflate() with small buffers
165	165	*/
166		-void test_deflate(Byte *compr, uLong comprLen) {
	166	+static void test_deflate(Byte *compr, uLong comprLen) {
167	167	z_stream c_stream; /* compression stream */
168	168	int err;
169	169	uLong len = (uLong)strlen(hello)+1;
170	170
171	171	c_stream.zalloc = zalloc;
		@@ -196,11 +196,11 @@
196	196	}
197	197
198	198	/* ===========================================================================
199	199	* Test inflate() with small buffers
200	200	*/
201		-void test_inflate(Byte compr, uLong comprLen, Byte uncompr,
	201	+static void test_inflate(Byte compr, uLong comprLen, Byte uncompr,
202	202	uLong uncomprLen) {
203	203	int err;
204	204	z_stream d_stream; /* decompression stream */
205	205
206	206	strcpy((char*)uncompr, "garbage");
		@@ -235,11 +235,11 @@
235	235	}
236	236
237	237	/* ===========================================================================
238	238	* Test deflate() with large buffers and dynamic change of compression level
239	239	*/
240		-void test_large_deflate(Byte compr, uLong comprLen, Byte uncompr,
	240	+static void test_large_deflate(Byte compr, uLong comprLen, Byte uncompr,
241	241	uLong uncomprLen) {
242	242	z_stream c_stream; /* compression stream */
243	243	int err;
244	244
245	245	c_stream.zalloc = zalloc;
		@@ -288,11 +288,11 @@
288	288	}
289	289
290	290	/* ===========================================================================
291	291	* Test inflate() with large buffers
292	292	*/
293		-void test_large_inflate(Byte compr, uLong comprLen, Byte uncompr,
	293	+static void test_large_inflate(Byte compr, uLong comprLen, Byte uncompr,
294	294	uLong uncomprLen) {
295	295	int err;
296	296	z_stream d_stream; /* decompression stream */
297	297
298	298	strcpy((char*)uncompr, "garbage");
		@@ -327,11 +327,11 @@
327	327	}
328	328
329	329	/* ===========================================================================
330	330	* Test deflate() with full flush
331	331	*/
332		-void test_flush(Byte compr, uLong comprLen) {
	332	+static void test_flush(Byte compr, uLong comprLen) {
333	333	z_stream c_stream; /* compression stream */
334	334	int err;
335	335	uInt len = (uInt)strlen(hello)+1;
336	336
337	337	c_stream.zalloc = zalloc;
		@@ -362,11 +362,12 @@
362	362	}
363	363
364	364	/* ===========================================================================
365	365	* Test inflateSync()
366	366	*/
367		-void test_sync(Byte compr, uLong comprLen, Byte uncompr, uLong uncomprLen) {
	367	+static void test_sync(Byte compr, uLong comprLen, Byte uncompr,
	368	+ uLong uncomprLen) {
368	369	int err;
369	370	z_stream d_stream; /* decompression stream */
370	371
371	372	strcpy((char*)uncompr, "garbage");
372	373
		@@ -402,11 +403,11 @@
402	403	}
403	404
404	405	/* ===========================================================================
405	406	* Test deflate() with preset dictionary
406	407	*/
407		-void test_dict_deflate(Byte *compr, uLong comprLen) {
	408	+static void test_dict_deflate(Byte *compr, uLong comprLen) {
408	409	z_stream c_stream; /* compression stream */
409	410	int err;
410	411
411	412	c_stream.zalloc = zalloc;
412	413	c_stream.zfree = zfree;
		@@ -436,11 +437,11 @@
436	437	}
437	438
438	439	/* ===========================================================================
439	440	* Test inflate() with a preset dictionary
440	441	*/
441		-void test_dict_inflate(Byte compr, uLong comprLen, Byte uncompr,
	442	+static void test_dict_inflate(Byte compr, uLong comprLen, Byte uncompr,
442	443	uLong uncomprLen) {
443	444	int err;
444	445	z_stream d_stream; /* decompression stream */
445	446
446	447	strcpy((char*)uncompr, "garbage");
447	448

	--- compat/zlib/test/example.c
	+++ compat/zlib/test/example.c
	@@ -34,16 +34,16 @@
34	static const char dictionary[] = "hello";
35	static uLong dictId; /* Adler32 value of the dictionary */
36
37	#ifdef Z_SOLO
38
39	void myalloc(void q, unsigned n, unsigned m) {
40	(void)q;
41	return calloc(n, m);
42	}
43
44	void myfree(void q, void p) {
45	(void)q;
46	free(p);
47	}
48
49	static alloc_func zalloc = myalloc;
	@@ -55,11 +55,11 @@
55	static free_func zfree = (free_func)0;
56
57	/* ===========================================================================
58	* Test compress() and uncompress()
59	*/
60	void test_compress(Byte compr, uLong comprLen, Byte uncompr,
61	uLong uncomprLen) {
62	int err;
63	uLong len = (uLong)strlen(hello)+1;
64
65	err = compress(compr, &comprLen, (const Bytef*)hello, len);
	@@ -79,11 +79,11 @@
79	}
80
81	/* ===========================================================================
82	* Test read/write of .gz files
83	*/
84	void test_gzio(const char fname, Byte uncompr, uLong uncomprLen) {
85	#ifdef NO_GZCOMPRESS
86	fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
87	#else
88	int err;
89	int len = (int)strlen(hello)+1;
	@@ -161,11 +161,11 @@
161	#endif /* Z_SOLO */
162
163	/* ===========================================================================
164	* Test deflate() with small buffers
165	*/
166	void test_deflate(Byte *compr, uLong comprLen) {
167	z_stream c_stream; /* compression stream */
168	int err;
169	uLong len = (uLong)strlen(hello)+1;
170
171	c_stream.zalloc = zalloc;
	@@ -196,11 +196,11 @@
196	}
197
198	/* ===========================================================================
199	* Test inflate() with small buffers
200	*/
201	void test_inflate(Byte compr, uLong comprLen, Byte uncompr,
202	uLong uncomprLen) {
203	int err;
204	z_stream d_stream; /* decompression stream */
205
206	strcpy((char*)uncompr, "garbage");
	@@ -235,11 +235,11 @@
235	}
236
237	/* ===========================================================================
238	* Test deflate() with large buffers and dynamic change of compression level
239	*/
240	void test_large_deflate(Byte compr, uLong comprLen, Byte uncompr,
241	uLong uncomprLen) {
242	z_stream c_stream; /* compression stream */
243	int err;
244
245	c_stream.zalloc = zalloc;
	@@ -288,11 +288,11 @@
288	}
289
290	/* ===========================================================================
291	* Test inflate() with large buffers
292	*/
293	void test_large_inflate(Byte compr, uLong comprLen, Byte uncompr,
294	uLong uncomprLen) {
295	int err;
296	z_stream d_stream; /* decompression stream */
297
298	strcpy((char*)uncompr, "garbage");
	@@ -327,11 +327,11 @@
327	}
328
329	/* ===========================================================================
330	* Test deflate() with full flush
331	*/
332	void test_flush(Byte compr, uLong comprLen) {
333	z_stream c_stream; /* compression stream */
334	int err;
335	uInt len = (uInt)strlen(hello)+1;
336
337	c_stream.zalloc = zalloc;
	@@ -362,11 +362,12 @@
362	}
363
364	/* ===========================================================================
365	* Test inflateSync()
366	*/
367	void test_sync(Byte compr, uLong comprLen, Byte uncompr, uLong uncomprLen) {

368	int err;
369	z_stream d_stream; /* decompression stream */
370
371	strcpy((char*)uncompr, "garbage");
372
	@@ -402,11 +403,11 @@
402	}
403
404	/* ===========================================================================
405	* Test deflate() with preset dictionary
406	*/
407	void test_dict_deflate(Byte *compr, uLong comprLen) {
408	z_stream c_stream; /* compression stream */
409	int err;
410
411	c_stream.zalloc = zalloc;
412	c_stream.zfree = zfree;
	@@ -436,11 +437,11 @@
436	}
437
438	/* ===========================================================================
439	* Test inflate() with a preset dictionary
440	*/
441	void test_dict_inflate(Byte compr, uLong comprLen, Byte uncompr,
442	uLong uncomprLen) {
443	int err;
444	z_stream d_stream; /* decompression stream */
445
446	strcpy((char*)uncompr, "garbage");
447

	--- compat/zlib/test/example.c
	+++ compat/zlib/test/example.c
	@@ -34,16 +34,16 @@
34	static const char dictionary[] = "hello";
35	static uLong dictId; /* Adler32 value of the dictionary */
36
37	#ifdef Z_SOLO
38
39	static void myalloc(void q, unsigned n, unsigned m) {
40	(void)q;
41	return calloc(n, m);
42	}
43
44	static void myfree(void q, void p) {
45	(void)q;
46	free(p);
47	}
48
49	static alloc_func zalloc = myalloc;
	@@ -55,11 +55,11 @@
55	static free_func zfree = (free_func)0;
56
57	/* ===========================================================================
58	* Test compress() and uncompress()
59	*/
60	static void test_compress(Byte compr, uLong comprLen, Byte uncompr,
61	uLong uncomprLen) {
62	int err;
63	uLong len = (uLong)strlen(hello)+1;
64
65	err = compress(compr, &comprLen, (const Bytef*)hello, len);
	@@ -79,11 +79,11 @@
79	}
80
81	/* ===========================================================================
82	* Test read/write of .gz files
83	*/
84	static void test_gzio(const char fname, Byte uncompr, uLong uncomprLen) {
85	#ifdef NO_GZCOMPRESS
86	fprintf(stderr, "NO_GZCOMPRESS -- gz* functions cannot compress\n");
87	#else
88	int err;
89	int len = (int)strlen(hello)+1;
	@@ -161,11 +161,11 @@
161	#endif /* Z_SOLO */
162
163	/* ===========================================================================
164	* Test deflate() with small buffers
165	*/
166	static void test_deflate(Byte *compr, uLong comprLen) {
167	z_stream c_stream; /* compression stream */
168	int err;
169	uLong len = (uLong)strlen(hello)+1;
170
171	c_stream.zalloc = zalloc;
	@@ -196,11 +196,11 @@
196	}
197
198	/* ===========================================================================
199	* Test inflate() with small buffers
200	*/
201	static void test_inflate(Byte compr, uLong comprLen, Byte uncompr,
202	uLong uncomprLen) {
203	int err;
204	z_stream d_stream; /* decompression stream */
205
206	strcpy((char*)uncompr, "garbage");
	@@ -235,11 +235,11 @@
235	}
236
237	/* ===========================================================================
238	* Test deflate() with large buffers and dynamic change of compression level
239	*/
240	static void test_large_deflate(Byte compr, uLong comprLen, Byte uncompr,
241	uLong uncomprLen) {
242	z_stream c_stream; /* compression stream */
243	int err;
244
245	c_stream.zalloc = zalloc;
	@@ -288,11 +288,11 @@
288	}
289
290	/* ===========================================================================
291	* Test inflate() with large buffers
292	*/
293	static void test_large_inflate(Byte compr, uLong comprLen, Byte uncompr,
294	uLong uncomprLen) {
295	int err;
296	z_stream d_stream; /* decompression stream */
297
298	strcpy((char*)uncompr, "garbage");
	@@ -327,11 +327,11 @@
327	}
328
329	/* ===========================================================================
330	* Test deflate() with full flush
331	*/
332	static void test_flush(Byte compr, uLong comprLen) {
333	z_stream c_stream; /* compression stream */
334	int err;
335	uInt len = (uInt)strlen(hello)+1;
336
337	c_stream.zalloc = zalloc;
	@@ -362,11 +362,12 @@
362	}
363
364	/* ===========================================================================
365	* Test inflateSync()
366	*/
367	static void test_sync(Byte compr, uLong comprLen, Byte uncompr,
368	uLong uncomprLen) {
369	int err;
370	z_stream d_stream; /* decompression stream */
371
372	strcpy((char*)uncompr, "garbage");
373
	@@ -402,11 +403,11 @@
403	}
404
405	/* ===========================================================================
406	* Test deflate() with preset dictionary
407	*/
408	static void test_dict_deflate(Byte *compr, uLong comprLen) {
409	z_stream c_stream; /* compression stream */
410	int err;
411
412	c_stream.zalloc = zalloc;
413	c_stream.zfree = zfree;
	@@ -436,11 +437,11 @@
437	}
438
439	/* ===========================================================================
440	* Test inflate() with a preset dictionary
441	*/
442	static void test_dict_inflate(Byte compr, uLong comprLen, Byte uncompr,
443	uLong uncomprLen) {
444	int err;
445	z_stream d_stream; /* decompression stream */
446
447	strcpy((char*)uncompr, "garbage");
448

M compat/zlib/test/minigzip.c

+16 -16

		--- compat/zlib/test/minigzip.c
		+++ compat/zlib/test/minigzip.c
		@@ -147,16 +147,16 @@
147	147
148	148	#if defined(Z_HAVE_UNISTD_H) \|\| defined(Z_LARGE)
149	149	# include <unistd.h> /* for unlink() */
150	150	#endif
151	151
152		-void myalloc(void q, unsigned n, unsigned m) {
	152	+static void myalloc(void q, unsigned n, unsigned m) {
153	153	(void)q;
154	154	return calloc(n, m);
155	155	}
156	156
157		-void myfree(void q, void p) {
	157	+static void myfree(void q, void p) {
158	158	(void)q;
159	159	free(p);
160	160	}
161	161
162	162	typedef struct gzFile_s {
		@@ -165,11 +165,11 @@
165	165	int err;
166	166	char *msg;
167	167	z_stream strm;
168	168	} *gzFile;
169	169
170		-gzFile gz_open(const char path, int fd, const char mode) {
	170	+static gzFile gz_open(const char path, int fd, const char mode) {
171	171	gzFile gz;
172	172	int ret;
173	173
174	174	gz = malloc(sizeof(struct gzFile_s));
175	175	if (gz == NULL)
		@@ -199,19 +199,19 @@
199	199	gz->err = 0;
200	200	gz->msg = "";
201	201	return gz;
202	202	}
203	203
204		-gzFile gzopen(const char path, const char mode) {
	204	+static gzFile gzopen(const char path, const char mode) {
205	205	return gz_open(path, -1, mode);
206	206	}
207	207
208		-gzFile gzdopen(int fd, const char *mode) {
	208	+static gzFile gzdopen(int fd, const char *mode) {
209	209	return gz_open(NULL, fd, mode);
210	210	}
211	211
212		-int gzwrite(gzFile gz, const void *buf, unsigned len) {
	212	+static int gzwrite(gzFile gz, const void *buf, unsigned len) {
213	213	z_stream *strm;
214	214	unsigned char out[BUFLEN];
215	215
216	216	if (gz == NULL \|\| !gz->write)
217	217	return 0;
		@@ -225,11 +225,11 @@
225	225	fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
226	226	} while (strm->avail_out == 0);
227	227	return len;
228	228	}
229	229
230		-int gzread(gzFile gz, void *buf, unsigned len) {
	230	+static int gzread(gzFile gz, void *buf, unsigned len) {
231	231	int ret;
232	232	unsigned got;
233	233	unsigned char in[1];
234	234	z_stream *strm;
235	235
		@@ -256,11 +256,11 @@
256	256	inflateReset(strm);
257	257	} while (strm->avail_out);
258	258	return len - strm->avail_out;
259	259	}
260	260
261		-int gzclose(gzFile gz) {
	261	+static int gzclose(gzFile gz) {
262	262	z_stream *strm;
263	263	unsigned char out[BUFLEN];
264	264
265	265	if (gz == NULL)
266	266	return Z_STREAM_ERROR;
		@@ -281,11 +281,11 @@
281	281	fclose(gz->file);
282	282	free(gz);
283	283	return Z_OK;
284	284	}
285	285
286		-const char gzerror(gzFile gz, int err) {
	286	+static const char gzerror(gzFile gz, int err) {
287	287	*err = gz->err;
288	288	return gz->msg;
289	289	}
290	290
291	291	#endif
		@@ -293,21 +293,21 @@
293	293	static char *prog;
294	294
295	295	/* ===========================================================================
296	296	* Display error message and exit
297	297	*/
298		-void error(const char *msg) {
	298	+static void error(const char *msg) {
299	299	fprintf(stderr, "%s: %s\n", prog, msg);
300	300	exit(1);
301	301	}
302	302
303	303	#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <[email protected]> */
304	304
305	305	/* Try compressing the input file at once using mmap. Return Z_OK if
306		- * if success, Z_ERRNO otherwise.
	306	+ * success, Z_ERRNO otherwise.
307	307	*/
308		-int gz_compress_mmap(FILE *in, gzFile out) {
	308	+static int gz_compress_mmap(FILE *in, gzFile out) {
309	309	int len;
310	310	int err;
311	311	int ifd = fileno(in);
312	312	caddr_t buf; /* mmap'ed buffer for the entire input file */
313	313	off_t buf_len; /* length of the input file */
		@@ -336,11 +336,11 @@
336	336
337	337	/* ===========================================================================
338	338	* Compress input to output then close both files.
339	339	*/
340	340
341		-void gz_compress(FILE *in, gzFile out) {
	341	+static void gz_compress(FILE *in, gzFile out) {
342	342	local char buf[BUFLEN];
343	343	int len;
344	344	int err;
345	345
346	346	#ifdef USE_MMAP
		@@ -364,11 +364,11 @@
364	364	}
365	365
366	366	/* ===========================================================================
367	367	* Uncompress input to output then close both files.
368	368	*/
369		-void gz_uncompress(gzFile in, FILE *out) {
	369	+static void gz_uncompress(gzFile in, FILE *out) {
370	370	local char buf[BUFLEN];
371	371	int len;
372	372	int err;
373	373
374	374	for (;;) {
		@@ -388,11 +388,11 @@
388	388
389	389	/* ===========================================================================
390	390	* Compress the given file: create a corresponding .gz file and remove the
391	391	* original.
392	392	*/
393		-void file_compress(char file, char mode) {
	393	+static void file_compress(char file, char mode) {
394	394	local char outfile[MAX_NAME_LEN];
395	395	FILE *in;
396	396	gzFile out;
397	397
398	398	if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
		@@ -424,11 +424,11 @@
424	424
425	425
426	426	/* ===========================================================================
427	427	* Uncompress the given file and remove the original.
428	428	*/
429		-void file_uncompress(char *file) {
	429	+static void file_uncompress(char *file) {
430	430	local char buf[MAX_NAME_LEN];
431	431	char infile, outfile;
432	432	FILE *out;
433	433	gzFile in;
434	434	z_size_t len = strlen(file);
435	435

	--- compat/zlib/test/minigzip.c
	+++ compat/zlib/test/minigzip.c
	@@ -147,16 +147,16 @@
147
148	#if defined(Z_HAVE_UNISTD_H) \|\| defined(Z_LARGE)
149	# include <unistd.h> /* for unlink() */
150	#endif
151
152	void myalloc(void q, unsigned n, unsigned m) {
153	(void)q;
154	return calloc(n, m);
155	}
156
157	void myfree(void q, void p) {
158	(void)q;
159	free(p);
160	}
161
162	typedef struct gzFile_s {
	@@ -165,11 +165,11 @@
165	int err;
166	char *msg;
167	z_stream strm;
168	} *gzFile;
169
170	gzFile gz_open(const char path, int fd, const char mode) {
171	gzFile gz;
172	int ret;
173
174	gz = malloc(sizeof(struct gzFile_s));
175	if (gz == NULL)
	@@ -199,19 +199,19 @@
199	gz->err = 0;
200	gz->msg = "";
201	return gz;
202	}
203
204	gzFile gzopen(const char path, const char mode) {
205	return gz_open(path, -1, mode);
206	}
207
208	gzFile gzdopen(int fd, const char *mode) {
209	return gz_open(NULL, fd, mode);
210	}
211
212	int gzwrite(gzFile gz, const void *buf, unsigned len) {
213	z_stream *strm;
214	unsigned char out[BUFLEN];
215
216	if (gz == NULL \|\| !gz->write)
217	return 0;
	@@ -225,11 +225,11 @@
225	fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
226	} while (strm->avail_out == 0);
227	return len;
228	}
229
230	int gzread(gzFile gz, void *buf, unsigned len) {
231	int ret;
232	unsigned got;
233	unsigned char in[1];
234	z_stream *strm;
235
	@@ -256,11 +256,11 @@
256	inflateReset(strm);
257	} while (strm->avail_out);
258	return len - strm->avail_out;
259	}
260
261	int gzclose(gzFile gz) {
262	z_stream *strm;
263	unsigned char out[BUFLEN];
264
265	if (gz == NULL)
266	return Z_STREAM_ERROR;
	@@ -281,11 +281,11 @@
281	fclose(gz->file);
282	free(gz);
283	return Z_OK;
284	}
285
286	const char gzerror(gzFile gz, int err) {
287	*err = gz->err;
288	return gz->msg;
289	}
290
291	#endif
	@@ -293,21 +293,21 @@
293	static char *prog;
294
295	/* ===========================================================================
296	* Display error message and exit
297	*/
298	void error(const char *msg) {
299	fprintf(stderr, "%s: %s\n", prog, msg);
300	exit(1);
301	}
302
303	#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <[email protected]> */
304
305	/* Try compressing the input file at once using mmap. Return Z_OK if
306	* if success, Z_ERRNO otherwise.
307	*/
308	int gz_compress_mmap(FILE *in, gzFile out) {
309	int len;
310	int err;
311	int ifd = fileno(in);
312	caddr_t buf; /* mmap'ed buffer for the entire input file */
313	off_t buf_len; /* length of the input file */
	@@ -336,11 +336,11 @@
336
337	/* ===========================================================================
338	* Compress input to output then close both files.
339	*/
340
341	void gz_compress(FILE *in, gzFile out) {
342	local char buf[BUFLEN];
343	int len;
344	int err;
345
346	#ifdef USE_MMAP
	@@ -364,11 +364,11 @@
364	}
365
366	/* ===========================================================================
367	* Uncompress input to output then close both files.
368	*/
369	void gz_uncompress(gzFile in, FILE *out) {
370	local char buf[BUFLEN];
371	int len;
372	int err;
373
374	for (;;) {
	@@ -388,11 +388,11 @@
388
389	/* ===========================================================================
390	* Compress the given file: create a corresponding .gz file and remove the
391	* original.
392	*/
393	void file_compress(char file, char mode) {
394	local char outfile[MAX_NAME_LEN];
395	FILE *in;
396	gzFile out;
397
398	if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
	@@ -424,11 +424,11 @@
424
425
426	/* ===========================================================================
427	* Uncompress the given file and remove the original.
428	*/
429	void file_uncompress(char *file) {
430	local char buf[MAX_NAME_LEN];
431	char infile, outfile;
432	FILE *out;
433	gzFile in;
434	z_size_t len = strlen(file);
435

	--- compat/zlib/test/minigzip.c
	+++ compat/zlib/test/minigzip.c
	@@ -147,16 +147,16 @@
147
148	#if defined(Z_HAVE_UNISTD_H) \|\| defined(Z_LARGE)
149	# include <unistd.h> /* for unlink() */
150	#endif
151
152	static void myalloc(void q, unsigned n, unsigned m) {
153	(void)q;
154	return calloc(n, m);
155	}
156
157	static void myfree(void q, void p) {
158	(void)q;
159	free(p);
160	}
161
162	typedef struct gzFile_s {
	@@ -165,11 +165,11 @@
165	int err;
166	char *msg;
167	z_stream strm;
168	} *gzFile;
169
170	static gzFile gz_open(const char path, int fd, const char mode) {
171	gzFile gz;
172	int ret;
173
174	gz = malloc(sizeof(struct gzFile_s));
175	if (gz == NULL)
	@@ -199,19 +199,19 @@
199	gz->err = 0;
200	gz->msg = "";
201	return gz;
202	}
203
204	static gzFile gzopen(const char path, const char mode) {
205	return gz_open(path, -1, mode);
206	}
207
208	static gzFile gzdopen(int fd, const char *mode) {
209	return gz_open(NULL, fd, mode);
210	}
211
212	static int gzwrite(gzFile gz, const void *buf, unsigned len) {
213	z_stream *strm;
214	unsigned char out[BUFLEN];
215
216	if (gz == NULL \|\| !gz->write)
217	return 0;
	@@ -225,11 +225,11 @@
225	fwrite(out, 1, BUFLEN - strm->avail_out, gz->file);
226	} while (strm->avail_out == 0);
227	return len;
228	}
229
230	static int gzread(gzFile gz, void *buf, unsigned len) {
231	int ret;
232	unsigned got;
233	unsigned char in[1];
234	z_stream *strm;
235
	@@ -256,11 +256,11 @@
256	inflateReset(strm);
257	} while (strm->avail_out);
258	return len - strm->avail_out;
259	}
260
261	static int gzclose(gzFile gz) {
262	z_stream *strm;
263	unsigned char out[BUFLEN];
264
265	if (gz == NULL)
266	return Z_STREAM_ERROR;
	@@ -281,11 +281,11 @@
281	fclose(gz->file);
282	free(gz);
283	return Z_OK;
284	}
285
286	static const char gzerror(gzFile gz, int err) {
287	*err = gz->err;
288	return gz->msg;
289	}
290
291	#endif
	@@ -293,21 +293,21 @@
293	static char *prog;
294
295	/* ===========================================================================
296	* Display error message and exit
297	*/
298	static void error(const char *msg) {
299	fprintf(stderr, "%s: %s\n", prog, msg);
300	exit(1);
301	}
302
303	#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <[email protected]> */
304
305	/* Try compressing the input file at once using mmap. Return Z_OK if
306	* success, Z_ERRNO otherwise.
307	*/
308	static int gz_compress_mmap(FILE *in, gzFile out) {
309	int len;
310	int err;
311	int ifd = fileno(in);
312	caddr_t buf; /* mmap'ed buffer for the entire input file */
313	off_t buf_len; /* length of the input file */
	@@ -336,11 +336,11 @@
336
337	/* ===========================================================================
338	* Compress input to output then close both files.
339	*/
340
341	static void gz_compress(FILE *in, gzFile out) {
342	local char buf[BUFLEN];
343	int len;
344	int err;
345
346	#ifdef USE_MMAP
	@@ -364,11 +364,11 @@
364	}
365
366	/* ===========================================================================
367	* Uncompress input to output then close both files.
368	*/
369	static void gz_uncompress(gzFile in, FILE *out) {
370	local char buf[BUFLEN];
371	int len;
372	int err;
373
374	for (;;) {
	@@ -388,11 +388,11 @@
388
389	/* ===========================================================================
390	* Compress the given file: create a corresponding .gz file and remove the
391	* original.
392	*/
393	static void file_compress(char file, char mode) {
394	local char outfile[MAX_NAME_LEN];
395	FILE *in;
396	gzFile out;
397
398	if (strlen(file) + strlen(GZ_SUFFIX) >= sizeof(outfile)) {
	@@ -424,11 +424,11 @@
424
425
426	/* ===========================================================================
427	* Uncompress the given file and remove the original.
428	*/
429	static void file_uncompress(char *file) {
430	local char buf[MAX_NAME_LEN];
431	char infile, outfile;
432	FILE *out;
433	gzFile in;
434	z_size_t len = strlen(file);
435

M compat/zlib/treebuild.xml

+2 -2

		--- compat/zlib/treebuild.xml
		+++ compat/zlib/treebuild.xml
		@@ -1,8 +1,8 @@
1	1	<?xml version="1.0" ?>
2		-<package name="zlib" version="1.3">
3		- <library name="zlib" dlversion="1.3" dlname="z">
	2	+<package name="zlib" version="1.3.1">
	3	+ <library name="zlib" dlversion="1.3.1" dlname="z">
4	4	<property name="description"> zip compression library </property>
5	5	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6	6
7	7	<!-- fixme: not implemented yet -->
8	8	<property name="compiler/c/inline" value="yes" />
9	9

	--- compat/zlib/treebuild.xml
	+++ compat/zlib/treebuild.xml
	@@ -1,8 +1,8 @@
1	<?xml version="1.0" ?>
2	<package name="zlib" version="1.3">
3	<library name="zlib" dlversion="1.3" dlname="z">
4	<property name="description"> zip compression library </property>
5	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6
7	<!-- fixme: not implemented yet -->
8	<property name="compiler/c/inline" value="yes" />
9

	--- compat/zlib/treebuild.xml
	+++ compat/zlib/treebuild.xml
	@@ -1,8 +1,8 @@
1	<?xml version="1.0" ?>
2	<package name="zlib" version="1.3.1">
3	<library name="zlib" dlversion="1.3.1" dlname="z">
4	<property name="description"> zip compression library </property>
5	<property name="include-target-dir" value="$(@PACKAGE/install-includedir)" />
6
7	<!-- fixme: not implemented yet -->
8	<property name="compiler/c/inline" value="yes" />
9

M compat/zlib/trees.c

+17 -3

		--- compat/zlib/trees.c
		+++ compat/zlib/trees.c
		@@ -1,7 +1,7 @@
1	1	/* trees.c -- output deflated data using Huffman coding
2		- * Copyright (C) 1995-2021 Jean-loup Gailly
	2	+ * Copyright (C) 1995-2024 Jean-loup Gailly
3	3	* detect_data_type() function provided freely by Cosmin Truta, 2006
4	4	* For conditions of distribution and use, see copyright notice in zlib.h
5	5	*/
6	6
7	7	/*
		@@ -897,18 +897,23 @@
897	897	*/
898	898	local void compress_block(deflate_state s, const ct_data ltree,
899	899	const ct_data *dtree) {
900	900	unsigned dist; /* distance of matched string */
901	901	int lc; /* match length or unmatched char (if dist == 0) */
902		- unsigned sx = 0; /* running index in sym_buf */
	902	+ unsigned sx = 0; /* running index in symbol buffers */
903	903	unsigned code; /* the code to send */
904	904	int extra; /* number of extra bits to send */
905	905
906	906	if (s->sym_next != 0) do {
	907	+#ifdef LIT_MEM
	908	+ dist = s->d_buf[sx];
	909	+ lc = s->l_buf[sx++];
	910	+#else
907	911	dist = s->sym_buf[sx++] & 0xff;
908	912	dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
909	913	lc = s->sym_buf[sx++];
	914	+#endif
910	915	if (dist == 0) {
911	916	send_code(s, lc, ltree); /* send a literal byte */
912	917	Tracecv(isgraph(lc), (stderr," '%c' ", lc));
913	918	} else {
914	919	/* Here, lc is the match length - MIN_MATCH */
		@@ -929,12 +934,16 @@
929	934	dist -= (unsigned)base_dist[code];
930	935	send_bits(s, dist, extra); /* send the extra distance bits */
931	936	}
932	937	} /* literal or match pair ? */
933	938
934		- /* Check that the overlay between pending_buf and sym_buf is ok: */
	939	+ /* Check for no overlay of pending_buf on needed symbols */
	940	+#ifdef LIT_MEM
	941	+ Assert(s->pending < 2 * (s->lit_bufsize + sx), "pendingBuf overflow");
	942	+#else
935	943	Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
	944	+#endif
936	945
937	946	} while (sx < s->sym_next);
938	947
939	948	send_code(s, END_BLOCK, ltree);
940	949	}
		@@ -1080,13 +1089,18 @@
1080	1089	/* ===========================================================================
1081	1090	* Save the match info and tally the frequency counts. Return true if
1082	1091	* the current block must be flushed.
1083	1092	*/
1084	1093	int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc) {
	1094	+#ifdef LIT_MEM
	1095	+ s->d_buf[s->sym_next] = (ush)dist;
	1096	+ s->l_buf[s->sym_next++] = (uch)lc;
	1097	+#else
1085	1098	s->sym_buf[s->sym_next++] = (uch)dist;
1086	1099	s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
1087	1100	s->sym_buf[s->sym_next++] = (uch)lc;
	1101	+#endif
1088	1102	if (dist == 0) {
1089	1103	/* lc is the unmatched char */
1090	1104	s->dyn_ltree[lc].Freq++;
1091	1105	} else {
1092	1106	s->matches++;
1093	1107

	--- compat/zlib/trees.c
	+++ compat/zlib/trees.c
	@@ -1,7 +1,7 @@
1	/* trees.c -- output deflated data using Huffman coding
2	* Copyright (C) 1995-2021 Jean-loup Gailly
3	* detect_data_type() function provided freely by Cosmin Truta, 2006
4	* For conditions of distribution and use, see copyright notice in zlib.h
5	*/
6
7	/*
	@@ -897,18 +897,23 @@
897	*/
898	local void compress_block(deflate_state s, const ct_data ltree,
899	const ct_data *dtree) {
900	unsigned dist; /* distance of matched string */
901	int lc; /* match length or unmatched char (if dist == 0) */
902	unsigned sx = 0; /* running index in sym_buf */
903	unsigned code; /* the code to send */
904	int extra; /* number of extra bits to send */
905
906	if (s->sym_next != 0) do {




907	dist = s->sym_buf[sx++] & 0xff;
908	dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
909	lc = s->sym_buf[sx++];

910	if (dist == 0) {
911	send_code(s, lc, ltree); /* send a literal byte */
912	Tracecv(isgraph(lc), (stderr," '%c' ", lc));
913	} else {
914	/* Here, lc is the match length - MIN_MATCH */
	@@ -929,12 +934,16 @@
929	dist -= (unsigned)base_dist[code];
930	send_bits(s, dist, extra); /* send the extra distance bits */
931	}
932	} /* literal or match pair ? */
933
934	/* Check that the overlay between pending_buf and sym_buf is ok: */



935	Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");

936
937	} while (sx < s->sym_next);
938
939	send_code(s, END_BLOCK, ltree);
940	}
	@@ -1080,13 +1089,18 @@
1080	/* ===========================================================================
1081	* Save the match info and tally the frequency counts. Return true if
1082	* the current block must be flushed.
1083	*/
1084	int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc) {




1085	s->sym_buf[s->sym_next++] = (uch)dist;
1086	s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
1087	s->sym_buf[s->sym_next++] = (uch)lc;

1088	if (dist == 0) {
1089	/* lc is the unmatched char */
1090	s->dyn_ltree[lc].Freq++;
1091	} else {
1092	s->matches++;
1093

	--- compat/zlib/trees.c
	+++ compat/zlib/trees.c
	@@ -1,7 +1,7 @@
1	/* trees.c -- output deflated data using Huffman coding
2	* Copyright (C) 1995-2024 Jean-loup Gailly
3	* detect_data_type() function provided freely by Cosmin Truta, 2006
4	* For conditions of distribution and use, see copyright notice in zlib.h
5	*/
6
7	/*
	@@ -897,18 +897,23 @@
897	*/
898	local void compress_block(deflate_state s, const ct_data ltree,
899	const ct_data *dtree) {
900	unsigned dist; /* distance of matched string */
901	int lc; /* match length or unmatched char (if dist == 0) */
902	unsigned sx = 0; /* running index in symbol buffers */
903	unsigned code; /* the code to send */
904	int extra; /* number of extra bits to send */
905
906	if (s->sym_next != 0) do {
907	#ifdef LIT_MEM
908	dist = s->d_buf[sx];
909	lc = s->l_buf[sx++];
910	#else
911	dist = s->sym_buf[sx++] & 0xff;
912	dist += (unsigned)(s->sym_buf[sx++] & 0xff) << 8;
913	lc = s->sym_buf[sx++];
914	#endif
915	if (dist == 0) {
916	send_code(s, lc, ltree); /* send a literal byte */
917	Tracecv(isgraph(lc), (stderr," '%c' ", lc));
918	} else {
919	/* Here, lc is the match length - MIN_MATCH */
	@@ -929,12 +934,16 @@
934	dist -= (unsigned)base_dist[code];
935	send_bits(s, dist, extra); /* send the extra distance bits */
936	}
937	} /* literal or match pair ? */
938
939	/* Check for no overlay of pending_buf on needed symbols */
940	#ifdef LIT_MEM
941	Assert(s->pending < 2 * (s->lit_bufsize + sx), "pendingBuf overflow");
942	#else
943	Assert(s->pending < s->lit_bufsize + sx, "pendingBuf overflow");
944	#endif
945
946	} while (sx < s->sym_next);
947
948	send_code(s, END_BLOCK, ltree);
949	}
	@@ -1080,13 +1089,18 @@
1089	/* ===========================================================================
1090	* Save the match info and tally the frequency counts. Return true if
1091	* the current block must be flushed.
1092	*/
1093	int ZLIB_INTERNAL _tr_tally(deflate_state *s, unsigned dist, unsigned lc) {
1094	#ifdef LIT_MEM
1095	s->d_buf[s->sym_next] = (ush)dist;
1096	s->l_buf[s->sym_next++] = (uch)lc;
1097	#else
1098	s->sym_buf[s->sym_next++] = (uch)dist;
1099	s->sym_buf[s->sym_next++] = (uch)(dist >> 8);
1100	s->sym_buf[s->sym_next++] = (uch)lc;
1101	#endif
1102	if (dist == 0) {
1103	/* lc is the unmatched char */
1104	s->dyn_ltree[lc].Freq++;
1105	} else {
1106	s->matches++;
1107

M compat/zlib/win32/DLL_FAQ.txt

+2 -18

		--- compat/zlib/win32/DLL_FAQ.txt
		+++ compat/zlib/win32/DLL_FAQ.txt
		@@ -1,25 +1,21 @@
1	1
2	2	Frequently Asked Questions about ZLIB1.DLL
3	3
4	4
5	5	This document describes the design, the rationale, and the usage
6		-of the official DLL build of zlib, named ZLIB1.DLL. If you have
	6	+of the common DLL build of zlib, named ZLIB1.DLL. If you have
7	7	general questions about zlib, you should see the file "FAQ" found
8	8	in the zlib distribution, or at the following location:
9	9	http://www.gzip.org/zlib/zlib_faq.html
10	10
11	11
12	12	1. What is ZLIB1.DLL, and how can I get it?
13	13
14		- - ZLIB1.DLL is the official build of zlib as a DLL.
	14	+ - ZLIB1.DLL is the common build of zlib as a DLL.
15	15	(Please remark the character '1' in the name.)
16	16
17		- Pointers to a precompiled ZLIB1.DLL can be found in the zlib
18		- web site at:
19		- http://www.zlib.net/
20		-
21	17	Applications that link to ZLIB1.DLL can rely on the following
22	18	specification:
23	19
24	20	* The exported symbols are exclusively defined in the source
25	21	files "zlib.h" and "zlib.def", found in an official zlib
		@@ -377,21 +373,9 @@
377	373	- No. A legitimate build of ZLIB1.DLL must provide the complete
378	374	zlib functionality, as implemented in the official zlib source
379	375	code. But you can make your own private DLL build, under a
380	376	different file name, as suggested in the previous answer.
381	377
382		-
383		-17. I made my own ZLIB1.DLL build. Can I test it for compliance?
384		-
385		- - We prefer that you download the official DLL from the zlib
386		- web site. If you need something peculiar from this DLL, you
387		- can send your suggestion to the zlib mailing list.
388		-
389		- However, in case you do rebuild the DLL yourself, you can run
390		- it with the test programs found in the DLL distribution.
391		- Running these test programs is not a guarantee of compliance,
392		- but a failure can imply a detected problem.
393		-
394	378	**
395	379
396	380	This document is written and maintained by
397	381	Cosmin Truta <[email protected]>
398	382

	--- compat/zlib/win32/DLL_FAQ.txt
	+++ compat/zlib/win32/DLL_FAQ.txt
	@@ -1,25 +1,21 @@
1
2	Frequently Asked Questions about ZLIB1.DLL
3
4
5	This document describes the design, the rationale, and the usage
6	of the official DLL build of zlib, named ZLIB1.DLL. If you have
7	general questions about zlib, you should see the file "FAQ" found
8	in the zlib distribution, or at the following location:
9	http://www.gzip.org/zlib/zlib_faq.html
10
11
12	1. What is ZLIB1.DLL, and how can I get it?
13
14	- ZLIB1.DLL is the official build of zlib as a DLL.
15	(Please remark the character '1' in the name.)
16
17	Pointers to a precompiled ZLIB1.DLL can be found in the zlib
18	web site at:
19	http://www.zlib.net/
20
21	Applications that link to ZLIB1.DLL can rely on the following
22	specification:
23
24	* The exported symbols are exclusively defined in the source
25	files "zlib.h" and "zlib.def", found in an official zlib
	@@ -377,21 +373,9 @@
377	- No. A legitimate build of ZLIB1.DLL must provide the complete
378	zlib functionality, as implemented in the official zlib source
379	code. But you can make your own private DLL build, under a
380	different file name, as suggested in the previous answer.
381
382
383	17. I made my own ZLIB1.DLL build. Can I test it for compliance?
384
385	- We prefer that you download the official DLL from the zlib
386	web site. If you need something peculiar from this DLL, you
387	can send your suggestion to the zlib mailing list.
388
389	However, in case you do rebuild the DLL yourself, you can run
390	it with the test programs found in the DLL distribution.
391	Running these test programs is not a guarantee of compliance,
392	but a failure can imply a detected problem.
393
394	**
395
396	This document is written and maintained by
397	Cosmin Truta <[email protected]>
398

	--- compat/zlib/win32/DLL_FAQ.txt
	+++ compat/zlib/win32/DLL_FAQ.txt
	@@ -1,25 +1,21 @@
1
2	Frequently Asked Questions about ZLIB1.DLL
3
4
5	This document describes the design, the rationale, and the usage
6	of the common DLL build of zlib, named ZLIB1.DLL. If you have
7	general questions about zlib, you should see the file "FAQ" found
8	in the zlib distribution, or at the following location:
9	http://www.gzip.org/zlib/zlib_faq.html
10
11
12	1. What is ZLIB1.DLL, and how can I get it?
13
14	- ZLIB1.DLL is the common build of zlib as a DLL.
15	(Please remark the character '1' in the name.)
16




17	Applications that link to ZLIB1.DLL can rely on the following
18	specification:
19
20	* The exported symbols are exclusively defined in the source
21	files "zlib.h" and "zlib.def", found in an official zlib
	@@ -377,21 +373,9 @@
373	- No. A legitimate build of ZLIB1.DLL must provide the complete
374	zlib functionality, as implemented in the official zlib source
375	code. But you can make your own private DLL build, under a
376	different file name, as suggested in the previous answer.
377












378	**
379
380	This document is written and maintained by
381	Cosmin Truta <[email protected]>
382

M compat/zlib/win32/README-WIN32.txt

+4 -4

		--- compat/zlib/win32/README-WIN32.txt
		+++ compat/zlib/win32/README-WIN32.txt
		@@ -1,8 +1,8 @@
1	1	ZLIB DATA COMPRESSION LIBRARY
2	2
3		-zlib 1.3.0 is a general purpose data compression library. All the code is
	3	+zlib 1.3.1 is a general purpose data compression library. All the code is
4	4	thread safe. The data format used by the zlib library is described by RFCs
5	5	(Request for Comments) 1950 to 1952 in the files
6	6	http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
7	7	and rfc1952.txt (gzip format).
8	8
		@@ -14,17 +14,17 @@
14	14	Questions about zlib should be sent to <[email protected]>. The zlib home page
15	15	is http://zlib.net/ . Before reporting a problem, please check this site to
16	16	verify that you have the latest version of zlib; otherwise get the latest
17	17	version and check whether the problem still exists or not.
18	18
19		-PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
20		-before asking for help.
	19	+PLEASE read DLL_FAQ.txt, and the zlib FAQ http://zlib.net/zlib_faq.html before
	20	+asking for help.
21	21
22	22
23	23	Manifest:
24	24
25		-The package zlib-1.3.0-win32-x86.zip will contain the following files:
	25	+The package zlib-1.3.1-win32-x86.zip will contain the following files:
26	26
27	27	README-WIN32.txt This document
28	28	ChangeLog Changes since previous zlib packages
29	29	DLL_FAQ.txt Frequently asked questions about zlib1.dll
30	30	zlib.3.pdf Documentation of this library in Adobe Acrobat format
31	31

	--- compat/zlib/win32/README-WIN32.txt
	+++ compat/zlib/win32/README-WIN32.txt
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.3.0 is a general purpose data compression library. All the code is
4	thread safe. The data format used by the zlib library is described by RFCs
5	(Request for Comments) 1950 to 1952 in the files
6	http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
7	and rfc1952.txt (gzip format).
8
	@@ -14,17 +14,17 @@
14	Questions about zlib should be sent to <[email protected]>. The zlib home page
15	is http://zlib.net/ . Before reporting a problem, please check this site to
16	verify that you have the latest version of zlib; otherwise get the latest
17	version and check whether the problem still exists or not.
18
19	PLEASE read DLL_FAQ.txt, and the the zlib FAQ http://zlib.net/zlib_faq.html
20	before asking for help.
21
22
23	Manifest:
24
25	The package zlib-1.3.0-win32-x86.zip will contain the following files:
26
27	README-WIN32.txt This document
28	ChangeLog Changes since previous zlib packages
29	DLL_FAQ.txt Frequently asked questions about zlib1.dll
30	zlib.3.pdf Documentation of this library in Adobe Acrobat format
31

	--- compat/zlib/win32/README-WIN32.txt
	+++ compat/zlib/win32/README-WIN32.txt
	@@ -1,8 +1,8 @@
1	ZLIB DATA COMPRESSION LIBRARY
2
3	zlib 1.3.1 is a general purpose data compression library. All the code is
4	thread safe. The data format used by the zlib library is described by RFCs
5	(Request for Comments) 1950 to 1952 in the files
6	http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
7	and rfc1952.txt (gzip format).
8
	@@ -14,17 +14,17 @@
14	Questions about zlib should be sent to <[email protected]>. The zlib home page
15	is http://zlib.net/ . Before reporting a problem, please check this site to
16	verify that you have the latest version of zlib; otherwise get the latest
17	version and check whether the problem still exists or not.
18
19	PLEASE read DLL_FAQ.txt, and the zlib FAQ http://zlib.net/zlib_faq.html before
20	asking for help.
21
22
23	Manifest:
24
25	The package zlib-1.3.1-win32-x86.zip will contain the following files:
26
27	README-WIN32.txt This document
28	ChangeLog Changes since previous zlib packages
29	DLL_FAQ.txt Frequently asked questions about zlib1.dll
30	zlib.3.pdf Documentation of this library in Adobe Acrobat format
31

M compat/zlib/zconf.h

+1 -9

		--- compat/zlib/zconf.h
		+++ compat/zlib/zconf.h
		@@ -1,7 +1,7 @@
1	1	/* zconf.h -- configuration of the zlib compression library
2		- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
	2	+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	/* @(#) $Id$ */
7	7
		@@ -298,18 +298,10 @@
298	298	# else
299	299	# define OF(args) ()
300	300	# endif
301	301	#endif
302	302
303		-#ifndef Z_ARG /* function prototypes for stdarg */
304		-# if defined(STDC) \|\| defined(Z_HAVE_STDARG_H)
305		-# define Z_ARG(args) args
306		-# else
307		-# define Z_ARG(args) ()
308		-# endif
309		-#endif
310		-
311	303	/* The following definitions for FAR are needed only for MSDOS mixed
312	304	* model programming (small or medium model with some far allocations).
313	305	* This was tested only with MSC; for other MSDOS compilers you may have
314	306	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
315	307	* just define FAR to be empty.
316	308

	--- compat/zlib/zconf.h
	+++ compat/zlib/zconf.h
	@@ -1,7 +1,7 @@
1	/* zconf.h -- configuration of the zlib compression library
2	* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* @(#) $Id$ */
7
	@@ -298,18 +298,10 @@
298	# else
299	# define OF(args) ()
300	# endif
301	#endif
302
303	#ifndef Z_ARG /* function prototypes for stdarg */
304	# if defined(STDC) \|\| defined(Z_HAVE_STDARG_H)
305	# define Z_ARG(args) args
306	# else
307	# define Z_ARG(args) ()
308	# endif
309	#endif
310
311	/* The following definitions for FAR are needed only for MSDOS mixed
312	* model programming (small or medium model with some far allocations).
313	* This was tested only with MSC; for other MSDOS compilers you may have
314	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
315	* just define FAR to be empty.
316

	--- compat/zlib/zconf.h
	+++ compat/zlib/zconf.h
	@@ -1,7 +1,7 @@
1	/* zconf.h -- configuration of the zlib compression library
2	* Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* @(#) $Id$ */
7
	@@ -298,18 +298,10 @@
298	# else
299	# define OF(args) ()
300	# endif
301	#endif
302








303	/* The following definitions for FAR are needed only for MSDOS mixed
304	* model programming (small or medium model with some far allocations).
305	* This was tested only with MSC; for other MSDOS compilers you may have
306	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
307	* just define FAR to be empty.
308

M compat/zlib/zconf.h.cmakein

+1 -9

		--- compat/zlib/zconf.h.cmakein
		+++ compat/zlib/zconf.h.cmakein
		@@ -1,7 +1,7 @@
1	1	/* zconf.h -- configuration of the zlib compression library
2		- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
	2	+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	/* @(#) $Id$ */
7	7
		@@ -300,18 +300,10 @@
300	300	# else
301	301	# define OF(args) ()
302	302	# endif
303	303	#endif
304	304
305		-#ifndef Z_ARG /* function prototypes for stdarg */
306		-# if defined(STDC) \|\| defined(Z_HAVE_STDARG_H)
307		-# define Z_ARG(args) args
308		-# else
309		-# define Z_ARG(args) ()
310		-# endif
311		-#endif
312		-
313	305	/* The following definitions for FAR are needed only for MSDOS mixed
314	306	* model programming (small or medium model with some far allocations).
315	307	* This was tested only with MSC; for other MSDOS compilers you may have
316	308	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
317	309	* just define FAR to be empty.
318	310

	--- compat/zlib/zconf.h.cmakein
	+++ compat/zlib/zconf.h.cmakein
	@@ -1,7 +1,7 @@
1	/* zconf.h -- configuration of the zlib compression library
2	* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* @(#) $Id$ */
7
	@@ -300,18 +300,10 @@
300	# else
301	# define OF(args) ()
302	# endif
303	#endif
304
305	#ifndef Z_ARG /* function prototypes for stdarg */
306	# if defined(STDC) \|\| defined(Z_HAVE_STDARG_H)
307	# define Z_ARG(args) args
308	# else
309	# define Z_ARG(args) ()
310	# endif
311	#endif
312
313	/* The following definitions for FAR are needed only for MSDOS mixed
314	* model programming (small or medium model with some far allocations).
315	* This was tested only with MSC; for other MSDOS compilers you may have
316	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
317	* just define FAR to be empty.
318

	--- compat/zlib/zconf.h.cmakein
	+++ compat/zlib/zconf.h.cmakein
	@@ -1,7 +1,7 @@
1	/* zconf.h -- configuration of the zlib compression library
2	* Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* @(#) $Id$ */
7
	@@ -300,18 +300,10 @@
300	# else
301	# define OF(args) ()
302	# endif
303	#endif
304








305	/* The following definitions for FAR are needed only for MSDOS mixed
306	* model programming (small or medium model with some far allocations).
307	* This was tested only with MSC; for other MSDOS compilers you may have
308	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
309	* just define FAR to be empty.
310

M compat/zlib/zconf.h.in

+1 -9

		--- compat/zlib/zconf.h.in
		+++ compat/zlib/zconf.h.in
		@@ -1,7 +1,7 @@
1	1	/* zconf.h -- configuration of the zlib compression library
2		- * Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
	2	+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	/* @(#) $Id$ */
7	7
		@@ -298,18 +298,10 @@
298	298	# else
299	299	# define OF(args) ()
300	300	# endif
301	301	#endif
302	302
303		-#ifndef Z_ARG /* function prototypes for stdarg */
304		-# if defined(STDC) \|\| defined(Z_HAVE_STDARG_H)
305		-# define Z_ARG(args) args
306		-# else
307		-# define Z_ARG(args) ()
308		-# endif
309		-#endif
310		-
311	303	/* The following definitions for FAR are needed only for MSDOS mixed
312	304	* model programming (small or medium model with some far allocations).
313	305	* This was tested only with MSC; for other MSDOS compilers you may have
314	306	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
315	307	* just define FAR to be empty.
316	308

	--- compat/zlib/zconf.h.in
	+++ compat/zlib/zconf.h.in
	@@ -1,7 +1,7 @@
1	/* zconf.h -- configuration of the zlib compression library
2	* Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* @(#) $Id$ */
7
	@@ -298,18 +298,10 @@
298	# else
299	# define OF(args) ()
300	# endif
301	#endif
302
303	#ifndef Z_ARG /* function prototypes for stdarg */
304	# if defined(STDC) \|\| defined(Z_HAVE_STDARG_H)
305	# define Z_ARG(args) args
306	# else
307	# define Z_ARG(args) ()
308	# endif
309	#endif
310
311	/* The following definitions for FAR are needed only for MSDOS mixed
312	* model programming (small or medium model with some far allocations).
313	* This was tested only with MSC; for other MSDOS compilers you may have
314	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
315	* just define FAR to be empty.
316

	--- compat/zlib/zconf.h.in
	+++ compat/zlib/zconf.h.in
	@@ -1,7 +1,7 @@
1	/* zconf.h -- configuration of the zlib compression library
2	* Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* @(#) $Id$ */
7
	@@ -298,18 +298,10 @@
298	# else
299	# define OF(args) ()
300	# endif
301	#endif
302








303	/* The following definitions for FAR are needed only for MSDOS mixed
304	* model programming (small or medium model with some far allocations).
305	* This was tested only with MSC; for other MSDOS compilers you may have
306	* to define NO_MEMCPY in zutil.h. If you don't need the mixed model,
307	* just define FAR to be empty.
308

M compat/zlib/zlib.3

+3 -3

		--- compat/zlib/zlib.3
		+++ compat/zlib/zlib.3
		@@ -1,6 +1,6 @@
1		-.TH ZLIB 3 "18 Aug 2023"
	1	+.TH ZLIB 3 "22 Jan 2024"
2	2	.SH NAME
3	3	zlib \- compression/decompression library
4	4	.SH SYNOPSIS
5	5	[see
6	6	.I zlib.h
		@@ -103,13 +103,13 @@
103	103	.LP
104	104	before asking for help.
105	105	Send questions and/or comments to [email protected],
106	106	or (for the Windows DLL version) to Gilles Vollant ([email protected]).
107	107	.SH AUTHORS AND LICENSE
108		-Version 1.3
	108	+Version 1.3.1
109	109	.LP
110		-Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
	110	+Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
111	111	.LP
112	112	This software is provided 'as-is', without any express or implied
113	113	warranty. In no event will the authors be held liable for any damages
114	114	arising from the use of this software.
115	115	.LP
116	116

	--- compat/zlib/zlib.3
	+++ compat/zlib/zlib.3
	@@ -1,6 +1,6 @@
1	.TH ZLIB 3 "18 Aug 2023"
2	.SH NAME
3	zlib \- compression/decompression library
4	.SH SYNOPSIS
5	[see
6	.I zlib.h
	@@ -103,13 +103,13 @@
103	.LP
104	before asking for help.
105	Send questions and/or comments to [email protected],
106	or (for the Windows DLL version) to Gilles Vollant ([email protected]).
107	.SH AUTHORS AND LICENSE
108	Version 1.3
109	.LP
110	Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
111	.LP
112	This software is provided 'as-is', without any express or implied
113	warranty. In no event will the authors be held liable for any damages
114	arising from the use of this software.
115	.LP
116

	--- compat/zlib/zlib.3
	+++ compat/zlib/zlib.3
	@@ -1,6 +1,6 @@
1	.TH ZLIB 3 "22 Jan 2024"
2	.SH NAME
3	zlib \- compression/decompression library
4	.SH SYNOPSIS
5	[see
6	.I zlib.h
	@@ -103,13 +103,13 @@
103	.LP
104	before asking for help.
105	Send questions and/or comments to [email protected],
106	or (for the Windows DLL version) to Gilles Vollant ([email protected]).
107	.SH AUTHORS AND LICENSE
108	Version 1.3.1
109	.LP
110	Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
111	.LP
112	This software is provided 'as-is', without any express or implied
113	warranty. In no event will the authors be held liable for any damages
114	arising from the use of this software.
115	.LP
116

M compat/zlib/zlib.3.pdf

		--- compat/zlib/zlib.3.pdf
		+++ compat/zlib/zlib.3.pdf
		cannot compute difference between binary files
1	1

	--- compat/zlib/zlib.3.pdf
	+++ compat/zlib/zlib.3.pdf
0	annot compute difference between binary files
1

	--- compat/zlib/zlib.3.pdf
	+++ compat/zlib/zlib.3.pdf
0	annot compute difference between binary files
1

M compat/zlib/zlib.h

+11 -11

		--- compat/zlib/zlib.h
		+++ compat/zlib/zlib.h
		@@ -1,9 +1,9 @@
1	1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2		- version 1.3, August 18th, 2023
	2	+ version 1.3.1, January 22nd, 2024
3	3
4		- Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
	4	+ Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
5	5
6	6	This software is provided 'as-is', without any express or implied
7	7	warranty. In no event will the authors be held liable for any damages
8	8	arising from the use of this software.
9	9
		@@ -35,15 +35,15 @@
35	35
36	36	#ifdef __cplusplus
37	37	extern "C" {
38	38	#endif
39	39
40		-#define ZLIB_VERSION "1.3"
41		-#define ZLIB_VERNUM 0x1300
	40	+#define ZLIB_VERSION "1.3.1"
	41	+#define ZLIB_VERNUM 0x1310
42	42	#define ZLIB_VER_MAJOR 1
43	43	#define ZLIB_VER_MINOR 3
44		-#define ZLIB_VER_REVISION 0
	44	+#define ZLIB_VER_REVISION 1
45	45	#define ZLIB_VER_SUBREVISION 0
46	46
47	47	/*
48	48	The 'zlib' compression library provides in-memory compression and
49	49	decompression functions, including integrity checks of the uncompressed data.
		@@ -934,14 +934,14 @@
934	934	pattern are full flush points.
935	935
936	936	inflateSync returns Z_OK if a possible full flush point has been found,
937	937	Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
938	938	has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
939		- In the success case, the application may save the current current value of
940		- total_in which indicates where valid compressed data was found. In the
941		- error case, the application may repeatedly call inflateSync, providing more
942		- input each time, until success or end of the input data.
	939	+ In the success case, the application may save the current value of total_in
	940	+ which indicates where valid compressed data was found. In the error case,
	941	+ the application may repeatedly call inflateSync, providing more input each
	942	+ time, until success or end of the input data.
943	943	*/
944	944
945	945	ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,
946	946	z_streamp source);
947	947	/*
		@@ -1756,18 +1756,18 @@
1756	1756
1757	1757	Combine two CRC-32 check values into one. For two sequences of bytes,
1758	1758	seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
1759	1759	calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
1760	1760	check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
1761		- len2.
	1761	+ len2. len2 must be non-negative.
1762	1762	*/
1763	1763
1764	1764	/*
1765	1765	ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
1766	1766
1767	1767	Return the operator corresponding to length len2, to be used with
1768		- crc32_combine_op().
	1768	+ crc32_combine_op(). len2 must be non-negative.
1769	1769	*/
1770	1770
1771	1771	ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op);
1772	1772	/*
1773	1773	Give the same result as crc32_combine(), using op in place of len2. op is
1774	1774

	--- compat/zlib/zlib.h
	+++ compat/zlib/zlib.h
	@@ -1,9 +1,9 @@
1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2	version 1.3, August 18th, 2023
3
4	Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
5
6	This software is provided 'as-is', without any express or implied
7	warranty. In no event will the authors be held liable for any damages
8	arising from the use of this software.
9
	@@ -35,15 +35,15 @@
35
36	#ifdef __cplusplus
37	extern "C" {
38	#endif
39
40	#define ZLIB_VERSION "1.3"
41	#define ZLIB_VERNUM 0x1300
42	#define ZLIB_VER_MAJOR 1
43	#define ZLIB_VER_MINOR 3
44	#define ZLIB_VER_REVISION 0
45	#define ZLIB_VER_SUBREVISION 0
46
47	/*
48	The 'zlib' compression library provides in-memory compression and
49	decompression functions, including integrity checks of the uncompressed data.
	@@ -934,14 +934,14 @@
934	pattern are full flush points.
935
936	inflateSync returns Z_OK if a possible full flush point has been found,
937	Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
938	has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
939	In the success case, the application may save the current current value of
940	total_in which indicates where valid compressed data was found. In the
941	error case, the application may repeatedly call inflateSync, providing more
942	input each time, until success or end of the input data.
943	*/
944
945	ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,
946	z_streamp source);
947	/*
	@@ -1756,18 +1756,18 @@
1756
1757	Combine two CRC-32 check values into one. For two sequences of bytes,
1758	seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
1759	calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
1760	check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
1761	len2.
1762	*/
1763
1764	/*
1765	ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
1766
1767	Return the operator corresponding to length len2, to be used with
1768	crc32_combine_op().
1769	*/
1770
1771	ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op);
1772	/*
1773	Give the same result as crc32_combine(), using op in place of len2. op is
1774

	--- compat/zlib/zlib.h
	+++ compat/zlib/zlib.h
	@@ -1,9 +1,9 @@
1	/* zlib.h -- interface of the 'zlib' general purpose compression library
2	version 1.3.1, January 22nd, 2024
3
4	Copyright (C) 1995-2024 Jean-loup Gailly and Mark Adler
5
6	This software is provided 'as-is', without any express or implied
7	warranty. In no event will the authors be held liable for any damages
8	arising from the use of this software.
9
	@@ -35,15 +35,15 @@
35
36	#ifdef __cplusplus
37	extern "C" {
38	#endif
39
40	#define ZLIB_VERSION "1.3.1"
41	#define ZLIB_VERNUM 0x1310
42	#define ZLIB_VER_MAJOR 1
43	#define ZLIB_VER_MINOR 3
44	#define ZLIB_VER_REVISION 1
45	#define ZLIB_VER_SUBREVISION 0
46
47	/*
48	The 'zlib' compression library provides in-memory compression and
49	decompression functions, including integrity checks of the uncompressed data.
	@@ -934,14 +934,14 @@
934	pattern are full flush points.
935
936	inflateSync returns Z_OK if a possible full flush point has been found,
937	Z_BUF_ERROR if no more input was provided, Z_DATA_ERROR if no flush point
938	has been found, or Z_STREAM_ERROR if the stream structure was inconsistent.
939	In the success case, the application may save the current value of total_in
940	which indicates where valid compressed data was found. In the error case,
941	the application may repeatedly call inflateSync, providing more input each
942	time, until success or end of the input data.
943	*/
944
945	ZEXTERN int ZEXPORT inflateCopy(z_streamp dest,
946	z_streamp source);
947	/*
	@@ -1756,18 +1756,18 @@
1756
1757	Combine two CRC-32 check values into one. For two sequences of bytes,
1758	seq1 and seq2 with lengths len1 and len2, CRC-32 check values were
1759	calculated for each, crc1 and crc2. crc32_combine() returns the CRC-32
1760	check value of seq1 and seq2 concatenated, requiring only crc1, crc2, and
1761	len2. len2 must be non-negative.
1762	*/
1763
1764	/*
1765	ZEXTERN uLong ZEXPORT crc32_combine_gen(z_off_t len2);
1766
1767	Return the operator corresponding to length len2, to be used with
1768	crc32_combine_op(). len2 must be non-negative.
1769	*/
1770
1771	ZEXTERN uLong ZEXPORT crc32_combine_op(uLong crc1, uLong crc2, uLong op);
1772	/*
1773	Give the same result as crc32_combine(), using op in place of len2. op is
1774

M compat/zlib/zlib.map

+100 -100

		--- compat/zlib/zlib.map
		+++ compat/zlib/zlib.map
		@@ -1,100 +1,100 @@
1		-ZLIB_1.2.0 {
2		- global:
3		- compressBound;
4		- deflateBound;
5		- inflateBack;
6		- inflateBackEnd;
7		- inflateBackInit_;
8		- inflateCopy;
9		- local:
10		- deflate_copyright;
11		- inflate_copyright;
12		- inflate_fast;
13		- inflate_table;
14		- zcalloc;
15		- zcfree;
16		- z_errmsg;
17		- gz_error;
18		- gz_intmax;
19		- _*;
20		-};
21		-
22		-ZLIB_1.2.0.2 {
23		- gzclearerr;
24		- gzungetc;
25		- zlibCompileFlags;
26		-} ZLIB_1.2.0;
27		-
28		-ZLIB_1.2.0.8 {
29		- deflatePrime;
30		-} ZLIB_1.2.0.2;
31		-
32		-ZLIB_1.2.2 {
33		- adler32_combine;
34		- crc32_combine;
35		- deflateSetHeader;
36		- inflateGetHeader;
37		-} ZLIB_1.2.0.8;
38		-
39		-ZLIB_1.2.2.3 {
40		- deflateTune;
41		- gzdirect;
42		-} ZLIB_1.2.2;
43		-
44		-ZLIB_1.2.2.4 {
45		- inflatePrime;
46		-} ZLIB_1.2.2.3;
47		-
48		-ZLIB_1.2.3.3 {
49		- adler32_combine64;
50		- crc32_combine64;
51		- gzopen64;
52		- gzseek64;
53		- gztell64;
54		- inflateUndermine;
55		-} ZLIB_1.2.2.4;
56		-
57		-ZLIB_1.2.3.4 {
58		- inflateReset2;
59		- inflateMark;
60		-} ZLIB_1.2.3.3;
61		-
62		-ZLIB_1.2.3.5 {
63		- gzbuffer;
64		- gzoffset;
65		- gzoffset64;
66		- gzclose_r;
67		- gzclose_w;
68		-} ZLIB_1.2.3.4;
69		-
70		-ZLIB_1.2.5.1 {
71		- deflatePending;
72		-} ZLIB_1.2.3.5;
73		-
74		-ZLIB_1.2.5.2 {
75		- deflateResetKeep;
76		- gzgetc_;
77		- inflateResetKeep;
78		-} ZLIB_1.2.5.1;
79		-
80		-ZLIB_1.2.7.1 {
81		- inflateGetDictionary;
82		- gzvprintf;
83		-} ZLIB_1.2.5.2;
84		-
85		-ZLIB_1.2.9 {
86		- inflateCodesUsed;
87		- inflateValidate;
88		- uncompress2;
89		- gzfread;
90		- gzfwrite;
91		- deflateGetDictionary;
92		- adler32_z;
93		- crc32_z;
94		-} ZLIB_1.2.7.1;
95		-
96		-ZLIB_1.2.12 {
97		- crc32_combine_gen;
98		- crc32_combine_gen64;
99		- crc32_combine_op;
100		-} ZLIB_1.2.9;
	1	+ZLIB_1.2.0 {
	2	+ global:
	3	+ compressBound;
	4	+ deflateBound;
	5	+ inflateBack;
	6	+ inflateBackEnd;
	7	+ inflateBackInit_;
	8	+ inflateCopy;
	9	+ local:
	10	+ deflate_copyright;
	11	+ inflate_copyright;
	12	+ inflate_fast;
	13	+ inflate_table;
	14	+ zcalloc;
	15	+ zcfree;
	16	+ z_errmsg;
	17	+ gz_error;
	18	+ gz_intmax;
	19	+ _*;
	20	+};
	21	+
	22	+ZLIB_1.2.0.2 {
	23	+ gzclearerr;
	24	+ gzungetc;
	25	+ zlibCompileFlags;
	26	+} ZLIB_1.2.0;
	27	+
	28	+ZLIB_1.2.0.8 {
	29	+ deflatePrime;
	30	+} ZLIB_1.2.0.2;
	31	+
	32	+ZLIB_1.2.2 {
	33	+ adler32_combine;
	34	+ crc32_combine;
	35	+ deflateSetHeader;
	36	+ inflateGetHeader;
	37	+} ZLIB_1.2.0.8;
	38	+
	39	+ZLIB_1.2.2.3 {
	40	+ deflateTune;
	41	+ gzdirect;
	42	+} ZLIB_1.2.2;
	43	+
	44	+ZLIB_1.2.2.4 {
	45	+ inflatePrime;
	46	+} ZLIB_1.2.2.3;
	47	+
	48	+ZLIB_1.2.3.3 {
	49	+ adler32_combine64;
	50	+ crc32_combine64;
	51	+ gzopen64;
	52	+ gzseek64;
	53	+ gztell64;
	54	+ inflateUndermine;
	55	+} ZLIB_1.2.2.4;
	56	+
	57	+ZLIB_1.2.3.4 {
	58	+ inflateReset2;
	59	+ inflateMark;
	60	+} ZLIB_1.2.3.3;
	61	+
	62	+ZLIB_1.2.3.5 {
	63	+ gzbuffer;
	64	+ gzoffset;
	65	+ gzoffset64;
	66	+ gzclose_r;
	67	+ gzclose_w;
	68	+} ZLIB_1.2.3.4;
	69	+
	70	+ZLIB_1.2.5.1 {
	71	+ deflatePending;
	72	+} ZLIB_1.2.3.5;
	73	+
	74	+ZLIB_1.2.5.2 {
	75	+ deflateResetKeep;
	76	+ gzgetc_;
	77	+ inflateResetKeep;
	78	+} ZLIB_1.2.5.1;
	79	+
	80	+ZLIB_1.2.7.1 {
	81	+ inflateGetDictionary;
	82	+ gzvprintf;
	83	+} ZLIB_1.2.5.2;
	84	+
	85	+ZLIB_1.2.9 {
	86	+ inflateCodesUsed;
	87	+ inflateValidate;
	88	+ uncompress2;
	89	+ gzfread;
	90	+ gzfwrite;
	91	+ deflateGetDictionary;
	92	+ adler32_z;
	93	+ crc32_z;
	94	+} ZLIB_1.2.7.1;
	95	+
	96	+ZLIB_1.2.12 {
	97	+ crc32_combine_gen;
	98	+ crc32_combine_gen64;
	99	+ crc32_combine_op;
	100	+} ZLIB_1.2.9;
101	101

	--- compat/zlib/zlib.map
	+++ compat/zlib/zlib.map
	@@ -1,100 +1,100 @@
1	ZLIB_1.2.0 {
2	global:
3	compressBound;
4	deflateBound;
5	inflateBack;
6	inflateBackEnd;
7	inflateBackInit_;
8	inflateCopy;
9	local:
10	deflate_copyright;
11	inflate_copyright;
12	inflate_fast;
13	inflate_table;
14	zcalloc;
15	zcfree;
16	z_errmsg;
17	gz_error;
18	gz_intmax;
19	_*;
20	};
21
22	ZLIB_1.2.0.2 {
23	gzclearerr;
24	gzungetc;
25	zlibCompileFlags;
26	} ZLIB_1.2.0;
27
28	ZLIB_1.2.0.8 {
29	deflatePrime;
30	} ZLIB_1.2.0.2;
31
32	ZLIB_1.2.2 {
33	adler32_combine;
34	crc32_combine;
35	deflateSetHeader;
36	inflateGetHeader;
37	} ZLIB_1.2.0.8;
38
39	ZLIB_1.2.2.3 {
40	deflateTune;
41	gzdirect;
42	} ZLIB_1.2.2;
43
44	ZLIB_1.2.2.4 {
45	inflatePrime;
46	} ZLIB_1.2.2.3;
47
48	ZLIB_1.2.3.3 {
49	adler32_combine64;
50	crc32_combine64;
51	gzopen64;
52	gzseek64;
53	gztell64;
54	inflateUndermine;
55	} ZLIB_1.2.2.4;
56
57	ZLIB_1.2.3.4 {
58	inflateReset2;
59	inflateMark;
60	} ZLIB_1.2.3.3;
61
62	ZLIB_1.2.3.5 {
63	gzbuffer;
64	gzoffset;
65	gzoffset64;
66	gzclose_r;
67	gzclose_w;
68	} ZLIB_1.2.3.4;
69
70	ZLIB_1.2.5.1 {
71	deflatePending;
72	} ZLIB_1.2.3.5;
73
74	ZLIB_1.2.5.2 {
75	deflateResetKeep;
76	gzgetc_;
77	inflateResetKeep;
78	} ZLIB_1.2.5.1;
79
80	ZLIB_1.2.7.1 {
81	inflateGetDictionary;
82	gzvprintf;
83	} ZLIB_1.2.5.2;
84
85	ZLIB_1.2.9 {
86	inflateCodesUsed;
87	inflateValidate;
88	uncompress2;
89	gzfread;
90	gzfwrite;
91	deflateGetDictionary;
92	adler32_z;
93	crc32_z;
94	} ZLIB_1.2.7.1;
95
96	ZLIB_1.2.12 {
97	crc32_combine_gen;
98	crc32_combine_gen64;
99	crc32_combine_op;
100	} ZLIB_1.2.9;
101

	--- compat/zlib/zlib.map
	+++ compat/zlib/zlib.map
	@@ -1,100 +1,100 @@
1	ZLIB_1.2.0 {
2	global:
3	compressBound;
4	deflateBound;
5	inflateBack;
6	inflateBackEnd;
7	inflateBackInit_;
8	inflateCopy;
9	local:
10	deflate_copyright;
11	inflate_copyright;
12	inflate_fast;
13	inflate_table;
14	zcalloc;
15	zcfree;
16	z_errmsg;
17	gz_error;
18	gz_intmax;
19	_*;
20	};
21
22	ZLIB_1.2.0.2 {
23	gzclearerr;
24	gzungetc;
25	zlibCompileFlags;
26	} ZLIB_1.2.0;
27
28	ZLIB_1.2.0.8 {
29	deflatePrime;
30	} ZLIB_1.2.0.2;
31
32	ZLIB_1.2.2 {
33	adler32_combine;
34	crc32_combine;
35	deflateSetHeader;
36	inflateGetHeader;
37	} ZLIB_1.2.0.8;
38
39	ZLIB_1.2.2.3 {
40	deflateTune;
41	gzdirect;
42	} ZLIB_1.2.2;
43
44	ZLIB_1.2.2.4 {
45	inflatePrime;
46	} ZLIB_1.2.2.3;
47
48	ZLIB_1.2.3.3 {
49	adler32_combine64;
50	crc32_combine64;
51	gzopen64;
52	gzseek64;
53	gztell64;
54	inflateUndermine;
55	} ZLIB_1.2.2.4;
56
57	ZLIB_1.2.3.4 {
58	inflateReset2;
59	inflateMark;
60	} ZLIB_1.2.3.3;
61
62	ZLIB_1.2.3.5 {
63	gzbuffer;
64	gzoffset;
65	gzoffset64;
66	gzclose_r;
67	gzclose_w;
68	} ZLIB_1.2.3.4;
69
70	ZLIB_1.2.5.1 {
71	deflatePending;
72	} ZLIB_1.2.3.5;
73
74	ZLIB_1.2.5.2 {
75	deflateResetKeep;
76	gzgetc_;
77	inflateResetKeep;
78	} ZLIB_1.2.5.1;
79
80	ZLIB_1.2.7.1 {
81	inflateGetDictionary;
82	gzvprintf;
83	} ZLIB_1.2.5.2;
84
85	ZLIB_1.2.9 {
86	inflateCodesUsed;
87	inflateValidate;
88	uncompress2;
89	gzfread;
90	gzfwrite;
91	deflateGetDictionary;
92	adler32_z;
93	crc32_z;
94	} ZLIB_1.2.7.1;
95
96	ZLIB_1.2.12 {
97	crc32_combine_gen;
98	crc32_combine_gen64;
99	crc32_combine_op;
100	} ZLIB_1.2.9;
101

M compat/zlib/zutil.h

+3 -24

		--- compat/zlib/zutil.h
		+++ compat/zlib/zutil.h
		@@ -1,7 +1,7 @@
1	1	/* zutil.h -- internal interface and configuration of the compression library
2		- * Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
	2	+ * Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	3	* For conditions of distribution and use, see copyright notice in zlib.h
4	4	*/
5	5
6	6	/* WARNING: this file should not be used by applications. It is
7	7	part of the implementation of the compression library and is
		@@ -54,11 +54,11 @@
54	54	#endif
55	55
56	56	extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
57	57	/* (size given to avoid silly warnings with Visual C++) */
58	58
59		-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
	59	+#define ERR_MSG(err) z_errmsg[(err) < -6 \|\| (err) > 2 ? 9 : 2 - (err)]
60	60
61	61	#define ERR_RETURN(strm,err) \
62	62	return (strm->msg = ERR_MSG(err), (err))
63	63	/* To be used only when the state is known to be valid */
64	64
		@@ -135,21 +135,12 @@
135	135	# if defined(M_I86) && !defined(Z_SOLO)
136	136	# include <malloc.h>
137	137	# endif
138	138	#endif
139	139
140		-#if defined(MACOS) \|\| defined(TARGET_OS_MAC)
	140	+#if defined(MACOS)
141	141	# define OS_CODE 7
142		-# ifndef Z_SOLO
143		-# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
144		-# include <unix.h> /* for fdopen */
145		-# else
146		-# ifndef fdopen
147		-# define fdopen(fd,mode) NULL /* No fdopen() */
148		-# endif
149		-# endif
150		-# endif
151	142	#endif
152	143
153	144	#ifdef __acorn
154	145	# define OS_CODE 13
155	146	#endif
		@@ -168,22 +159,10 @@
168	159
169	160	#ifdef __APPLE__
170	161	# define OS_CODE 19
171	162	#endif
172	163
173		-#if defined(_BEOS_) \|\| defined(RISCOS)
174		-# define fdopen(fd,mode) NULL /* No fdopen() */
175		-#endif
176		-
177		-#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
178		-# if defined(_WIN32_WCE)
179		-# define fdopen(fd,mode) NULL /* No fdopen() */
180		-# else
181		-# define fdopen(fd,type) _fdopen(fd,type)
182		-# endif
183		-#endif
184		-
185	164	#if defined(__BORLANDC__) && !defined(MSDOS)
186	165	#pragma warn -8004
187	166	#pragma warn -8008
188	167	#pragma warn -8066
189	168	#endif
190	169

	--- compat/zlib/zutil.h
	+++ compat/zlib/zutil.h
	@@ -1,7 +1,7 @@
1	/* zutil.h -- internal interface and configuration of the compression library
2	* Copyright (C) 1995-2022 Jean-loup Gailly, Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* WARNING: this file should not be used by applications. It is
7	part of the implementation of the compression library and is
	@@ -54,11 +54,11 @@
54	#endif
55
56	extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
57	/* (size given to avoid silly warnings with Visual C++) */
58
59	#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
60
61	#define ERR_RETURN(strm,err) \
62	return (strm->msg = ERR_MSG(err), (err))
63	/* To be used only when the state is known to be valid */
64
	@@ -135,21 +135,12 @@
135	# if defined(M_I86) && !defined(Z_SOLO)
136	# include <malloc.h>
137	# endif
138	#endif
139
140	#if defined(MACOS) \|\| defined(TARGET_OS_MAC)
141	# define OS_CODE 7
142	# ifndef Z_SOLO
143	# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
144	# include <unix.h> /* for fdopen */
145	# else
146	# ifndef fdopen
147	# define fdopen(fd,mode) NULL /* No fdopen() */
148	# endif
149	# endif
150	# endif
151	#endif
152
153	#ifdef __acorn
154	# define OS_CODE 13
155	#endif
	@@ -168,22 +159,10 @@
168
169	#ifdef __APPLE__
170	# define OS_CODE 19
171	#endif
172
173	#if defined(_BEOS_) \|\| defined(RISCOS)
174	# define fdopen(fd,mode) NULL /* No fdopen() */
175	#endif
176
177	#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX
178	# if defined(_WIN32_WCE)
179	# define fdopen(fd,mode) NULL /* No fdopen() */
180	# else
181	# define fdopen(fd,type) _fdopen(fd,type)
182	# endif
183	#endif
184
185	#if defined(__BORLANDC__) && !defined(MSDOS)
186	#pragma warn -8004
187	#pragma warn -8008
188	#pragma warn -8066
189	#endif
190

	--- compat/zlib/zutil.h
	+++ compat/zlib/zutil.h
	@@ -1,7 +1,7 @@
1	/* zutil.h -- internal interface and configuration of the compression library
2	* Copyright (C) 1995-2024 Jean-loup Gailly, Mark Adler
3	* For conditions of distribution and use, see copyright notice in zlib.h
4	*/
5
6	/* WARNING: this file should not be used by applications. It is
7	part of the implementation of the compression library and is
	@@ -54,11 +54,11 @@
54	#endif
55
56	extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
57	/* (size given to avoid silly warnings with Visual C++) */
58
59	#define ERR_MSG(err) z_errmsg[(err) < -6 \|\| (err) > 2 ? 9 : 2 - (err)]
60
61	#define ERR_RETURN(strm,err) \
62	return (strm->msg = ERR_MSG(err), (err))
63	/* To be used only when the state is known to be valid */
64
	@@ -135,21 +135,12 @@
135	# if defined(M_I86) && !defined(Z_SOLO)
136	# include <malloc.h>
137	# endif
138	#endif
139
140	#if defined(MACOS)
141	# define OS_CODE 7









142	#endif
143
144	#ifdef __acorn
145	# define OS_CODE 13
146	#endif
	@@ -168,22 +159,10 @@
159
160	#ifdef __APPLE__
161	# define OS_CODE 19
162	#endif
163












164	#if defined(__BORLANDC__) && !defined(MSDOS)
165	#pragma warn -8004
166	#pragma warn -8008
167	#pragma warn -8066
168	#endif
169

Fossil SCM

Keyboard Shortcuts