[openoffice] branch trunk updated: Updated download link for zlib, updated LICENSE

[ms...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 995e4ac  Updated download link for zlib, updated LICENSE
995e4ac is described below

commit 995e4ac6f0abe66c6c7c4e709fd33ffad8550489
Author: mseidel <ms...@apache.org>
AuthorDate: Mon Mar 2 17:02:46 2020 +0100

    Updated download link for zlib, updated LICENSE
---
 main/LICENSE           |  2 +-
 main/external_deps.lst |  8 ++++----
 main/zlib/makefile.mk  | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/main/LICENSE b/main/LICENSE
index 31edc2d..3c4ab2a 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -1931,7 +1931,7 @@ ____
 For ZLIB DATA COMPRESSION LIBRARY - built in main/zlib/:
 - zlib license
 
-(C) 1995-2010 Jean-loup Gailly and Mark Adler
+(C) 1995-2012 Jean-loup Gailly and Mark Adler
 
  This software is provided 'as-is', without any express or implied
  warranty.  In no event will the authors be held liable for any damages
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 0869c8d..b51fc09 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -103,10 +103,10 @@ if (SYSTEM_REDLAND != YES)
     URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (GUI!=UNX || SYSTEM_ZLIB!=YES)
-    MD5 = 2ab442d169156f34c379c968f3f482dd
-    name = zlib-1.2.7.tar.bz2
-    URL1 = $(OOO_EXTRAS)$(MD5)-$(name)
-    URL2 = http://zlib.net/zlib-1.2.7.tar.bz2
+    MD5 = 60df6a37c56e7c1366cca812414f7b85
+    name = zlib-1.2.7.tar.gz
+    URL1 = https://www.zlib.net/fossils/$(name)
+    URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
 
 if (SOLAR_JAVA==TRUE && ENABLE_MEDIAWIKI==YES)
     MD5 = 2c9b0f83ed5890af02c0df1c1776f39b
diff --git a/main/zlib/makefile.mk b/main/zlib/makefile.mk
index db2ce8d..f72fa49 100644
--- a/main/zlib/makefile.mk
+++ b/main/zlib/makefile.mk
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  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
@@ -7,16 +7,16 @@
 #  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.
-#  
+#
 #**************************************************************
 
 
@@ -41,7 +41,7 @@ all:
 # --- Files --------------------------------------------------------
 
 TARFILE_NAME=zlib-1.2.7
-TARFILE_MD5=2ab442d169156f34c379c968f3f482dd
+TARFILE_MD5=60df6a37c56e7c1366cca812414f7b85
 
 PATCH_FILES=zlib-1.2.7.patch
 ADDITIONAL_FILES=makefile.mk
@@ -68,4 +68,4 @@ PATCHED_HEADERS=$(INCCOM)$/patched$/zlib.h
 ALLTAR: $(PATCHED_HEADERS)
 
 $(PATCHED_HEADERS) : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
-    @$(PERL) make_patched_header.pl $@ $(PRJNAME)
+	@$(PERL) make_patched_header.pl $@ $(PRJNAME)