subject:"core.git\: Branch 'libreoffice\-7\-6' \- download.lst"

core.git: Branch 'libreoffice-7-6' - download.lst external/expat

2024-03-22 Thread Taichi Haradaguchi (via logerrit)

 download.lst|4 +-
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 -
 3 files changed, 2 insertions(+), 52 deletions(-)

New commits:
commit af7dbe1de9145b91d212f6567c6a47bd92a7a60e
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Mar 22 13:43:14 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Mar 22 20:57:14 2024 +0100

Expat: upgrade to release 2.6.2

Fixes CVE-2024-28757

Change-Id: Id85044fa9d8eda922425e580e9d6979f6563e98a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165129
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 370ca73a45b291e172918b4c8fcbc37ccaa434cf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165177
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 21c6aa046ffb..5294f74dc6aa 100644
--- a/download.lst
+++ b/download.lst
@@ -106,8 +106,8 @@ ETONYEK_TARBALL := 
libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-EXPAT_SHA256SUM := 
cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
-EXPAT_TARBALL := expat-2.6.0.tar.xz
+EXPAT_SHA256SUM := 
ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364
+EXPAT_TARBALL := expat-2.6.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/expat/0001-Fix-compiler-warnings.patch 
b/external/expat/0001-Fix-compiler-warnings.patch
deleted file mode 100644
index adec5ed0d9be..
--- a/external/expat/0001-Fix-compiler-warnings.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 3f60a47cb5716bb810789a12ef6024c1dc448164 Mon Sep 17 00:00:00 2001
-From: Taichi Haradaguchi <20001...@ymail.ne.jp>
-Date: Fri, 9 Feb 2024 19:28:35 +0900
-Subject: [PATCH] Fix compiler warnings
-
-> In file included from ./../lib/internal.h:149,
->  from codepage.c:38:
-> ./../lib/expat.h:1045:5: warning: "XML_GE" is not defined, evaluates to 0 
[-Wundef]
->  1045 | #if XML_GE == 1
->   | ^~
-> ./../lib/internal.h:158:5: warning: "XML_GE" is not defined, evaluates to 0 
[-Wundef]
->   158 | #if XML_GE == 1
->   | ^~

- expat/lib/expat.h| 2 +-
- expat/lib/internal.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/expat/lib/expat.h b/expat/lib/expat.h
-index 95464b0d..79bbfb61 100644
 a/expat/lib/expat.h
-+++ b/expat/lib/expat.h
-@@ -1042,7 +1042,7 @@ typedef struct {
- XMLPARSEAPI(const XML_Feature *)
- XML_GetFeatureList(void);
- 
--#if XML_GE == 1
-+#if defined(XML_GE) && XML_GE == 1
- /* Added in Expat 2.4.0 for XML_DTD defined and
-  * added in Expat 2.6.0 for XML_GE == 1. */
- XMLPARSEAPI(XML_Bool)
-diff --git a/expat/lib/internal.h b/expat/lib/internal.h
-index cce71e4c..208c6b67 100644
 a/expat/lib/internal.h
-+++ b/expat/lib/internal.h
-@@ -155,7 +155,7 @@ extern "C" {
- void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
- const char **fromLimRef);
- 
--#if XML_GE == 1
-+#if defined(XML_GE) && XML_GE == 1
- unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
- unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
- const char *unsignedCharToPrintable(unsigned char c);
--- 
-2.43.1
-
diff --git a/external/expat/UnpackedTarball_expat.mk 
b/external/expat/UnpackedTarball_expat.mk
index 465105f2ca8c..5d4f41f6d147 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -13,10 +13,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools))
 
-# * external/expat/0001-Fix-compiler-warnings.patch was sent to upstream as
-#    "Fix compiler warnings":
 $(eval $(call gb_UnpackedTarball_add_patches,expat,\
-   external/expat/0001-Fix-compiler-warnings.patch \
external/expat/expat-winapi.patch \
 ))

core.git: Branch 'libreoffice-7-6' - download.lst

2024-02-22 Thread Michael Stahl (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d0924d74add31eba6bcf436e7f8bc6f5f6fb2fd6
Author: Michael Stahl 
AuthorDate: Thu Feb 22 11:57:37 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 22 21:19:56 2024 +0100

libxml2: upgrade to release 2.12.5

Fixes CVE-2024-25062

Change-Id: I0e98fd919328e9633a602c4872de0b06eb972cc0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163734
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4c3ee61e3eda0cbfd812443f80af89aa3a24ac73)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163754
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 5d76eb5783a7..5743c6c951a3 100644
--- a/download.lst
+++ b/download.lst
@@ -344,8 +344,8 @@ XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa
-LIBXML_VERSION_MICRO := 3
+LIBXML_SHA256SUM := 
a972796696afd38073e0f59c283c3a2f5a560b5268b4babc391b286166526b21
+LIBXML_VERSION_MICRO := 5
 LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick

core.git: Branch 'libreoffice-7-6' - download.lst external/libxml2 filter/source helpcompiler/source xmlsecurity/source

2024-02-22 Thread Caolán McNamara (via logerrit)

 download.lst|   14 +++---
 external/libxml2/ExternalPackage_libxml2.mk |2 +-
 external/libxml2/libxml2-global-symbols.patch   |8 +++-
 filter/source/xsltfilter/LibXSLTTransformer.cxx |   16 
 helpcompiler/source/HelpCompiler.cxx|   14 ++
 xmlsecurity/source/xmlsec/saxhelper.cxx |   15 ++-
 6 files changed, 59 insertions(+), 10 deletions(-)

New commits:
commit 4203efb98bf96ee168847c614b6bc7a3bfb7896c
Author: Caolán McNamara 
AuthorDate: Wed Jan 3 20:45:14 2024 +
Commit: Michael Stahl 
CommitDate: Thu Feb 22 20:29:06 2024 +0100

upgrade libxml2, libxslt & liblangtag

what I'm really after is some vexating not-reproducible oss-fuzz msan
warnings when using libxml2 in the fodt2pdf fuzzer. So lets upgrade
libxml2 to the latest, which requires bumping libxslt, and then requires
a newer liblangtag because of no longer implicit includes that it
depended on.

xmlKeepBlanksDefaultValue and xmlSubstituteEntitiesDefault are
deprecated, we should get around to updating those uses

Change-Id: I8fda0dffda0a7ea65407d246a3121875cb8ad4a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161598
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 6875c975f80d8b813b1829a530162869a1e2d92e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163752
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index db2385c300dc..5d76eb5783a7 100644
--- a/download.lst
+++ b/download.lst
@@ -319,8 +319,8 @@ LIBGPGERROR_TARBALL := libgpg-error-1.43.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBLANGTAG_SHA256SUM := 
1f12a20a02ec3a8d22e54dedb8b683a43c9c160bda1ba337bf1060607ae733bd
-LIBLANGTAG_TARBALL := liblangtag-0.6.3.tar.bz2
+LIBLANGTAG_SHA256SUM := 
5ed6bcd4ae3f3c05c912e62f216cd1a44123846147f729a49fb5668da51e030e
+LIBLANGTAG_TARBALL := liblangtag-0.6.7.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
@@ -344,14 +344,14 @@ XMLSEC_TARBALL := xmlsec1-1.2.37.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXML_SHA256SUM := 
737e1d7f8ab3f139729ca13a2494fd17bf30ddb4b7a427cf336252cab57f57f7
-LIBXML_VERSION_MICRO := 4
-LIBXML_TARBALL := libxml2-2.11.$(LIBXML_VERSION_MICRO).tar.xz
+LIBXML_SHA256SUM := 
8c8f1092340a89ff32bc44ad5c9693aff9bc8a7a3e161bb239666e5d15ac9aaa
+LIBXML_VERSION_MICRO := 3
+LIBXML_TARBALL := libxml2-2.12.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXSLT_SHA256SUM := 
1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1
-LIBXSLT_VERSION_MICRO := 38
+LIBXSLT_SHA256SUM := 
2a20ad621148339b0759c4d4e96719362dee64c9a096dbba625ba053846349f0
+LIBXSLT_VERSION_MICRO := 39
 LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libxml2/ExternalPackage_libxml2.mk 
b/external/libxml2/ExternalPackage_libxml2.mk
index 3c399970cd5b..799044575f9a 100644
--- a/external/libxml2/ExternalPackage_libxml2.mk
+++ b/external/libxml2/ExternalPackage_libxml2.mk
@@ -21,7 +21,7 @@ else # COM=MSC
 $(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.dll,win32/bin.msvc/libxml2.dll))
 endif
 else # OS!=WNT
-$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.11.$(LIBXML_VERSION_MICRO)))
+$(eval $(call 
gb_ExternalPackage_add_file,libxml2,$(LIBO_URE_LIB_FOLDER)/libxml2.so.2,.libs/libxml2.so.2.12.$(LIBXML_VERSION_MICRO)))
 endif
 endif # DISABLE_DYNLOADING
 
diff --git a/external/libxml2/libxml2-global-symbols.patch 
b/external/libxml2/libxml2-global-symbols.patch
index cbbe5a622284..32146da4b3d7 100644
--- a/external/libxml2/libxml2-global-symbols.patch
+++ b/external/libxml2/libxml2-global-symbols.patch
@@ -13,7 +13,7 @@
  } LIBXML2_2.6.28;
  
  LIBXML2_2.6.32 {
-@@ -2231,3 +2231,49 @@
+@@ -2231,3 +2231,55 @@
xmlPopOutputCallbacks;
  } LIBXML2_2.9.8;
  
@@ -23,6 +23,12 @@
 +xmlNewSAXParserCtxt;
 +} LIBXML2_2.9.11;
 +
++LIBXML2_2.12.3 {
++global:
++xmlCtxtSetMaxAmplification;
++xmlTextReaderSetMaxAmplification;
++} LIBXML2_2.11.4;
++
 +# HACK: export global variable accessor functions (globals.h)
 +LIBXML2_GLOBAL_VARIABLES {
 +global:
diff --git a/filter/source/xsltfilter/LibXSLTTransformer.cxx 
b/filter/source/xsltfilter/LibXSLTTransformer.cxx
index 5e9a7c4bcd35..28803b68e840 100644
--- a/filter/source/xsltfilter/LibXSLTTransformer.cxx
+++ b/filter/source/xsltfilter/LibXSLTTransformer.cxx
@@ -503,7 +503,23 @@ namespace XSLT
 {   // backward compatibility for old clients using createInstance
 params = args;
 }
+
+#ifdef __GNUC__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored

core.git: Branch 'libreoffice-7-6' - download.lst

2024-02-16 Thread Mike Kaganski (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a16ba62d52841c4431837889b65bc78743db32d2
Author: Mike Kaganski 
AuthorDate: Fri Feb 16 13:43:20 2024 +0600
Commit: Christian Lohmaier 
CommitDate: Fri Feb 16 23:21:08 2024 +0100

OpenSSL: upgrade to 3.0.13

Change-Id: Ib03c99a2dbf0f7c932b8a6b953ac9eb9c43f978f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163493
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index 07de31c55b34..db2385c300dc 100644
--- a/download.lst
+++ b/download.lst
@@ -423,8 +423,8 @@ OPENLDAP_TARBALL := openldap-2.6.6.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
-OPENSSL_TARBALL := openssl-3.0.11.tar.gz
+OPENSSL_SHA256SUM := 
88525753f79d3bec27d2fa7c66aa0b92b3aa9498dafd93d7cfa4b3780cdae313
+OPENSSL_TARBALL := openssl-3.0.13.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Branch 'libreoffice-7-6' - download.lst external/nss

2024-02-16 Thread Michael Stahl (via logerrit)

 download.lst|4 ++--
 external/nss/README |   26 +++---
 2 files changed, 13 insertions(+), 17 deletions(-)

New commits:
commit cd94b0af38d712fa6eb0e0f43ce13ac6e72535d9
Author: Michael Stahl 
AuthorDate: Fri Feb 16 10:34:54 2024 +0100
Commit: Christian Lohmaier 
CommitDate: Fri Feb 16 16:30:11 2024 +0100

nss: upgrade to release 3.98

Fixes CVE-2023-5388

Also update README, and remove obsolete documentation of Debian's
mangled SONAME; relevant Debian changelog:

  nss (2:3.13.4-2) unstable; urgency=low

  * debian/control, debian/libnss3*, debian/rules,
mozilla/security/coreconf/*, mozilla/security/nss/lib/*/manifest.mn:
Move to unversioned library. ABI compatibility is ensured upstream, and
the SO version, if it needed a change at any time, would be a change in
the library name. There is no reason to keep making compatibility more
difficult with other distros and upstream binary releases. While 
previous
versions were one-way compatible (binaries built against other distros 
or
upstream nspr could work on Debian), this approach works both ways.

  -- Mike Hommey   Thu, 17 May 2012 09:45:36 +0200

Change-Id: Ifc1eae68827fa88ae001a3903c8555af67b488ac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163494
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index 8a4c256adede..07de31c55b34 100644
--- a/download.lst
+++ b/download.lst
@@ -397,8 +397,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
-NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
59bb55a59b02e4004fc26ad0aa1a13fe8d73c6c90c447dd2f2efb73fb81083ed
+NSS_TARBALL := nss-3.98-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/nss/README b/external/nss/README
index 6997cea6ca06..09931f64ea20 100644
--- a/external/nss/README
+++ b/external/nss/README
@@ -1,5 +1,16 @@
 Contains the Network Security Services (NSS) libraries from Mozilla
 
+== ESR versions ==
+
+Upstream releases both regular and "ESR" versions, the latter go into Firefox
+ESR and Thunderbird.
+
+There is a new ESR version about once a year, and a ESR version gets micro
+updates only when there are security issues to fix, and it's not always obvious
+from the release notes of a regular release if there are security issues that
+are relevant to LibreOffice, hence it's probably best to bundle only the ESR
+versions and upgrade for every micro release (as recommended by upstream).
+
 == Fips 140 and signed libraries ==
 
 Fips 140 mode is not supported. That is, the *.chk files containing the
@@ -20,18 +31,3 @@ With all supported macOS SDK we use
 NSS_USE_SYSTEM_SQLITE=1
 to build using the system sqlite.
 
-== system NSS on Linux ==
-
-Note that different Linux distributions use different SONAMEs for the
-NSS libraries, so it is not possible to use --with-system-nss and build
-a portable generic LO installation set, despite NSS upstream apparently
-maintaining ABI compatibility.
-
-Debian Squeeze:
-0x000e (SONAME) Library soname: [libnss3.so.1d]
-Fedora 20:
-0x000e (SONAME) Library soname: [libnss3.so]
-
-For the record, the LSB specified SONAME is libnss3.so
-http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/libnss3.html
-

core.git: Branch 'libreoffice-7-6' - download.lst

2024-02-16 Thread Andras Timar (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 85c6a7a4944efa5b91e25a35860997e254d35f4c
Author: Andras Timar 
AuthorDate: Wed Feb 14 22:18:30 2024 +0100
Commit: Xisco Fauli 
CommitDate: Fri Feb 16 11:55:43 2024 +0100

nss: upgrade to release 3.97

Change-Id: If0eaf6a93f57239d81491c635922745bf3f38fd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163410
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit f25b7efba56757b085f7a836f57d9c2fc8fd14b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163408
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 2022db8bba0f..8a4c256adede 100644
--- a/download.lst
+++ b/download.lst
@@ -397,8 +397,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739
-NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
a7a920d295998563b33d9e06c1a36b799201493d81b64537fab42f2a733411ce
+NSS_TARBALL := nss-3.97-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Branch 'libreoffice-7-6' - download.lst

2024-02-15 Thread Xisco Fauli (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4eaa94db5a9b974bf9393920fe825b30873b62a3
Author: Xisco Fauli 
AuthorDate: Thu Feb 15 11:26:54 2024 +0100
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Fri Feb 16 08:05:50 2024 +0100

zlib: upgrade to 1.3.1

Change-Id: I339b4e9c94ea50b3ddb41dfdac0e48d27939bc74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163432
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 636c8cdf330f7dcd6aebe19df6790b4a78ec667e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163399
Reviewed-by:  Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index 54c36e4ddbd0..2022db8bba0f 100644
--- a/download.lst
+++ b/download.lst
@@ -555,8 +555,8 @@ XSLTML_TARBALL := 
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ZLIB_SHA256SUM := 
8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7
-ZLIB_TARBALL := zlib-1.3.tar.xz
+ZLIB_SHA256SUM := 
38ef96b8dfe510d42707d9c781877914792541133e1870841463bfa73f883e32
+ZLIB_TARBALL := zlib-1.3.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Branch 'libreoffice-7-6' - download.lst external/expat

2024-02-15 Thread Taichi Haradaguchi (via logerrit)

 download.lst|4 +-
 external/expat/0001-Fix-compiler-warnings.patch |   47 
 external/expat/UnpackedTarball_expat.mk |3 +
 3 files changed, 52 insertions(+), 2 deletions(-)

New commits:
commit 0ba4dfa1000a9177f1ea855ec4ffaddf7fc44c19
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Fri Feb 9 03:42:30 2024 +0100
Commit: Xisco Fauli 
CommitDate: Thu Feb 15 15:07:40 2024 +0100

Expat: upgrade to release 2.6.0

Fixes CVE-2023-52425 and CVE-2023-52426.

Change-Id: Id135bbaea893a83129bdbee44948c09322a64c07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163146
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit b7e4078033b064bfc3847db0916a4df389117817)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163393
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 3a846afd408e..54c36e4ddbd0 100644
--- a/download.lst
+++ b/download.lst
@@ -106,8 +106,8 @@ ETONYEK_TARBALL := 
libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-EXPAT_SHA256SUM := 
ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
-EXPAT_TARBALL := expat-2.5.0.tar.xz
+EXPAT_SHA256SUM := 
cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e
+EXPAT_TARBALL := expat-2.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/expat/0001-Fix-compiler-warnings.patch 
b/external/expat/0001-Fix-compiler-warnings.patch
new file mode 100644
index ..adec5ed0d9be
--- /dev/null
+++ b/external/expat/0001-Fix-compiler-warnings.patch
@@ -0,0 +1,47 @@
+From 3f60a47cb5716bb810789a12ef6024c1dc448164 Mon Sep 17 00:00:00 2001
+From: Taichi Haradaguchi <20001...@ymail.ne.jp>
+Date: Fri, 9 Feb 2024 19:28:35 +0900
+Subject: [PATCH] Fix compiler warnings
+
+> In file included from ./../lib/internal.h:149,
+>  from codepage.c:38:
+> ./../lib/expat.h:1045:5: warning: "XML_GE" is not defined, evaluates to 0 
[-Wundef]
+>  1045 | #if XML_GE == 1
+>   | ^~
+> ./../lib/internal.h:158:5: warning: "XML_GE" is not defined, evaluates to 0 
[-Wundef]
+>   158 | #if XML_GE == 1
+>   | ^~
+---
+ expat/lib/expat.h| 2 +-
+ expat/lib/internal.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/expat/lib/expat.h b/expat/lib/expat.h
+index 95464b0d..79bbfb61 100644
+--- a/expat/lib/expat.h
 b/expat/lib/expat.h
+@@ -1042,7 +1042,7 @@ typedef struct {
+ XMLPARSEAPI(const XML_Feature *)
+ XML_GetFeatureList(void);
+ 
+-#if XML_GE == 1
++#if defined(XML_GE) && XML_GE == 1
+ /* Added in Expat 2.4.0 for XML_DTD defined and
+  * added in Expat 2.6.0 for XML_GE == 1. */
+ XMLPARSEAPI(XML_Bool)
+diff --git a/expat/lib/internal.h b/expat/lib/internal.h
+index cce71e4c..208c6b67 100644
+--- a/expat/lib/internal.h
 b/expat/lib/internal.h
+@@ -155,7 +155,7 @@ extern "C" {
+ void _INTERNAL_trim_to_complete_utf8_characters(const char *from,
+ const char **fromLimRef);
+ 
+-#if XML_GE == 1
++#if defined(XML_GE) && XML_GE == 1
+ unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser);
+ unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser);
+ const char *unsignedCharToPrintable(unsigned char c);
+-- 
+2.43.1
+
diff --git a/external/expat/UnpackedTarball_expat.mk 
b/external/expat/UnpackedTarball_expat.mk
index 5d4f41f6d147..465105f2ca8c 100644
--- a/external/expat/UnpackedTarball_expat.mk
+++ b/external/expat/UnpackedTarball_expat.mk
@@ -13,7 +13,10 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,expat,$(EXPAT_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,expat,conftools))
 
+# * external/expat/0001-Fix-compiler-warnings.patch was sent to upstream as
+#    "Fix compiler warnings":
 $(eval $(call gb_UnpackedTarball_add_patches,expat,\
+   external/expat/0001-Fix-compiler-warnings.patch \
external/expat/expat-winapi.patch \
 ))

core.git: Branch 'libreoffice-7-6' - download.lst

2024-01-31 Thread Michael Stahl (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3f3bd3212e3a4f631aa3c1172ff8adc8623dfdbc
Author: Michael Stahl 
AuthorDate: Wed Jan 31 10:30:18 2024 +0100
Commit: Xisco Fauli 
CommitDate: Wed Jan 31 21:45:27 2024 +0100

curl: upgrade to release 8.6.0

Fixes CVE-2024-0853

Change-Id: Iabba0748f7c48ee03a8223aef9ca81bf379738e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162793
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 9667ea7e274c4e29cf7c35d9e124a8fbcb2af3da)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162813
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 3c867135ccc0..3a846afd408e 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb
-CURL_TARBALL := curl-8.5.0.tar.xz
+CURL_SHA256SUM := 
3ccd55d91af9516539df80625f818c734dc6f2ecf9bada33c76765e99121db15
+CURL_TARBALL := curl-8.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

core.git: Branch 'libreoffice-7-6' - download.lst

2023-12-11 Thread Michael Stahl (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e1f6cdc3d4c07603e59d19a12fe401bb0d113686
Author: Michael Stahl 
AuthorDate: Mon Dec 11 13:07:22 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Dec 11 20:39:56 2023 +0100

curl: upgrade to release 8.5.0

Fixes CVE-2023-46218 (cookies apparently used by libcmis)

Change-Id: I6f903ab63589d3318c0cc7d47f5183f7ae55f52b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160592
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 0a2df11fb563177951db1e8890d67cee8d44246a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160577
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index adadeabbbc24..3c867135ccc0 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d
-CURL_TARBALL := curl-8.4.0.tar.xz
+CURL_SHA256SUM := 
42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb
+CURL_TARBALL := curl-8.5.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-11-01 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 533e84c07b249334fb32495bb923264fb89dbdaf
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Oct 1 00:30:13 2023 +0900
Commit: Xisco Fauli 
CommitDate: Thu Nov 2 00:51:09 2023 +0100

Upgrade Harfbuzz to 8.2.2

Fix regression from 8.2.0 in parsing CSS-style feature strings.

(https://lists.freedesktop.org/archives/libreoffice/2023-September/091026.html)
(https://github.com/harfbuzz/harfbuzz/issues/4414)

Change-Id: Ifdaeb7b2a9a5da2866810e4d5298f57a0fd9bd9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157434
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 
(cherry picked from commit d8326f1f54b2f4644b52fbfa7106eeeae6e5bb7b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158704
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 04ed71b1ae90..b5516ffb6749 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79
-HARFBUZZ_TARBALL := harfbuzz-8.0.0.tar.xz
+HARFBUZZ_SHA256SUM := 
e433ad85fbdf57f680be29479b3f964577379aaf319f557eb76569f0ecbc90f3
+HARFBUZZ_TARBALL := harfbuzz-8.2.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/libtiff

2023-10-30 Thread Caolán McNamara (via logerrit)

 download.lst   
  |4 
 
external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch
 |   79 --
 external/libtiff/UnpackedTarball_libtiff.mk
  |1 
 3 files changed, 2 insertions(+), 82 deletions(-)

New commits:
commit 3640b7e807dc7bf34e598e94c327b6d6a3fd8b04
Author: Caolán McNamara 
AuthorDate: Sat Oct 28 17:16:27 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Oct 30 12:30:57 2023 +0100

upgrade libtiff to 4.6.0

Change-Id: I839f78e5431caac378ce936aa5e34357144ae6b1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158593
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 4273ebd28b9d3f50797f9e2dede0d9e8ce26e6f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158541
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 5167045219da..04ed71b1ae90 100644
--- a/download.lst
+++ b/download.lst
@@ -453,8 +453,8 @@ LIBPNG_TARBALL := libpng-1.6.40.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTIFF_SHA256SUM := 
3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a
-LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
+LIBTIFF_SHA256SUM := 
e178649607d1e22b51cf361dd20a3753f244f022eefab1f2f218fc62ebaf87d2
+LIBTIFF_TARBALL := tiff-4.6.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch
 
b/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch
deleted file mode 100644
index 68353bd9ed20..
--- 
a/external/libtiff/0001-WebP-decoder-validate-WebP-blob-width-height-band-co.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 350ff161c8a61b6483a1e4689e09cd47dd0dd5f9 Mon Sep 17 00:00:00 2001
-From: Even Rouault 
-Date: Sat, 17 Jun 2023 16:22:38 +0200
-Subject: [PATCH] WebP decoder: validate WebP blob width, height, band count
- against TIFF parameters
-
-to avoid use of uninitialized variable, or decoding corrupted content
-without explicit error
-
-Fixes #581, fixes #582

- libtiff/tif_webp.c | 51 ++
- 1 file changed, 51 insertions(+)
-
-diff --git a/libtiff/tif_webp.c b/libtiff/tif_webp.c
-index 07db7cce..ce15391e 100644
 a/libtiff/tif_webp.c
-+++ b/libtiff/tif_webp.c
-@@ -149,6 +149,57 @@ static int TWebPDecode(TIFF *tif, uint8_t *op, tmsize_t 
occ, uint16_t s)
- segment_height = td->td_rowsperstrip;
- }
- 
-+int webp_width, webp_height;
-+if (!WebPGetInfo(tif->tif_rawcp,
-+ tif->tif_rawcc > UINT32_MAX ? UINT32_MAX
-+ : 
(uint32_t)tif->tif_rawcc,
-+ _width, _height))
-+{
-+TIFFErrorExtR(tif, module, "WebPGetInfo() failed");
-+return 0;
-+}
-+if ((uint32_t)webp_width != segment_width ||
-+(uint32_t)webp_height != segment_height)
-+{
-+TIFFErrorExtR(
-+tif, module, "WebP blob dimension is %dx%d. Expected %ux%u",
-+webp_width, webp_height, segment_width, segment_height);
-+return 0;
-+}
-+
-+#if WEBP_DECODER_ABI_VERSION >= 0x0002
-+WebPDecoderConfig config;
-+if (!WebPInitDecoderConfig())
-+{
-+TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed");
-+return 0;
-+}
-+
-+const bool bWebPGetFeaturesOK =
-+WebPGetFeatures(tif->tif_rawcp,
-+tif->tif_rawcc > UINT32_MAX
-+? UINT32_MAX
-+: (uint32_t)tif->tif_rawcc,
-+) == VP8_STATUS_OK;
-+
-+WebPFreeDecBuffer();
-+
-+if (!bWebPGetFeaturesOK)
-+{
-+TIFFErrorExtR(tif, module, "WebPInitDecoderConfig() failed");
-+return 0;
-+}
-+
-+const int webp_bands = config.input.has_alpha ? 4 : 3;
-+if (webp_bands != sp->nSamples)
-+{
-+TIFFErrorExtR(tif, module,
-+  "WebP blob band count is %d. Expected %d", 
webp_bands,
-+  sp->nSamples);
-+return 0;
-+}
-+#endif
-+
- buffer_size = segment_width * segment_height * sp->nSamples;
- if (occ == (tmsize_t)buffer_size)
- {
--- 
-2.41.0
-
diff --git a/external/libtiff/UnpackedTarball_libtiff.mk 
b/external/libtiff/UnpackedTarball_libtiff.mk
index 32ed699b7491..f7eeb6ace868 100644
--- a/external/libtiff/UnpackedTarball_libtiff.mk
+++ b/external/libtiff/UnpackedTarball_libtiff.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libtiff,1))
 $(eval $(call gb_UnpackedTarball_add_patches,libtiff,\

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/mariadb-connector-c RepositoryExternal.mk

2023-10-23 Thread Mike Kaganski (via logerrit)

 RepositoryExternal.mk |1 +
 download.lst  |4 ++--
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk |8 
+++-
 external/mariadb-connector-c/configs/wnt_ma_config.h  |4 
 4 files changed, 6 insertions(+), 11 deletions(-)

New commits:
commit 77a8401c41040e5a36f2bd980ec66ecdad0562d8
Author: Mike Kaganski 
AuthorDate: Fri Oct 20 08:52:46 2023 +0300
Commit: Michael Stahl 
CommitDate: Mon Oct 23 12:16:14 2023 +0200

mariadb connector: upgrade to release 3.3.7 (fixes tdf#157826)

Change-Id: I053b827b7bc14535760236fcb057c154c359f4dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158252
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 
(cherry picked from commit 5a0498ded11d514c21e3124333a3560da1373202)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158278
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index b105e1d755d0..d93fa9a7c891 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -312,6 +312,7 @@ $(call gb_LinkTarget_use_system_win32_libs,$(1),\
kernel32 \
shlwapi \
crypt32 \
+   bcrypt \
 )
 
 endef
diff --git a/download.lst b/download.lst
index 6c0684d07362..5167045219da 100644
--- a/download.lst
+++ b/download.lst
@@ -366,8 +366,8 @@ LXML_TARBALL := lxml-4.1.1.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-MARIADB_CONNECTOR_C_SHA256SUM := 
431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
-MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
+MARIADB_CONNECTOR_C_SHA256SUM := 
975a9a862fed80f84e0206373f7ef05537aada5b65d99b71b36ab892b44240bf
+MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.3.7-src.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk 
b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
index 3458089ce99e..b8802e16695e 100644
--- a/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
+++ b/external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk
@@ -21,12 +21,10 @@ $(eval $(call 
gb_StaticLibrary_set_include,mariadb-connector-c,\
 # This is needed for MSVC 2008: it somehow finds a dlopen somewhere
 # but the static library then contains unreferenced symbols.
 # This macro enables a re-definition to native Win32 APIs in my_global.h.
-## TODO missing enable: -D HAVE_COMPRESS
-## (but then need to add "-lz" to mysqlcppconn linking)
-$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN -D 
ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD -DSQLITE_ENABLE_COLUMN_METADATA=1))
+$(eval $(call gb_StaticLibrary_add_cflags,mariadb-connector-c,-DHAVE_DLOPEN 
-DHAVE_COMPRESS -D ENABLED_LOCAL_INFILE -D LIBMARIADB -D THREAD 
-DSQLITE_ENABLE_COLUMN_METADATA=1))
 
 ifeq ($(OS),WNT)
-$(eval $(call 
gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED 
-DHAVE_STRTOULL))
+$(eval $(call 
gb_StaticLibrary_add_cflags,mariadb-connector-c,-D_TIMESPEC_DEFINED 
-DHAVE_STRTOULL -DHAVE_WINCRYPT))
 $(eval $(call gb_StaticLibrary_set_include,mariadb-connector-c,\
$$(INCLUDE) \
-I$(call gb_UnpackedTarball_get_dir,mariadb-connector-c)/win-iconv \
@@ -46,7 +44,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_cobjects,mariadb-connector-c,\
UnpackedTarball/mariadb-connector-c/libmariadb/ma_default \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_dtoa \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_errmsg \
-   UnpackedTarball/mariadb-connector-c/libmariadb/ma_hash \
+   UnpackedTarball/mariadb-connector-c/libmariadb/ma_hashtbl \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_init \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_io \
UnpackedTarball/mariadb-connector-c/libmariadb/ma_list \
diff --git a/external/mariadb-connector-c/configs/wnt_ma_config.h 
b/external/mariadb-connector-c/configs/wnt_ma_config.h
index d06393509881..acd08c125a95 100644
--- a/external/mariadb-connector-c/configs/wnt_ma_config.h
+++ b/external/mariadb-connector-c/configs/wnt_ma_config.h
@@ -72,11 +72,7 @@
 # define HAVE_LONG 1
 #endif
 
-#ifdef _M_X64
 #define SIZEOF_LONG_LONG 8
-#else
-#define SIZEOF_LONG_LONG 4
-#endif
 #if defined(SIZEOF_LONG_LONG)
 # define HAVE_LONG_LONG 1
 #endif

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/libffi external/python3

2023-10-18 Thread Taichi Haradaguchi (via logerrit)

 download.lst|4 ++--
 external/libffi/ExternalPackage_libffi.mk   |2 +-
 external/python3/UnpackedTarball_python3.mk |2 ++
 external/python3/python-3.8-msvc-libffi.patch.1 |   16 
 4 files changed, 21 insertions(+), 3 deletions(-)

New commits:
commit f298e4b24660e34e651a9b0ec349b542b661efa6
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Oct 14 11:30:48 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Oct 18 10:55:27 2023 +0200

Upgrade libffi to 3.4.4

Change-Id: I417abc5d76db235c23195abff22d3d27f9c0fa77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157972
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 7359700d5dc847accd360e70f7dcc45d119577be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158030
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 09c449b11a92..6c0684d07362 100644
--- a/download.lst
+++ b/download.lst
@@ -309,8 +309,8 @@ LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.6.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBFFI_SHA256SUM := 
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
-LIBFFI_TARBALL := libffi-3.3.tar.gz
+LIBFFI_SHA256SUM := 
d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676
+LIBFFI_TARBALL := libffi-3.4.4.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libffi/ExternalPackage_libffi.mk 
b/external/libffi/ExternalPackage_libffi.mk
index 61b0a1ca460c..c524ef90289f 100644
--- a/external/libffi/ExternalPackage_libffi.mk
+++ b/external/libffi/ExternalPackage_libffi.mk
@@ -13,7 +13,7 @@ $(eval $(call 
gb_ExternalPackage_use_external_project,libffi,libffi))
 
 ifeq ($(COM),MSC)
 $(eval $(call 
gb_ExternalPackage_add_files,libffi,$(LIBO_LIB_FOLDER)/python-core-$(PYTHON_VERSION)/lib,
 \
-$(HOST_PLATFORM)/.libs/libffi-7.dll \
+$(HOST_PLATFORM)/.libs/libffi-8.dll \
 ))
 endif
 
diff --git a/external/python3/UnpackedTarball_python3.mk 
b/external/python3/UnpackedTarball_python3.mk
index 127dea4a8ee4..93cb9015c9a6 100644
--- a/external/python3/UnpackedTarball_python3.mk
+++ b/external/python3/UnpackedTarball_python3.mk
@@ -12,6 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,python3))
 $(eval $(call 
gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL),,python3))
 
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\
+   PCbuild/libffi.props \
PCbuild/pcbuild.sln \
 ))
 
@@ -19,6 +20,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\
external/python3/i100492-freebsd.patch.1 \
external/python3/python-3.3.0-darwin.patch.1 \
external/python3/python-3.8-msvc-sdk.patch.1 \
+   external/python3/python-3.8-msvc-libffi.patch.1 \
external/python3/python-3.7.6-msvc-ssl.patch.1 \
external/python3/python-3.5.4-msvc-disable.patch.1 \
external/python3/ubsan.patch.0 \
diff --git a/external/python3/python-3.8-msvc-libffi.patch.1 
b/external/python3/python-3.8-msvc-libffi.patch.1
new file mode 100644
index ..674043a7dca6
--- /dev/null
+++ b/external/python3/python-3.8-msvc-libffi.patch.1
@@ -0,0 +1,16 @@
+--- python3/PCbuild/libffi.props.orig  2023-08-25 04:36:32.0 +0900
 python3/PCbuild/libffi.props   2023-10-14 15:13:24.850511531 +0900
+@@ -6,11 +6,11 @@
+ 
+ 
+   
$(libffiOutDir);%(AdditionalLibraryDirectories)
+-  
libffi-7.lib;%(AdditionalDependencies)
++  
libffi-8.lib;%(AdditionalDependencies)
+ 
+   
+   
+-<_LIBFFIDLL Include="$(libffiOutDir)\libffi-7.dll" />
++<_LIBFFIDLL Include="$(libffiOutDir)\libffi-8.dll" />
+   
+   
+

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-10-16 Thread Eike Rathke (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 772f747667d6bf0aff5dc9267cb4e8c004a133b1
Author: Eike Rathke 
AuthorDate: Fri Oct 13 17:35:38 2023 +0200
Commit: Xisco Fauli 
CommitDate: Mon Oct 16 11:16:47 2023 +0200

Update language-subtag-registry to 2023-08-02

Change-Id: I61e7e6c0a7010ff6f8db61a72b57a57de3e61c74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157943
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 234da25e9134c99cad0d825e0f99890b64d45859)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157955
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 3e5944f85423..09c449b11a92 100644
--- a/download.lst
+++ b/download.lst
@@ -279,8 +279,8 @@ LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LANGTAGREG_SHA256SUM := 
9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da
-LANGTAGREG_TARBALL := language-subtag-registry-2023-05-11.tar.bz2
+LANGTAGREG_SHA256SUM := 
59fdc026b5088e7947e1e6add482d2a40e1f7e25c50f198b456954216462c2eb
+LANGTAGREG_TARBALL := language-subtag-registry-2023-08-02.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-10-11 Thread Thorsten Behrens (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2f05cbfeac4a7f2cd5ce7c3ec655cfed4ec7bdac
Author: Thorsten Behrens 
AuthorDate: Wed Oct 11 10:00:26 2023 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 11 13:56:57 2023 +0200

curl: upgrade to release 8.4.0

Fixes CVE-2023-38546 and CVE-2023-38545

Minor amount of bugfixes, nothing that immediately affects us. New
feature: IPFS protocols via HTTP gateway now supported, with the right
URL.

Change-Id: I24af4d17b570685081aa031c50a87bb8dcf1833d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157811
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/download.lst b/download.lst
index 823d5351c1c4..f381cdf98eaa 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63
-CURL_TARBALL := curl-8.3.0.tar.xz
+CURL_SHA256SUM := 
16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d
+CURL_TARBALL := curl-8.4.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/openssl

2023-10-03 Thread Taichi Haradaguchi (via logerrit)

 download.lst   |4 ++--
 external/openssl/configurable-z-option.patch.0 |   14 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit ba808a28f5ea365eaf8fe5d9c7c91b417633d75f
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Sep 30 23:54:06 2023 +0900
Commit: Caolán McNamara 
CommitDate: Tue Oct 3 21:39:02 2023 +0200

openssl: upgrade to release 3.0.11

Change-Id: I80c6fde3b6ae526f46b6bc346f09b287cc88b032
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157433
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit d059aebd99f717d846e7746d5ff5b99d507a3160)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157466
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 3ff258e84901..823d5351c1c4 100644
--- a/download.lst
+++ b/download.lst
@@ -423,8 +423,8 @@ OPENLDAP_TARBALL := openldap-2.6.6.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323
-OPENSSL_TARBALL := openssl-3.0.10.tar.gz
+OPENSSL_SHA256SUM := 
b3425d3bb4a2218d0697eb41f7fc0cdede016ed19ca49d168b78e8d947887f55
+OPENSSL_TARBALL := openssl-3.0.11.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/openssl/configurable-z-option.patch.0 
b/external/openssl/configurable-z-option.patch.0
index 9a4426edd5d2..d9478b6a9701 100644
--- a/external/openssl/configurable-z-option.patch.0
+++ b/external/openssl/configurable-z-option.patch.0
@@ -1,15 +1,15 @@
 Configurations/10-main.conf.sav2021-08-24 13:38:47.0 +
-+++ Configurations/10-main.conf2021-11-02 22:20:44.377653700 +
-@@ -13,7 +13,7 @@
+--- Configurations/10-main.conf.sav2023-09-19 22:02:31.0 +0900
 Configurations/10-main.conf2023-09-30 23:47:49.734377000 +0900
+@@ -14,7 +14,7 @@
  } elsif ($disabled{asm}) {
  # assembler is still used to compile uplink shim
  $vc_win64a_info = { AS=> "ml64",
 -ASFLAGS   => "/nologo /Zi",
 +ASFLAGS   => "/nologo $$(DEBUG_FLAGS_VALUE)",
  asflags   => "/c /Cp /Cx",
- asoutflag => "/Fo" };
- } else {
-@@ -41,7 +41,7 @@
+ asoutflag => "/Fo",
+ perlasm_scheme => "masm" };
+@@ -44,7 +44,7 @@
  } elsif ($disabled{asm}) {
  # not actually used, uplink shim is inlined into C code
  $vc_win32_info = { AS=> "ml",
@@ -18,7 +18,7 @@
 asflags   => "/Cp /coff /c /Cx",
 asoutflag => "/Fo",
 perlasm_scheme => "win32" };
-@@ -1323,10 +1323,10 @@
+@@ -1333,10 +1333,10 @@
  "UNICODE", "_UNICODE",
  "_CRT_SECURE_NO_DEPRECATE",
  "_WINSOCK_DEPRECATED_NO_WARNINGS"),

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-09-29 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6f6ac891e7fac111699b04f7e32e218b8897f24a
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 13 23:37:13 2023 +0900
Commit: Xisco Fauli 
CommitDate: Fri Sep 29 10:55:27 2023 +0200

upgrade zlib to 1.3

Change-Id: I474d1f3bc0ae804bd579d32712ed9e2fba4e89e3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157378
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 271491c338bd1f0faad627c8d43076e6e6d2a754)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157324
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 393b47d9af49..3ff258e84901 100644
--- a/download.lst
+++ b/download.lst
@@ -555,8 +555,8 @@ XSLTML_TARBALL := 
a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-ZLIB_SHA256SUM := 
d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98
-ZLIB_TARBALL := zlib-1.2.13.tar.xz
+ZLIB_SHA256SUM := 
8a9ba2898e1d0d774eca6ba5b4627a11e5588ba85c8851336eb38de4683050a7
+ZLIB_TARBALL := zlib-1.3.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/curl

2023-09-27 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 external/curl/ExternalProject_curl.mk|   26 +-
 external/curl/UnpackedTarball_curl.mk|   12 
 external/curl/asan-poison-nsspem.patch.0 |   11 ---
 external/curl/curl-nss.patch.1   |   17 -
 5 files changed, 7 insertions(+), 63 deletions(-)

New commits:
commit 609d4a6b8d66d02a36c57de99efd36a4b1c2b789
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Sep 13 18:25:13 2023 +0900
Commit: Michael Stahl 
CommitDate: Wed Sep 27 12:34:13 2023 +0200

curl: upgrade to release 8.3.0

Fixes CVE-2023-38039

* NSS support was removed in this release, so NSS related patches are not 
necessary now.
* add configure options for curl.

Change-Id: I71e09bac3c69ce4b13deee770a32225f39f79c46
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156917
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit c2930ebff82c4f7ffe8377ab82627131f8544226)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157311
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 2b875b046e8e..393b47d9af49 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
dd322f6bd0a20e6cebdfd388f69e98c3d183bed792cf4713c8a7ef498cba4894
-CURL_TARBALL := curl-8.2.1.tar.xz
+CURL_SHA256SUM := 
376d627767d6c4f05105ab6d497b0d9aba7111770dd9d995225478209c37ea63
+CURL_TARBALL := curl-8.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 087ea2c44b39..fdc93a46c3cb 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -10,21 +10,10 @@
 $(eval $(call gb_ExternalProject_ExternalProject,curl))
 
 $(eval $(call gb_ExternalProject_use_externals,curl,\
+   $(if $(ENABLE_OPENSSL),openssl) \
zlib \
 ))
 
-ifeq ($(TLS),NSS)
-$(eval $(call gb_ExternalProject_use_externals,curl,\
-   nss3 \
-))
-else
-ifeq ($(TLS),OPENSSL)
-$(eval $(call gb_ExternalProject_use_externals,curl,\
-   openssl \
-))
-endif
-endif
-
 $(eval $(call gb_ExternalProject_register_targets,curl,\
build \
 ))
@@ -41,18 +30,14 @@ curl_LDFLAGS += -L$(SYSBASE)/usr/lib
 endif
 endif
 
-# there are 2 include paths, the other one is passed to --with-nss below
-ifeq ($(SYSTEM_NSS),)
-curl_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss
-endif
-
 # use --with-secure-transport on macOS >10.5 and iOS to get a native UI for 
SSL certs for CMIS usage
-# use --with-nss/--with-openssl only on platforms other than macOS and iOS
+# use --with-openssl only on platforms other than macOS and iOS
 $(call gb_ExternalProject_get_state_target,curl,build):
$(call gb_Trace_StartRange,curl,EXTERNAL)
$(call gb_ExternalProject_run,build,\
$(gb_RUN_CONFIGURE) ./configure \
-   --without-nss --without-openssl --without-gnutls 
--without-mbedtls \
+   --without-amissl --without-bearssl --without-gnutls \
+   --without-mbedtls --without-rustls --without-wolfssl \
--enable-ftp --enable-http --enable-ipv6 \
--without-libidn2 --without-libpsl --without-librtmp \
--without-libssh2 --without-nghttp2 \
@@ -66,8 +51,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--disable-tftp  \
$(if $(filter iOS MACOSX,$(OS)),\
--with-secure-transport,\
-   $(if $(filter NSS,$(TLS)),--with-nss$(if 
$(SYSTEM_NSS),,="$(call gb_UnpackedTarball_get_dir,nss)/dist/out") 
--with-nss-deprecated)) \
-   $(if $(filter 
OPENSSL,$(TLS)),--with-openssl$(if $(SYSTEM_OPENSSL),,="$(call 
gb_UnpackedTarball_get_dir,openssl)")) \
+   $(if $(ENABLE_OPENSSL),--with-openssl$(if 
$(SYSTEM_OPENSSL),,="$(call gb_UnpackedTarball_get_dir,openssl)"))) \
$(if $(filter LINUX,$(OS)),--without-ca-bundle 
--without-ca-path) \
$(gb_CONFIGURE_PLATFORMS) \
$(if $(filter 
TRUE,$(DISABLE_DYNLOADING)),--disable-shared,--disable-static) \
diff --git a/external/curl/UnpackedTarball_curl.mk 
b/external/curl/UnpackedTarball_curl.mk
index e78adabb8d07..4412857d36a0 100644
--- a/external/curl/UnpackedTarball_curl.mk
+++ b/external/curl/UnpackedTarball_curl.mk
@@ -27,22 +27,10 @@ $(eval $(call gb_UnpackedTarball_add_patches,curl,\
external/curl/configurable-z-option.patch.0 \
 ))
 
-ifeq ($(SYSTEM_NSS),)
-$(eval $(call

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/poppler

2023-09-26 Thread Michael Stahl (via logerrit)

 download.lst  |4 ++--
 external/poppler/StaticLibrary_poppler.mk |6 +-
 external/poppler/disable-freetype.patch.1 |2 +-
 external/poppler/poppler-config.patch.1   |   27 +++
 4 files changed, 19 insertions(+), 20 deletions(-)

New commits:
commit 5b74eb49c84da9cf67c9a4d618850fbec3efb853
Author: Michael Stahl 
AuthorDate: Mon Sep 25 15:50:43 2023 +0200
Commit: Xisco Fauli 
CommitDate: Tue Sep 26 10:40:31 2023 +0200

poppler: upgrade to release 23.09.0

Fixes CVE-2023-34872

Change-Id: I289b3016695a01aff7d393cb09d66cd726d9b592
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157247
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3d31dfa9b99d0df5e400c1a6d7e8df6c46129b3c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157218
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 629782352844..2b875b046e8e 100644
--- a/download.lst
+++ b/download.lst
@@ -458,8 +458,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
-POPPLER_TARBALL := poppler-23.06.0.tar.xz
+POPPLER_SHA256SUM := 
80d1d44dd8bdf4ac1a47d56c5065075eb9991790974b1ed7d14b972acde88e55
+POPPLER_TARBALL := poppler-23.09.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index c8c2e47c43d1..7b6f958245ac 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -13,7 +13,10 @@ $(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler))
 
 $(eval $(call 
gb_StaticLibrary_set_precompiled_header,poppler,external/poppler/inc/pch/precompiled_poppler))
 
-$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg))
+$(eval $(call gb_StaticLibrary_use_externals,poppler,\
+   libjpeg \
+   zlib \
+))
 
 $(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler))
 
@@ -92,6 +95,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/poppler/FDPDFDocBuilder \
UnpackedTarball/poppler/poppler/FILECacheLoader \
UnpackedTarball/poppler/poppler/FileSpec \
+   UnpackedTarball/poppler/poppler/FlateEncoder \
UnpackedTarball/poppler/poppler/FontEncodingTables \
UnpackedTarball/poppler/poppler/FontInfo \
UnpackedTarball/poppler/poppler/Form \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 77c643de40f5..3c4d1d0f7a8a 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -19,9 +19,9 @@ disable freetype dependent code
 -#include FT_FREETYPE_H
 +//#include 
 +//#include FT_FREETYPE_H
+ #include 
  
  // helper for using std::visit to get a dependent false for static_asserts
- // to help get compile errors if one ever extends variants
 @@ -2760,6 +2760,8 @@
  
  Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
, bool forceName)
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index be8fc98556a7..8f71e987b2b9 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -2,7 +2,7 @@
 
 note: to get the 3rd one, use -DENABLE_CPP=on
 
-mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB=off -DENABLE_ZLIB_UNCOMPRESS=off 
-DENABLE_GPGME=off -DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off 
-DENABLE_SPLASH=off -DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6
+mkdir build && cd build && cmake .. -DENABLE_DCTDECODER=libjpeg 
-DHAVE_CAIRO=off -DENABLE_LIBOPENJPEG=none -DENABLE_CMS=none 
-DENABLE_LIBCURL=off -DENABLE_ZLIB_UNCOMPRESS=off -DENABLE_GPGME=off 
-DENABLE_NSS3=off -DENABLE_LIBPNG=off -DENABLE_LIBTIFF=off -DENABLE_SPLASH=off 
-DENABLE_UTILS=off -DENABLE_CPP=off -DENABLE_GLIB=off 
-DENABLE_GOBJECT_INTROSPECTION=off -DENABLE_GTK_DOC=off -DENABLE_QT5=off 
-DENABLE_QT6=off
 
 manually disabled these because cmake failed to do it:
 HAVE_CAIRO
@@ -37,9 +37,6 @@ index 0fbd336a..451213f8 100644
 +/* Do not hardcode the library location */
 +/* #undef ENABLE_RELOCATABLE */
 +
-+/* Build against zlib. */
-+/* #undef ENABLE_ZLIB */
-+
 +/* Use zlib instead of builtin zlib decoder to uncompress flate streams. */
 +/* #undef ENABLE_ZLIB_UNCOMPRESS */
 +
@@ -182,7 +179,7 @@ index 0fbd336a..451213f8 100644

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-09-25 Thread Michael Stahl (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 05c7f25b699edff9fa188e09c923b2bf3411ff54
Author: Michael Stahl 
AuthorDate: Mon Sep 25 14:22:40 2023 +0200
Commit: Xisco Fauli 
CommitDate: Mon Sep 25 21:52:23 2023 +0200

libtommath: upgrade to release 1.2.1

Fixes CVE-2023-36328.

Change-Id: I1193f5df789c7dd10855e35936fc2697697c464e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157246
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3daab618c759be2b93ad337061ef347c76229a22)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157217
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/download.lst b/download.lst
index ad8d97ebdce4..0044c6a8f3ab 100644
--- a/download.lst
+++ b/download.lst
@@ -329,8 +329,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
-LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
+LIBTOMMATH_SHA256SUM := 
986025d7b374276fee2e30e99f3649e4ac0db8a02257a37ee10eae72abed0d1f
+LIBTOMMATH_TARBALL := ltm-1.2.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-09-14 Thread Caolán McNamara (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 118383279b6cb609dc1e2623bd6f42f833ac12bf
Author: Caolán McNamara 
AuthorDate: Thu Sep 14 08:23:53 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Sep 14 10:24:52 2023 +0200

tdf#157231 CVE-2023-4863 upgrade to libwebp-1.3.2.tar.gz

Change-Id: Ib60466a59069b59fa884654167f33ccc58e59330
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156882
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index d14cdac5f7a8..ad8d97ebdce4 100644
--- a/download.lst
+++ b/download.lst
@@ -334,8 +334,8 @@ LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBWEBP_SHA256SUM := 
b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66
-LIBWEBP_TARBALL := libwebp-1.3.1.tar.gz
+LIBWEBP_SHA256SUM := 
2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4
+LIBWEBP_TARBALL := libwebp-1.3.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/openldap

2023-08-15 Thread Taichi Haradaguchi (via logerrit)

 download.lst  |4 ++--
 external/openldap/UnpackedTarball_openldap.mk |2 --
 external/openldap/Wint-conversion.patch   |   11 ---
 external/openldap/configure-c99.patch |   11 ---
 external/openldap/openldap-2.4.44.patch.1 |2 +-
 5 files changed, 3 insertions(+), 27 deletions(-)

New commits:
commit a0348d148a3be3b64640d2809ea6c5ad168344d2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Aug 7 17:01:24 2023 +0900
Commit: Michael Stahl 
CommitDate: Tue Aug 15 11:36:10 2023 +0200

openldap: upgrade to release 2.6.6

* remove Wint-conversion.patch and configure-c99.patch, which were fixed 
upstream.

Change-Id: Ia93b0190e60ab3420fe79c5446f22a1573b1ea6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155441
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit af3e5bef6c4e6b3158a7ab5a97c22909a7a1faa5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155606
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 7c6da561227e..5f319a6e2841 100644
--- a/download.lst
+++ b/download.lst
@@ -418,8 +418,8 @@ OFFICEOTRON_JAR := 
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENLDAP_SHA256SUM := 
d51704e50178430c06cf3d8aa174da66badf559747a47d920bb54b2d4aa40991
-OPENLDAP_TARBALL := openldap-2.6.4.tgz
+OPENLDAP_SHA256SUM := 
082e998cf542984d43634442dbe11da860759e510907152ea579bdc42fe39ea0
+OPENLDAP_TARBALL := openldap-2.6.6.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/openldap/UnpackedTarball_openldap.mk 
b/external/openldap/UnpackedTarball_openldap.mk
index 98c88a28ccc5..61a083ddcd8a 100644
--- a/external/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -20,8 +20,6 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,openldap,\
 
 $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
external/openldap/openldap-2.4.44.patch.1 \
-   external/openldap/configure-c99.patch \
-   external/openldap/Wint-conversion.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/openldap/Wint-conversion.patch 
b/external/openldap/Wint-conversion.patch
deleted file mode 100644
index 60e14c991cc0..
--- a/external/openldap/Wint-conversion.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 configure
-+++ configure
-@@ -19241,7 +19241,7 @@
- int
- main ()
- {
--pthread_detach(NULL);
-+pthread_t t; pthread_detach(t);
-   ;
-   return 0;
- }
diff --git a/external/openldap/configure-c99.patch 
b/external/openldap/configure-c99.patch
deleted file mode 100644
index f1c3da6c4c23..
--- a/external/openldap/configure-c99.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 configure
-+++ configure
-@@ -14691,7 +14691,7 @@
- #include 
- #include 
- static char *pattern, *string;
--main()
-+int main()
- {
-   int rc;
-   regex_t re;
diff --git a/external/openldap/openldap-2.4.44.patch.1 
b/external/openldap/openldap-2.4.44.patch.1
index 1521e86a2664..2dfaf355afb0 100644
--- a/external/openldap/openldap-2.4.44.patch.1
+++ b/external/openldap/openldap-2.4.44.patch.1
@@ -11,7 +11,7 @@
  INSTALLDIRS= 
  
 @@ -32,7 +32,3 @@
-   $(RM) config.status libtool stamp-h stamp-h.in
+   $(RM) config.status libtool stamp-h stamp-h.in 
libraries/libldap/ldap.pc libraries/liblber/lber.pc
  
  distclean: veryclean FORCE
 -

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-08-07 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 72c058e25bd034645efa1900dc898f065d8175dc
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Aug 6 01:57:31 2023 +0900
Commit: Xisco Fauli 
CommitDate: Mon Aug 7 10:34:59 2023 +0200

openssl: upgrade to release 3.0.10

Change-Id: Iee5716bdd111e2f30cb38d48a86104da52872dd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155382
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 72f28e12b15823197e42265af1f8dda21224c90a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155392
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 1bb3767bcbe8..7c6da561227e 100644
--- a/download.lst
+++ b/download.lst
@@ -423,8 +423,8 @@ OPENLDAP_TARBALL := openldap-2.6.4.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90
-OPENSSL_TARBALL := openssl-3.0.9.tar.gz
+OPENSSL_SHA256SUM := 
1761d4f5b13a1028b9b6f3d4b8e17feb0cedc9370f6afe61d7193d2cdce83323
+OPENSSL_TARBALL := openssl-3.0.10.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/libtommath

2023-07-25 Thread Taichi Haradaguchi (via logerrit)

 download.lst  |4 ++--
 external/libtommath/README|2 +-
 external/libtommath/UnpackedTarball_libtommath.mk |2 --
 external/libtommath/clang-cl.patch|   16 
 external/libtommath/libtommath-msvc.patch |   12 
 5 files changed, 3 insertions(+), 33 deletions(-)

New commits:
commit 89da375303b085e0ebb2604e1c51cc90b1099ab9
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 17:27:57 2023 +0900
Commit: خالد حسني 
CommitDate: Tue Jul 25 10:57:58 2023 +0200

LibTomMath: upgrade to release 1.2.0

* external/libtommath/clang-cl.patch: removed "typedef unsigned __int128
mp_word" from tommmath.h
* external/libtommath/libtommath-msvc.patch: fixed upstream

Change-Id: I38fe730ff0e9649c6a0ad8d64b723a27e3434012
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153871
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 13bc0489d98b1f49a4f82fccb89d640439db4f4e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154315
Reviewed-by: خالد حسني 

diff --git a/download.lst b/download.lst
index a218a4c388e8..cd4f75c9d2e4 100644
--- a/download.lst
+++ b/download.lst
@@ -329,8 +329,8 @@ LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.11.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
-LIBTOMMATH_TARBALL := ltm-1.0.zip
+LIBTOMMATH_SHA256SUM := 
b7c75eecf680219484055fcedd686064409254ae44bc31a96c5032843c0e18b1
+LIBTOMMATH_TARBALL := ltm-1.2.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libtommath/README b/external/libtommath/README
index a028ff733161..41f91970a71b 100644
--- a/external/libtommath/README
+++ b/external/libtommath/README
@@ -3,4 +3,4 @@ integer library written entirely in C.
 
 Used by embedded firebird (external/firebird).
 
-https://www.libtom.net/LibTomMath/
+From [https://www.libtom.net/LibTomMath/].
diff --git a/external/libtommath/UnpackedTarball_libtommath.mk 
b/external/libtommath/UnpackedTarball_libtommath.mk
index bb0b9e352930..8961a46162c5 100644
--- a/external/libtommath/UnpackedTarball_libtommath.mk
+++ b/external/libtommath/UnpackedTarball_libtommath.mk
@@ -14,8 +14,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,libtommath,$(LIBTOMMATH_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libtommath,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libtommath,\
-   external/libtommath/libtommath-msvc.patch \
-   external/libtommath/clang-cl.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libtommath/clang-cl.patch 
b/external/libtommath/clang-cl.patch
deleted file mode 100644
index 1cc92d380c62..
--- a/external/libtommath/clang-cl.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 tommath.h
-+++ tommath.h
-@@ -15,6 +15,13 @@
- #ifndef BN_H_
- #define BN_H_
- 
-+// Work around clang-cl issue when mp_word is a typedef for unsigned 
__int128, see
-+//  "Clang-cl generates a call 
to an undefined symbol
-+// _udivti3":
-+#if defined _WIN32 && defined __clang__
-+#define MP_8BIT
-+#endif
-+
- #include 
- #include 
- #include 
diff --git a/external/libtommath/libtommath-msvc.patch 
b/external/libtommath/libtommath-msvc.patch
deleted file mode 100644
index 07884871aac9..
--- a/external/libtommath/libtommath-msvc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 makefile.msvc  2016-02-05 23:25:32.0 +0100
-+++ makefile.msvc  2016-07-21 11:34:20.618390100 +0200
-@@ -38,3 +38,9 @@
- 
- library: $(OBJECTS)
-   lib /out:tommath.lib $(OBJECTS)
-+
-+.cc.obj:
-+  $(CC) /nologo $(CFLAGS) /c $<
-+
-+.c.obj:
-+  $(CC) /nologo $(CFLAGS) /c $<

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/harfbuzz

2023-07-23 Thread Taichi Haradaguchi (via logerrit)

 download.lst  |4 ++--
 external/harfbuzz/UnpackedTarball_harfbuzz.mk |2 --
 external/harfbuzz/tdf137553.patch.1   |   16 
 3 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 6c72e31752131cfe619583e320d42c0c1bf3149b
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jul 9 13:56:23 2023 +0900
Commit: خالد حسني 
CommitDate: Mon Jul 24 01:11:51 2023 +0200

Upgrade Harfbuzz to 8.0.0

Change-Id: I04d81509c50f0335d201b5286460989f526b58f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154233
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 21d0534d8ca6ec5362848fb29b6f1ead7d1643d6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154320
Reviewed-by: خالد حسني 

diff --git a/download.lst b/download.lst
index 9cba05cca51d..9a7ae74a1a9e 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
-HARFBUZZ_TARBALL := harfbuzz-7.3.0.tar.xz
+HARFBUZZ_SHA256SUM := 
1f98b5e3d06a344fe667d7e8210094ced458791499839bddde98c167ce6a7c79
+HARFBUZZ_TARBALL := harfbuzz-8.0.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk 
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index b2e1f5145dc7..9bc9e326b426 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,9 +15,7 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
 
-# https://github.com/harfbuzz/harfbuzz/pull/4314
 $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
-   external/harfbuzz/tdf137553.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/harfbuzz/tdf137553.patch.1 
b/external/harfbuzz/tdf137553.patch.1
deleted file mode 100644
index 807001e497b2..
--- a/external/harfbuzz/tdf137553.patch.1
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur harfbuzz.org/src/hb-graphite2.cc harfbuzz/src/hb-graphite2.cc
 harfbuzz.org/src/hb-graphite2.cc   2023-07-08 12:33:00
-+++ harfbuzz/src/hb-graphite2.cc   2023-07-08 12:37:46
-@@ -363,9 +363,10 @@
-   }
-   else
-   {
-+  auto origin_X = gr_slot_origin_X (is) * xscale;
-   c->advance = 0;
--  clusters[ci].advance += gr_slot_origin_X(is) * xscale - curradv;
--  curradv += clusters[ci].advance;
-+  clusters[ci].advance += origin_X - curradv;
-+  curradv = origin_X;
-   }
-   ci++;
- }

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/poppler

2023-07-05 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 -
 external/poppler/README  |2 
 external/poppler/UnpackedTarball_poppler.mk  |1 
 external/poppler/disable-freetype.patch.1|   18 ++---
 external/poppler/disable-nss-and-gpgmepp.patch.1 |   76 +++
 external/poppler/gcc7-EntityInfo.patch.1 |   43 +++--
 external/poppler/inc/pch/precompiled_poppler.hxx |   30 -
 external/poppler/poppler-config.patch.1  |   27 +---
 8 files changed, 161 insertions(+), 40 deletions(-)

New commits:
commit 8a639c80ddb9ea2a40b63e6f0d97dfcb056183c0
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 14 09:58:15 2023 +0900
Commit: Christian Lohmaier 
CommitDate: Wed Jul 5 13:59:38 2023 +0200

poppler: upgrade to release 23.06.0

Add external/poppler/disable-nss-and-gpgmepp.patch.1 to get rid of
some code that requires NSS or GPGMEPP.

Update external/poppler/inc/pch/precompiled_poppler.hxx.

Change-Id: I5e61371776c64962452022516446b5079c3840e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153097
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 27e1c198a504deb4634f5f6673a77b5944c9f8cc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153908
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index 0fa89e658822..9cba05cca51d 100644
--- a/download.lst
+++ b/download.lst
@@ -458,8 +458,8 @@ LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POPPLER_SHA256SUM := 
b04148bf849c1965ada7eff6be4685130e3a18a84e0cce73bf9bc472ec32f2b4
-POPPLER_TARBALL := poppler-23.03.0.tar.xz
+POPPLER_SHA256SUM := 
d38c6b2f31c8f6f3727fb60a011a0e6c567ebf56ef1ccad36263ca9ed6448a65
+POPPLER_TARBALL := poppler-23.06.0.tar.xz
 POPPLER_DATA_SHA256SUM := 
c835b640a40ce357e1b83666aabd95edffa24d49b8daff63adb851cdab74
 POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
diff --git a/external/poppler/README b/external/poppler/README
index 35a640264618..08d3612c3542 100644
--- a/external/poppler/README
+++ b/external/poppler/README
@@ -1 +1 @@
-From [http://poppler.freedesktop.org/]. Not modified.  PDF rendering library 
based on the xpdf-3.0 code base. 
+From [https://poppler.freedesktop.org/]. Not modified.  PDF rendering library 
based on the xpdf-3.0 code base.
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index 6cbed9e103ec..73265d8ec65b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,poppler,0))
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/char_traits.patch \
external/poppler/disable-freetype.patch.1 \
+   external/poppler/disable-nss-and-gpgmepp.patch.1 \
external/poppler/gcc7-EntityInfo.patch.1 \
external/poppler/gcc7-GfxFont.patch.1 \
external/poppler/poppler-config.patch.1 \
diff --git a/external/poppler/disable-freetype.patch.1 
b/external/poppler/disable-freetype.patch.1
index 710742206925..77c643de40f5 100644
--- a/external/poppler/disable-freetype.patch.1
+++ b/external/poppler/disable-freetype.patch.1
@@ -1,8 +1,8 @@
 disable freetype dependent code
 
 poppler/poppler/Form.cc.orig   2022-09-14 15:46:48.588316681 +0200
-+++ poppler/poppler/Form.cc2022-09-14 15:48:01.468274551 +0200
-@@ -46,7 +46,7 @@
+--- poppler/poppler/Form.cc.orig   2023-06-05 19:29:14.0 +0900
 poppler/poppler/Form.cc2023-06-14 18:50:22.232312300 +0900
+@@ -48,7 +48,7 @@
  #include 
  #include 
  #include 
@@ -11,7 +11,7 @@ disable freetype dependent code
  #include "goo/gmem.h"
  #include "goo/gfile.h"
  #include "goo/GooString.h"
-@@ -77,8 +77,8 @@
+@@ -78,8 +78,8 @@
  #include "fofi/FoFiTrueType.h"
  #include "fofi/FoFiIdentifier.h"
  
@@ -20,18 +20,18 @@ disable freetype dependent code
 +//#include 
 +//#include FT_FREETYPE_H
  
- // return a newly allocated char* containing an UTF16BE string of size length
- char *pdfDocEncodingToUTF16(const std::string , int *length)
-@@ -2743,6 +2743,8 @@
+ // helper for using std::visit to get a dependent false for static_asserts
+ // to help get compile errors if one ever extends variants
+@@ -2760,6 +2760,8 @@
  
- Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
)
+ Form::AddFontResult Form::addFontToDefaultResources(const std::string 
, int faceIndex, const std::string , const std::string 
, bool forceName)
  {
 +return {};
 +#if 0
  if (!GooString::endsWith(filepath, ".ttf") && 
!GooString::endsWith(filepath, ".ttc") && !GooString::endsWith(filepath, 
".otf")) {
  error(errIO, -1, "We only support embedding

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/harfbuzz

2023-07-05 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 external/harfbuzz/README |6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 0ae4def1b72bba636ca9b51a06fb190c28e7e360
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 28 19:03:16 2023 +0900
Commit: Christian Lohmaier 
CommitDate: Wed Jul 5 13:52:40 2023 +0200

Upgrade Harfbuzz to 7.3.0

Release Notes:
https://github.com/harfbuzz/harfbuzz/releases/tag/7.2.0 (v7.2.0)
https://github.com/harfbuzz/harfbuzz/releases/tag/7.3.0 (v7.3.0)

Change-Id: I4f57b7e829f2356b5e2b442ff00df555121c0e66
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153729
Tested-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 8492195582a546b607bb15bc61adb64dcd74b904)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153894
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/download.lst b/download.lst
index b179b4ba7034..0fa89e658822 100644
--- a/download.lst
+++ b/download.lst
@@ -222,8 +222,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-HARFBUZZ_SHA256SUM := 
f135a61cd464c9ed6bc9823764c188f276c3850a8dc904628de2a87966b7077b
-HARFBUZZ_TARBALL := harfbuzz-7.1.0.tar.xz
+HARFBUZZ_SHA256SUM := 
20770789749ac9ba846df33983dbda22db836c70d9f5d050cb9aa5347094a8fb
+HARFBUZZ_TARBALL := harfbuzz-7.3.0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/harfbuzz/README b/external/harfbuzz/README
index 149da5566ab9..557c0a724ce8 100644
--- a/external/harfbuzz/README
+++ b/external/harfbuzz/README
@@ -1 +1,5 @@
-HarfBuzz is an OpenType text shaping engine. From 
[https://harfbuzz.github.io/].
+HarfBuzz is an OpenType text shaping engine.
+
+From [https://harfbuzz.github.io/].
+
+Release archives at [https://github.com/harfbuzz/harfbuzz/releases].

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/libxslt

2023-07-04 Thread Taichi Haradaguchi (via logerrit)

 download.lst|4 ++--
 external/libxslt/README |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 746790a8ec3f7cbd22f5f74565e657145b6e9ef2
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 18:38:33 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Jul 4 21:07:39 2023 +0200

libxslt: upgrade to release 1.1.38

Change-Id: I0534d7e02c9486b3d58f56e1a26fe6846b4a20b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153874
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 362dfc50a28a918ec73609a00d2851eb3058375d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153905
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 47c1abb8f9cd..b179b4ba7034 100644
--- a/download.lst
+++ b/download.lst
@@ -350,8 +350,8 @@ LIBXML_TARBALL := 
libxml2-2.11.$(LIBXML_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBXSLT_SHA256SUM := 
8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
-LIBXSLT_VERSION_MICRO := 35
+LIBXSLT_SHA256SUM := 
1f32450425819a09acaff2ab7a5a7f8a2ec7956e505d7beeb45e843d0e1ecab1
+LIBXSLT_VERSION_MICRO := 38
 LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz
 # three static lines
 # so that git cherry-pick
diff --git a/external/libxslt/README b/external/libxslt/README
index dd69a9d732c3..2eb71661b903 100644
--- a/external/libxslt/README
+++ b/external/libxslt/README
@@ -1 +1 @@
-Gnome xslt library written in C, from [http://xmlsoft.org/xslt/]
+libxslt is an XSLT processor based on libxml2, from 
[https://gitlab.gnome.org/GNOME/libxslt/]

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-07-04 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9373156f5cc70d4234e81a9f5d84d0a0f527085b
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Mon Jul 3 22:01:59 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Jul 4 11:05:32 2023 +0200

libpng: upgrade to release 1.6.40

Change-Id: I2f366045097a6f063e26703b4132710573a40e65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153879
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit 2c733d79d8d1ce630711c5b9bcceb2b6f99eb51a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153913
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 74fc95e75c61..47c1abb8f9cd 100644
--- a/download.lst
+++ b/download.lst
@@ -448,8 +448,8 @@ PIXMAN_TARBALL := pixman-0.42.2.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBPNG_SHA256SUM := 
1f4696ce70b4ee5f85f1e1623dc1229b210029fa4b7aee573df3e2ba7b036937
-LIBPNG_TARBALL := libpng-1.6.39.tar.xz
+LIBPNG_SHA256SUM := 
535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1
+LIBPNG_TARBALL := libpng-1.6.40.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/postgresql

2023-07-03 Thread Taichi Haradaguchi (via logerrit)

 download.lst   |4 ++--
 external/postgresql/README |6 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 3e88d79827738862ee19b687c002349b93d4e138
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Wed Jun 28 18:58:58 2023 +0900
Commit: Caolán McNamara 
CommitDate: Mon Jul 3 22:33:45 2023 +0200

postgresql: upgrade to release 13.11

CVE-2023-2454 and CVE-2023-2455 don't affect LibreOffice.

Release Notes: https://www.postgresql.org/docs/release/13.11/

Change-Id: I1de521b6aa9af1e6d84ea794b0f4f5d62de377f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153728
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit a815a1dbc765df464a36f120ff32c2a834c1fc8f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153895
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index ccb3ae574391..74fc95e75c61 100644
--- a/download.lst
+++ b/download.lst
@@ -465,8 +465,8 @@ POPPLER_DATA_TARBALL := poppler-data-0.4.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-POSTGRESQL_SHA256SUM := 
5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2
-POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
+POSTGRESQL_SHA256SUM := 
4992ff647203566b670d4e54dc5317499a26856c93576d0ea951bdf6bee50bfb
+POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/postgresql/README b/external/postgresql/README
index edc3d5df2781..a04037993690 100644
--- a/external/postgresql/README
+++ b/external/postgresql/README
@@ -1,3 +1,7 @@
 PostgreSQL object-relational database management system
 
-We use some pieces of this code for the postgresql database connector.
\ No newline at end of file
+We use some pieces of this code for the postgresql database connector.
+
+From [https://www.postgresql.org/].
+
+Release archives at [https://www.postgresql.org/ftp/source/].

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/libwebp

2023-07-03 Thread Taichi Haradaguchi (via logerrit)

 download.lst|4 +-
 external/libwebp/CVE-2023-1999.patch.1  |   52 
 external/libwebp/UnpackedTarball_libwebp.mk |1 
 3 files changed, 2 insertions(+), 55 deletions(-)

New commits:
commit e99df5f6f9a38d9fa66d515481f43bdc9200c208
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Jul 1 11:56:32 2023 +0900
Commit: Caolán McNamara 
CommitDate: Mon Jul 3 12:41:56 2023 +0200

upgrade libwebp to 1.3.1

Fixes CVE-2023-1999.

Change-Id: I3d0f5f718242977156729521d14efb1a8d71aee4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153819
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>
(cherry picked from commit c1fe534ae49e7e97b5965a5d1fbf910598215102)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153835
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 6a76dee49b12..ccb3ae574391 100644
--- a/download.lst
+++ b/download.lst
@@ -334,8 +334,8 @@ LIBTOMMATH_TARBALL := ltm-1.0.zip
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBWEBP_SHA256SUM := 
64ac4614db292ae8c5aa26de0295bf1623dbb3985054cb656c55e67431def17c
-LIBWEBP_TARBALL := libwebp-1.3.0.tar.gz
+LIBWEBP_SHA256SUM := 
b3779627c2dfd31e3d8c4485962c2efe17785ef975e2be5c8c0c9e6cd3c4ef66
+LIBWEBP_TARBALL := libwebp-1.3.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libwebp/CVE-2023-1999.patch.1 
b/external/libwebp/CVE-2023-1999.patch.1
deleted file mode 100644
index 65c2cf75fb79..
--- a/external/libwebp/CVE-2023-1999.patch.1
+++ /dev/null
@@ -1,52 +0,0 @@
-From a486d800b60d0af4cc0836bf7ed8f21e12974129 Mon Sep 17 00:00:00 2001
-From: James Zern 
-Date: Wed, 22 Feb 2023 22:15:47 -0800
-Subject: [PATCH] EncodeAlphaInternal: clear result->bw on error
-
-This avoids a double free should the function fail prior to
-VP8BitWriterInit() and a previous trial result's buffer carried over.
-Previously in ApplyFiltersAndEncode() trial.bw (with a previous
-iteration's buffer) would be freed, followed by best.bw pointing to the
-same buffer.
-
-Since:
-187d379d add a fallback to ALPHA_NO_COMPRESSION
-
-In addition, check the return value of VP8BitWriterInit() in this
-function.
-
-Bug: webp:603
-Change-Id: Ic258381ee26c8c16bc211d157c8153831c8c6910

- src/enc/alpha_enc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/enc/alpha_enc.c b/src/enc/alpha_enc.c
-index f7c02690e3..7d205586fe 100644
 a/src/enc/alpha_enc.c
-+++ b/src/enc/alpha_enc.c
-@@ -13,6 +13,7 @@
- 
- #include 
- #include 
-+#include 
- 
- #include "src/enc/vp8i_enc.h"
- #include "src/dsp/dsp.h"
-@@ -148,6 +149,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, 
int width, int height,
-   }
- } else {
-   VP8LBitWriterWipeOut(_bw);
-+  memset(>bw, 0, sizeof(result->bw));
-   return 0;
- }
-   }
-@@ -162,7 +164,7 @@ static int EncodeAlphaInternal(const uint8_t* const data, 
int width, int height,
-   header = method | (filter << 2);
-   if (reduce_levels) header |= ALPHA_PREPROCESSED_LEVELS << 4;
- 
--  VP8BitWriterInit(>bw, ALPHA_HEADER_LEN + output_size);
-+  if (!VP8BitWriterInit(>bw, ALPHA_HEADER_LEN + output_size)) ok = 0;
-   ok = ok && VP8BitWriterAppend(>bw, , ALPHA_HEADER_LEN);
-   ok = ok && VP8BitWriterAppend(>bw, output, output_size);
- 
diff --git a/external/libwebp/UnpackedTarball_libwebp.mk 
b/external/libwebp/UnpackedTarball_libwebp.mk
index 78761793174e..67f797157717 100644
--- a/external/libwebp/UnpackedTarball_libwebp.mk
+++ b/external/libwebp/UnpackedTarball_libwebp.mk
@@ -15,7 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libwebp,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libwebp,\
external/libwebp/Makefile.vc.patch \
-   external/libwebp/CVE-2023-1999.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/libassuan

2023-06-28 Thread Taichi Haradaguchi (via logerrit)

 download.lst|4 ++--
 external/libassuan/ExternalPackage_libassuan.mk |2 +-
 external/libassuan/w32-build-fixes.patch.1  |   14 --
 3 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 64148345dfe046e21955ec60042c4e64acb04049
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Jun 24 10:18:55 2023 +0900
Commit: Xisco Fauli 
CommitDate: Wed Jun 28 09:59:54 2023 +0200

Update libassuan to 2.5.6

Change-Id: Iea5af01231e67c24d34287929a54f5ec86af47ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153545
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>
(cherry picked from commit 88019e3ac34e35c193df0ae682722f6ec3ba5133)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153669
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index ae37b394ae52..6a76dee49b12 100644
--- a/download.lst
+++ b/download.lst
@@ -289,8 +289,8 @@ LCMS2_TARBALL := lcms2-2.12.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBASSUAN_SHA256SUM := 
8e8c2fcc982f9ca67dcbb1d95e2dc746b1739a4668bc20b3a3c5be632edb34e4
-LIBASSUAN_TARBALL := libassuan-2.5.5.tar.bz2
+LIBASSUAN_SHA256SUM := 
e9fd27218d5394904e4e39788f9b1742711c3e6b41689a31aa3380bd5aa4f426
+LIBASSUAN_TARBALL := libassuan-2.5.6.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/libassuan/ExternalPackage_libassuan.mk 
b/external/libassuan/ExternalPackage_libassuan.mk
index 0f24e5e2dec4..2df7b562d584 100644
--- a/external/libassuan/ExternalPackage_libassuan.mk
+++ b/external/libassuan/ExternalPackage_libassuan.mk
@@ -15,7 +15,7 @@ ifneq ($(DISABLE_DYNLOADING),TRUE)
 
 ifeq ($(OS),LINUX)
 
-$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.5))
+$(eval $(call 
gb_ExternalPackage_add_file,libassuan,$(LIBO_LIB_FOLDER)/libassuan.so.0,src/.libs/libassuan.so.0.8.6))
 
 else ifeq ($(OS),MACOSX)
 
diff --git a/external/libassuan/w32-build-fixes.patch.1 
b/external/libassuan/w32-build-fixes.patch.1
index ebf98c5f5093..8d77eef37cd5 100644
--- a/external/libassuan/w32-build-fixes.patch.1
+++ b/external/libassuan/w32-build-fixes.patch.1
@@ -33,20 +33,6 @@ diff -ru libassuan.orig/src/Makefile.am 
libassuan/src/Makefile.am
   `echo $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) | \
   sed -e 's/-I/--include-dir /g;s/-D/--define /g'`
  
-@@ -148,10 +148,10 @@
-   $(DESTDIR)$(bindir)/gpgcedev.dll
- endif
- 
-+mkheader$(EXEEXT): mkheader.c Makefile
--mkheader: mkheader.c Makefile
-   $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \
-   $(LDFLAGS_FOR_BUILD) -I. -I$(srcdir) -o $@ $(srcdir)/mkheader.c
- 
-+assuan.h: assuan.h.in mkheader$(EXEEXT) $(parts_of_assuan_h)
-+  ./mkheader$(EXEEXT) $(host_os) $(srcdir)/assuan.h.in \
--assuan.h: assuan.h.in mkheader $(parts_of_assuan_h)
--  ./mkheader $(host_os) $(srcdir)/assuan.h.in \
-$(PACKAGE_VERSION) $(VERSION_NUMBER) >$@
 diff -ru libassuan.orig/src/assuan-handler.c libassuan/src/assuan-handler.c
 --- libassuan.orig/src/assuan-handler.c 2016-06-25 16:27:49.0 +0200
 +++ libassuan/src/assuan-handler.c  2017-09-24 15:32:51.200956200 +0200

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-06-27 Thread Eike Rathke (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 03661c8f5a07e49fe54ae521d250aa45080cdbf2
Author: Eike Rathke 
AuthorDate: Tue Jun 27 13:39:13 2023 +0200
Commit: Xisco Fauli 
CommitDate: Tue Jun 27 22:35:13 2023 +0200

Update language-subtag-registry to 2023-05-11

Change-Id: Ieb1c3eab66c06c8e7b3d9751d9e4548dbd7efc04
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153643
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 41dbc7eb47f5f0392da77cd6693249471e135fcb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153664

diff --git a/download.lst b/download.lst
index 8d9f83b8db7a..ae37b394ae52 100644
--- a/download.lst
+++ b/download.lst
@@ -279,8 +279,8 @@ LIBJPEG_TURBO_TARBALL := libjpeg-turbo-2.1.5.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LANGTAGREG_SHA256SUM := 
e2d9224e0e50fc8ad12a3cf47396bbcadf45b2515839d4770432653a88972c00
-LANGTAGREG_TARBALL := language-subtag-registry-2022-08-08.tar.bz2
+LANGTAGREG_SHA256SUM := 
9042b64cd473bf36073513b474046f13778107b57c2ac47fb2633104120d69da
+LANGTAGREG_TARBALL := language-subtag-registry-2023-05-11.tar.bz2
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-06-27 Thread Caolán McNamara (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b2f1907013e5fec1f1e2b2c20cc5ca5c12e662d2
Author: Caolán McNamara 
AuthorDate: Sun Jun 25 20:04:39 2023 +0100
Commit: Michael Stahl 
CommitDate: Tue Jun 27 12:08:37 2023 +0200

upgrade libtiff to 4.5.1

Change-Id: Ia07f368a371930f655bdc3495e76295dad740d30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153570
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 3b302b98795310befdae4a4f925ab9921682b79c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153609
Reviewed-by: Michael Stahl 

diff --git a/download.lst b/download.lst
index 7111b41795c9..b89efb00a776 100644
--- a/download.lst
+++ b/download.lst
@@ -453,8 +453,8 @@ LIBPNG_TARBALL := libpng-1.6.39.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-LIBTIFF_SHA256SUM := 
dafac979c5e7b6c650025569c5a4e720995ba5f17bc17e6276d1f12427be267c
-LIBTIFF_TARBALL := tiff-4.5.0rc3.tar.xz
+LIBTIFF_SHA256SUM := 
3c080867114c26edab3129644a63b708028a90514b7fe3126e38e11d24f9f88a
+LIBTIFF_TARBALL := tiff-4.5.1.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst

2023-06-15 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ead11155b611a355d0f4bfa91454b345a0cd15e0
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Thu Jun 15 07:09:06 2023 +0900
Commit: Xisco Fauli 
CommitDate: Thu Jun 15 20:53:37 2023 +0200

nss: upgrade to release 3.90

Change-Id: Ic446f33abd5355886b8c8c181a088c07ea4605c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153096
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 3f6bb9565d4edce563dbd938c655ae853926d362)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153083
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index a9c9eaf5f0fc..e8ce2bfc67aa 100644
--- a/download.lst
+++ b/download.lst
@@ -392,8 +392,8 @@ MYTHES_TARBALL := mythes-1.2.5.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-NSS_SHA256SUM := 
fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a
-NSS_TARBALL := nss-3.88.1-with-nspr-4.35.tar.gz
+NSS_SHA256SUM := 
f78ab1d911cae8bbc94758fb3bd0f731df4087423a4ff5db271ba65381f6b739
+NSS_TARBALL := nss-3.90-with-nspr-4.35.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/curl

2023-06-13 Thread Taichi Haradaguchi (via logerrit)

 download.lst |4 ++--
 external/curl/README |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit eb8480ab2f87a1ab92f2782abf6c80626c28e4c0
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sat Jun 10 15:57:28 2023 +0900
Commit: Michael Stahl 
CommitDate: Tue Jun 13 12:04:47 2023 +0200

curl: upgrade to release 8.1.2

Fixes CVE-2023-28321, CVE-2023-28322, and 2 more CVEs that
probably don't affect LibreOffice.

Change-Id: If8720ba3647216063bffc8678aa64dad9a317128
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152809
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>
Reviewed-by: Michael Stahl 
(cherry picked from commit dc19ef0d42e89edffcc21795194eb1eeb5957d0f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152879

diff --git a/download.lst b/download.lst
index 8a647a765d6f..a9c9eaf5f0fc 100644
--- a/download.lst
+++ b/download.lst
@@ -75,8 +75,8 @@ CPPUNIT_TARBALL := cppunit-1.15.1.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-CURL_SHA256SUM := 
0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0
-CURL_TARBALL := curl-8.0.1.tar.xz
+CURL_SHA256SUM := 
31b1118eb8bfd43cd95d9a3f146f814ff874f6ed3999b29d94f4d1e7dbac5ef6
+CURL_TARBALL := curl-8.1.2.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/curl/README b/external/curl/README
index 292e4edf57b6..4a7044623608 100644
--- a/external/curl/README
+++ b/external/curl/README
@@ -1 +1 @@
-A URL manipulation engine from [http://curl.haxx.se/].
+A URL manipulation engine from [https://curl.se/].

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - download.lst external/openssl

2023-06-13 Thread Taichi Haradaguchi (via logerrit)

 download.lst   
|4 
 
external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
 |  221 --
 external/openssl/README
|2 
 external/openssl/UnpackedTarball_openssl.mk
|2 
 external/openssl/openssl-no-_umul128-on-aarch64.patch.1
|   58 --
 5 files changed, 3 insertions(+), 284 deletions(-)

New commits:
commit 69ea3ca8e97cb5990170e9b41e095a44313c2de7
Author: Taichi Haradaguchi <20001...@ymail.ne.jp>
AuthorDate: Sun Jun 11 17:36:54 2023 +0900
Commit: Xisco Fauli 
CommitDate: Tue Jun 13 11:12:52 2023 +0200

openssl: upgrade to release 3.0.9

Fixes CVE-2023-1255, CVE-2023-2650 and 3 more CVEs that
probably don't affect LibreOffice.

Change-Id: Ic615b008298471267121a0f4deb227ddb3a0409e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152851
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi  <20001...@ymail.ne.jp>
(cherry picked from commit 2137d04d1ddb80691c29de0df99fc2ba58820ce0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152970
Reviewed-by: Xisco Fauli 

diff --git a/download.lst b/download.lst
index 5366f5e1bbbd..8a647a765d6f 100644
--- a/download.lst
+++ b/download.lst
@@ -418,8 +418,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
-OPENSSL_SHA256SUM := 
6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e
-OPENSSL_TARBALL := openssl-3.0.8.tar.gz
+OPENSSL_SHA256SUM := 
eb1ab04781474360f77c318ab89d8c5a03abc38e63d65a603cabbf1b00a1dc90
+OPENSSL_TARBALL := openssl-3.0.9.tar.gz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git 
a/external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
 
b/external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
deleted file mode 100644
index d96d1d76883e..
--- 
a/external/openssl/0001-x509-excessive-resource-use-verifying-policy-constra.patch.1
+++ /dev/null
@@ -1,221 +0,0 @@
-From 959c59c7a0164117e7f8366466a32bb1f8d77ff1 Mon Sep 17 00:00:00 2001
-From: Pauli 
-Date: Wed, 8 Mar 2023 15:28:20 +1100
-Subject: [PATCH] x509: excessive resource use verifying policy constraints
-
-A security vulnerability has been identified in all supported versions
-of OpenSSL related to the verification of X.509 certificate chains
-that include policy constraints.  Attackers may be able to exploit this
-vulnerability by creating a malicious certificate chain that triggers
-exponential use of computational resources, leading to a denial-of-service
-(DoS) attack on affected systems.
-
-Fixes CVE-2023-0464
-
-Reviewed-by: Tomas Mraz 
-Reviewed-by: Shane Lontis 
-(Merged from https://github.com/openssl/openssl/pull/20568)

- crypto/x509/pcy_local.h |  8 +++-
- crypto/x509/pcy_node.c  | 12 +---
- crypto/x509/pcy_tree.c  | 36 ++--
- 3 files changed, 42 insertions(+), 14 deletions(-)
-
-diff --git a/crypto/x509/pcy_local.h b/crypto/x509/pcy_local.h
-index 18b53cc09e..cba107ca03 100644
 a/crypto/x509/pcy_local.h
-+++ b/crypto/x509/pcy_local.h
-@@ -111,6 +111,11 @@ struct X509_POLICY_LEVEL_st {
- };
- 
- struct X509_POLICY_TREE_st {
-+/* The number of nodes in the tree */
-+size_t node_count;
-+/* The maximum number of nodes in the tree */
-+size_t node_maximum;
-+
- /* This is the tree 'level' data */
- X509_POLICY_LEVEL *levels;
- int nlevel;
-@@ -157,7 +162,8 @@ X509_POLICY_NODE 
*ossl_policy_tree_find_sk(STACK_OF(X509_POLICY_NODE) *sk,
- X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
-  X509_POLICY_DATA *data,
-  X509_POLICY_NODE *parent,
-- X509_POLICY_TREE *tree);
-+ X509_POLICY_TREE *tree,
-+ int extra_data);
- void ossl_policy_node_free(X509_POLICY_NODE *node);
- int ossl_policy_node_match(const X509_POLICY_LEVEL *lvl,
-const X509_POLICY_NODE *node, const ASN1_OBJECT 
*oid);
-diff --git a/crypto/x509/pcy_node.c b/crypto/x509/pcy_node.c
-index 9d9a7ea179..450f95a655 100644
 a/crypto/x509/pcy_node.c
-+++ b/crypto/x509/pcy_node.c
-@@ -59,10 +59,15 @@ X509_POLICY_NODE *ossl_policy_level_find_node(const 
X509_POLICY_LEVEL *level,
- X509_POLICY_NODE *ossl_policy_level_add_node(X509_POLICY_LEVEL *level,
-  X509_POLICY_DATA *data,
-  X509_POLICY_NODE *parent,
-- X509_POLICY_TREE *tree)
-+

38 matches

Mail list logo