RepositoryExternal.mk
| 7
chart2/source/tools/InternalDataProvider.cxx
| 7
configure.ac
| 24
connectivity/source/commontools/dbconversion.cxx
| 9
connectivity/source/drivers/dbase/DTable.cxx
| 13
connectivity/source/drivers/hsqldb/HDriver.cxx
| 31
download.lst
| 857 ++++++----
external/curl/ExternalPackage_curl.mk
| 2
external/curl/ExternalProject_curl.mk
| 4
external/curl/clang-cl.patch.0
| 2
external/curl/curl-7.26.0_win-proxy.patch
| 25
external/curl/curl-msvc-disable-protocols.patch.1
| 4
external/curl/curl-msvc.patch.1
| 4
external/curl/curl-nss.patch.1
| 15
external/curl/zlib.patch.0
| 20
external/expat/expat-winapi.patch
| 13
external/harfbuzz/62e803b36173fd096d7ad460dd1d1db9be542593.patch.1
| 29
external/harfbuzz/UnpackedTarball_harfbuzz.mk
| 1
external/hsqldb/UnpackedTarball_hsqldb.mk
| 1
external/hsqldb/patches/disable-dump-script.patch
| 14
external/icu/UnpackedTarball_icu.mk
| 2
external/icu/cec7de7a390dd6907b0ea0feb4488ed3934ee71d.patch.2
| 94 +
external/icu/e450fa50fc242282551f56b941dc93b9a8a0bcbb.patch.2
| 39
external/libffi/ExternalPackage_libffi.mk
| 20
external/libffi/ExternalProject_libffi.mk
| 29
external/libffi/Module_libffi.mk
| 1
external/libjpeg-turbo/UnpackedTarball_libjpeg-turbo.mk
| 1
external/libjpeg-turbo/c76f4a08263b0cea40d2967560ac7c21f6959079.patch.1
| 38
external/libmwaw/Library_mwaw.mk
| 4
external/libodfgen/0001-tdf-101077-make-double-string-conversion-locale-agno.patch.1
| 58
external/libodfgen/ExternalProject_libodfgen.mk
| 4
external/libodfgen/Library_odfgen.mk
| 3
external/libodfgen/UnpackedTarball_libodfgen.mk
| 8
external/libodfgen/c++11.patch
| 44
external/libodfgen/libodfgen-bundled-soname.patch.0
| 5
external/libxml2/ExternalPackage_libxml2.mk
| 2
external/libxml2/UnpackedTarball_libxml2.mk
| 3
external/libxml2/libxml2-android.patch
| 6
external/libxml2/libxml2-config.patch.1
| 43
external/libxml2/xml2-config.in
| 28
external/libxslt/UnpackedTarball_libxslt.mk
| 1
external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1
| 69
external/libxslt/rpath.patch.0
| 2
external/nss/ExternalProject_nss.mk
| 7
external/nss/UnpackedTarball_nss.mk
| 2
external/nss/asan.patch.1
| 6
external/nss/clang-cl.patch.0
| 12
external/nss/macos-dlopen.patch.0
| 2
external/nss/nss-android.patch.1
| 7
external/nss/nss-bz1646594.patch.1
| 2
external/nss/nss-restore-manual-pre-dependencies.patch.1
| 83
external/nss/nss-win32-make.patch.1
| 4
external/nss/nss.aix.patch
| 10
external/nss/nss.bzmozilla1238154.patch
| 2
external/nss/nss.cygwin64.in32bit.patch
| 2
external/nss/nss.nowerror.patch
| 2
external/nss/nss.patch
| 22
external/nss/nss.utf8bom.patch.1
| 4
external/nss/nss.vs2015.patch
| 2
external/nss/nss.vs2015.pdb.patch
| 2
external/nss/nss.windows.patch
| 6
external/nss/nss_macosx.patch
| 17
external/nss/ubsan.patch.0
| 2
external/openssl/ExternalPackage_openssl.mk
| 12
external/openssl/ExternalProject_openssl.mk
| 15
external/openssl/UnpackedTarball_openssl.mk
| 12
external/openssl/ccb0a11145ee72b042d10593a64eaf9e8a55ec12.patch.1
| 56
external/openssl/openssl-1.0.1h-win64.patch.1
| 47
external/openssl/openssl-1.0.2k-cve-2020-1971.patch.1
| 578 ------
external/openssl/openssl-3650-masm.patch.1
| 35
external/openssl/openssl-fixbuild.patch.1
| 23
external/openssl/openssl-no-multilib.patch.0
| 38
external/openssl/openssllnx.patch
| 23
external/openssl/opensslsol.patch
| 20
external/openssl/opensslwnt.patch
| 167 -
external/openssl/opensslwnt_safeseh.patch
| 23
external/poppler/StaticLibrary_poppler.mk
| 7
external/poppler/UnpackedTarball_poppler.mk
| 2
external/poppler/disable-freetype.patch.1
| 41
external/poppler/gcc7-EntityInfo.patch.1
| 48
external/poppler/poppler-config.patch.1
| 69
external/postgresql/ExternalProject_postgresql.mk
| 2
external/postgresql/postgres-msvc-build.patch.1
| 6
external/python3/ExternalPackage_python3.mk
| 278 +--
external/python3/ExternalProject_python3.mk
| 28
external/python3/UnpackedTarball_python3.mk
| 1
external/python3/i100492-freebsd.patch.1
| 6
external/python3/internal-zlib.patch.0
| 22
external/python3/python-3.3.0-clang.patch.1
| 13
external/python3/python-3.3.0-darwin.patch.1
| 20
external/python3/python-3.3.3-disable-obmalloc.patch.0
| 4
external/python3/python-3.3.3-elf-rpath.patch.1
| 12
external/python3/python-3.5.4-msvc-disable.patch.1
| 8
external/python3/python-3.5.tweak.strip.soabi.patch
| 2
external/python3/python-3.7.6-msvc-ssl.patch.1
| 27
external/python3/ubsan.patch.0
| 23
external/zlib/UnpackedTarball_zlib.mk
| 4
external/zlib/ubsan.patch
| 11
formula/source/core/api/token.cxx
| 13
include/vcl/BitmapTools.hxx
| 5
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
| 16
jvmfwk/source/framework.cxx
| 8
jvmfwk/source/fwkbase.cxx
| 6
librelogo/source/LibreLogo/LibreLogo.py
| 34
lotuswordpro/source/filter/lwpdrawobj.cxx
| 58
lotuswordpro/source/filter/lwpfribptr.cxx
| 35
lotuswordpro/source/filter/lwpfribptr.hxx
| 4
pyuno/source/loader/pythonloader.py
| 4
sc/source/core/inc/interpre.hxx
| 12
sc/source/core/tool/compiler.cxx
| 9
sc/source/core/tool/interpr1.cxx
| 6
sc/source/core/tool/interpr3.cxx
| 4
sc/source/core/tool/interpr4.cxx
| 27
sc/source/core/tool/interpr7.cxx
| 3
scripting/source/pyprov/pythonscript.py
| 8
sdext/Executable_xpdfimport.mk
| 4
sdext/source/pdfimport/wrapper/wrapper.cxx
| 52
sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
| 57
sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
| 10
sfx2/source/doc/iframe.cxx
| 33
solenv/flatpak-manifest.in
| 12
solenv/gbuild/partial_build.mk
| 2
svtools/source/svhtml/parhtml.cxx
| 6
sw/qa/core/data/html/pass/ofz40593-1.html
|binary
sw/qa/core/data/ww5/pass/ooo37322-1-WW2.doc
|binary
sw/qa/core/data/ww8/pass/ofz34749-1.doc
|binary
sw/qa/core/data/ww8/pass/ofz38011-1.doc
|binary
sw/source/core/inc/layact.hxx
| 8
sw/source/core/layout/layact.cxx
| 65
sw/source/core/layout/objectformattertxtfrm.cxx
| 2
sw/source/core/layout/pagechg.cxx
| 2
sw/source/core/text/itrform2.cxx
| 4
sw/source/core/undo/undobj.cxx
| 11
sw/source/filter/html/htmltab.cxx
| 32
sw/source/filter/ww8/ww8par.cxx
| 13
sw/source/filter/ww8/ww8par.hxx
| 12
sw/source/filter/ww8/ww8par2.cxx
| 9
sw/source/filter/ww8/ww8par6.cxx
| 3
test/source/xmltesttools.cxx
| 2
tools/source/generic/poly.cxx
| 2
unoxml/source/xpath/xpathobject.cxx
| 2
vcl/source/gdi/jobset.cxx
| 7
vcl/source/graphic/Manager.cxx
| 7
vcl/unx/generic/printer/cpdmgr.cxx
| 49
144 files changed, 2062 insertions(+), 2061 deletions(-)
New commits:
commit e0eabe6ec3d1ba99da36b8647c2a5d4de13ec7d3
Author: Andras Timar <[email protected]>
AuthorDate: Sat Apr 1 18:52:18 2023 +0200
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:52:18 2023 +0200
Bump version to 6.4.7.2.M8
Change-Id: I10ed6218b601ae5fe2b2c4aaa183928f61ef0b86
diff --git a/configure.ac b/configure.ac
index 69c307106b92..562afd38e503 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice],[6.4.7.2.M7],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.4.7.2.M8],[],[],[http://documentfoundation.org/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
commit 660276810d36f32d912cca56b515390f368f4d41
Author: Michael Stahl <[email protected]>
AuthorDate: Mon Mar 20 11:52:22 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:49:05 2023 +0200
curl: upgrade to release 8.0.0
Fixes CVE-2023-27535.
Also hopefully fixes excessive storage consumption during build:
o build: drop the use of XC_AMEND_DISTCLEAN [62]
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149153
Tested-by: Jenkins
Reviewed-by: Michael Stahl <[email protected]>
(cherry picked from commit bbe0d0534abe6480c4502ce8fb543a736d3399d8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149105
Reviewed-by: Xisco Fauli <[email protected]>
(cherry picked from commit 38b54a4d86e05bbbbdbf2a38771395579d1b005a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149108
Tested-by: Xisco Fauli <[email protected]>
(cherry picked from commit 383128f262ea7fef7b6e372dc364a32d6cb0a7da)
curl: upgrade to release 8.0.1
Apparently 8.0.0 had a serious regression.
Change-Id: Icc761f5e5e01b5d9bebecc13f7cba608f5834f54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149204
Tested-by: Jenkins
Reviewed-by: Michael Stahl <[email protected]>
(cherry picked from commit e5005c76bd60a004f6025728e794ba3e4d0dfff1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149112
Tested-by: László Németh <[email protected]>
Reviewed-by: Xisco Fauli <[email protected]>
(cherry picked from commit f2d935242665774f080bb13a2814988ad615f6e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149321
Tested-by: Michael Stahl <[email protected]>
diff --git a/download.lst b/download.lst
index 0a212bda07d3..f89513e83607 100644
--- a/download.lst
+++ b/download.lst
@@ -71,8 +71,8 @@ CT2N_TARBALL :=
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
# three static lines
# so that git cherry-pick
# will not run into conflicts
-CURL_SHA256SUM :=
1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f
-CURL_TARBALL := curl-7.88.1.tar.xz
+CURL_SHA256SUM :=
0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0
+CURL_TARBALL := curl-8.0.1.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit 37847d39330752470a6f952b40e005fb08303f98
Author: Taichi Haradaguchi <[email protected]>
AuthorDate: Thu Feb 23 15:31:02 2023 +0900
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:49:05 2023 +0200
curl: upgrade to release 7.88.1
Fixes CVE-2023-23916, 2 CVEs that probably don't affect LO.
Reference: https://curl.se/docs/security.html
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147977
Tested-by: Jenkins
Reviewed-by: Michael Stahl <[email protected]>
(cherry picked from commit 6074d16b8c631e679a67364837d4ca9799731152)
Change-Id: If9b3fc7c5ce66bfe1027caff39ea2c1cf55df7ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148044
Tested-by: Michael Stahl <[email protected]>
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/download.lst b/download.lst
index ffc4b986c2f0..0a212bda07d3 100644
--- a/download.lst
+++ b/download.lst
@@ -71,8 +71,8 @@ CT2N_TARBALL :=
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
# three static lines
# so that git cherry-pick
# will not run into conflicts
-CURL_SHA256SUM :=
ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff
-CURL_TARBALL := curl-7.87.0.tar.xz
+CURL_SHA256SUM :=
1dae31b2a7c1fe269de99c0c31bb488346aab3459b5ffca909d6938249ae415f
+CURL_TARBALL := curl-7.88.1.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/curl/curl-7.26.0_win-proxy.patch
b/external/curl/curl-7.26.0_win-proxy.patch
index 909ca38315a6..62016a70e8a0 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -44,7 +44,7 @@
/****************************************************************
* Detect what (if any) proxy to use. Remember that this selects a host
* name and is not limited to HTTP proxies only.
-@@ -4613,6 +4633,66 @@
+@@ -4613,6 +4633,67 @@
* For compatibility, the all-uppercase versions of these variables are
* checked if the lowercase versions don't exist.
*/
@@ -58,6 +58,7 @@
+ char *ieProxy;
+ char *ieNoProxy;
+ char *pos;
++ bool spacesp;
+
+ ieProxy = wstrToCstr(ieProxyConfig->lpszProxy);
+ ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass);
@@ -72,7 +73,7 @@
+ }
+ }
+
-+ if(!Curl_check_noproxy(conn->host.name, no_proxy)) {
++ if(!Curl_check_noproxy(conn->host.name, no_proxy, &spacesp)) {
+ /* Look for the http proxy setting */
+ char *tok;
+ char *saveptr;
diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1
index 2128849369e7..2e8766b3d45f 100644
--- a/external/curl/curl-nss.patch.1
+++ b/external/curl/curl-nss.patch.1
@@ -1,7 +1,7 @@
diff -ur curl.org/configure curl/configure
---- curl.org/configure 2016-03-13 15:14:07.177000076 +0100
-+++ curl/configure 2016-03-13 15:16:44.132000076 +0100
-@@ -28230,7 +28230,12 @@
+--- curl.orig/configure 2023-02-20 16:11:55.000000000 +0900
++++ curl/configure 2023-02-23 15:40:58.617432471 +0900
+@@ -28675,7 +28675,12 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired
libraries and compilation flags for NSS." >&5
printf "%s\n" "$as_me: WARNING: Using hard-wired libraries and compilation
flags for NSS." >&2;}
addld="-L$OPT_NSS/lib"
commit 8a417a122ac8f1d6ebfbb206e91480d99ffd5565
Author: Taichi Haradaguchi <[email protected]>
AuthorDate: Fri Dec 30 21:29:58 2022 +0900
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:49:05 2023 +0200
curl: upgrade to release 7.87.0
Fixes CVE-2022-43551 and CVE-2022-43552.
https://curl.se/docs/CVE-2022-43551.html
https://curl.se/docs/CVE-2022-43552.html
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145116
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <[email protected]>
(cherry picked from commit 181806115a694ade32c7bba1abd9aa931b1a93b9)
Change-Id: I979ed11c212aef226ad9f26420462e5f9dbe15e5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148043
Tested-by: Michael Stahl <[email protected]>
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/download.lst b/download.lst
index 31ca21a4aeac..ffc4b986c2f0 100644
--- a/download.lst
+++ b/download.lst
@@ -71,8 +71,8 @@ CT2N_TARBALL :=
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
# three static lines
# so that git cherry-pick
# will not run into conflicts
-CURL_SHA256SUM :=
2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b
-CURL_TARBALL := curl-7.86.0.tar.xz
+CURL_SHA256SUM :=
ee5f1a1955b0ed413435ef79db28b834ea5f0fb7c8cfb1ce47175cc3bee08fff
+CURL_TARBALL := curl-7.87.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/curl/curl-7.26.0_win-proxy.patch
b/external/curl/curl-7.26.0_win-proxy.patch
index 6fb20533e097..909ca38315a6 100644
--- a/external/curl/curl-7.26.0_win-proxy.patch
+++ b/external/curl/curl-7.26.0_win-proxy.patch
@@ -12,8 +12,8 @@
--- curl-7.26.0/lib/url.c
+++ misc/build/curl-7.26.0/lib/url.c
@@ -78,6 +78,10 @@
- bool Curl_win32_idn_to_ascii(const char *in, char **out);
- #endif /* USE_LIBIDN2 */
+
+ #include <limits.h>
+#ifdef _WIN32
+#include <WinHttp.h>
diff --git a/external/curl/curl-msvc-disable-protocols.patch.1
b/external/curl/curl-msvc-disable-protocols.patch.1
index 89c4ff576f85..71ff0c01a028 100644
--- a/external/curl/curl-msvc-disable-protocols.patch.1
+++ b/external/curl/curl-msvc-disable-protocols.patch.1
@@ -2,7 +2,7 @@ disable protocols nobody needs in MSVC build
--- curl/lib/config-win32.h.orig 2017-08-09 16:43:29.464000000 +0200
+++ curl/lib/config-win32.h 2017-08-09 16:47:38.549200000 +0200
-@@ -616,4 +616,20 @@
+@@ -654,4 +654,20 @@
# define ENABLE_IPV6 1
#endif
diff --git a/external/curl/curl-nss.patch.1 b/external/curl/curl-nss.patch.1
index 5ef25748d7eb..2128849369e7 100644
--- a/external/curl/curl-nss.patch.1
+++ b/external/curl/curl-nss.patch.1
@@ -1,7 +1,7 @@
diff -ur curl.org/configure curl/configure
--- curl.org/configure 2016-03-13 15:14:07.177000076 +0100
+++ curl/configure 2016-03-13 15:16:44.132000076 +0100
-@@ -27985,7 +27985,12 @@
+@@ -28230,7 +28230,12 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Using hard-wired
libraries and compilation flags for NSS." >&5
printf "%s\n" "$as_me: WARNING: Using hard-wired libraries and compilation
flags for NSS." >&2;}
addld="-L$OPT_NSS/lib"
diff --git a/external/curl/zlib.patch.0 b/external/curl/zlib.patch.0
index b8e242a3aaea..b4442ba262d1 100644
--- a/external/curl/zlib.patch.0
+++ b/external/curl/zlib.patch.0
@@ -1,6 +1,6 @@
--- configure
+++ configure
-@@ -22808,7 +22808,6 @@
+@@ -23035,7 +23035,6 @@
clean_CPPFLAGS=$CPPFLAGS
clean_LDFLAGS=$LDFLAGS
clean_LIBS=$LIBS
@@ -8,7 +8,7 @@
# Check whether --with-zlib was given.
if test ${with_zlib+y}
-@@ -22818,6 +22818,7 @@
+@@ -23045,6 +23044,7 @@
if test "$OPT_ZLIB" = "no" ; then
@@ -16,7 +16,7 @@
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: zlib disabled" >&5
printf "%s\n" "$as_me: WARNING: zlib disabled" >&2;}
else
-@@ -22825,6 +825,21 @@
+@@ -23052,6 +23052,21 @@
OPT_ZLIB=""
fi
@@ -38,7 +38,7 @@
if test -z "$OPT_ZLIB" ; then
if test -n "$PKG_CONFIG"; then
-@@ -23120,6 +23120,7 @@
+@@ -23344,6 +23359,7 @@
printf "%s\n" "$as_me: found both libz and libz.h header" >&6;}
curl_zlib_msg="enabled"
fi
@@ -48,7 +48,7 @@
if test x"$AMFIXLIB" = x1; then
--- configure.ac
+++ configure.ac
-@@ -1222,19 +1222,30 @@
+@@ -1243,19 +1243,30 @@
clean_CPPFLAGS=$CPPFLAGS
clean_LDFLAGS=$LDFLAGS
clean_LIBS=$LIBS
@@ -80,7 +80,7 @@
if test -z "$OPT_ZLIB" ; then
CURL_CHECK_PKGCONFIG(zlib)
-@@ -1316,6 +1316,7 @@
+@@ -1336,6 +1347,7 @@
AC_MSG_NOTICE([found both libz and libz.h header])
curl_zlib_msg="enabled"
fi
commit d5ff418a17f05cbfb2527c228d5d8541c88ffb1c
Author: Taichi Haradaguchi <[email protected]>
AuthorDate: Fri Feb 24 17:49:23 2023 +0900
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:49:05 2023 +0200
postgresql: upgrade to release 13.10
Fixes CVE-2022-41862
Reference: https://www.postgresql.org/support/security/CVE-2022-41862/
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147834
Tested-by: Jenkins
Reviewed-by: Michael Stahl <[email protected]>
(cherry picked from commit efff34d7bdccf210a5e878bd9bc4d35ec72b71ab)
Change-Id: I6075838972fec1c091f3150b19c5da4dc80ad6d3
diff --git a/download.lst b/download.lst
index 3a094e76fcde..31ca21a4aeac 100644
--- a/download.lst
+++ b/download.lst
@@ -480,8 +480,8 @@ POPPLER_TARBALL := poppler-22.09.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-POSTGRESQL_SHA256SUM :=
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
-POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
+POSTGRESQL_SHA256SUM :=
5bbcf5a56d85c44f3a8b058fb46862ff49cbc91834d07e295d02e6de3c216df2
+POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit d600c9ec50d094e9e8176885ffdd0159ca41728f
Author: Eike Rathke <[email protected]>
AuthorDate: Mon Feb 27 16:10:06 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:49:05 2023 +0200
Always push a result, even if it's only an error
PERCENTILE() and QUARTILE() if an error was passed as argument (or
an error encountered during obtaining arguments) omitted to push
an error result, only setting the error.
Fallout from
commit f336f63da900d76c2bf6e5690f1c8a7bd15a0aa2
CommitDate: Thu Mar 3 16:28:59 2016 +0000
tdf#94635 Add FORECAST.ETS functions to Calc
Change-Id: I23e276fb0ce735cfd6383cc963446499dcf819f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147922
Reviewed-by: Eike Rathke <[email protected]>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147959
Tested-by: Thorsten Behrens <[email protected]>
Reviewed-by: Thorsten Behrens <[email protected]>
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index f219beca9386..d442d4eee224 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -3474,7 +3474,7 @@ void ScInterpreter::ScPercentile( bool bInclusive )
GetNumberSequenceArray( 1, aArray, false );
if ( aArray.empty() || nGlobalError != FormulaError::NONE )
{
- SetError( FormulaError::NoValue );
+ PushNoValue();
return;
}
if ( bInclusive )
@@ -3497,7 +3497,7 @@ void ScInterpreter::ScQuartile( bool bInclusive )
GetNumberSequenceArray( 1, aArray, false );
if ( aArray.empty() || nGlobalError != FormulaError::NONE )
{
- SetError( FormulaError::NoValue );
+ PushNoValue();
return;
}
if ( bInclusive )
commit 796179cb20860367dbc05b45040b652ca61b9ebf
Author: Eike Rathke <[email protected]>
AuthorDate: Mon Feb 27 23:14:01 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:49:04 2023 +0200
Underflow assert also in already calculated path
Change-Id: I7bd1c4960280a6526bb82e5b95c5253775df1e1a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147937
Reviewed-by: Eike Rathke <[email protected]>
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147958
Tested-by: Thorsten Behrens <[email protected]>
Reviewed-by: Thorsten Behrens <[email protected]>
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 002c7de4c1da..170e60f6afca 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3982,9 +3982,20 @@ StackVar ScInterpreter::Interpret()
(*aTokenMatrixMapIter).second->GetType() != svJumpMatrix)
{
// Path already calculated, reuse result.
- nStackBase = sp - pCur->GetParamCount();
- if ( nStackBase > sp )
- nStackBase = sp; // underflow?!?
+ if (sp >= pCur->GetParamCount())
+ nStackBase = sp - pCur->GetParamCount();
+ else
+ {
+ SAL_WARN("sc.core", "Stack anomaly with calculated path at "
+ << aPos.Tab() << "," << aPos.Col() << "," << aPos.Row()
+ << " " << aPos.Format(
+ ScRefFlags::VALID | ScRefFlags::FORCE_DOC |
ScRefFlags::TAB_3D, pDok)
+ << " eOp: " << static_cast<int>(eOp)
+ << " params: " <<
static_cast<int>(pCur->GetParamCount())
+ << " nStackBase: " << nStackBase << " sp: " << sp);
+ nStackBase = sp;
+ assert(!"underflow");
+ }
sp = nStackBase;
PushTokenRef( (*aTokenMatrixMapIter).second);
}
commit 6c0368e28f90a673be38323dee9c3383f1d41964
Author: Samuel Mehrbrodt <[email protected]>
AuthorDate: Mon Feb 27 15:27:24 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:49:04 2023 +0200
Check iframe target for allowed document URLs
Change-Id: I00e4192becbc160282a43ab89dcd269f3d1012d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147921
Reviewed-by: Thorsten Behrens <[email protected]>
Tested-by: Thorsten Behrens <[email protected]>
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index aea851894286..6dca7bcddb56 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -46,6 +46,11 @@
#include <vcl/window.hxx>
#include <tools/debug.hxx>
#include <macroloader.hxx>
+#include <officecfg/Office/Common.hxx>
+
+#include <unicode/errorcode.h>
+#include <unicode/regex.h>
+#include <unicode/unistr.h>
using namespace ::com::sun::star;
@@ -155,6 +160,31 @@ IFrameObject::IFrameObject(const uno::Reference <
uno::XComponentContext >& rxCo
aArguments[0] >>= mxObj;
}
+bool lcl_isScriptURLAllowed(const OUString& aScriptURL)
+{
+ boost::optional<css::uno::Sequence<OUString>> allowedEvents(
+
officecfg::Office::Common::Security::Scripting::AllowedDocumentEventURLs::get());
+ // When AllowedDocumentEventURLs is empty, all event URLs are allowed
+ if (!allowedEvents)
+ return true;
+
+ icu::ErrorCode status;
+ const uint32_t rMatcherFlags = UREGEX_CASE_INSENSITIVE;
+ icu::UnicodeString usInput(aScriptURL.getStr());
+ const css::uno::Sequence<OUString>& rAllowedEvents = *allowedEvents;
+ for (auto const& allowedEvent : rAllowedEvents)
+ {
+ icu::UnicodeString usRegex(allowedEvent.getStr());
+ icu::RegexMatcher rmatch1(usRegex, usInput, rMatcherFlags, status);
+ if (aScriptURL.startsWith(allowedEvent) || rmatch1.matches(status))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
sal_Bool SAL_CALL IFrameObject::load(
const uno::Sequence < css::beans::PropertyValue >& /*lDescriptor*/,
const uno::Reference < frame::XFrame >& xFrame )
@@ -174,6 +204,9 @@ sal_Bool SAL_CALL IFrameObject::load(
return false;
}
+ if (!lcl_isScriptURLAllowed(aTargetURL.Complete))
+ return false;
+
DBG_ASSERT( !mxFrame.is(), "Frame already existing!" );
VclPtr<vcl::Window> pParent = VCLUnoHelper::GetWindow(
xFrame->getContainerWindow() );
VclPtr<IFrameWindow_Impl> pWin = VclPtr<IFrameWindow_Impl>::Create(
pParent, maFrmDescr.IsFrameBorderOn() );
commit 6550c39d2912119321de5de525ea62bc30c67e13
Author: Michael Stahl <[email protected]>
AuthorDate: Tue Feb 21 11:11:42 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:49:04 2023 +0200
nss: upgrade to release 3.88.1
Fixes CVE-2023-0767 CVE-2022-3479
Change-Id: I688dc7d0785ed3344c33e331c7e9ef37baa720ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147387
Tested-by: Jenkins
Reviewed-by: Michael Stahl <[email protected]>
(cherry picked from commit 538975a0e511ad79a7dd3c71300b993d1554cd03)
diff --git a/download.lst b/download.lst
index a8a4fa9be04e..3a094e76fcde 100644
--- a/download.lst
+++ b/download.lst
@@ -414,8 +414,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-NSS_SHA256SUM :=
8b5a2e9e3d632a78ad4d9c8d2ea502d2790d7a8e7b1986d173107232eca27432
-NSS_TARBALL := nss-3.86-with-nspr-4.35.tar.gz
+NSS_SHA256SUM :=
fcfa26d2738ec5b0cf72ab4be784eac832a75132cda2e295799c04d62a93607a
+NSS_TARBALL := nss-3.88.1-with-nspr-4.35.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit 81a7b7d2c254376ce62b9d2b8784251c72be26df
Author: Taichi Haradaguchi <[email protected]>
AuthorDate: Mon Nov 21 23:33:32 2022 +0900
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:48:44 2023 +0200
nss: upgrade to release 3.86.0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143038
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <[email protected]>
(cherry picked from commit a2969884af71e88d2541bd2bfdebea222876fef4)
Change-Id: Ia236c7124d920785f7a2856db5ee1ccbef7a2d68
diff --git a/download.lst b/download.lst
index 0284889bb8c5..a8a4fa9be04e 100644
--- a/download.lst
+++ b/download.lst
@@ -414,8 +414,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-NSS_SHA256SUM :=
b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30
-NSS_TARBALL := nss-3.83-with-nspr-4.34.1.tar.gz
+NSS_SHA256SUM :=
8b5a2e9e3d632a78ad4d9c8d2ea502d2790d7a8e7b1986d173107232eca27432
+NSS_TARBALL := nss-3.86-with-nspr-4.35.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/nss/UnpackedTarball_nss.mk
b/external/nss/UnpackedTarball_nss.mk
index 8fa1edd530cc..03c7c229df67 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.vs2015.patch \
external/nss/nss.vs2015.pdb.patch \
external/nss/nss.bzmozilla1238154.patch \
- external/nss/nss-bz1646594.patch.1 \
+ external/nss/nss-bz1646594.patch.1 \
external/nss/macos-dlopen.patch.0 \
$(if $(filter iOS,$(OS)), \
external/nss/nss-ios.patch) \
diff --git a/external/nss/asan.patch.1 b/external/nss/asan.patch.1
index ce584a34a3b5..ccabd446ebac 100644
--- a/external/nss/asan.patch.1
+++ b/external/nss/asan.patch.1
@@ -1,7 +1,7 @@
diff -ur nss.org/nss/coreconf/Linux.mk nss/nss/coreconf/Linux.mk
--- nss.org/nss/coreconf/Linux.mk 2014-05-06 04:36:01.817838877 +0200
+++ nss/nss/coreconf/Linux.mk 2014-05-06 04:37:25.387835456 +0200
-@@ -146,7 +146,7 @@
+@@ -157,7 +157,7 @@
# we don't use -z defs there.
# Also, -z defs conflicts with Address Sanitizer, which emits relocations
# against the libsanitizer runtime built into the main executable.
diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index 1d615c2397d8..04e21e7003d0 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -14,7 +14,7 @@
#pragma intrinsic(_InterlockedExchange)
--- nspr/pr/include/prbit.h
+++ nspr/pr/include/prbit.h
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@
*/
#if defined(_WIN32) && (_MSC_VER >= 1300) && \
(defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM) || \
@@ -23,7 +23,7 @@
# include <intrin.h>
# pragma intrinsic(_BitScanForward,_BitScanReverse)
__forceinline static int __prBitScanForward32(unsigned int val)
-@@ -32,7 +32,7 @@
+@@ -33,7 +33,7 @@
# define pr_bitscan_ctz32(val) __prBitScanForward32(val)
# define pr_bitscan_clz32(val) __prBitScanReverse32(val)
# define PR_HAVE_BUILTIN_BITSCAN32
@@ -32,7 +32,7 @@
(defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
defined(__aarch64__))
# define pr_bitscan_ctz32(val) __builtin_ctz(val)
-@@ -136,7 +136,7 @@
+@@ -138,7 +138,7 @@
*/
#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_AMD64) || \
@@ -63,7 +63,7 @@
#define CERTDB_VALID_PEER CERTDB_TERMINAL_RECORD
--- nss/lib/util/pkcs11n.h
+++ nss/lib/util/pkcs11n.h
-@@ -426,7 +426,7 @@
+@@ -563,7 +563,7 @@
/* keep the old value for compatibility reasons*/
#define CKT_NSS_MUST_VERIFY ((__CKT_NSS_MUST_VERIFY)(CKT_NSS + 4))
#else
@@ -80,7 +80,7 @@
# in the outer pkcs11t.h:
--- nss/lib/util/pkcs11t.h
+++ nss/lib/util/pkcs11t.h
-@@ -72,7 +72,14 @@
+@@ -78,7 +78,14 @@
#define CK_INVALID_HANDLE 0
/* pack */
@@ -95,7 +95,7 @@
typedef struct CK_VERSION {
CK_BYTE major; /* integer portion of version number */
-@@ -1795,6 +1802,13 @@
+@@ -2586,6 +2593,13 @@
#include "pkcs11n.h"
/* undo packing */
diff --git a/external/nss/macos-dlopen.patch.0
b/external/nss/macos-dlopen.patch.0
index 1889b8df7cd3..e8abc8f59c69 100644
--- a/external/nss/macos-dlopen.patch.0
+++ b/external/nss/macos-dlopen.patch.0
@@ -1,6 +1,6 @@
--- nspr/pr/src/linking/prlink.c
+++ nspr/pr/src/linking/prlink.c
-@@ -799,7 +799,7 @@
+@@ -555,7 +555,7 @@
* The reason is that DARWIN's dlopen ignores the provided path
* and checks for the plain filename in DYLD_LIBRARY_PATH,
* which could load an unexpected version of a library. */
diff --git a/external/nss/nss-android.patch.1 b/external/nss/nss-android.patch.1
index 9677caebbcec..cbf7f5402f3f 100644
--- a/external/nss/nss-android.patch.1
+++ b/external/nss/nss-android.patch.1
@@ -1,7 +1,7 @@
diff -ur nss.org/nspr/build/autoconf/config.sub
nss/nspr/build/autoconf/config.sub
--- nss.org/nspr/build/autoconf/config.sub 2017-09-07 15:29:45.031246453
+0200
+++ nss/nspr/build/autoconf/config.sub 2017-09-07 15:32:13.087235423 +0200
-@@ -111,6 +111,10 @@
+@@ -110,6 +110,11 @@
exit 1;;
esac
@@ -15,7 +15,7 @@ diff -ur nss.org/nspr/build/autoconf/config.sub
nss/nspr/build/autoconf/config.s
diff -ur nss.org/nspr/configure nss/nspr/configure
--- nss.org/nspr/configure 2017-09-07 15:29:45.018246359 +0200
+++ nss/nspr/configure 2017-09-07 15:31:47.604075663 +0200
-@@ -2737,18 +2739,15 @@
+@@ -2728,18 +2728,15 @@
esac
AS="$android_toolchain"/bin/"$android_tool_prefix"-as
@@ -40,7 +40,8 @@ diff -ur nss.org/nspr/configure nss/nspr/configure
diff -ur nss.org/nss/Makefile nss/nss/Makefile
--- nss.org/nss/Makefile 2017-09-07 15:29:44.933245745 +0200
+++ nss/nss/Makefile 2017-09-07 15:32:04.347181076 +0200
-@@ -62,6 +62,6 @@
+@@ -65,7 +65,7 @@
+
ifeq ($(OS_TARGET),Android)
NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \
- --target=$(ANDROID_PREFIX) \
diff --git a/external/nss/nss-restore-manual-pre-dependencies.patch.1
b/external/nss/nss-restore-manual-pre-dependencies.patch.1
new file mode 100644
index 000000000000..ea034f0dc80f
--- /dev/null
+++ b/external/nss/nss-restore-manual-pre-dependencies.patch.1
@@ -0,0 +1,83 @@
+Revert of upstream:
+
+changeset: 15608:744881490c78
+user: Jan-Marek Glogowski <[email protected]>
+date: Wed May 13 19:00:40 2020 +0000
+summary: Bug 1637083 Replace pre-dependency with shell hack r=rrelyea
+
+--- b/nss/coreconf/rules.mk Wed May 13 19:00:40 2020 +0000
++++ a/nss/coreconf/rules.mk Tue May 12 21:33:43 2020 +0000
+@@ -31,21 +31,10 @@
+ USE_NT_C_SYNTAX=1
+ endif
+
+-# For whatever reason, "." can't be handled using make conditionals.
+-# Based on automake's SUBDIRS "." handling.
+ ifdef DIRS
+ ifndef IGNORE_DIRS
+-ifneq (,$(filter .,$(DIRS)))
+-TARGETS = $(NULL)
+-ALL_TRASH = $(NULL)
+-endif
+-
+ $(DIRS):
++ $(IGNORE_ERROR)@$(MAKE) -C $@ $(MAKECMDGOALS)
+- $(IGNORE_ERROR)@if [ "$@" != "." ]; then \
+- $(MAKE) -C $@ $(MAKECMDGOALS) ; \
+- else \
+- IGNORE_DIRS=1 $(MAKE) -C $@ $(MAKECMDGOALS) ; \
+- fi
+ @$(CLICK_STOPWATCH)
+ endif
+ endif
+@@ -84,9 +73,7 @@
+ check: $(DIRS)
+
+ clean clobber: $(DIRS)
+-ifneq (,$(ALL_TRASH))
+ rm -rf $(ALL_TRASH)
+-endif
+
+ realclean clobber_all: $(DIRS)
+ rm -rf $(wildcard *.OBJ) dist $(ALL_TRASH)
+--- b/nss/lib/ckfw/builtins/manifest.mn Wed May 13 19:00:40 2020 +0000
++++ a/nss/lib/ckfw/builtins/manifest.mn Tue May 12 21:33:43 2020 +0000
+@@ -5,9 +5,7 @@
+
+ CORE_DEPTH = ../../..
+
++DIRS = testlib
+-DIRS = . testlib
+-
+-testlib: .
+
+ MODULE = nss
+
+--- b/nss/lib/ckfw/manifest.mn Wed May 13 19:00:40 2020 +0000
++++ a/nss/lib/ckfw/manifest.mn Tue May 12 21:33:43 2020 +0000
+@@ -5,9 +5,7 @@
+
+ CORE_DEPTH = ../..
+
++DIRS = builtins
+-DIRS = . builtins
+-
+-builtins: .
+
+ PRIVATE_EXPORTS = \
+ ck.h \
+--- b/nss/manifest.mn Wed May 13 19:00:40 2020 +0000
++++ a/nss/manifest.mn Tue May 12 21:33:43 2020 +0000
+@@ -24,6 +24,12 @@
+ # no real way to encode these in any sensible way
+ $(MAKE) -C coreconf/nsinstall program
+ $(MAKE) export
++ # pre-build child dir -> parent dir dependencies
++ # ckfw/builtins -> ckfw
++ IGNORE_DIRS=1 $(MAKE) -C lib/ckfw libs
++ # ckfw/builtins/testlib -> ckfw/builtins + base
++ $(MAKE) -C lib/base libs
++ IGNORE_DIRS=1 $(MAKE) -C lib/ckfw/builtins libs
+
+ lib: coreconf
+ cmd: lib
diff --git a/external/nss/nss-win32-make.patch.1
b/external/nss/nss-win32-make.patch.1
index 7ba3df451ee6..6a3201a082a1 100644
--- a/external/nss/nss-win32-make.patch.1
+++ b/external/nss/nss-win32-make.patch.1
@@ -1,6 +1,6 @@
--- nss/nss/coreconf/rules.mk.orig2 2014-06-03 15:30:01.667200000 +0200
+++ nss/nss/coreconf/rules.mk 2014-06-03 15:30:14.537200000 +0200
-@@ -259,7 +259,7 @@
+@@ -174,7 +174,7 @@
$(LIBRARY): $(OBJS) | $$(@D)/d
rm -f $@
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
@@ -9,7 +9,7 @@
else
$(AR) cr $@ $(OBJS)
endif
-@@ -297,7 +297,7 @@
+@@ -214,7 +214,7 @@
ifdef NS_USE_GCC
$(LINK_DLL) $(OBJS) $(SUB_SHLOBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
$(OS_LIBS) $(LD_LIBS) $(RES)
else
diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index 4b0c6bfb3261..10572f94717a 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
@@ -1,7 +1,7 @@
diff -ru a/nspr/configure b/nspr/configure
--- a/a/nspr/configure 2014-09-29 16:47:42.984012225 +0100
+++ b/b/nspr/configure 2014-09-29 16:50:33.907375937 +0100
-@@ -6369,7 +6369,6 @@
+@@ -6325,7 +6325,6 @@
AIX_LINK_OPTS='-brtl -bnso -berok'
;;
esac
@@ -12,7 +12,7 @@ diff -ru a/nspr/configure b/nspr/configure
diff -ru a/nspr/configure.in b/nspr/configure.in
--- a/a/nspr/configure.in 2014-09-29 16:46:35.257394860 +0100
+++ b/b/nspr/configure.in 2014-09-29 16:50:33.908375942 +0100
-@@ -1229,7 +1229,8 @@
+@@ -1180,7 +1180,8 @@
AC_DEFINE(XP_UNIX)
AC_DEFINE(AIX)
AC_DEFINE(SYSV)
@@ -22,7 +22,7 @@ diff -ru a/nspr/configure.in b/nspr/configure.in
AC_CHECK_HEADER(sys/atomic_op.h, AC_DEFINE(AIX_HAVE_ATOMIC_OP_H))
case "${target_os}" in
aix3.2*)
-@@ -1269,10 +1270,9 @@
+@@ -1220,10 +1221,9 @@
AC_DEFINE(HAVE_SOCKLEN_T)
AC_DEFINE(HAVE_FCNTL_FILE_LOCKING)
USE_IPV6=1
@@ -48,7 +48,7 @@ diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
--- a/a/nss/cmd/platlibs.mk 2014-09-29 16:47:42.987012253 +0100
+++ b/b/nss/cmd/platlibs.mk 2014-09-29 16:50:33.910375955 +0100
-@@ -134,7 +134,7 @@
+@@ -171,7 +171,7 @@
$(NULL)
ifeq ($(OS_ARCH), AIX)
@@ -57,7 +57,7 @@ diff -ru a/nss/cmd/platlibs.mk b/nss/cmd/platlibs.mk
endif
# $(PROGRAM) has NO explicit dependencies on $(EXTRA_SHARED_LIBS)
-@@ -180,7 +180,7 @@
+@@ -217,7 +217,7 @@
$(NULL)
ifeq ($(OS_ARCH), AIX)
diff --git a/external/nss/nss.bzmozilla1238154.patch
b/external/nss/nss.bzmozilla1238154.patch
index 468ff810b9ca..425f38257892 100644
--- a/external/nss/nss.bzmozilla1238154.patch
+++ b/external/nss/nss.bzmozilla1238154.patch
@@ -1,7 +1,7 @@
diff -ru a/nspr/configure b/nspr/configure
--- a/a/nspr/configure 2019-01-26 12:23:06.589389910 +0100
+++ b/b/nspr/configure 2019-01-26 12:26:56.566222293 +0100
-@@ -7127,7 +7127,7 @@
+@@ -6883,7 +6883,7 @@
# Determine compiler version
diff --git a/external/nss/nss.cygwin64.in32bit.patch
b/external/nss/nss.cygwin64.in32bit.patch
index b00761a0e85b..bce0f1d09403 100644
--- a/external/nss/nss.cygwin64.in32bit.patch
+++ b/external/nss/nss.cygwin64.in32bit.patch
@@ -3,7 +3,7 @@ on Cygwin 64bit and in 32bit mode
diff -ru nss.orig/nss/Makefile nss/nss/Makefile
--- a/nss.orig/nss/Makefile 2016-02-26 01:00:52.146713100 +0100
+++ b/nss/nss/Makefile 2016-02-26 01:02:05.303560100 +0100
-@@ -59,6 +59,8 @@
+@@ -63,6 +63,8 @@
# Translate coreconf build options to NSPR configure options.
#
diff --git a/external/nss/nss.nowerror.patch b/external/nss/nss.nowerror.patch
index ff81a9b33539..bdf7a33a874c 100644
--- a/external/nss/nss.nowerror.patch
+++ b/external/nss/nss.nowerror.patch
@@ -1,7 +1,7 @@
diff -ur nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
--- a/nss.org/nss/coreconf/WIN32.mk 2016-04-13 11:33:09.322294523 +0200
+++ b/nss/nss/coreconf/WIN32.mk 2016-04-13 11:33:27.744323969 +0200
-@@ -127,7 +127,7 @@
+@@ -121,7 +121,7 @@
-D_CRT_NONSTDC_NO_WARNINGS
OS_DLLFLAGS += -nologo -DLL -SUBSYSTEM:WINDOWS
ifndef NSS_ENABLE_WERROR
diff --git a/external/nss/nss.utf8bom.patch.1 b/external/nss/nss.utf8bom.patch.1
index e8c56abefcde..f474adf6f932 100644
--- a/external/nss/nss.utf8bom.patch.1
+++ b/external/nss/nss.utf8bom.patch.1
@@ -1,7 +1,7 @@
diff -ur nss.org/nss/lib/ckfw/builtins/certdata.perl
nss/nss/lib/ckfw/builtins/certdata.perl
--- nss.org/nss/lib/ckfw/builtins/certdata.perl 2016-03-31
18:26:07.890190900 +0800
+++ nss/nss/lib/ckfw/builtins/certdata.perl 2016-03-31 19:16:16.727269600
+0800
-@@ -110,6 +110,9 @@
+@@ -122,6 +122,9 @@
sub doprint {
my $i;
@@ -11,7 +11,7 @@ diff -ur nss.org/nss/lib/ckfw/builtins/certdata.perl
nss/nss/lib/ckfw/builtins/c
print <<EOD
/* THIS IS A GENERATED FILE */
/* This Source Code Form is subject to the terms of the Mozilla Public
-@@ -119,6 +122,7 @@
+@@ -131,6 +134,7 @@
#ifndef BUILTINS_H
#include "builtins.h"
#endif /* BUILTINS_H */
diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch
index de4f8762fd5b..73cff7c833fb 100644
--- a/external/nss/nss.vs2015.patch
+++ b/external/nss/nss.vs2015.patch
@@ -1,7 +1,7 @@
diff -ru nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
--- a/nss.org/nss/coreconf/WIN32.mk 2016-02-12 15:36:18.000000000 +0100
+++ b/nss/nss/coreconf/WIN32.mk 2016-02-26 00:42:43.170809600 +0100
-@@ -199,7 +199,7 @@
+@@ -192,7 +192,7 @@
# Disable C4244: conversion from 'type1' to 'type2', possible loss of data
# Disable C4018: 'expression' : signed/unsigned mismatch
# Disable C4312: 'type cast': conversion from 'type1' to 'type2' of
greater size
diff --git a/external/nss/nss.vs2015.pdb.patch
b/external/nss/nss.vs2015.pdb.patch
index c66940132cdd..3b498f976ac6 100644
--- a/external/nss/nss.vs2015.pdb.patch
+++ b/external/nss/nss.vs2015.pdb.patch
@@ -1,7 +1,7 @@
diff -ru nss.orig/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk
--- a/nss.orig/nss/coreconf/WIN32.mk 2016-03-04 08:30:16.306639400 +0100
+++ b/nss/nss/coreconf/WIN32.mk 2016-03-04 08:31:17.987233200 +0100
-@@ -169,15 +169,15 @@
+@@ -163,15 +163,15 @@
DLLFLAGS += -OUT:$@
ifdef MOZ_DEBUG_SYMBOLS
ifdef MOZ_DEBUG_FLAGS
diff --git a/external/nss/nss.windows.patch b/external/nss/nss.windows.patch
index 901846e7bc1f..27a44045802e 100644
--- a/external/nss/nss.windows.patch
+++ b/external/nss/nss.windows.patch
@@ -1,6 +1,6 @@
--- a/a/nspr/config/rules.mk 2008-12-03 00:24:39.000000000 +0100
+++ b/b/nspr/config/rules.mk 2009-11-27 13:36:22.662753328 +0100
-@@ -415,7 +415,7 @@
+@@ -423,7 +423,7 @@
ifdef NEED_ABSOLUTE_PATH
# The quotes allow absolute paths to contain spaces.
@@ -11,7 +11,7 @@
$(OBJDIR)/%.$(OBJ_SUFFIX): %.cpp
--- a/a/nss/coreconf/rules.mk 2008-12-03 00:24:39.000000000 +0100
+++ b/b/nss/coreconf/rules.mk 2009-11-27 13:36:22.662753328 +0100
-@@ -386,7 +386,7 @@
+@@ -280,7 +280,7 @@
endif
# The quotes allow absolute paths to contain spaces.
@@ -22,7 +22,7 @@
ifdef USE_NT_C_SYNTAX
--- a/a/nspr/pr/include/md/_win95.h
+++ b/b/nspr/pr/include/md/_win95.h
-@@ -312,7 +312,7 @@
+@@ -317,7 +317,7 @@
#define _MD_ATOMIC_ADD(ptr,val) (InterlockedExchangeAdd((PLONG)ptr,
(LONG)val) + val)
#define _MD_ATOMIC_DECREMENT(x) InterlockedDecrement((PLONG)x)
#endif /* x86 */
diff --git a/external/nss/nss_macosx.patch b/external/nss/nss_macosx.patch
index 3144fa687761..72277a425242 100644
--- a/external/nss/nss_macosx.patch
+++ b/external/nss/nss_macosx.patch
@@ -1,7 +1,7 @@
diff -ru a/nspr/configure b/nspr/configure
--- a/a/nspr/configure 2014-09-29 16:50:33.907375937 +0100
+++ b/b/nspr/configure 2014-09-29 16:51:59.213931947 +0100
-@@ -6577,7 +6579,7 @@
+@@ -6483,7 +6486,7 @@
DSO_CFLAGS=-fPIC
@@ -13,7 +13,7 @@ diff -ru a/nspr/configure b/nspr/configure
diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
--- a/a/nss/coreconf/Darwin.mk 2014-09-29 16:50:22.992304799 +0100
+++ b/b/nss/coreconf/Darwin.mk 2014-09-29 16:51:59.214931953 +0100
-@@ -20,13 +24,17 @@
+@@ -20,13 +20,17 @@
ifeq (,$(filter-out i%86,$(CPU_ARCH)))
ifdef USE_64
@@ -31,7 +31,14 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
override CPU_ARCH = x86
endif
else
-@@ -40,12 +48,16 @@
+@@ -33,19 +37,20 @@
+ ifeq (arm,$(CPU_ARCH))
+ # Nothing set for arm currently.
+ else
+-OS_REL_CFLAGS = -Dppc
+-CC += -arch ppc
+-CCC += -arch ppc
+ endif
endif
ifneq (,$(MACOS_SDK_DIR))
@@ -49,7 +56,7 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
# GCC <= 3
DARWIN_SDK_FRAMEWORKS = -F$(MACOS_SDK_DIR)/System/Library/Frameworks
ifneq (,$(shell find $(MACOS_SDK_DIR)/Library/Frameworks -maxdepth 0))
-@@ -108,7 +120,7 @@
+@@ -108,7 +113,7 @@
# May override this with different compatibility and current version numbers.
DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
# May override this with -bundle to create a loadable module.
@@ -61,7 +68,7 @@ diff -ru a/nss/coreconf/Darwin.mk b/nss/coreconf/Darwin.mk
diff -ru a/nss/Makefile b/nss/Makefile
--- a/a/nss/Makefile 2014-09-29 16:50:22.990304789 +0100
+++ b/b/nss/Makefile 2014-09-29 16:51:59.207931908 +0100
-@@ -72,6 +72,9 @@
+@@ -82,6 +82,9 @@
ifeq ($(OS_TARGET),WIN95)
NSPR_CONFIGURE_OPTS += --enable-win32-target=WIN95
endif
diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0
index 059a9f3b2c0a..72be8aa6600a 100644
--- a/external/nss/ubsan.patch.0
+++ b/external/nss/ubsan.patch.0
@@ -18,7 +18,7 @@
count * sizeof(lgdbSlotData);
data->data = (unsigned char *)PORT_ZAlloc(dataLen);
-@@ -327,7 +327,7 @@
+@@ -329,7 +329,7 @@
}
if ((encoded->major == LGDB_DB_EXT1_VERSION_MAJOR) &&
(encoded->minor >= LGDB_DB_EXT1_VERSION_MINOR)) {
commit 0e996c686ac7a23b229c4f1c48fae33b185886e5
Author: Taichi Haradaguchi <[email protected]>
AuthorDate: Tue Sep 20 17:51:08 2022 +0900
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:48:17 2023 +0200
nss: update to release 3.83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140231
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <[email protected]>
(cherry picked from commit 06c9e1d27093ca7bbe38a1eb93fbb85b80f75f75)
Change-Id: Ic1cb36b3a56cde40296fd46ef356dea286932692
diff --git a/download.lst b/download.lst
index f4554aabe42b..0284889bb8c5 100644
--- a/download.lst
+++ b/download.lst
@@ -414,8 +414,8 @@ NEON_TARBALL := neon-0.30.2.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-NSS_SHA256SUM :=
5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835
-NSS_TARBALL := nss-3.79-with-nspr-4.34.tar.gz
+NSS_SHA256SUM :=
b1e1198fa7ee4e0fe4fa6937245c94820fd3c3c6897779493858af1bf6310b30
+NSS_TARBALL := nss-3.83-with-nspr-4.34.1.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/nss/nss-bz1646594.patch.1
b/external/nss/nss-bz1646594.patch.1
index e6c75922a7dc..cffb9f5fe61d 100644
--- a/external/nss/nss-bz1646594.patch.1
+++ b/external/nss/nss-bz1646594.patch.1
@@ -2,7 +2,7 @@ regression from
https://bugzilla.mozilla.org/show_bug.cgi?id=1646594
--- nss/nss/coreconf/arch.mk.orig2 2020-08-18 14:33:21.295252404 +0200
+++ nss/nss/coreconf/arch.mk 2020-08-18 14:33:46.360320806 +0200
-@@ -116,8 +116,10 @@
+@@ -94,8 +94,10 @@
OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
endif
KERNEL = Linux
diff --git a/external/nss/nss.patch b/external/nss/nss.patch
index 66fbe37dc5ed..cc9eeed1b009 100644
--- a/external/nss/nss.patch
+++ b/external/nss/nss.patch
@@ -1,6 +1,6 @@
--- a/a/nspr/configure 2017-08-29 23:44:13.686045013 +0530
+++ b/b/nspr/configure 2017-08-29 23:46:53.774768655 +0530
-@@ -7034,7 +7034,7 @@
+@@ -6794,7 +6794,7 @@
PR_MD_CSRCS=linux.c
MKSHLIB='$(CC) $(DSO_LDOPTS) -o $@'
DSO_CFLAGS=-fPIC
@@ -11,7 +11,7 @@
# combo is not yet good at debugging
inlined
--- a/nss.orig/nspr/pr/src/misc/prnetdb.c 2017-08-29 23:44:13.690045031
+0530
+++ b/nss/nspr/pr/src/misc/prnetdb.c 2017-08-29 23:47:03.810814019 +0530
-@@ -438,7 +438,7 @@
+@@ -441,7 +441,7 @@
char *buf = *bufp;
PRIntn buflen = *buflenp;
@@ -51,7 +51,7 @@
--- a/nss.org/nss/coreconf/arch.mk 2017-08-29 23:44:13.646044832 +0530
+++ b/nss/nss/coreconf/arch.mk 2017-08-29 23:45:51.494487134 +0530
-@@ -305,11 +305,17 @@
+@@ -284,11 +284,17 @@
OBJDIR_NAME_COMPILER = $(COMPILER_TAG)
endif
OBJDIR_NAME_BASE =
$(OS_TARGET)$(OS_RELEASE)$(CPU_TAG)$(OBJDIR_NAME_COMPILER)$(LIBC_TAG)$(IMPL_STRATEGY)$(OBJDIR_TAG)
@@ -83,7 +83,7 @@
# The default implementation strategy for FreeBSD is pthreads.
--- a/nss.org/nss/coreconf/Linux.mk 2017-08-29 23:44:13.642044814 +0530
+++ b/nss/nss/coreconf/Linux.mk 2017-08-29 23:47:26.318915759 +0530
-@@ -147,7 +147,7 @@
+@@ -158,7 +158,7 @@
# Also, -z defs conflicts with Address Sanitizer, which emits relocations
# against the libsanitizer runtime built into the main executable.
ZDEFS_FLAG = -Wl,-z,defs
@@ -92,7 +92,7 @@
LDFLAGS += $(ARCHFLAG) -z noexecstack
# On Maemo, we need to use the -rpath-link flag for even the standard system
-@@ -177,8 +177,13 @@
+@@ -188,8 +188,13 @@
endif
endif
@@ -108,7 +108,7 @@
# dependencies in the same directory where it resides.
--- a/nss.org/nss/coreconf/rules.mk 2017-08-29 23:44:13.646044832 +0530
+++ b/nss/nss/coreconf/rules.mk 2017-08-29 23:47:37.442966042 +0530
-@@ -261,7 +261,7 @@
+@@ -176,7 +176,7 @@
ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET)))
$(AR) $(subst /,\\,$(OBJS))
else
@@ -119,7 +119,7 @@
--- a/nss.org/nss/coreconf/SunOS5.mk 2017-08-29 23:44:13.646044832 +0530
+++ b/nss/nss/coreconf/SunOS5.mk 2017-08-29 23:45:00.902258445 +0530
-@@ -48,8 +48,11 @@
+@@ -46,8 +46,11 @@
# OPTIMIZER += -mno-omit-leaf-frame-pointer -fno-omit-frame-pointer
endif
else
@@ -135,7 +135,7 @@
ifndef BUILD_OPT
--- a/nss.org/nss/coreconf/Werror.mk 2017-08-29 23:44:13.646044832 +0530
+++ b/nss/nss/coreconf/Werror.mk 2017-08-29 23:44:23.994091608 +0530
-@@ -94,7 +94,8 @@
+@@ -96,7 +96,8 @@
endif #ndef NSS_ENABLE_WERROR
ifeq ($(NSS_ENABLE_WERROR),1)
commit f9d4bcfc47146a4ff0abc7b7a6da4c2039d2fd61
Author: Eike Rathke <[email protected]>
AuthorDate: Fri Feb 17 12:03:54 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:48:17 2023 +0200
Stack check safety belt before fishing in muddy waters
Have it hit hard in debug builds.
Change-Id: I9ea54844a0661fd7a75616a2876983a74b2d5bad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147205
Reviewed-by: Eike Rathke <[email protected]>
Tested-by: Jenkins
(cherry picked from commit 9d91fbba6f374fa1c10b38eae003da89bd4e6d4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147245
Reviewed-by: Caolán McNamara <[email protected]>
(cherry picked from commit 166a07062dd4ffedca6106f439a6fcddaeee5eb5)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147391
Tested-by: Michael Stahl <[email protected]>
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx
index 3b902524d901..c7d4527dbf57 100644
--- a/sc/source/core/inc/interpre.hxx
+++ b/sc/source/core/inc/interpre.hxx
@@ -235,6 +235,7 @@ private:
inline bool MustHaveParamCount( short nAct, short nMust );
inline bool MustHaveParamCount( short nAct, short nMust, short nMax );
inline bool MustHaveParamCountMin( short nAct, short nMin );
+ inline bool MustHaveParamCountMinWithStackCheck( short nAct, short nMin );
void PushParameterExpected();
void PushIllegalParameter();
void PushIllegalArgument();
@@ -1086,6 +1087,17 @@ inline bool ScInterpreter::MustHaveParamCountMin( short
nAct, short nMin )
return false;
}
+inline bool ScInterpreter::MustHaveParamCountMinWithStackCheck( short nAct,
short nMin )
+{
+ assert(sp >= nAct);
+ if (sp < nAct)
+ {
+ PushParameterExpected();
+ return false;
+ }
+ return MustHaveParamCountMin( nAct, nMin);
+}
+
inline bool ScInterpreter::CheckStringPositionArgument( double & fVal )
{
if (!rtl::math::isFinite( fVal))
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 0f37b4f9f35e..f1f7a6827cf1 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -7524,7 +7524,7 @@ void ScInterpreter::ScVLookup()
void ScInterpreter::ScSubTotal()
{
sal_uInt8 nParamCount = GetByte();
- if ( MustHaveParamCountMin( nParamCount, 2 ) )
+ if ( MustHaveParamCountMinWithStackCheck( nParamCount, 2 ) )
{
// We must fish the 1st parameter deep from the stack! And push it on
top.
const FormulaToken* p = pStack[ sp - nParamCount ];
@@ -7571,7 +7571,7 @@ void ScInterpreter::ScSubTotal()
void ScInterpreter::ScAggregate()
{
sal_uInt8 nParamCount = GetByte();
- if ( MustHaveParamCountMin( nParamCount, 3 ) )
+ if ( MustHaveParamCountMinWithStackCheck( nParamCount, 3 ) )
{
// fish the 1st parameter from the stack and push it on top.
const FormulaToken* p = pStack[ sp - nParamCount ];
commit a52beb04b95a5134e855441ec78abf96e9a7728d
Author: Eike Rathke <[email protected]>
AuthorDate: Thu Feb 16 20:20:31 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:48:17 2023 +0200
Obtain actual 0-parameter count for OR(), AND() and 1-parameter functions
OR and AND for legacy infix notation are classified as binary
operators but in fact are functions with parameter count. In case
no argument is supplied, GetByte() returns 0 and for that case the
implicit binary operator 2 parameters were wrongly assumed.
Similar for functions expecting 1 parameter, without argument 1
was assumed. For "real" unary and binary operators the compiler
already checks parameters. Omit OR and AND and 1-parameter
functions from this implicit assumption and return the actual 0
count.
Change-Id: Ie05398c112a98021ac2875cf7b6de994aee9d882
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147173
Reviewed-by: Eike Rathke <[email protected]>
Tested-by: Jenkins
(cherry picked from commit e7ce9bddadb2db222eaa5f594ef1de2e36d57e5c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147129
Reviewed-by: Caolán McNamara <[email protected]>
(cherry picked from commit d6599a2af131994487d2d9223a4fd32a8c3ddc49)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147390
Tested-by: Michael Stahl <[email protected]>
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 17594207234f..0db0c3464610 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -95,17 +95,14 @@ sal_uInt8 FormulaToken::GetParamCount() const
return 0; // parameters and specials
// ocIf... jump commands not for FAP, have cByte then
//2do: bool parameter whether FAP or not?
- else if ( GetByte() )
+ else if (GetByte())
return GetByte(); // all functions, also ocExternal and ocMacro
- else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP)
- return 2; // binary
- else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP)
- || eOp == ocPercentSign)
- return 1; // unary
+ else if (SC_OPCODE_START_BIN_OP <= eOp && eOp < SC_OPCODE_STOP_BIN_OP &&
eOp != ocAnd && eOp != ocOr)
+ return 2; // binary operators, compiler checked; OR and AND
legacy but are functions
+ else if ((SC_OPCODE_START_UN_OP <= eOp && eOp < SC_OPCODE_STOP_UN_OP) ||
eOp == ocPercentSign)
+ return 1; // unary operators, compiler checked
else if (SC_OPCODE_START_NO_PAR <= eOp && eOp < SC_OPCODE_STOP_NO_PAR)
return 0; // no parameter
- else if (SC_OPCODE_START_1_PAR <= eOp && eOp < SC_OPCODE_STOP_1_PAR)
- return 1; // one parameter
else if (FormulaCompiler::IsOpCodeJumpCommand( eOp ))
return 1; // only the condition counts as parameter
else
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index eb3fb987c034..002c7de4c1da 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -4012,7 +4012,15 @@ StackVar ScInterpreter::Interpret()
else if (sp >= pCur->GetParamCount())
nStackBase = sp - pCur->GetParamCount();
else
- nStackBase = sp; // underflow?!?
+ {
+ SAL_WARN("sc.core", "Stack anomaly at " << aPos.Format(
+ ScRefFlags::VALID | ScRefFlags::FORCE_DOC |
ScRefFlags::TAB_3D, pDok)
+ << " eOp: " << static_cast<int>(eOp)
+ << " params: " <<
static_cast<int>(pCur->GetParamCount())
+ << " nStackBase: " << nStackBase << " sp: " <<
sp);
+ nStackBase = sp;
+ assert(!"underflow");
+ }
}
switch( eOp )
commit 9198b0e565f38570f737ae6dc6424c6f7d1a73e1
Author: Caolán McNamara <[email protected]>
AuthorDate: Mon Feb 13 13:56:10 2023 +0000
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:48:17 2023 +0200
disable script dump
Change-Id: I04d740cc0fcf87daa192a0a6af34138278043a19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146986
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <[email protected]>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147051
Tested-by: Thorsten Behrens <[email protected]>
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx
b/connectivity/source/drivers/hsqldb/HDriver.cxx
index de76ecbba29d..95c610843efa 100644
--- a/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -300,6 +300,37 @@ namespace connectivity
} // if ( xStream.is() )
::comphelper::disposeComponent(xStream);
}
+
+ // disallow any database/script files that contain a
"SCRIPT[.*]" entry (this is belt and braces
+ // in that bundled hsqldb 1.8.0 is patched to also reject
them)
+ //
+ // hsqldb 2.6.0 release notes have: added system role
SCRIPT_OPS for export / import of database structure and data
+ // which seems to provide a builtin way to do this with
contemporary hsqldb
+ const OUString sScript( "script" );
+ if (!bIsNewDatabase && xStorage->isStreamElement(sScript))
+ {
+ Reference<XStream > xStream =
xStorage->openStreamElement(sScript, ElementModes::READ);
+ if (xStream.is())
+ {
+ std::unique_ptr<SvStream>
pStream(::utl::UcbStreamHelper::CreateStream(xStream));
+ if (pStream)
+ {
+ OString sLine;
+ while (pStream->ReadLine(sLine))
+ {
+ OString sText = sLine.trim();
+ if
(sText.startsWithIgnoreAsciiCase("SCRIPT"))
+ {
+ ::connectivity::SharedResources
aResources;
+ sMessage =
aResources.getResourceString(STR_COULD_NOT_LOAD_FILE).replaceFirst("$filename$",
sSystemPath);
+ break;
+ }
+ }
+ }
+ } // if ( xStream.is() )
+ ::comphelper::disposeComponent(xStream);
+ }
+
}
catch(Exception&)
{
diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk
b/external/hsqldb/UnpackedTarball_hsqldb.mk
index cbba770f19a0..ed262cccf4ca 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
external/hsqldb/patches/jdbc-4.1.patch \
external/hsqldb/patches/multipleResultSets.patch \
) \
+ external/hsqldb/patches/disable-dump-script.patch \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/hsqldb/patches/disable-dump-script.patch
b/external/hsqldb/patches/disable-dump-script.patch
new file mode 100644
index 000000000000..401dd38abc9a
--- /dev/null
+++ b/external/hsqldb/patches/disable-dump-script.patch
@@ -0,0 +1,14 @@
+--- a/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2023-02-13
11:08:11.297243034 +0000
++++ b/hsqldb/src/org/hsqldb/DatabaseCommandInterpreter.java 2023-02-13
13:49:17.973089433 +0000
+@@ -403,6 +403,11 @@
+ throw Trace.error(Trace.INVALID_IDENTIFIER);
+ }
+
++ // added condition to avoid execution of spurious command in
.script or .log file
++ if (session.isProcessingScript() ||
session.isProcessingLog()) {
++ return new Result(ResultConstants.UPDATECOUNT);
++ }
++
+ dsw = new ScriptWriterText(database, token, true, true, true);
+
+ dsw.writeAll();
commit 6c8b53f144745a6b92b498c3e4763fe000ca6415
Author: Michael Stahl <[email protected]>
AuthorDate: Wed Feb 8 12:11:24 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:48:17 2023 +0200
openssl: upgrade to release 1.1.1t
Fixes CVE-2023-0286 CVE-2023-0215 CVE-2022-4450 CVE-2022-4304
Change-Id: I93ce0362b17bd07b0644564a0676daaa56bc8b50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146653
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <[email protected]>
(cherry picked from commit f9229fdadbd205a8953577efc72a6e43717c764e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146660
Tested-by: Michael Stahl <[email protected]>
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/download.lst b/download.lst
index c3be1d04a07a..f4554aabe42b 100644
--- a/download.lst
+++ b/download.lst
@@ -440,8 +440,8 @@ OPENLDAP_TARBALL := openldap-2.4.59.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-OPENSSL_SHA256SUM :=
c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa
-OPENSSL_TARBALL := openssl-1.1.1s.tar.gz
+OPENSSL_SHA256SUM :=
8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b
+OPENSSL_TARBALL := openssl-1.1.1t.tar.gz
# three static lines
# so that git cherry-pick
# will not run into conflicts
commit 1afa7e43f6e5eab02c1fe7de25fede71436f4a21
Author: Michael Stahl <[email protected]>
AuthorDate: Wed Feb 8 12:31:13 2023 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:48:17 2023 +0200
add three static lines beween tarballs to ease cherry-picking
Change-Id: Ieb79d58796e38c5ba67ee0c7ae4e1edeafef3345
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146659
Tested-by: Michael Stahl <[email protected]>
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/download.lst b/download.lst
index 4a1f521b7925..c3be1d04a07a 100644
--- a/download.lst
+++ b/download.lst
@@ -1,113 +1,266 @@
ABW_SHA256SUM :=
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
ABW_TARBALL := libabw-0.1.3.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
APACHE_COMMONS_LOGGING_SHA256SUM :=
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
APR_SHA256SUM :=
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
APR_TARBALL := apr-1.5.2.tar.gz
APR_UTIL_SHA256SUM :=
976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
BOOST_SHA256SUM :=
8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
BOOST_TARBALL := boost_1_69_0.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
BREAKPAD_SHA256SUM :=
7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9
BREAKPAD_TARBALL := breakpad.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
BSH_SHA256SUM :=
9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96
BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
BZIP2_SHA256SUM :=
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
BZIP2_TARBALL := bzip2-1.0.8.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
CAIRO_SHA256SUM :=
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
CAIRO_VERSION_MICRO := 0
CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
CDR_SHA256SUM :=
6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48
CDR_TARBALL := libcdr-0.1.5.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
CLUCENE_SHA256SUM :=
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
CLUCENE_TARBALL := 48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBCMIS_SHA256SUM :=
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
COINMP_SHA256SUM :=
86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
COINMP_TARBALL := CoinMP-1.7.6.tgz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
CPPUNIT_SHA256SUM :=
3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780
CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
CT2N_SHA256SUM :=
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
CT2N_TARBALL := 1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
CURL_SHA256SUM :=
2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b
CURL_TARBALL := curl-7.86.0.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
EBOOK_SHA256SUM :=
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
EBOOK_TARBALL := libe-book-0.1.3.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
EPOXY_SHA256SUM :=
002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
EPOXY_TARBALL := libepoxy-1.5.3.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
EPM_SHA256SUM :=
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
EPUBGEN_SHA256SUM :=
03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
ETONYEK_SHA256SUM :=
e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
ETONYEK_VERSION_MICRO := 9
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
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FIREBIRD_SHA256SUM :=
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONTCONFIG_SHA256SUM :=
cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
FONTCONFIG_TARBALL := fontconfig-2.12.6.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_CALADEA_SHA256SUM :=
c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
FONT_CALADEA_TARBALL :=
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_CARLITO_SHA256SUM :=
4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
FONT_CARLITO_TARBALL :=
c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_DEJAVU_SHA256SUM :=
7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a
FONT_DEJAVU_TARBALL :=
33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_GENTIUM_SHA256SUM :=
2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc
FONT_GENTIUM_TARBALL := 1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_LIBERATION_NARROW_SHA256SUM :=
8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
FONT_LIBERATION_NARROW_TARBALL := liberation-narrow-fonts-ttf-1.07.6.tar.gz
FONT_LIBERATION_SHA256SUM :=
c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45
FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.00.4.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_LINLIBERTINEG_SHA256SUM :=
54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
FONT_LINLIBERTINEG_TARBALL :=
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_SOURCECODE_SHA256SUM :=
09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
FONT_SOURCECODE_TARBALL :=
907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_SOURCESANS_SHA256SUM :=
e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
FONT_SOURCESANS_TARBALL :=
edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_SOURCESERIF_SHA256SUM :=
826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
FONT_SOURCESERIF_TARBALL := source-serif-pro-3.000R.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_EMOJIONE_COLOR_SHA256SUM :=
d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_NOTO_SHA256SUM :=
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_CULMUS_SHA256SUM :=
dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b
FONT_CULMUS_TARBALL := culmus-0.131.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_LIBRE_HEBREW_SHA256SUM :=
f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_ALEF_SHA256SUM :=
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
FONT_ALEF_TARBALL := alef-1.001.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_AMIRI_SHA256SUM :=
1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
FONT_AMIRI_TARBALL := Amiri-0.111.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_KACST_SHA256SUM :=
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_REEM_SHA256SUM :=
f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f
FONT_REEM_TARBALL := ReemKufi-0.7.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FONT_SCHEHERAZADE_SHA256SUM :=
251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
FREETYPE_SHA256SUM :=
db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
FREETYPE_TARBALL := freetype-2.9.1.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
GLM_SHA256SUM :=
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
GPGME_SHA256SUM :=
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
GPGME_TARBALL := gpgme-1.9.0.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
GRAPHITE_SHA256SUM :=
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
HARFBUZZ_SHA256SUM :=
9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
HSQLDB_SHA256SUM :=
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
HUNSPELL_SHA256SUM :=
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
HYPHEN_SHA256SUM :=
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
ICU_SHA256SUM :=
53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948
ICU_TARBALL := icu4c-65_1-src.tgz
ICU_DATA_SHA256SUM :=
06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6
ICU_DATA_TARBALL := icu4c-65_1-data.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
JFREEREPORT_FLOW_ENGINE_SHA256SUM :=
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
JFREEREPORT_FLOW_ENGINE_TARBALL :=
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
JFREEREPORT_FLUTE_SHA256SUM :=
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
@@ -130,134 +283,320 @@ JFREEREPORT_LIBXML_SHA256SUM :=
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f
JFREEREPORT_LIBXML_TARBALL := ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
JFREEREPORT_SAC_SHA256SUM :=
085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
JFREEREPORT_SAC_TARBALL := 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBJPEG_TURBO_SHA256SUM :=
b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523
LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LANGTAGREG_SHA256SUM :=
fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da
LANGTAGREG_TARBALL := language-subtag-registry-2020-04-01.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LANGUAGETOOL_SHA256SUM :=
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
LANGUAGETOOL_TARBALL :=
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LCMS2_SHA256SUM :=
48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20
LCMS2_TARBALL := lcms2-2.9.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBASSUAN_SHA256SUM :=
47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
LIBASSUAN_TARBALL := libassuan-2.5.1.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBATOMIC_OPS_SHA256SUM :=
1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665
LIBATOMIC_OPS_TARBALL := libatomic_ops-7.6.8.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBEOT_SHA256SUM :=
cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a
LIBEOT_TARBALL := libeot-0.01.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBEXTTEXTCAT_SHA256SUM :=
13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8
LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.5.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
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBGPGERROR_SHA256SUM :=
4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
LIBGPGERROR_TARBALL := libgpg-error-1.27.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBLANGTAG_SHA256SUM :=
d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e
LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBNUMBERTEXT_SHA256SUM :=
e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7
LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.5.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
LIBTOMMATH_TARBALL := ltm-1.0.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
XMLSEC_SHA256SUM :=
13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4
XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBXML_SHA256SUM :=
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
LIBXML_VERSION_MICRO := 3
LIBXML_TARBALL := libxml2-2.10.$(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_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LPSOLVE_SHA256SUM :=
171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LXML_SHA256SUM :=
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
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
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
MDDS_SHA256SUM :=
144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d
MDDS_TARBALL := mdds-1.5.0.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
MDNSRESPONDER_SHA256SUM :=
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
MDNSRESPONDER_TARBALL := mDNSResponder-878.200.35.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
MSPUB_SHA256SUM :=
ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba
MSPUB_TARBALL := libmspub-0.1.4.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
MWAW_SHA256SUM :=
0c639edba5297bde5575193bf5b5f2f469956beaff5c0206d91ce9df6bde1868
MWAW_VERSION_MICRO := 16
MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
MYTHES_SHA256SUM :=
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f
MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
NEON_SHA256SUM :=
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
NEON_TARBALL := neon-0.30.2.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
NSS_SHA256SUM :=
5369ed274a19f480ec94e1faef04da63e3cbac1a82e15bb1751e58b2f274b835
NSS_TARBALL := nss-3.79-with-nspr-4.34.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
ODFGEN_SHA256SUM :=
55200027fd46623b9bdddd38d275e7452d1b0ff8aeddcad6f9ae6dc25f610625
ODFGEN_VERSION_MICRO := 8
ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
ODFVALIDATOR_SHA256SUM :=
984f2a479df79e27e7b01a5815ac53ae64e07746b882262d8a64566494515504
ODFVALIDATOR_JAR :=
odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies-971c54fd38a968f5860014b44301872706f9e540.jar
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
OFFICEOTRON_SHA256SUM :=
f2443f27561af52324eee03a1892d9f569adc8db9e7bca55614898bc2a13a770
OFFICEOTRON_JAR :=
8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
OPENLDAP_SHA256SUM :=
99f37d6747d88206c470067eda624d5e48c1011e943ec0ab217bae8712e22f34
OPENLDAP_TARBALL := openldap-2.4.59.tgz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
OPENSSL_SHA256SUM :=
c5ac01e760ee6ff0dab61d6b2bbd30146724d063eb322180c6f18a6f74e4b6aa
OPENSSL_TARBALL := openssl-1.1.1s.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
ORCUS_SHA256SUM :=
0dd26f3f2e611c51df9ee02d6dbf08887989eaa417b73f6877cd0d94df795fc2
ORCUS_TARBALL := liborcus-0.15.3.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
OWNCLOUD_ANDROID_LIB_SHA256SUM :=
b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb
OWNCLOUD_ANDROID_LIB_TARBALL :=
owncloud-android-library-0.9.4-no-binary-deps.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
PAGEMAKER_SHA256SUM :=
66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d
PAGEMAKER_TARBALL := libpagemaker-0.0.4.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
PDFIUM_SHA256SUM :=
eb98a77eaaab9e9e8de541cfd18b9438dd3c538bd5ef163820353179727f5dc9
PDFIUM_TARBALL := pdfium-4643.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
PIXMAN_SHA256SUM :=
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3997aa20a88e
PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
LIBPNG_SHA256SUM :=
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
LIBPNG_TARBALL := libpng-1.6.37.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
POPPLER_SHA256SUM :=
d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
POPPLER_TARBALL := poppler-22.09.0.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
POSTGRESQL_SHA256SUM :=
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3
POSTGRESQL_TARBALL := postgresql-13.5.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
PYTHON_SHA256SUM :=
d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562
PYTHON_TARBALL := Python-3.8.16.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
QRCODEGEN_SHA256SUM :=
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
QXP_TARBALL := libqxp-0.0.2.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
RAPTOR_SHA256SUM :=
ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
RAPTOR_TARBALL := a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
RASQAL_SHA256SUM :=
6924c9ac6570bd241a9669f83b467c728a322470bf34f4b2da4f69492ccfd97c
RASQAL_TARBALL := 1f5def51ca0026cd192958ef07228b52-rasqal-0.9.33.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
REDLAND_SHA256SUM :=
de1847f7b59021c16bdc72abb4d8e2d9187cd6124d69156f3326dd34ee043681
REDLAND_TARBALL := e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
REVENGE_SHA256SUM :=
c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf
REVENGE_VERSION_MICRO := 4
REVENGE_TARBALL := librevenge-0.0.$(REVENGE_VERSION_MICRO).tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
RHINO_SHA256SUM :=
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
SERF_SHA256SUM :=
6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700
SERF_TARBALL := serf-1.2.1.tar.bz2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
STAROFFICE_SHA256SUM :=
6b00e1ed8194e6072be4441025d1b888e39365727ed5b23e0e8c92c4009d1ec4
STAROFFICE_VERSION_MICRO := 6
STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
SWING_SHA256SUM :=
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1
SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
TWAIN_DSM_SHA256SUM :=
82c818be771f242388457aa8c807e4b52aa84dc22b21c6c56184a6b4cbb085e6
TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
UCPP_SHA256SUM :=
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
VISIO_SHA256SUM :=
8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
VISIO_TARBALL := libvisio-0.1.7.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
WPD_SHA256SUM :=
2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09
WPD_VERSION_MICRO := 3
WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
WPG_SHA256SUM :=
99b3f7f8832385748582ab8130fbb9e5607bd5179bebf9751ac1d51a53099d1c
WPG_VERSION_MICRO := 3
WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
WPS_SHA256SUM :=
1421e034286a9f96d3168a1c54ea570ee7aa008ca07b89de005ad5ce49fb29ca
WPS_VERSION_MICRO := 10
WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
XSLTML_SHA256SUM :=
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
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
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
ZMF_SHA256SUM :=
27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22
ZMF_TARBALL := libzmf-0.0.2.tar.xz
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
NUMBERTEXT_EXTENSION_SHA256SUM :=
1568ed1d2feb8210bb5de61d69574a165cded536cfa17c6953c9064076469de2
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
UNOWINREG_SHA256SUM :=
eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6
+# three static lines
+# so that git cherry-pick
+# will not run into conflicts
OPENSYMBOL_SHA256SUM :=
884ed41809687c3e168fc7c19b16585149ff058eca79acbf3ee784f6630704cc
commit f32fa3bd24203454f6625c4ce068cb95446a35d5
Author: Christian Lohmaier <[email protected]>
AuthorDate: Thu Dec 15 14:00:28 2022 +0100
Commit: Andras Timar <[email protected]>
CommitDate: Sat Apr 1 18:48:09 2023 +0200
don't export entries from download.lst - only used by make
no need to plant that into the environment of every recipe. some Jenkins
Windows builders already run into "environment is too large for exec"
issue just by attempting a "xargs --show-limits </dev/null" from a dummy
rule within the make environment
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144217
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <[email protected]>
(cherry picked from commit ec4409a911fd4a67eb1bc74aae33081ae8510339)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144325
Reviewed-by: Michael Stahl <[email protected]>
(cherry picked from commit 70f0cf457bdd36e914f3e98cf027ee25a75df448)
Cherry-pick part of commit d9617d5529e0da23bd8602d07ce459cc42746e02 to
fix make module.clean.
Change-Id: I321fa9075532eef62a7d4e33a08c272276de717e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146658
Tested-by: Michael Stahl <[email protected]>
Reviewed-by: Michael Stahl <[email protected]>
diff --git a/configure.ac b/configure.ac
index c71239e16cd8..69c307106b92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7762,7 +7762,7 @@ if test "$with_export_validation" != "no"; then
ODFVALIDATOR="$BUILDDIR/bin/odfvalidator.sh"
# and fetch name of odfvalidator jar name from download.lst
- ODFVALIDATOR_JAR=`$SED -n -e "s/export *ODFVALIDATOR_JAR *:=
*\(.*\) */\1/p" $SRC_ROOT/download.lst`
+ ODFVALIDATOR_JAR=`$SED -n -e "s/^ODFVALIDATOR_JAR *:= *\(.*\)
*/\1/p" $SRC_ROOT/download.lst`
AC_SUBST(ODFVALIDATOR_JAR)
if test -z "$ODFVALIDATOR_JAR"; then
@@ -7789,7 +7789,7 @@ if test "$with_export_validation" != "no"; then
OFFICEOTRON="$BUILDDIR/bin/officeotron.sh"
# and fetch name of officeotron jar name from download.lst
- OFFICEOTRON_JAR=`$SED -n -e "s/export *OFFICEOTRON_JAR *:= *\(.*\)
*/\1/p" $SRC_ROOT/download.lst`
+ OFFICEOTRON_JAR=`$SED -n -e "s/^OFFICEOTRON_JAR *:= *\(.*\)
*/\1/p" $SRC_ROOT/download.lst`
AC_SUBST(OFFICEOTRON_JAR)
if test -z "$OFFICEOTRON_JAR"; then
diff --git a/download.lst b/download.lst
index da646717fbb8..4a1f521b7925 100644
--- a/download.lst
+++ b/download.lst
@@ -1,262 +1,262 @@
-export ABW_SHA256SUM :=
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
-export ABW_TARBALL := libabw-0.1.3.tar.xz
-export APACHE_COMMONS_LOGGING_SHA256SUM :=
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
-export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
-export APR_SHA256SUM :=
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
-export APR_TARBALL := apr-1.5.2.tar.gz
-export APR_UTIL_SHA256SUM :=
976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19
-export APR_UTIL_TARBALL := apr-util-1.5.4.tar.gz
-export BOOST_SHA256SUM :=
8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
-export BOOST_TARBALL := boost_1_69_0.tar.bz2
-export BREAKPAD_SHA256SUM :=
7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9
-export BREAKPAD_TARBALL := breakpad.zip
-export BSH_SHA256SUM :=
9e93c73e23aff644b17dfff656444474c14150e7f3b38b19635e622235e01c96
-export BSH_TARBALL := beeca87be45ec87d241ddd0e1bad80c1-bsh-2.0b6-src.zip
-export BZIP2_SHA256SUM :=
ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
-export BZIP2_TARBALL := bzip2-1.0.8.tar.gz
-export CAIRO_SHA256SUM :=
5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331
-export CAIRO_VERSION_MICRO := 0
-export CAIRO_TARBALL := cairo-1.16.$(CAIRO_VERSION_MICRO).tar.xz
-export CDR_SHA256SUM :=
6ace5c499a8be34ad871e825442ce388614ae2d8675c4381756a7319429e3a48
-export CDR_TARBALL := libcdr-0.1.5.tar.xz
-export CLUCENE_SHA256SUM :=
ddfdc433dd8ad31b5c5819cc4404a8d2127472a3b720d3e744e8c51d79732eab
-export CLUCENE_TARBALL :=
48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-export LIBCMIS_SHA256SUM :=
d7b18d9602190e10d437f8a964a32e983afd57e2db316a07d87477a79f5000a2
-export LIBCMIS_TARBALL := libcmis-0.5.2.tar.xz
-export COINMP_SHA256SUM :=
86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f
-export COINMP_TARBALL := CoinMP-1.7.6.tgz
-export CPPUNIT_SHA256SUM :=
3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780
-export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
-export CT2N_SHA256SUM :=
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
-export CT2N_TARBALL :=
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM :=
2d61116e5f485581f6d59865377df4463f2e788677ac43222b496d4e49fb627b
-export CURL_TARBALL := curl-7.86.0.tar.xz
-export EBOOK_SHA256SUM :=
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
-export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
-export EPOXY_SHA256SUM :=
002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
-export EPOXY_TARBALL := libepoxy-1.5.3.tar.xz
-export EPM_SHA256SUM :=
b3fc4c5445de6c9a801504a3ea3efb2d4ea9d5a622c9427e716736e7713ddb91
-export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-export EPUBGEN_SHA256SUM :=
03e084b994cbeffc8c3dd13303b2cb805f44d8f2c3b79f7690d7e3fc7f6215ad
-export EPUBGEN_TARBALL := libepubgen-0.1.1.tar.xz
-export ETONYEK_SHA256SUM :=
e61677e8799ce6e55b25afc11aa5339113f6a49cff031f336e32fa58635b1a4a
-export ETONYEK_VERSION_MICRO := 9
-export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.xz
-export EXPAT_SHA256SUM :=
ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
-export EXPAT_TARBALL := expat-2.5.0.tar.xz
-export FIREBIRD_SHA256SUM :=
6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860
-export FIREBIRD_TARBALL := Firebird-3.0.0.32483-0.tar.bz2
-export FONTCONFIG_SHA256SUM :=
cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017
-export FONTCONFIG_TARBALL := fontconfig-2.12.6.tar.bz2
-export FONT_CALADEA_SHA256SUM :=
c48d1c2fd613c9c06c959c34da7b8388059e2408d2bb19845dc3ed35f76e4d09
-export FONT_CALADEA_TARBALL :=
368f114c078f94214a308a74c7e991bc-crosextrafonts-20130214.tar.gz
-export FONT_CARLITO_SHA256SUM :=
4bd12b6cbc321c1cf16da76e2c585c925ce956a08067ae6f6c64eff6ccfdaf5a
-export FONT_CARLITO_TARBALL :=
c74b7223abe75949b4af367942d96c7a-crosextrafonts-carlito-20130920.tar.gz
-export FONT_DEJAVU_SHA256SUM :=
7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a136f00e96a908b0a
-export FONT_DEJAVU_TARBALL :=
33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
-export FONT_GENTIUM_SHA256SUM :=
2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc
-export FONT_GENTIUM_TARBALL :=
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
-export FONT_LIBERATION_NARROW_SHA256SUM :=
8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
-export FONT_LIBERATION_NARROW_TARBALL :=
liberation-narrow-fonts-ttf-1.07.6.tar.gz
-export FONT_LIBERATION_SHA256SUM :=
c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45
-export FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.00.4.tar.gz
-export FONT_LINLIBERTINEG_SHA256SUM :=
54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
-export FONT_LINLIBERTINEG_TARBALL :=
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
-export FONT_SOURCECODE_SHA256SUM :=
09466dce87653333f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
-export FONT_SOURCECODE_TARBALL :=
907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz
-export FONT_SOURCESANS_SHA256SUM :=
e7bc9a1fec787a529e49f5a26b93dcdcf41506449dfc70f92cdef6d17eb6fb61
-export FONT_SOURCESANS_TARBALL :=
edc4d741888bc0d38e32dbaa17149596-source-sans-pro-2.010R-ro-1.065R-it.tar.gz
-export FONT_SOURCESERIF_SHA256SUM :=
826a2b784d5cdb4c2bbc7830eb62871528360a61a52689c102a101623f1928e3
-export FONT_SOURCESERIF_TARBALL := source-serif-pro-3.000R.tar.gz
-export FONT_EMOJIONE_COLOR_SHA256SUM :=
d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7
-export FONT_EMOJIONE_COLOR_TARBALL := EmojiOneColor-SVGinOT-1.3.tar.gz
-export FONT_NOTO_SHA256SUM :=
29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994
-export FONT_NOTO_TARBALL := noto-fonts-20171024.tar.gz
-export FONT_CULMUS_SHA256SUM :=
dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b
-export FONT_CULMUS_TARBALL := culmus-0.131.tar.gz
-export FONT_LIBRE_HEBREW_SHA256SUM :=
f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a
-export FONT_LIBRE_HEBREW_TARBALL := libre-hebrew-1.0.tar.gz
-export FONT_ALEF_SHA256SUM :=
b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52
-export FONT_ALEF_TARBALL := alef-1.001.tar.gz
-export FONT_AMIRI_SHA256SUM :=
1fbfccced6348b5db2c1c21d5b319cd488e14d055702fa817a0f6cb83d882166
-export FONT_AMIRI_TARBALL := Amiri-0.111.zip
-export FONT_KACST_SHA256SUM :=
dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56
-export FONT_KACST_TARBALL := ttf-kacst_2.01+mry.tar.gz
-export FONT_REEM_SHA256SUM :=
f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f
-export FONT_REEM_TARBALL := ReemKufi-0.7.zip
-export FONT_SCHEHERAZADE_SHA256SUM :=
251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5
-export FONT_SCHEHERAZADE_TARBALL := Scheherazade-2.100.zip
-export FREEHAND_SHA256SUM :=
0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac
-export FREEHAND_TARBALL := libfreehand-0.1.2.tar.xz
-export FREETYPE_SHA256SUM :=
db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d
-export FREETYPE_TARBALL := freetype-2.9.1.tar.bz2
-export GLM_SHA256SUM :=
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c81062990532904a
-export GLM_TARBALL :=
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
-export GPGME_SHA256SUM :=
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
-export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
-export GRAPHITE_SHA256SUM :=
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
-export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
-export HARFBUZZ_SHA256SUM :=
9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
-export HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz
-export HSQLDB_SHA256SUM :=
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
-export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-export HUNSPELL_SHA256SUM :=
57be4e03ae9dd62c3471f667a0d81a14513e314d4d92081292b90435944ff951
-export HUNSPELL_TARBALL := hunspell-1.7.0.tar.gz
-export HYPHEN_SHA256SUM :=
304636d4eccd81a14b6914d07b84c79ebb815288c76fe027b9ebff6ff24d5705
-export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
-export ICU_SHA256SUM :=
53e37466b3d6d6d01ead029e3567d873a43a5d1c668ed2278e253b683136d948
-export ICU_TARBALL := icu4c-65_1-src.tgz
-export ICU_DATA_SHA256SUM :=
06359a7c4ad125ba11d3ac30617cd4b932f1214f611db96573032726574896b6
-export ICU_DATA_TARBALL := icu4c-65_1-data.zip
-export JFREEREPORT_FLOW_ENGINE_SHA256SUM :=
233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
-export JFREEREPORT_FLOW_ENGINE_TARBALL :=
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-export JFREEREPORT_FLUTE_SHA256SUM :=
1b5b24f7bc543c0362b667692f78db8bab4ed6dafc6172f104d0bd3757d8a133
-export JFREEREPORT_FLUTE_TARBALL :=
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-export JFREEREPORT_LIBBASE_SHA256SUM :=
75c80359c9ce343c20aab8a36a45cb3b9ee7c61cf92c13ae45399d854423a9ba
-export JFREEREPORT_LIBBASE_TARBALL :=
eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-export JFREEREPORT_LIBFONTS_SHA256SUM :=
e0531091787c0f16c83965fdcbc49162c059d7f0c64669e7f119699321549743
-export JFREEREPORT_LIBFONTS_TARBALL :=
3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-export JFREEREPORT_LIBFORMULA_SHA256SUM :=
5826d1551bf599b85742545f6e01a0079b93c1b2c8434bf409eddb3a29e4726b
-export JFREEREPORT_LIBFORMULA_TARBALL :=
3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-export JFREEREPORT_LIBLAYOUT_SHA256SUM :=
e1fb87f3f7b980d33414473279615c4644027e013012d156efa538bc2b031772
-export JFREEREPORT_LIBLAYOUT_TARBALL :=
db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-export JFREEREPORT_LIBLOADER_SHA256SUM :=
3d853b19b1d94a6efa69e7af90f7f2b09ecf302913bee3da796c15ecfebcfac8
-export JFREEREPORT_LIBLOADER_TARBALL :=
97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-export JFREEREPORT_LIBREPOSITORY_SHA256SUM :=
abe2c57ac12ba45d83563b02e240fa95d973376de2f720aab8fe11f2e621c095
-export JFREEREPORT_LIBREPOSITORY_TARBALL :=
8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-export JFREEREPORT_LIBSERIALIZER_SHA256SUM :=
05640a1f6805b2b2d7e2cb9c50db9a5cb084e3c52ab1a71ce015239b4a1d4343
-export JFREEREPORT_LIBSERIALIZER_TARBALL :=
f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-export JFREEREPORT_LIBXML_SHA256SUM :=
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
-export JFREEREPORT_LIBXML_TARBALL :=
ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-export JFREEREPORT_SAC_SHA256SUM :=
085f2112c51fa8c1783fac12fbd452650596415121348393bb51f0f7e85a9045
-export JFREEREPORT_SAC_TARBALL :=
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-export LIBJPEG_TURBO_SHA256SUM :=
b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523
-export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz
-export LANGTAGREG_SHA256SUM :=
fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da
-export LANGTAGREG_TARBALL := language-subtag-registry-2020-04-01.tar.bz2
-export LANGUAGETOOL_SHA256SUM :=
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
-export LANGUAGETOOL_TARBALL :=
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
-export LCMS2_SHA256SUM :=
48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20
-export LCMS2_TARBALL := lcms2-2.9.tar.gz
-export LIBASSUAN_SHA256SUM :=
47f96c37b4f2aac289f0bc1bacfa8bd8b4b209a488d3d15e2229cb6cc9b26449
-export LIBASSUAN_TARBALL := libassuan-2.5.1.tar.bz2
-export LIBATOMIC_OPS_SHA256SUM :=
1d6a279edf81767e74d2ad2c9fce09459bc65f12c6525a40b0cb3e53c089f665
-export LIBATOMIC_OPS_TARBALL := libatomic_ops-7.6.8.tar.gz
-export LIBEOT_SHA256SUM :=
cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a
-export LIBEOT_TARBALL := libeot-0.01.tar.bz2
-export LIBEXTTEXTCAT_SHA256SUM :=
13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8
-export LIBEXTTEXTCAT_TARBALL := libexttextcat-3.4.5.tar.xz
-export LIBFFI_SHA256SUM :=
72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
-export LIBFFI_TARBALL := libffi-3.3.tar.gz
-export LIBGPGERROR_SHA256SUM :=
4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2
-export LIBGPGERROR_TARBALL := libgpg-error-1.27.tar.bz2
-export LIBLANGTAG_SHA256SUM :=
d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e
-export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
-export LIBNUMBERTEXT_SHA256SUM :=
e1c9086b4cecb6b25f180316f30740dfabe6a4dbaf70dddc34276fc839e4f4f7
-export LIBNUMBERTEXT_TARBALL := libnumbertext-1.0.5.tar.xz
-export LIBTOMMATH_SHA256SUM :=
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
-export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export XMLSEC_SHA256SUM :=
13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4
-export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
-export LIBXML_SHA256SUM :=
5d2cc3d78bec3dbe212a9d7fa629ada25a7da928af432c93060ff5c17ee28a9c
-export LIBXML_VERSION_MICRO := 3
-export LIBXML_TARBALL := libxml2-2.10.$(LIBXML_VERSION_MICRO).tar.xz
-export LIBXSLT_SHA256SUM :=
8247f33e9a872c6ac859aa45018bc4c4d00b97e2feac9eebc10c93ce1f34dd79
-export LIBXSLT_VERSION_MICRO := 35
-export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.xz
-export LPSOLVE_SHA256SUM :=
171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
-export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
... etc. - the rest is truncated
