summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2019-08-30Filter out problematic file URLsStephan Bergmann2-0/+153
(cherry picked from commit 7e50e885ebbe130debcd4278a10a4e288655fdfc) Conflicts: shell/source/win32/SysShExec.cxx Reviewed-on: https://gerrit.libreoffice.org/70188 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a35068ba25ed9da37bcb20598c9791b6979cf1ef) Change-Id: I87fd37e56326bef4888354b923407530c6f70760
2019-08-30New o3tl::runtimeToOUString to convert from C++ runtime NTBS to OUStringStephan Bergmann1-0/+48
Change-Id: I613bb70b6828f615fd45af38b2d873ece55ace60 (cherry picked from commit d689ad29c28ad7f077c2239a8fa4c2b6307a6aa1) Reviewed-on: https://gerrit.libreoffice.org/71591 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de>
2019-08-30libxslt: add patch for CVE-2019-11068Michael Stahl2-0/+121
Change-Id: I3fe30de8140dce3d81cdfae7d41e0bd465b1d5f4 Reviewed-on: https://gerrit.libreoffice.org/70879 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 2d85b75b1220484aebd6e583d6d7aee71280e38e) Reviewed-on: https://gerrit.libreoffice.org/70894 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit 32948e7778b959ef1037d9be707a6bfc7db4160d)
2019-08-30openssl: remove MinGW patchMichael Stahl2-124/+0
This breaks the OPENSSL_IMPLEMENT_GLOBAL macro quite badly, which is also used on MSVC builds, and MSVC warns about the breakage. Change-Id: I8f4c7c8097e7d737ca32d6a020a569c0a99b92d4
2019-08-30openssl: try to fix build with 7.1A SDKMichael Stahl1-1/+1
Change-Id: Ic4a9e53227e34fe41a69afd52a9e91ef9545f8f9
2019-08-30python3: upgrade to release 3.5.7Michael Stahl4-3/+66
Fixes CVE-2019-9636 CVE-2019-5010 CVE-2018-14647 Reviewed-on: https://gerrit.libreoffice.org/70182 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3c7354a85a9bd47a2676aadaad2f6622fe2d959c) Reviewed-on: https://gerrit.libreoffice.org/70194 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> (cherry picked from commit a072b91c03f7e24cc5fe99e4b7462d37ef8d703b) Change-Id: If0a115960aed1ee90b63e6716c844669f0ec91e5
2019-08-30upgrade to python 3.5.6Caolán McNamara2-3/+3
Reviewed-on: https://gerrit.libreoffice.org/66519 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Jenkins (cherry picked from commit 6808e1e5e2361220988dfa81cb35d03fb6e15855) Change-Id: I6cdfc50b2385c426e20ce0e9b216b18c763249b8
2019-08-30configure: try to keep PYTHON_VERSION from going staleMichael Stahl1-0/+3
Since it was set to 3.5.0, the bundled python was upgraded twice, but the directory is still named python-core-3.5.0 :( Reviewed-on: https://gerrit.libreoffice.org/41433 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit ac3a4fe35e873de17eefb46c3f5e792aded6b0a5) Reviewed-on: https://gerrit.libreoffice.org/56683 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Change-Id: I15eec4148c2436e1f289d9851ce5bd212d4a368a
2019-08-30poppler: upgrade to release 0.74.0Michael Stahl4-8/+36
Fixes CVE-2019-7310. Add patch to fix CVE-2019-9200 too. CVE-2018-20662 looks irrelevant because we don't build pdfunite tool. Reviewed-on: https://gerrit.libreoffice.org/69094 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit f9b354784faf65ecc8024cf6d7d7aaf589f6d91f) Change-Id: I5e7ddabbb341f6bfefb376d552b50c4006f41906
2019-08-30openssl: upgrade to release 1.0.2rMichael Stahl1-2/+2
Fixes CVE-2019-1559, plus a couple low-severity CVEs. Reviewed-on: https://gerrit.libreoffice.org/68430 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit e3b6c3ec9fd795601b0749675903fb49c72718fd) Change-Id: Icb6849ca5f33cb1169ce303505b2e32636e3b25b
2019-08-30upgrade to openssl 1.0.2pCaolán McNamara1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/59926 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit dd371caa3aff09c80c19772fcf5968cfcf14ff8c) Change-Id: Ifacf5dce39d830838b3cf57df760a04df97ade4b
2019-08-30upload openssl 1.0.2oDavid Tardon1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/52051 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 9c459fd919cb8199a69fc2d630742930e533285b) Change-Id: Ib44570ff53d754d1d568378ef0dac4d4789f2042
2019-08-30upload openssl 1.0.2mDavid Tardon1-2/+2
Reviewed-on: https://gerrit.libreoffice.org/44421 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 899d7139355b8bea4bc1e6f9c05dededdb6f2c39) Change-Id: Iac75c0a2633a11c4ca3f2007c62bf74be2f576ca
2019-08-30upload openssl 1.0.2kDavid Tardon2-3/+3
Reviewed-on: https://gerrit.libreoffice.org/33800 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit a97371bf4d123ece75f3f9aeef8f3d4abfc6ad9c) Change-Id: I26d49db0207b3f4f64aa9698da4cf3567d195834
2019-08-30mDNSResponder: upgrade to release 878.200.35Michael Stahl4-108/+2
Apple can't afford the costly GPG licenses to sign releases apparently, but the sha256 matches some OpenWRT and FreshPorts repos... Fixes CVE-2015-7988. Removing windows build patches, fixed upstream (except for the last hunk of the SOCKET patch, but that is in code that is only used on MacOSX). Reviewed-on: https://gerrit.libreoffice.org/68092 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3a85c2db176db708c0ff9401c40858eb60e80f1e) Change-Id: I9fdba5929badb75f995c66da0850d188780e7beb
2019-08-30curl: add patches for CVE-2018-16890 and CVE-2019-3822Michael Stahl3-0/+76
The third one (CVE-2019-3823) isn't relevant because SMTP is disabled. Change-Id: I2383c1a7b0c67c586402d4098092cee565edcdda Reviewed-on: https://gerrit.libreoffice.org/67445 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2019-08-30python3: add patch bpo-17239: Disable external entities in SAX parserMichael Stahl2-0/+60
Change-Id: I44e969d8d3a8fe6b6426d61a1cbe83154c8518dd Reviewed-on: https://gerrit.libreoffice.org/66329 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit a57dd8eba9c0799dd42eb547a37622bce8fdb0b3) Reviewed-on: https://gerrit.libreoffice.org/66370 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 66b3860fd1772284dc12d0d2d2c76ac59b16883e)
2019-08-30poppler: upgrade to release 0.73.0Michael Stahl6-14/+54
Change-Id: If20998f8565b5534a96b3f29ccec572273edca1d Reviewed-on: https://gerrit.libreoffice.org/66306 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 0609ea4fc27f34367716bf41c0cdaa7785aed9da) Reviewed-on: https://gerrit.libreoffice.org/66369 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 033ff5b3eb90deaf6fd5eb8a74100233aa5fe772)
2019-08-30Fix o3tl::make_uniqueStephan Bergmann1-1/+2
...after 3f20471490c61b19fe4222f8c40df255051f6e3d "use std::unique_ptr in FlatFndBox: and extend o3tl::make_unique to cope with arrays" Change-Id: I17a07d0be677aa4a5427be4a5c2f05ed8b675726 (cherry picked from commit 64d06e5f168ec498b2d5dda139263f56dfe9772d)
2019-08-30use std::unique_ptr in FlatFndBox [only make_unique.hxx]Noel Grandin1-0/+16
and extend o3tl::make_unique to cope with arrays Change-Id: I84caa46ab5060f9777bfe275f229499cb0b407be Reviewed-on: https://gerrit.libreoffice.org/38794 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> (cherry picked from commit 3f20471490c61b19fe4222f8c40df255051f6e3d)
2019-08-30sdext: fix build with poppler 0.73Michael Stahl3-6/+10
... which has removed Guchar, Gushort, Guint, Gulong... Change-Id: Ia54ad378031f167f6779f6ffe574b85c1e72f26d Reviewed-on: https://gerrit.libreoffice.org/66305 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 50d371ae08c66648d9f32f633b2245e1746e2bb6) Reviewed-on: https://gerrit.libreoffice.org/66363 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit b5698ac28a8a79105edf28ffc1db19bbcbecda3a)
2019-08-30Fix build with poppler-0.72Andreas Sturmlechner1-0/+8
Change-Id: I0664d1b39e97b7555c0a3cba442db52b84f37134 Reviewed-on: https://gerrit.libreoffice.org/65960 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 65a6c9ae4791188ffcecf489073cf38873ce5e17) Reviewed-on: https://gerrit.libreoffice.org/66376 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit a5a188d5bbb99f6e305dad6f81b9e3760aa32676)
2019-08-30Fix build with poppler 0.71Aleksei Nikiforov3-2/+10
Change-Id: I470ece9dc4766e10e1ccb5e99b25a8d8cc4cbf38 Reviewed-on: https://gerrit.libreoffice.org/63860 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 8ff41a26caf51544699863c89598d37d93dc1b21) Reviewed-on: https://gerrit.libreoffice.org/66375 Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru> Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 704ff8be10ecfb39be064bd08b2f9c11312e3428)
2019-08-30poppler dropped GBool since 0.71Mike Kaganski2-25/+32
See https://lists.freedesktop.org/archives/libreoffice/2018-November/081410.html Change-Id: I258e08894486a925bed50a3a4232b6e805af6784 Reviewed-on: https://gerrit.libreoffice.org/63625 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5e8bdd9203dd642111c62a6668ee665a20d4ba19) Reviewed-on: https://gerrit.libreoffice.org/66374 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit c85bd2c443b9a509b028a90ee9e766929e63089f)
2019-08-30lcms2: upgrade to release 2.9Michael Stahl4-28/+175
... at least, that's the plan - this is harder than it appears, as the upstream maintainer appears to have released version 2.9 at least 3 times: - Fedora has a file evidently downloaded before Nov. 17 with SHA512 of e30ad5a9a1ab9e7aaace9431434caa19a5ff6143db46644aba971a5ee37a265b26bf738e886d766405a7eb45a9d620d67c7ab3684ace86a107cf5a76642c04a5 - Gentoo has a file evidently downloaded before Nov. 19 with SHA256 of d4ad6f8718f7f9dc8b2a3276c9f237aa3f5eccdcf98b86dedc4262d8a1e7f009 - Debian has a file evidently downloaded before Dec. 17 with SHA256 of 48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20 The lcms2-2.9.tar.gz available from sourceforge currently matches the one Debian has, so let's use it. * 0017-Upgrade-Visual-studio-2017-15.8.patch added (fixing CVE-2018-16435) * 0001-Added-an-extra-check-to-MLU-bounds.patch.1 removed (fixed upstream) Change-Id: Iab8dada8f6d77d5b2da8560993380b3332bc02f6 Reviewed-on: https://gerrit.libreoffice.org/66400 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 99b20e589e64fbcf374d84ae68911ef2a96e537c) Reviewed-on: https://gerrit.libreoffice.org/66428 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 5d6a91c4df0ea51bb32794ff6068fa19bda44307)
2019-08-30lcms2: try to get rid of $(DEVENV) /UpgradeMichael Stahl1-1/+0
It's not clear to me that this is actually required, particularly why it would be required for VS 2015 but not VS 2017, and why only for this external and not the others that use MSBuild.exe. Reportedly this can fail if you have an expired or not yet registered VS, while strangely enough everything else compiles fine in that case, so rather than try to find out how to check for that issue in configure, avoid the problem by removing the /Upgrade. Change-Id: I55566e109e57117f65febb91de7580667c984a54 Reviewed-on: https://gerrit.libreoffice.org/34947 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit aa7390652bbc3f80907707bd4aebcf2ea8a413c7)
2019-08-30upload lcms2 2.8David Tardon8-2133/+7
Change-Id: I8a3b138c051d3cddf25855a635262311669bdddc Reviewed-on: https://gerrit.libreoffice.org/33798 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 0ada594b5c4cd8490efac86029674187356c56c8)
2019-08-30libxml2: fix MSVC buildMichael Stahl1-1/+2
libxml2.rc(1) : fatal error RC1015: cannot open include file 'winver.h'. Change-Id: I6653eaefd1da0440811154a718683951d79fb871
2019-08-30libxml2: upgrade to release 2.9.9Michael Stahl3-16/+4
* fixes CVE-2018-14404 * drop one hunk from libxml2-android.patch that was added in commit 6a17d2f2ba7acfec277314b97b50e41532d6b44d; presumably nan() exists now given that other code is calling it. Change-Id: I696cc4e1da55536ea1c89a6e0446ce5bc8398ba4 Reviewed-on: https://gerrit.libreoffice.org/66308 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit beea5852720b22043aefcd1e6b7243c202b40601) Reviewed-on: https://gerrit.libreoffice.org/66367 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 69b5995ed815bea4d21080f64a4232f44131696f)
2019-08-30libxml2: upgrade to release 2.9.8Michael Stahl3-9/+10
Change-Id: Ic6802c16b740f6aee59ae2f74b7edcd37461f1f3 Reviewed-on: https://gerrit.libreoffice.org/50835 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit f775b5427bf085577feb5badb762156283d76ae5)
2019-08-30upload libxml2 2.9.7David Tardon2-3/+3
Change-Id: I3f72ec938c87e0c0d30a91b32d96fedf5379207f Reviewed-on: https://gerrit.libreoffice.org/44423 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 3ab270242edc9e2ccbe50b2abecf3fec242113d1)
2019-08-30upload libxml2 2.9.6David Tardon2-3/+4
Change-Id: Iafb9d9e2459451d213cad5d9141755df999d7ced Reviewed-on: https://gerrit.libreoffice.org/43306 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit a0439f5a5b8ee8adaeba0bacbef3bf77a7fd05a0)
2019-08-30libxml2: upgrade to release 2.9.5Michael Stahl10-605/+4
* drop ubsan.patch.0: presumably fixed upstream * drop 0001-* CVE fixes: fixed upstream Change-Id: I3e2a53b5ef82ef8edd85e812fd5dee67ab60db94 Reviewed-on: https://gerrit.libreoffice.org/41951 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 2b329599183107735e1a7b6aad516452eb6fa6a6)
2019-08-30Keep original CFLAGS etc. unmodified in configure.acStephan Bergmann1-64/+73
...even if they are modified for the remaineder of configure.ac itself in the MSVC 2015-specific code checking for UCRT. Otherwise, the flags determined by LinkTarget.mk would lack any debug and optimization flags when building with MSVC 2015. Change-Id: Ib78418e0ad04bf2eae16a14b5c0904ba4f582eca Reviewed-on: https://gerrit.libreoffice.org/34248 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit ed4b23548d28941f9b2c75207832afcb6c6ad0b3)
2019-08-30solenv(gcc-wrappers): remove trailing space of includepathMark Hung1-8/+12
Change-Id: Ic14140f197a2c5e1632fd27cfae38ca4eff9bd8c Reviewed-on: https://gerrit.libreoffice.org/34562 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit baf043318e83e768abe4ed7ae1c45bb75c0197e3)
2019-08-30Remove unreachable codeSamuel Mehrbrodt1-8/+1
VS 2015 won't compile because of this Change-Id: I4244ccd6d5dbbedef536ea8782afd3a8f2abf3a9 Reviewed-on: https://gerrit.libreoffice.org/66395 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
2019-08-30"make debug=t" enables debuginfo againStephan Bergmann1-0/+2
...which had inadvertently been broken with 99db9f2295eb9a8b3288df9798a292b8d6e1b854 "Make --enable-symbols orthogonal to --enable-debug/-dbgutil" Change-Id: I3962aa8c67426f3aebc5ad746f7ac281c68d941a (cherry picked from commit 62c4a8aacf76771e97a8da35096e6ad69a11979a)
2019-08-30curl: fix CVE-2017-1000254 & CVE-2018-14618/1000120Thorsten Behrens4-0/+186
* still don't upgrade to new release, no idea how the new windows build system likes targeting Win XP which is still supported in 5.4 Change-Id: If9c235d2c3e1902f154cae570a9719945112fe33 (cherry picked from commit 8d86210e1d113f5688015ea197d7b04b173899fb)
2019-08-30keep pyuno script processing below base uriCaolán McNamara1-2/+28
Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7 Reviewed-on: https://gerrit.libreoffice.org/62173 Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Tested-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 34e9072344067010b82124a3a104b20c73da9f0c)
2019-08-30Only supported MSVS version on this branch is VS2015Thorsten Behrens1-9/+2
Due to 3rd party dependencies requiring better C++11 support Change-Id: Ic603ce6567e21f809eda042e981e4dc099b64f43 (cherry picked from commit eaf14ee264dc266586831e234c81662693eb5ea6)
2019-08-30Drop support for MSVC 2013David Ostrovsky33-3705/+7
Reviewed-on: https://gerrit.libreoffice.org/22588 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 84b36c704d73362d4d86dc9e9c0efa0625958347) Conflicts: configure.ac download.lst external/python33/ExternalPackage_python3.mk external/python33/ExternalProject_python3.mk external/python33/Module_python33.mk external/python33/UnpackedTarball_python3.mk external/python33/clang-cl.patch.0 Change-Id: Ibf47c9ff7b5fb098e284a58c547b61286264dd80 (cherry picked from commit a5f0e613a5b2017c8e9a9373f3c175529d321bb2)
2019-08-30WaE: include needed headerDavid Tardon1-0/+1
"error: In the GNU C Library, "major" is defined by <sys/sysmacros.h>. For historical compatibility, it is currently defined by <sys/types.h> as well, but we plan to remove this soon. To use "major", include <sys/sysmacros.h> directly. If you did not intend to use a system-defined macro "major", you should undefine it after including <sys/types.h>." Change-Id: I7f5741d4c2eae277e316c5fc97aa73b9430fbdc1 (cherry picked from commit 01bf741a79241829b0d5c048e8f45e3cf6914d3e)
2019-08-30nss: upgrade to release 3.38Michael Stahl2-2/+12
Fixes CVE-2018-0495 and "the ASN.1 code". (Remove one hunk of nss-android.patch.1 that should be obsolete with the current Android toolchain baseline (but that hunk didn't exist in libreoffice-6-0 or older anyway).) Change-Id: I5516edec17b72f53acd2749e8840805eead077bc Reviewed-on: https://gerrit.libreoffice.org/58697 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> (cherry picked from commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903) Reviewed-on: https://gerrit.libreoffice.org/58722 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit e4874f777048535650a2bb1ce875e1a6e3e4b7ef) (cherry picked from commit 88c54effcdfa2fb044add69da3a47d06ef796271)
2019-08-30nss: Upgrade to release 3.31.1 and update patchesGautam Prajapati2-65/+55
This commit updates the NSS to release 3.31.1 and NSPR to 4.15. It also updates the external/nss/nss.patch and external/nss/nss-android.patch to incorporate the NSS source changes. Change-Id: Icdd933b67e717f8d91622cd5f6001e34e261b746 Reviewed-on: https://gerrit.libreoffice.org/41636 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit c6df07f905cd9562132b06e44f90b0479b250f7a) (cherry picked from commit fc5aafb1478affadce79a82c3504182e65e2525e)
2019-08-30nss: try to remove nss.windowbuild.patch.0Michael Stahl2-56/+0
It's not obvious to me what problem this solves. Maybe the problem no longer exsists in the new upstream release? Change-Id: I16762e0024536afb821eac70c6ba3929d5b8927a Reviewed-on: https://gerrit.libreoffice.org/36798 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 489414f2395b6c8008ebcda7c37a150fd4ed7ad5) (cherry picked from commit e2ec351222a76644f61800363274bb702fedbc36)
2019-08-30xmlsecurity: nsscrypto_initialize: try to avoid profile migrationMichael Stahl1-0/+14
https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.35_release_notes NSS 3.35 and later will automatically migrate migrate profiles from the old "dbm:" BDB format to the new "sql:" SQLite format. The new format can be read by NSS 3.12 and later, which is old enough that it can be assumed to be available. However LibreOffice still shouldn't migrate the profile on its own: LO typically uses a Mozilla Firefox or Thunderbird profile, and if it is a system Firefox with system NSS libraries, then it's probably a bad idea for LO to migrate the profile under Firefox's nose, particularly considering the "partial migration" scenario if the profile is password-protected. Try to avoid this by checking if the profile is the old format and explicitly using the "dbm:" prefix to prevent the migration. Change-Id: I06480522f830ce74e2fb7bf79fee84ad80979b82 Reviewed-on: https://gerrit.libreoffice.org/58756 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 61688aa1abd9db9adbb8dc5d5aacc6269b21fd27) Reviewed-on: https://gerrit.libreoffice.org/58974 (cherry picked from commit dc5474b2e2f361eec981c6955630dbb020442eae) (cherry picked from commit 32dfccb3b007f4aba75d2705a50e3d9f1a15c146)
2019-08-30Resolves: tdf#112269 libwpd fixCaolán McNamara2-0/+43
Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1 Reviewed-on: https://gerrit.libreoffice.org/42056 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 05da1c67e49a2d758799db735a826c4d292fea44) (cherry picked from commit 9618de6c0b58770d79761ad28386a701daf4f3df)
2019-08-30use correct sizeDavid Tardon2-0/+26
(cherry picked from commit d1ae31a1fc49ec7a68b2a07c5e5e97d95b346ca9) Change-Id: I620ada9b209bb2084eccaa81385beb6306d6a3d0 Reviewed-on: https://gerrit.libreoffice.org/38827 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 54e7b46718bf2f47c7f55a93cfbb23681429ffc6) (cherry picked from commit 2f3482382f4c07b5caf21dc26d34d621efdc66e8)
2019-08-30curl: in 7.52.1, the parameter is documented as --with-libidn2,Michael Stahl1-0/+1
but actually it is --with-libidn (it's consistent in later versions). Change-Id: Ib24767974173e4c737fc10d9420e6dbad3440239 (cherry picked from commit 66a2c1fe2e4fd57987ae62f6274a89fab0fab58a)
2019-08-30curl: disable protocols nobody needs in MSVC buildMichael Stahl2-0/+25
These are disabled via configure on other platforms. Change-Id: I4e27865396f3817ceb5645ab8589c21fdaa5afab (cherry picked from commit 152a1d279cbc81e7b5f076a2c4b20c12c6929ce6) (cherry picked from commit db39b7ec54f3a8875c083b064cc2c7a2a76f9fcf)
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 23:05:10 +0000