From 940b4d1848e8c70ab7642901a68594e8016caffc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 27 Apr 2024 18:51:28 +0200 Subject: Adding upstream version 1:7.0.4. Signed-off-by: Daniel Baumann --- external/zlib/Makefile | 14 ++++++++++++ external/zlib/Module_zlib.mk | 23 +++++++++++++++++++ external/zlib/README | 1 + external/zlib/StaticLibrary_zlib.mk | 36 ++++++++++++++++++++++++++++++ external/zlib/StaticLibrary_zlib_x64.mk | 39 +++++++++++++++++++++++++++++++++ external/zlib/UnpackedTarball_zlib.mk | 25 +++++++++++++++++++++ external/zlib/ubsan.patch | 11 ++++++++++ 7 files changed, 149 insertions(+) create mode 100644 external/zlib/Makefile create mode 100644 external/zlib/Module_zlib.mk create mode 100644 external/zlib/README create mode 100644 external/zlib/StaticLibrary_zlib.mk create mode 100644 external/zlib/StaticLibrary_zlib_x64.mk create mode 100644 external/zlib/UnpackedTarball_zlib.mk create mode 100644 external/zlib/ubsan.patch (limited to 'external/zlib') diff --git a/external/zlib/Makefile b/external/zlib/Makefile new file mode 100644 index 000000000..569ad8a0b --- /dev/null +++ b/external/zlib/Makefile @@ -0,0 +1,14 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk new file mode 100644 index 000000000..468cb2dea --- /dev/null +++ b/external/zlib/Module_zlib.mk @@ -0,0 +1,23 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_Module_Module,zlib)) + +$(eval $(call gb_Module_add_targets,zlib,\ + StaticLibrary_zlib \ + UnpackedTarball_zlib \ +)) + +ifeq ($(BUILD_X64),TRUE) +$(eval $(call gb_Module_add_targets,zlib,\ + StaticLibrary_zlib_x64 \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/README b/external/zlib/README new file mode 100644 index 000000000..401875737 --- /dev/null +++ b/external/zlib/README @@ -0,0 +1 @@ +Compression library from [http://www.zlib.net/]. diff --git a/external/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk new file mode 100644 index 000000000..f5263bef7 --- /dev/null +++ b/external/zlib/StaticLibrary_zlib.mk @@ -0,0 +1,36 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,zlib)) + +$(eval $(call gb_StaticLibrary_use_unpacked,zlib,zlib)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib)) + +$(eval $(call gb_StaticLibrary_add_generated_cobjects,zlib,\ + UnpackedTarball/zlib/adler32 \ + UnpackedTarball/zlib/compress \ + UnpackedTarball/zlib/crc32 \ + UnpackedTarball/zlib/deflate \ + UnpackedTarball/zlib/gzclose \ + UnpackedTarball/zlib/gzlib \ + UnpackedTarball/zlib/gzread \ + UnpackedTarball/zlib/gzwrite \ + UnpackedTarball/zlib/inffast \ + UnpackedTarball/zlib/inflate \ + UnpackedTarball/zlib/inftrees \ + UnpackedTarball/zlib/trees \ + UnpackedTarball/zlib/zutil \ +)) + +ifeq ($(ENABLE_DEBUG),TRUE) +$(eval $(call gb_StaticLibrary_add_cflags,zlib,-DZLIB_DEBUG)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/StaticLibrary_zlib_x64.mk b/external/zlib/StaticLibrary_zlib_x64.mk new file mode 100644 index 000000000..a51f326d1 --- /dev/null +++ b/external/zlib/StaticLibrary_zlib_x64.mk @@ -0,0 +1,39 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_StaticLibrary_StaticLibrary,zlib_x64)) + +$(eval $(call gb_StaticLibrary_set_x64,zlib_x64,YES)) + +$(eval $(call gb_StaticLibrary_use_unpacked,zlib_x64,zlib)) + +$(eval $(call gb_StaticLibrary_set_warnings_disabled,zlib_x64)) + +$(eval $(call gb_StaticLibrary_set_include,zlib_x64,\ + -I$(call gb_UnpackedTarball_get_dir,zlib) \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_StaticLibrary_add_x64_generated_cobjects,zlib_x64,\ + UnpackedTarball/zlib/x64/adler32 \ + UnpackedTarball/zlib/x64/compress \ + UnpackedTarball/zlib/x64/crc32 \ + UnpackedTarball/zlib/x64/deflate \ + UnpackedTarball/zlib/x64/inffast \ + UnpackedTarball/zlib/x64/inflate \ + UnpackedTarball/zlib/x64/inftrees \ + UnpackedTarball/zlib/x64/trees \ + UnpackedTarball/zlib/x64/zutil \ +)) + +ifeq ($(ENABLE_DEBUG),TRUE) +$(eval $(call gb_StaticLibrary_add_cflags,zlib_x64,-DZLIB_DEBUG)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/UnpackedTarball_zlib.mk b/external/zlib/UnpackedTarball_zlib.mk new file mode 100644 index 000000000..e74039d25 --- /dev/null +++ b/external/zlib/UnpackedTarball_zlib.mk @@ -0,0 +1,25 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# + +$(eval $(call gb_UnpackedTarball_UnpackedTarball,zlib)) + +$(eval $(call gb_UnpackedTarball_set_tarball,zlib,$(ZLIB_TARBALL))) + +$(eval $(call gb_UnpackedTarball_set_post_action,zlib,\ + mkdir -p x64 && \ + cp $(addsuffix .c,adler32 compress crc32 deflate inffast inflate inftrees trees zutil) x64 \ +)) + +$(eval $(call gb_UnpackedTarball_set_patchlevel,zlib,0)) + +$(eval $(call gb_UnpackedTarball_add_patches,zlib, \ + external/zlib/ubsan.patch \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/zlib/ubsan.patch b/external/zlib/ubsan.patch new file mode 100644 index 000000000..2d7ff8d67 --- /dev/null +++ b/external/zlib/ubsan.patch @@ -0,0 +1,11 @@ +--- trees.c ++++ trees.c +@@ -870,7 +870,7 @@ + bi_windup(s); /* align on byte boundary */ + put_short(s, (ush)stored_len); + put_short(s, (ush)~stored_len); +- zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len); ++ if (stored_len != 0) zmemcpy(s->pending_buf + s->pending, (Bytef *)buf, stored_len); + s->pending += stored_len; + #ifdef ZLIB_DEBUG + s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L; -- cgit v1.2.3