Age | Commit message (Collapse) | Author |
|
what I'm really after is some vexating not-reproducible oss-fuzz msan
warnings when using libxml2 in the fodt2pdf fuzzer. So lets upgrade
libxml2 to the latest, which requires bumping libxslt, and then requires
a newer liblangtag because of no longer implicit includes that it
depended on.
xmlKeepBlanksDefaultValue and xmlSubstituteEntitiesDefault are
deprecated, we should get around to updating those uses
Change-Id: I8fda0dffda0a7ea65407d246a3121875cb8ad4a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161598
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit 6875c975f80d8b813b1829a530162869a1e2d92e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163751
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 050a2db3964d5f02e2dd149cb7f76342457a6719)
|
|
After 5b42f148e206cda19467e76c2f9915fc2b6fa5f6 "ExternalProject_libxml2 still
needs to build the xmllint executable" (which I had happened to prepare on
macOS, so didn't originally notice the issue addressed here now), Linux builds
like <https://ci.libreoffice.org/job/lo_callgrind_linux/13374/> started to fail
with
> CCLD xmllint
> /opt/rh/devtoolset-11/root/usr/libexec/gcc/x86_64-redhat-linux/11/ld: xmllint-xmllint.o: in function `testSAX':
> /home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/UnpackedTarball/libxml2/xmllint.c:1646: undefined reference to `xmlNewSAXParserCtxt'
> /opt/rh/devtoolset-11/root/usr/libexec/gcc/x86_64-redhat-linux/11/ld: xmllint-xmllint.o: in function `myReallocFunc':
> /home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/UnpackedTarball/libxml2/xmllint.c:357: undefined reference to `xmlMemSize'
> collect2: error: ld returned 1 exit status
> make[2]: *** [Makefile:1007: xmllint] Error 1
> make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_callgrind_linux/external/libxml2/ExternalProject_libxml2.mk:37: /home/tdf/lode/jenkins/workspace/lo_callgrind_linux/workdir/ExternalProject/libxml2/build] Error 1
Turns out that those two functions have been introduced after the previously
used libxml2 2.10.4. No idea how things are supposed to work (given that
workdir/UnpackedTarball/libxml2/libxml2.syms starts off with "Retained for
backward compatibility. Don't add new symbols.", it appears that there should be
some other mechanism at play to make xmllint on Linux find the libxml2.so
symbols it needs, but which doesn't work as intended in our build), but just add
those two symbols to libxml2.syms for now. (With a new version named
LIBXML2_2.11.4, even if the symbols can actually have been introduced in some
other version between 2.10.4 and 2.11.4, but who cares.)
Change-Id: Ib9d5c7901fe94b8014a87b049fc27ef5658fd954
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152292
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 7d9b3393e2632247624d8a1e3129365290d1b60b)
|
|
No idea why fd6cbd983a3021d22321854d0414bdc42c6cb1b7 "upgrade to libxml2-2.11.4"
started to only explicitly make libxml2.la (the commit message doesn't say), but
that caused at least <https://ci.libreoffice.org/job/lo_ubsan/2788/> to fail
with
> make[1]: *** Deleting file '/home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/CustomTarget/sfx2/classification/example.validated'
> [build VAL] CustomTarget/sfx2/classification/example.validated
> /bin/sh: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/UnpackedTarball/libxml2//xmllint: No such file or directory
> make[1]: *** [/home/tdf/lode/jenkins/workspace/lo_ubsan/sfx2/CustomTarget_classification.mk:20: /home/tdf/lode/jenkins/workspace/lo_ubsan/workdir/CustomTarget/sfx2/classification/example.validated] Error 1
Change-Id: I7e7aa2bae05cf8674720cfd72c78840cd7a28919
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152256
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit 5b42f148e206cda19467e76c2f9915fc2b6fa5f6)
|
|
'checked' field removed with:
https://gitlab.gnome.org/GNOME/libxml2/-/commit/ce76ebfd1312459951d555ad9d87fb9a89eede55
win32 'run_debug' removed with:
https://gitlab.gnome.org/GNOME/libxml2/-/commit/59f2f60e3eff07324f1c7cd861a444d714be750b
add libxml2-XMLCALL-redefine.patch.0 to avoid:
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): error C2220: the following warning is treated as an error
UnpackedTarball\libxml2\include\libxml/xmlexports.h(41): warning C4005: 'XMLCALL': macro redefinition
UnpackedTarball\expat\lib\expat_external.h(69): note: see previous definition of 'XMLCALL'
Change-Id: Ia9b1540dc1b4eccf91662c8d995c036f71de6fc6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152176
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>
(cherry picked from commit fd6cbd983a3021d22321854d0414bdc42c6cb1b7)
|
|
Fixes CVE-2022-2309
Change-Id: I180218be275d3b6d38f8f74aa51c57e50d2734ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139911
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit d621a8839cebf96fe3ac374026f344f8e68bf011)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139954
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140007
Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
|
|
When building a static LO with --disable-dynloading on Linux,
--without-system-libs failed for me. And it left me really puzzled:
raptor configure failed and claimed it couldn't link libxml2.
raptor's config.log showed missing math functions. xml2-config of
LO's build is patched and it includes a -lm. The xml2-config in my
chroot doesn't. But we explicitly pass the xml2-config for
non-system-libxml2 build. Reading the configure from raptor didn't
reveal a way, that it could somehow pick up the xml2-config from
the chroot, but that code is autoconf-complex...
When running "sh -x configure", it turned out the configure script
actually picks up the LIBXML_* flags from the environment, which
are set by LO's config_host.mk. These just add -lm for Android.
So this adds a xml2-config.in "dummy", which overwrites the one
from the libxml2 source and just echos LO's LIBXML_* values and
it adds -lm for all DISABLE_DYNLOADING targets.
Change-Id: Ia713cf80c8e7dc989cf23c224e7a0f7ea1210a87
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116409
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 8b9f8f0f9d38cc64f742fe5358fce88d0f82391a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139965
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 5c044ae7a3246bddbd0513bd5ed3efef10cb1503)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140006
Tested-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
|
|
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/+/115927
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
|
|
also for C#
Enables pdb generation for symbol builds, for:
- cli_basetypes.dll
- cli_cppuhelper.dll
- cli_uno.dll
- cli_ure.dll
Not covered are:
- cli_oootypes.dll
- cli_uretypes.dll
..as sadly climaker generates those, and can't produce PDBs.
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87727
(cherry picked from commit 1bbabd67720d6d2cfcca15d811c625562fcffad6)
also for libxslt.dll
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87967
(cherry picked from commit 98c7c52e30a921a1bde3e4b2aa8c240d95ed577d)
also for libxml.dll
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88156
(cherry picked from commit 52292c374c3a6a5b4d9c6ced616b0ddd505a5298)
also for nss
Enables pdb generation for symbol builds, for:
- freebl3.dll
- libeay32.dll
- nspr4.dll
- nss3.dll
- nssckbi.dll
- nssdbm3.dll
- nssutil3.dll
- plc4.dll
- plds4.dll
- smime3.dll
- softokn3.dll
- sqlite3.dll
- ssl3.dll
- ssleay32.dll
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88673
(cherry picked from commit 54acab919e7c7c5d60fc697bda54278861ac250e)
all above Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
libxstl.dll: Reduce code when symboles enabled
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88157
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit 127d8c2abcae44869458b39a77f48c93bff8c327)
Change-Id: I9db843a638cf9091fa49b21e27dcb578f98e95fb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88933
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
... which is, surprisingly enough, required to build the latest libxslt.
Change-Id: Ifbb36ed61b8f68185f9c788f63a8edeb58899f94
Reviewed-on: https://gerrit.libreoffice.org/83311
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
(cherry picked from commit d1bf39a78ed239d4493f0470ca937852265e79d6)
Reviewed-on: https://gerrit.libreoffice.org/83346
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
...that had been added with fcb2d8a87ad696f7f2fe069f0ed68a88803e1b54
"external/libxml2: Avoid UBSan nullptr-with-offset"
Change-Id: I7ee234c8c6a868ed825a8ed3fa0dcdc69decb7ba
Reviewed-on: https://gerrit.libreoffice.org/81299
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
...(new with Clang 10 trunk), where adding even an offset of 0 to a null pointer
is UB in C. Seen when building UIConfig_modules/schart:
> [UIL] chart2/uiconfig/ui/3dviewdialog
> xpath.c:14532:5: runtime error: applying zero offset to null pointer
> #0 in xmlXPathTryStreamCompile at workdir/UnpackedTarball/libxml2/xpath.c:14532:5
> #1 in xmlXPathCtxtCompile__internal_alias at workdir/UnpackedTarball/libxml2/xpath.c:14634:12
> #2 in xsltXPathCompileFlags at workdir/UnpackedTarball/libxslt/libxslt/xsltutils.c:2323:11
> #3 in xsltValueOfComp at workdir/UnpackedTarball/libxslt/libxslt/preproc.c:1258:18
> #4 in xsltStylePreCompute at workdir/UnpackedTarball/libxslt/libxslt/preproc.c:2225:6
> #5 in xsltParseTemplateContent at workdir/UnpackedTarball/libxslt/libxslt/xslt.c:4916:13
> #6 in xsltParseStylesheetTemplate at workdir/UnpackedTarball/libxslt/libxslt/xslt.c:5467:5
> #7 in xsltParseStylesheetTop at workdir/UnpackedTarball/libxslt/libxslt/xslt.c:6205:6
> #8 in xsltParseStylesheetProcess at workdir/UnpackedTarball/libxslt/libxslt/xslt.c:6461:2
> #9 in xsltParseStylesheetImportedDoc at workdir/UnpackedTarball/libxslt/libxslt/xslt.c:6675:9
> #10 in xsltParseStylesheetDoc at workdir/UnpackedTarball/libxslt/libxslt/xslt.c:6714:11
> #11 in main at workdir/UnpackedTarball/libxslt/xsltproc/xsltproc.c:888:9
Change-Id: I016ca8d24315385bcfeafca56dda44d9be10f517
Reviewed-on: https://gerrit.libreoffice.org/81285
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
* 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>
|
|
Change-Id: Ic6802c16b740f6aee59ae2f74b7edcd37461f1f3
Reviewed-on: https://gerrit.libreoffice.org/50835
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I3f72ec938c87e0c0d30a91b32d96fedf5379207f
Reviewed-on: https://gerrit.libreoffice.org/44423
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
... instead of hard-coding some subset of the variables everywhere.
Change-Id: I5eac5663563ee9d6cb7b57f5f6e9d55560587276
Reviewed-on: https://gerrit.libreoffice.org/44167
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Iafb9d9e2459451d213cad5d9141755df999d7ced
Reviewed-on: https://gerrit.libreoffice.org/43306
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: I9abf1742c213f47c576ffbb7dafd33087f7037e5
Reviewed-on: https://gerrit.libreoffice.org/43307
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
|
|
Change-Id: Ia1164c70d02dce70cb346c1fd4033f12d91c6e5d
Reviewed-on: https://gerrit.libreoffice.org/42297
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
* 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>
|
|
Change-Id: Ic786fef17cbdb574c342925a4c57875123ef3151
|
|
Added support for arm64
Change-Id: Ibd13dc2c56e2caffd97b1f3b78caece2d331b51c
|
|
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW. Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux. That attempt can be considered abandoned, and
the relevant code rotting.
Due to this heritage, there are now three kinds of MinGW-specific code in LO:
* Code from the original OOo native Windows effort that is no longer relevant
for the LO cross-compilation effort, but has never been removed properly.
* Code from the original OOo native Windows effort that is re-purposed for the
LO cross-compilation effort.
* Code that has been added specifially for the LO cross-compilation effort.
All three kinds of code are removed.
(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)
Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
|
|
Change-Id: I46df2800eb3440ee6c139867cf00f5cad5c4f3f1
Reviewed-on: https://gerrit.libreoffice.org/32012
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
|
|
Change-Id: Ia3109b704155b9baa28f2a5f224e55af161f4fa1
Reviewed-on: https://gerrit.libreoffice.org/25412
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
When Windows build is executed, cscript is used to execute JavaScript files.
This uses cscript from the system to execute *.js files. cscript is not
only capable of executing JavaScript, but also VBScript. Which engine to
run is usually determined by the file extension, except when any installed
program has added a registered association to the used file type. In that
case, the execution of cscript and thus the build fails. This can be prevented
by directly defining the script engine when calling cscript, using the
/e:javascript parameter for *.js targets.
Change-Id: If717b8ae5335acbe4f11c269d3c98a7247a135e6
Reviewed-on: https://gerrit.libreoffice.org/21717
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
|
|
Seems to break the tinderbox, needs more work?
This reverts commit 6aaf1ec5a781b50ceda6d0d288a43dba435be2ce.
|
|
Change-Id: I2d4cedac4081260c5147d8c11904d042c765e3a6
Reviewed-on: https://gerrit.libreoffice.org/21557
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
|
|
and even if it had, everything ends up in liblo-native-code.so now
Change-Id: I5d62cf619867d6d0f7c5d4f91acf529706ebdc75
|
|
- drop libxml2-freebsd.patch.1 (upstream libtool 2.4.6 does the same)
- drop libxml2-vc15.patch (fixed upstream)
Change-Id: Ia2f194f39efebd3d2ea924d23a5543ac53e93116
Reviewed-on: https://gerrit.libreoffice.org/20084
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: Ia2bb2897bc3fdb04c89f3328718f32fecd30eb64
Reviewed-on: https://gerrit.libreoffice.org/16760
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
|
|
Change-Id: I57d30410640fa1b7e1768136b1802546b2b7253f
|
|
...assuming the delayLoadHook in cli_ure/source/native/native_bootstrap.cxx is
no longer necessary and loading of cppuhelper from the program dir cannot fail
regardless in whatever scenario the cli_cppuhelper library itself is loaded.
Change-Id: I13f32b327bca4cce9780864f5e57cdad3860afe5
|
|
Hopefully this should fix up the most important external libraries.
Change-Id: I744cb5a2ce7fafb10852059050cf24589d6ca400
|
|
Change-Id: I67f269e316906913b1a9b4d91907d95b869ca71f
|
|
Change-Id: I22e7a142bb874653344a7ffcc55e8a062669fa2a
|
|
Change-Id: I36672c56742468cda8c0481b76ee6e3fec700983
|
|
Change-Id: I0523e49e640812be435ba4c97b1881ca253eb2ab
|
|
Change-Id: I62f2f654ac661ebf266b7b5cf70728a616c9b50f
|
|
Change-Id: I4f4cecd95f87b9d37fa1b1a270cf554d7707aaa2
|
|
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
|
|
Change-Id: Ifd46fc5dc531bd5bdb489c7550476f9c07a0a976
|
|
So don't bother building libxml2 programs for Android, we have no need for
them, there is no way to run them on normal devices, etc. While at it, don't
bother with scripts, manpages or "data" either. We just want the library.
Change-Id: Ic6553c4ed5b51feab40fed6bd62fd10795e9acf9
|
|
- from libxml2-configure.patch:
* drop config.sub Android stuff (obsolete)
* drop Makefile.in disabling targets for Android (hypothetically obsolete)
* drop xmlversion.h changes (pointless - configure.js generates it)
* split out libxml2-freebsd.patch.1
* split out libxml2-config.patch.1
- drop libxml2-long-path.patch (integrated upstream)
- drop libxml2-gnome599717.patch (obsolete)
- drop libxml2-xpath.patch (obsolete)
- drop libxml2-latin.patch (obsolete)
- drop libxml2-aix.patch:
presumably don't need special check for V7BETA since it's released now
- drop libxml2-mingw.patch:
actually appears to patch a MSVC-specific part of the file so is
obsolete anyway
Change-Id: I87bf8968bd4a554852a2791420a5d0db822beeaa
|
|
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
|
|
Change-Id: I5a823cf7dafc2f04e705de6f4c30ec365922a096
|
|
Deliver all external libraries to INSTDIR directly.
Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
|
|
Change-Id: I1324c8f21e31c69b9780136cc777e1aea3bc546e
|
|
Change-Id: I3067e3c819a4918e1d3c91dc0e0cfa3e4fc92b3d
|
|
Change-Id: I0ed69bcfee650ae403d793b27db4ad906132efed
|
|
Change-Id: Ifea928fc56239043f976ed1e0d2c986bc5cfb934
Reviewed-on: https://gerrit.libreoffice.org/6339
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
|