This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO41X by this push:
new 83aea518c7 Update zlib to 1.3.1
83aea518c7 is described below
commit 83aea518c7f3c808307ad79888307cd0d661615c
Author: mseidel <[email protected]>
AuthorDate: Tue Jan 23 11:37:27 2024 +0100
Update zlib to 1.3.1
(cherry picked from commit 31cbf0498f0068311e6843a8dec28f7e1948a304)
---
main/external_deps.lst | 4 ++--
main/zlib/make_patched_header.pl | 10 ++++------
main/zlib/makefile.mk | 10 +++++-----
main/zlib/{zlib-1.3.patch => zlib-1.3.1.patch} | 16 ++++++++--------
4 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/main/external_deps.lst b/main/external_deps.lst
index a9c5343038..ad1092cb04 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -100,8 +100,8 @@ if (SYSTEM_REDLAND != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (GUI!=UNX || SYSTEM_ZLIB!=YES)
- MD5 = 60373b133d630f74f4a1f94c1185a53f
- name = zlib-1.3.tar.gz
+ MD5 = 9855b6d802d7fe5b7bd5b196a2271655
+ name = zlib-1.3.1.tar.gz
URL1 = https://www.zlib.net/fossils/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
diff --git a/main/zlib/make_patched_header.pl b/main/zlib/make_patched_header.pl
index 8b4fa099e1..5321d4924a 100755
--- a/main/zlib/make_patched_header.pl
+++ b/main/zlib/make_patched_header.pl
@@ -2,7 +2,7 @@
eval 'exec perl -S $0 ${1+"$@"}'
if 0;
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -10,19 +10,18 @@ eval 'exec perl -S $0 ${1+"$@"}'
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
-
#
# make_patched_header - make patched header
#
@@ -59,4 +58,3 @@ close ORIG_FILE;
exit(0);
-
diff --git a/main/zlib/makefile.mk b/main/zlib/makefile.mk
index fb59a42f35..cd4bbe06bd 100644
--- a/main/zlib/makefile.mk
+++ b/main/zlib/makefile.mk
@@ -19,8 +19,6 @@
#
#**************************************************************
-
-
PRJ=.
PRJNAME=zlib
@@ -40,10 +38,10 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=zlib-1.3
-TARFILE_MD5=60373b133d630f74f4a1f94c1185a53f
+TARFILE_NAME=zlib-1.3.1
+TARFILE_MD5=9855b6d802d7fe5b7bd5b196a2271655
-PATCH_FILES=zlib-1.3.patch
+PATCH_FILES=zlib-1.3.1.patch
ADDITIONAL_FILES=makefile.mk
#relative to CONFIGURE_DIR
@@ -69,3 +67,5 @@ ALLTAR: $(PATCHED_HEADERS)
$(PATCHED_HEADERS) : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
@$(PERL) make_patched_header.pl $@ $(PRJNAME)
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/zlib/zlib-1.3.patch b/main/zlib/zlib-1.3.1.patch
similarity index 90%
rename from main/zlib/zlib-1.3.patch
rename to main/zlib/zlib-1.3.1.patch
index 29d94ed2ba..6b8c651db1 100644
--- a/main/zlib/zlib-1.3.patch
+++ b/main/zlib/zlib-1.3.1.patch
@@ -1,5 +1,5 @@
---- misc/zlib-1.3/makefile.mk Fri Mar 14 10:17:06 2008
-+++ misc/build/zlib-1.3/makefile.mk Fri Mar 14 10:16:56 2008
+--- misc/zlib-1.3.1/makefile.mk Fri Mar 14 10:17:06 2008
++++ misc/build/zlib-1.3.1/makefile.mk Fri Mar 14 10:16:56 2008
@@ -1 +1,82 @@
-dummy
+#*************************************************************************
@@ -11,9 +11,9 @@
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
-+#
++#
+# http://www.apache.org/licenses/LICENSE-2.0
-+#
++#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -46,7 +46,7 @@
+ $(SLO)$/inflate.obj \
+ $(SLO)$/inftrees.obj \
+ $(SLO)$/trees.obj \
-+ $(SLO)$/zutil.obj \
++ $(SLO)$/zutil.obj \
+ $(SLO)$/unzip.obj \
+ $(SLO)$/ioapi.obj
+
@@ -56,7 +56,7 @@
+LIB1OBJFILES=$(SLOFILES)
+
+.IF "$(BUILD_X64)"!=""
-+SLOFILES_X64= $(SLO_X64)$/adler32.obj \
++SLOFILES_X64= $(SLO_X64)$/adler32.obj \
+ $(SLO_X64)$/compress.obj \
+ $(SLO_X64)$/deflate.obj \
+ $(SLO_X64)$/crc32.obj \
@@ -64,7 +64,7 @@
+ $(SLO_X64)$/inflate.obj \
+ $(SLO_X64)$/inftrees.obj \
+ $(SLO_X64)$/trees.obj \
-+ $(SLO_X64)$/zutil.obj \
++ $(SLO_X64)$/zutil.obj \
+ $(SLO_X64)$/unzip.obj \
+ $(SLO_X64)$/ioapi.obj
+
@@ -78,7 +78,7 @@
+$(MISC)$/%.c : contrib$/minizip$/%.c
+ @echo ------------------------------
+ @echo Making: $@
-+ @$(COPY) $< $@
++ @$(COPY) $< $@
+
+.INCLUDE : set_wntx64.mk
+.INCLUDE : target.mk
