summaryrefslogtreecommitdiffstats
path: root/external
Commit message (Collapse)AuthorAgeFilesLines
* nss: upgrade to release 3.73Michael Stahl2021-12-037-115/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: CVE-2021-43527 Memory corruption via DER-encoded DSA and RSA-PSS signatures Includes: nss: upgrade to release 3.71 * external/nss/nss.getopt.patch.0: fixed upstream * external/nss/nss-win-arm64.patch: fixed upstream * external/nss/nss_macosx.patch: one hunk was fixed upstream Conflicts: download.lst Change-Id: I5c3f169c57fc2763029b07ad7e325b2f53b7e28f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126218 Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit c8e21d246bcb4289cb25c82be440cd07b7418436) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126252 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 973df7d7872f2c93cd6a8191802c98b5da0b3b6f)
* use clang-cl's -Zc:dllexportInlines- for Skia (tdf#144598)Luboš Luňák2021-09-211-0/+17
| | | | | | | | | | | | | | | | | | | | | | | This is clang-cl's equivalent of -fvisibility-inlines-hidden, and it seems to be also sort of the equivalent of MSVC's -Zc:inline. So it saves build time and disk space. As an additional effect, this disables emitting copies of inlines functions in every .o file where the function is called (even if inlined), which means that it hopefully avoids the problem of SkOpts_avx.cpp generating a copy of SkRect::round() which would include AVX code, and the linker might select this as the instance of SkRect::round() to keep, thus making SSE2 code call AVX code without checking for AVX availability first. Change-Id: I97541ae11d05f489894bc9233271eb21fd520f43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122335 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 36f76223193fb96df7b8cbc1a1ff30f739857189) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122285 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* patch Skia to search only system32/ for librariesLuboš Luňák2021-09-162-1/+15
| | | | | | | | | | | | | | | LO on Windows defaults to Vulkan, and Skia tries to load the vulkan DLL, which may not be present on some systems. The library AFAICT should always be in a system directory, so restrict library searching to just there to avoid the possibility of DLL hijacking, just to be safe. Change-Id: I78ad3c7297e613c0316e82c5ff3c0110a02da337 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121437 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122137 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* exernal/firebird: extern/cloop: Missing dependencies of compilations on...Stephan Bergmann2021-09-132-0/+42
| | | | | | | | | | | ...output directories Change-Id: Iaa2b750a12e3df078b46e5bb4feeafc926e11165 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121741 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122042 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#101630 - gdrive support w/oAuth and Drive API v3Christian Lohmaier2021-08-183-0/+889
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LibreOffice is only using drive.file scope, so can only see files it owns/that were created by LibreOffice. In addition, also store the refresh token in LO's password-store if the user enabled persistent storage, removing the need to to the copy'n'paste dance to grant access each time LO is launched. related tdf#115643 also store the refresh token for onedrive consolidate the fallback-auth provides for onedrive/gdrive into one, they are all the same login in browser, then copy code method that ultimately should be changed to having LO listen on local port for the code Change-Id: I97e3843682c302d2884e35ece6e72bc3a07e2539 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119572 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 73041de9563c9a973d1b5394c6e5520a7d799980) fix install with --disable-cmis Change-Id: I51430a860a0b5047b566ed8184f0f563ec54f288 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119661 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 299b72e4c9ad239d747e47eaf004400f5a590695) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120544
* curl: upgrade to release 7.78.0Michael Stahl2021-07-237-29/+13
| | | | | | | | | | | | | | | | | | | | * Fixes CVE-2020-8284 CVE-2021-22924 * Also fixes these which don't look relevant to LO: CVE-2020-8231 CVE-2020-8285 CVE-2020-8286 CVE-2021-22876 CVE-2021-22890 CVE-2021-22897 CVE-2021-22898 CVE-2021-22901 CVE-2021-22922 CVE-2021-22923 CVE-2021-22925 CVE-2021-22926 * disable some new protocols and dependencies * remove curl-ios.patch.1 as the code no longer exists upstream Change-Id: I12d5f87f4d503a5f9859226a05cfe2a07e46d993 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119313 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 946f457c885bd10ff1a7281c351f3981f035f5a7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119262 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* upgrade to Expat 2.4.1Caolán McNamara2021-06-023-12/+14
| | | | | | | | | | drop ubsan patch in favour of fix applied as https://github.com/libexpat/libexpat/pull/398 Change-Id: I59eb9e24206b9a4cf323b7f7d48d8df0792a1c46 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116102 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* libxml2: upgrade to release 2.9.12Michael Stahl2021-05-244-16/+4
| | | | | | | | | | | | | | | Fixes: CVE-2021-3516 CVE-2021-3517 CVE-2021-3518 CVE-2021-3537 CVE-2021-3541 * external/libxml2/ubsan.patch.0: remove, fixed upstream Change-Id: I347dc854b862e78bde87d3e57cf5fdb584ca5673 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115913 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit bf0c6a98ae38cd2188d7f7e94f1563e5ce6a8ce4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115925 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* allow utf-8 in xml names (liborcus) (tdf#141672)Luboš Luňák2021-05-022-0/+305
| | | | | | | | | | Change-Id: Ib150d55b588a572e4352396f18de2331983b2aae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114892 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com> (cherry picked from commit 6b7c2fa65eb68be520ed4135cc245e33fa22e8bf) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114917 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* liborcus: newline problem with GCC 11 -E -fdirectives-onlyMichael Stahl2021-05-022-0/+16
| | | | | | | | | | | | ooxml_tokens.inl:3524:32: error: stray '#' in program Change-Id: Ib7f50e1798e8c985f31a0338944ae1e9b439e98f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114975 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit aa38eede9d340cbb11a792ab1ebbe681521a4489) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114921 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* Python .so files names have changed on macOS at least for some reasonTor Lillqvist2021-04-211-15/+13
| | | | | | | | | | | | | | | | | | | | | | | There is no longer any "m" in the name suffix. Adapt the names of the ones we want to remove for macOS. The idlelib and tkinter dylibs are no longer there at all. Don't use the -f flag to the rm commands. Thus we will notice the next time something we want to remove isn't actually there or has been renamed. But sadly for some unknown reason we do need to use a * wildcard in the .so names. Fixes a problem caught by App Store review where the Python curses module had not been removed as it should have been. (It uses non-public APIs and can thus not be included.) Change-Id: I51b9728cc9ca0a962908d3994e3a0ff8e4fa7f60 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114372 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114376 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* xmlsec: fix signing documents on WNTMichael Stahl2021-04-072-0/+69
| | | | | | | | | | | | | | | | | Duplicate ds:X509Certificate elements cause: warn:xmlsecurity.comp:9604:3820:xmlsecurity/source/helper/xmlsignaturehelper.cxx:658: X509Data do not form a chain: certificate in cycle: (regression from 5af5ea893bcb8a8eb472ac11133da10e5a604e66) Change-Id: I3d319a2f74dbec17b73f1c7bb8f4efe4e335f0ac Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113746 Tested-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit ae08aa8a095832ae2a88eac14f9680ac8d3a13b6) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113748 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* tdf#140229 neon: update to release 0.31.2Jan-Marek Glogowski2021-04-021-5/+5
| | | | | | | | | | | | | | | | | | I didn't check all commits, but the most likely fix was "Fix hang on SSL connection close with IIS (issue #11)". The server from this bug report is a "Microsoft-IIS/10.0", according to the output from "curl --dump-header". Not sure this bug is critical enough to bump the neon dependency in configure. Change-Id: I3e20bad1aa732641e6f8a83316e58fc7513186c6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113495 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> (cherry picked from commit c974b23ff78dbe11a7b23f7317fdd096ab8cb282) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113523 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#140332: Can't use System V semaphores in a sandboxed macOS processTor Lillqvist2021-02-232-0/+19
| | | | | | | | | | | | | | | | See https://developer.apple.com/library/archive/documentation/Security/Conceptual/AppSandboxDesignGuide/AppSandboxInDepth/AppSandboxInDepth.html , "Note: System V semaphores are not supported in sandboxed apps". So use POSIX semaphores instead. Change-Id: I37c910cf13b868ab15fe31f90e42d24a9a24eeb1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111239 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111256 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Jenkins
* postgresql: try to cargo-cult MSBuild argumentsMichael Stahl2021-02-041-1/+3
| | | | | | | | | | | | | Extremely unclear to me whether these are useful or necessary, but the other MSBuild ones have them. Change-Id: Iacdd1a1e326bd9ae7c918f5b143495f613ff41d1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110385 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de> (cherry picked from commit bbc5cc71fd1723db8cb5020f83db5cafc0f8a52a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110361 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#136368 bump to libnumbertext 1.0.7László Németh2021-02-011-0/+4
| | | | | | | | | | | | | | | | | | | – New language modules: Irish, Luganda, Maltese and Marathi – tdf#136368 fix Old Hungarian transliteration – Fixes in Finnish, Thai and Ukrainian language modules. See https://github.com/Numbertext/libnumbertext/releases/tag/1.0.7 and https://github.com/Numbertext/libnumbertext/blob/1.0.7/ChangeLog Change-Id: If98c6098e5d66a4fee8c316e10c8c8a69202e10f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110235 Tested-by: Jenkins Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit e6165b7cac5d91458d61da3de35486cde3004897) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110221 Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
* mac: allow cross compiling with host/build x86_64-apple-macosChristian Lohmaier2021-01-292-1/+2
| | | | | | | | | | | | | | | apple silicon supports to cross compile without special build-tools/full cross-compiling setup, so just always pass the build/host for firebird. firebird and nss don't recognize the -macos specifier, so substitute it by -darwin to make those happy… Change-Id: I953317fc87da2a20dc91acd88c8528796c3b2a69 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110093 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 5a0991c9cd60b6ab10fe0665511e7749a0c0ecc2) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110065 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* postgresql: upgrade to release 13.1Michael Stahl2021-01-2110-162/+149
| | | | | | | | | | | | | | | | | | | | | | | | Fixes CVE-2020-25694, plus a bunch more CVE that don't look relevant. * --with-krb5 no longer exists, neither does --disable-shared * remove internal-zlib.patch.1: zlib is only used by pg_* tools / contrib/pgcrypto * remove postgresql-libs-leak.patch: some relic from pre-gbuild times, not clear what the point is for static libs * remove postgresql-9.2.1-libreoffice.patch: another dmake .mk file relic, and the win32 nmake build system was removed * add postgres-msvc-build.patch.1 to fix Cygwin perl and openssl * on WNT, libpq.dll is now built, no longer static lib Change-Id: Ic0232a28801b2f604d9f4e33d5621ae3362defaa Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109640 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 234833f7823a1424b62c93e145f0cfe2c6b6efd5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109677 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* nss: fix parallel build race in nsinstall.pyMichael Stahl2021-01-202-8/+12
| | | | | | | | | | | | | | | | | File "/home/tdf/lode/jenkins/workspace/android_aarch64/external/nss/nsinstall.py", line 112, in nsinstall os.makedirs(args[0]) File "/opt/rh/rh-python38/root/usr/lib64/python3.8/os.py", line 223, in makedirs mkdir(name, mode) FileExistsError: [Errno 17] File exists: '../../../../dist/public/dbm' ../../../coreconf/rules.mk:119: recipe for target '../../../../dist/public/dbm/d' failed Change-Id: I4273e6d3d5fa520353fff8738823ef281fe237ed Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109619 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 6f5186a94dcd1989cdd819e35163af0542912559) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109586 Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* mac: don't put script files into Contents/MacOS or framework-bin directoryChristian Lohmaier2021-01-201-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signing them as executable code would require external attributes, and those in turn break packaging into hfs+ dmg when building on apfs with Big Sur. It is not a new thing - the old Code Signing in Depth technote https://developer.apple.com/library/archive/technotes/tn2206/_index.html already reads: "Store Python, Perl, shell, and other script files and other non-Mach-O executables in your app's Contents/Resources directory. While it's possible to sign such executables and store them in Contents/MacOS, this is not recommended. […] Put another way, a properly-signed app that has all of its files in the correct places will not contain any signatures stored as extended attributes." The patch does exactly that for LO and the shipped python framework and adds symlinks for the moved files. Same applies for the Language pack applescript and the tarball - those are also moved into Contents/Resources also incluses the follow-up fix by Stephan Bergmann Fix unoinfo on macOS – https://gerrit.libreoffice.org/c/core/+/109627 Change-Id: Iab21e77b73f941248ca89c6e80703fdf67a1057c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109537 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 4b9190fc29aec0f005f08c0269bb9ff081f19fe3) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109573 Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* poppler: upgrade to release 21.01.0Michael Stahl2021-01-072-54/+40
| | | | | | | | | | | | | | Fixes CVE-2020-27778, CVE-2020-35702 and changelogs mention lots of fuzzing fixes. Change-Id: Ib07bdee726905e74afc13a01bbbd53f218121744 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108912 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit 48e8b32a9b66722bbb28fc15840b3706a461aeb7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108903 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* openssl: upgrade to release 1.1.1iMichael Stahl2021-01-072-19/+0
| | | | | | | | | | | | | | | Fixes CVE-2020-1971 * openssl-macos-arm64.patch.1: remove, was fixed upstream Change-Id: I405270228682025bf26240e3ea923bfd234068f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108804 Tested-by: Michael Stahl <michael.stahl@allotropia.de> Reviewed-by: Michael Stahl <michael.stahl@allotropia.de> (cherry picked from commit adfceaf32651f6ef17a9b63906366818b667d6b5) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108898 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
* external/cairo: Fix mask usage in image-compositorStephan Bergmann2020-12-302-0/+55
| | | | | | | | | | Change-Id: Id3d8e4715e295290e07146ef06898b313ead57a5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108449 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit c767e91c725b504db08e84b1fd25b11bfc33a4cc) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108344 Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* onedrive integration: updating metadata needs to be http PATCHChristian Lohmaier2020-12-151-1/+10
| | | | | | | | | | | | | | | | avoids general i/o error message when adding newly created documents via the "Save remote" menu option. support for PATCH was added with 9cfcf83f53e0ae897b30705f790c6ebe0b86932e but only applied in onedrive-document.cxx OneDriveDocument::setContentStream which has it's own update of properties instead of reusing the method from onedrive-object.cxx Change-Id: I50f8801ac3186953f60198f877cedf3729307b89 (cherry picked from commit 97a809a74c60a38c46280b98bd2ec1c365643391) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107732 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* tdf#115643 make onedrive work again by switching to graph APIChristian Lohmaier2020-12-142-0/+437
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the live SDK method had been deprecated quite a while ago and has been turned off a while back. Notes: While you can access and save existing files using the remote files dialog, creating new files or using "save as" requires using the LibreOffice open/save dialogs. Authentication is clunky: username and password you're asked when creating a new connection is not used at all for connecting, so only fill out a username to label your onedrive entry. Actual authentication is done in browser - copy'n'paste the URL from the dialog into the browser, login and approve access for LibreOffice (approving access only necessary once), then you get redirected to localhost, ignore that there is nothing to display. The important part is the code from the URL-bar. Copy and paste that into the LibreOffice dialog and LO can request an authentication token for API access. Testing this feature requires compiling with corresponding api-keys specified in configure/having an app registered with microsoft. Change-Id: I2db11ac09f9fdc354a10d6c749b2bec84b5d34a9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107646 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 9cfcf83f53e0ae897b30705f790c6ebe0b86932e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107631 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
* More NSS fixes for macOS on arm64Tor Lillqvist2020-12-071-2/+19
| | | | | | | | | | | | | | | | | | | | | | I think the attempt to set CPU_ARCH in external/nss/ExternalProject_nss.mk does not actually work. And anyway, it should be arm64 for macOS on arm64, not aarch64. Now NSS configury correctly finds the APIs present in the system when building for macOS on arm64. Previously, it attempted to compile the test snippets for PowerPC... which caused for instance dladdr() not to be found, which caused the softokn3 loading to fail. (It's somewhat surprising that the NSS configury still has "support" for MacOS on PowerPC... Do people really build latest and greatest NSS on such machines? Or is it just a leftover and the NSS people never, ever, remove anything?) Change-Id: I0dc35df0460db7997efcfdf92594fd8ae352aa49 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107316 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107325
* Drop Python modules we don't want on macOS, too, like on other platformsTor Lillqvist2020-12-051-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On macOS, for various reasons, we use a different approach than on other platforms to construct the bundled Python. Instead of explicitly listing what to include (out of what Python contains and builds) (in ExternalPackage_python3.mk), after Python is built, we remove stuff we don't want (in ExternalProject_python3.mk) and then include everything left in the LibreOfficePython.framework (in GeneratedPackage_python3.mk). This fixes a problem in App Store review: For some reason the review said that the setcchar() function from the ncurses library, used by Python's curses module, is non-public. No idea why the (automated) review picked on that function. As far as I see from the ncurses header in the SDK, that function is no less public than the other ncurses functions that the Python module uses. But oh well, we don't actually ship the curses module anyway on other platforms, so just drop it on macOS, too. And while at it, drop the other unwanted ones, too. And any binary shared libraries for them. Change-Id: Idecaf10a6fb1c59e8711095927f5699b8d2ec98e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107055 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107141 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107256 Tested-by: Jenkins
* mariadb-connector-c: enable WNT-only pvio_npipe/pvio_shmem pluginsMichael Stahl2020-12-022-1/+9
| | | | | | | | | | | They were already compiled in some way. Change-Id: Ic1b8563a53bad5be03bce2c0d3d2cf841e303f02 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107007 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit d350af4e0cf697e2f8ac97ffbf12243e72e1b89a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107027
* tdf#135202 mariadb-connector-c: enable native_password pluginMichael Stahl2020-12-022-1/+2
| | | | | | | | | | | | | | | ... and remove dialog authentication plugin; it quite uselessly defaults to asking for a password on stdin, unless a function symbol is defined by the library that links the connector static library. There are more authentication plugins but no idea if those are needed. Change-Id: I88ee9629e4763fb548c3f294b552cff3d739e6cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107006 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de> (cherry picked from commit b746633b2b251695134e7f8c268a75e45cf97c82) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107021
* CVE-2020-25713 raptor2: malformed input file can lead to a segfaultCaolán McNamara2020-11-243-15/+34
| | | | | | | | | | | | | | | due to an out of bounds array access in raptor_xml_writer_start_element_common use a better fix than the initial suggestion See: https: //bugs.mageia.org/show_bug.cgi?id=27605 https: //www.openwall.com/lists/oss-security/2020/11/13/1 Change-Id: I9203904755b0e4ac98ae1e39942fd6f616c1efff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106448 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* CVE-2020-25713 raptor2: malformed input file can lead to a segfaultCaolán McNamara2020-11-232-0/+15
| | | | | | | | | | | | | | due to an out of bounds array access in raptor_xml_writer_start_element_common See: https://bugs.mageia.org/show_bug.cgi?id=27605 https://www.openwall.com/lists/oss-security/2020/11/13/1 Change-Id: Ida4783a61412ffce868eacf81310da338d3e2df1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106248 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
* tdf#135202: Mysql declare more plugins for native passwordJulien Nabet2020-11-221-0/+3
| | | | | | | | | Add pvio_npipe + pvio_shmem + dialog Change-Id: I48d828e5cdf8d269aef3a40d75235a9519af8dc1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105804 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
* firebird: build fixes (incl. parallel build)Jan-Marek Glogowski2020-11-215-100/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main idea is to get rid of the "unset MAKEFLAGS". AFAI can see, the whole CPU stuff isn't used anymore. So we can drop the whole FB_CPU_ARG handling. Since LO doesn't use any of make's implicit rules, the build breaks, but luckily it just requires a single rule for the btyacc build - just a Firebuild build tool. Then there is the whole broken handling of LIBTOMMATH and LIBATOMIC_OPS already in LO's configure.ac. I don't know if any internal build of Firebird with these as system libs would work. I guess people either have a system Firebird or also build with internal libtommath and libatomic_ops. This fixes just the obvious errors. I didn't try to build it, so there might still be typos (TBH I thought hard about just dropping the system build of these libraries, after seeing the broken configure.ac). And I'm not sure our / the system boost preprocessor library is ever used over the Firebird-internal copy. It also looks like it's also just used in an other build tool and nothing of the Firebird DB itself depends on it. Then there is the movement of the install_name_tool / otool patching on MacOS from the patch into the ExternalProject to further shrink the patches, as the build doesn't depend on it. This also introduces a different debug build mode for the gcc-/g++-wrapper: MSVC_USE_INDIVIDUAL_PDBS. It uses -Fd to write a separate PDB per output file instead of using -FS to use sync writes to a single PDB, which might work around the PDB access failures seen by Jenkins for linking executables. In theory it's also faster and should work with all the other wrapper users, but I don't want to open that can of additional build errors (yet), for eventually marginal gains. Change-Id: I8d4c5d2f17def9e840a67ef1004787e8baaffa83 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105902 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
* Add comment on how to run Python's own unit testsTor Lillqvist2020-11-191-0/+6
| | | | | | | Change-Id: Id62a688d2ddf7493d419a00a9fd0dfc6a6f13f0c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106173 Tested-by: Tor Lillqvist <tml@collabora.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
* tdf#123936 Formatting files in module external with clang-formatPhilipp Hofer2020-11-194-62/+61
| | | | | | | Change-Id: If304aa6be018442a72e284f62d7745b3cdaef536 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105668 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
* external/skia: UBSan needs GrContext_Base RTTI nowStephan Bergmann2020-11-182-1/+34
| | | | | | | | | | | | | | | | | | | | | | ...in vcl: > [GAL] sounds > instdir/program/gengal.bin: symbol lookup error: instdir/program/libvcllo.so: undefined symbol: _ZTI14GrContext_Base > make[1]: *** [solenv/gbuild/Gallery.mk:56: workdir/Gallery/sounds.done] Error 1 (I didn't check what source exactly causes UBSan to require it now.) Marking both the class and some of its members as SK_API would cause MSVC to fail with > error: attribute 'dllexport' cannot be applied to member of 'dllexport' class so remove it from the class members. Change-Id: I9f5ed397d32f1f445bfa1d70bcff494e78c16046 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106039 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* external/icu: Silence UBSan misaligned-pointer-useStephan Bergmann2020-11-181-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | ...seen when e.g. building CustomTarget/i18npool/breakiterator/char_in.brk: > rbbitblb.cpp:1405:18: runtime error: member access within misaligned address 0x627000026987 for type 'icu_68::RBBIStateTableRow', which requires 2 byte alignment > 0x627000026987: note: pointer points here > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > ^ and > rbbitblb.cpp:1607:18: runtime error: member access within misaligned address 0x627000026ecf for type 'icu_68::RBBIStateTableRow', which requires 2 byte alignment > 0x627000026ecf: note: pointer points here > 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > ^ (i.e., even though those code branches only access the byte-sized RBBIStateTableRow8 data, they did so through a RBBIStateTableRow union pointer, which has stronger alignment requirements) Change-Id: I0abe5bd756758e33e495538f548e80f99460f43c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106038 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Make firebird build for macOS on arm64Tor Lillqvist2020-11-182-0/+124
| | | | | | | | | No idea whether it works. Change-Id: I008cf9fab56bedb2e1f33ad6a99c9cd95d7483a7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106024 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
* Update to ICU 68.1Eike Rathke2020-11-179-82/+52
| | | | | | | | | | | Also made it necessary to adapt two places in libcdr and libebook that used UBool TRUE which is gone now to use standard true instead. Change-Id: I1c1df3030f8b883bec6045756907ee0b78060382 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105964 Tested-by: Jenkins Reviewed-by: Eike Rathke <erack@redhat.com>
* firebird: fix Thread handle type on WindowsJan-Marek Glogowski2020-11-172-0/+38
| | | | | | | | | | | | | | | MSVC compiler complains about 'warning C4312: "reinterpret_cast": conversion from "unsigned long" to "HANDLE" of greater size'. Seems like an real error, if real_handle is too small to hold the full "HANDLE" value, returned by _beginthreadex. Upstream strangely just fixed in master, not B3_0_Release branch. Change-Id: I87ad263529e119f68da976245646bf8b69efd35a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105924 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
* update Skia to chrome/m88Luboš Luňák2020-11-1710-132/+153
| | | | | | | Change-Id: I74c19597b07e9d07ee90e4191b75787241fdd845 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105829 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
* Modify the non-symlink libfbclient.dylib.3.0.0Stephan Bergmann2020-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least in my --enable-debug build, workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib originally contains libfbclient.dylib -> libfbclient.dylib.2 libfbclient.dylib.2 -> libfbclient.dylib.3.0.0 libfbclient.dylib.3.0.0 so if we modify libfbclient.dylib with install_name_tool, it will break the symlink and modify libfbclient.dylib but not libfbclient.dylib.3.0.0---where the latter is what gets delivered via external/firebird/ExternalPackage_firebird.mk. (This didn't cause any issues, though, because gb_LinkTarget__use_libfbembed in RepositoryExternal.mk links against the modified libfbclient.dylib in workdir, not against the delivered libfbclient.dylib.3.0.0, so e.g. Library_firebird_sdbc did already contain the correct @loader_path/libfbclient.dylib.3.0.0 reference. Also, the `install_name_tool -id` treatment of libEngine12.dylib in external/firebird/firebird-macosx.patch.1 should not technically be necessary, as nothing links against that library; but if left unmodified, it would record the build machine's /full-path-to/workdir/UnpackedTarball/firebird/gen/Debug/firebird/plugins/libEngine12.dylib so better "clean it up". Also, the `install_name_tool -change` treatment of libEngine12.dylib in external/firebird/firebird-macosx.patch.1 is necessary because otherwise it would record a full-path dependency to /full-path-to/workdir/UnpackedTarball/firebird/gen/Debug/firebird/lib/libfbclient.dylib.3.0.0 which macosx-change-install-names.pl, called from MAKE_POST in external/firebird/ExternalProject_firebird.mk, would not adjust. With all those modifications in external/firebird/firebird-macosx.patch.1, the call to macosx-change-install-names.pl should effectively have nothing left to do, as these libraries do not depend on any other LO-provided libraries, but better leave it in place anyway.) Change-Id: Icf7f2ff5cb844b07be223e0b74cd6a650725777a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105946 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Make one more thing in Python compile for macOS on arm64Tor Lillqvist2020-11-151-0/+12
| | | | | | | Change-Id: I6716048f0b58eb502b9d1ade8a13b8e33e4aaf2b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105905 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
* Make python3 build on macOS 11, including for arm64Tor Lillqvist2020-11-152-0/+39
| | | | | | | | | | | | There is no /usr/lib/libz.dylib any longer in macOS 11. No idea whether it works (especially on arm64), but that is another issue. Change-Id: I92ac0c500388730eca0be4766f07b1af2d2808e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105897 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
* xmlsecurity: prepare to verify signatures using pdfiumMiklos Vajna2020-11-122-0/+346
| | | | | | | | | | All the needed API is already in the version we bundle, except one. And also we'll need direct access to the underling pdfium document, for now. Change-Id: Ib5c87c95072401b1a6ca0151177d70b4bcd8c46d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105610 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
* external/gpgmepp: Adapt to _AC_UNDECLARED_WARNING in autoconf 2.70betaStephan Bergmann2020-11-102-0/+38
| | | | | | | | | | | see the linked <https://lists.gnu.org/archive/html/autoconf/2020-11/msg00004.html> "Fallout from _AC_UNDECLARED_WARNING in autoconf 2.70beta" for details Change-Id: I02c0f41d8f9e2ec7f833423a55ccbfff19e5ceb8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105555 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* mariadb-connector-c: fix makefile for GNU make 3.82Michael Stahl2020-11-101-7/+7
| | | | | | | | | | | | Old make thinks that ; terminates the recipe, have to escape it. (other changes are just cosmetic) (regression from 8c9b8c5970a08c2ef0ccddb7a691f3731d39175a) Change-Id: Ib0119511977bbff077f037fbb5975df9f860ae58 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105516 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
* tdf#135202: Mysql use openssl libs to be able to use caching_sha2_pwJulien Nabet2020-11-062-5/+17
| | | | | | | Change-Id: I7552b65022b725c6e87fef61478dc6e9c4322559 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105376 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@cib.de>
* external/libwpd: Missing include for size_tStephan Bergmann2020-11-052-0/+11
| | | | | | | | | | | | | | | | ...as now reported when building with recent trunk GCC/libstdc++ on Linux: > In file included from WPXContentListener.cpp:26: > In file included from ./WPXContentListener.h:29: > ./WPXTable.h:56:31: error: unknown type name 'size_t'; did you mean 'std::size_t'? > const WPXTableCell *getCell(size_t i, size_t j) > ^~~~~~ > std::size_t Change-Id: Ic20240f01c7b0305cb87ababf53a3aaf66072d61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105324 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
* Fix apr build with current Xcode: Include <stdlib.h> for exit()Tor Lillqvist2020-11-042-0/+27
| | | | | | | | | (Or whatever it is that had broken it.) Change-Id: I72bc42e618f011518c05a2cdb875cfe64515b4d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105269 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>