summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)AuthorFilesLines
2018-02-22Patch liborcus to avoid incorrect parsing of XML.Kohei Yoshida2-0/+31
Found by Antti Levomäki and Christian Jalio from Forcepoint. This one is not a backport from the master branch. On the master branch the same fix will come from updating liborcus from 0.13.3 to 0.13.4. (cherry picked from commit 160350de5f07024b22fb5a9b596918ccc7f22c75) Conflicts: external/liborcus/UnpackedTarball_liborcus.mk Change-Id: I701c5a65ff67d77767913f8d056682b9db549f84 Reviewed-on: https://gerrit.libreoffice.org/50147 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2018-01-25curl: fix CVE-2018-1000005/1000007Michael Stahl3-0/+148
* 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: I4fbd7f1c5f1f0563895f6f8ede10063621d10a4b Reviewed-on: https://gerrit.libreoffice.org/48542 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-12-04Use proper ucontext_t in external/breakpadStephan Bergmann2-0/+195
SUSv4 merely claims that ucontext_t is defined as a structure type (in <signal.h>), and at least /usr/include/sys/ucontext.h in glibc-headers-2.26-15.fc27.x86_64 now defines it as typedef struct ucontext_t { ... } ucontext_t; instead of as typedef struct ucontext { ... } ucontext_t; as was done in older glibc, so referring to it as "struct ucontext" (C/C++) or "ucontext" (C++) no longer works. Change-Id: I3d515a4ce7e5a49d0277136cad2b982bdf799ac5 (cherry picked from commit 935f76d0edeb0025dee39f95e1f0bc1a840e316e) Reviewed-on: https://gerrit.libreoffice.org/45785 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-12-04icu: do not include non-standardized xlocale.h if U_PLATFORM_IS_LINUX_BASEDEike Rathke2-0/+15
... should be more platforms ... but be conservative. U_PLATFORM_IMPLEMENTS_POSIX does not hold what it promises. "The file and this data structure is not standardized. Don't rely on it. It can go away without warning." ... And since glibc 2.26 it's gone. https://ssl.icu-project.org/trac/ticket/13329 Change-Id: I4c1f6130571f5d094cb35ce70e4d333763cee32a (cherry picked from commit 9e399bc613bb4ea1470bd52c64af920d4e9bc39b) Reviewed-on: https://gerrit.libreoffice.org/45786 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-12-01Compensate for loss of Type 1 "Standard Symbols L" substitute for "Symbol"Stephan Bergmann3-21/+0
At least for me on Linux since LO 5.3, 'soffice sw/qa/extras/rtfexport/data/fdo72031.rtf' shows "Å" (rendered in "DejaVu Sans") instead of "⊕" (rendered in "Standard Symbols L"). That's presumably because 47ea13ef8dc8ab9aeded6121845e3ebd1d28b292 "Kill the old Unix layout engines" removed support for Type 1 fonts (see "Ignore Type 1 fonts" in FontCfgWrapper::addFontSet, vcl/unx/generic/fontmanager/fontconfig.cxx), and my (Fedora 25) /usr/share/fonts/default/Type1/s050000l.pfb "Standard Symbols L" is a Type 1 font. So we fell back to fontconfig's generic (weak) suggestion of "DejaVu Sans" as a substitute for "Symbol". So extend our fc_local.conf to suggest our "OpenSymbol" as a substitute for "Symbol". As that fc_local.conf was originally brought along by --with-fonts, which is enabled by default but can be disabled, compilation of fc_local.conf from the various snippets is moved to postprocess. macOS and Windows were never affected, as they both come with a "Symbol" font installed in the system. (And we don't install fc_local.conf on Windows at all.) Reviewed-on: https://gerrit.libreoffice.org/42670 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit e79f1261549d9c497a38ea1af8843a86883b02cd) Change-Id: I8d6d87f24974577fd66f5f3989f606237ebb3d75 Reviewed-on: https://gerrit.libreoffice.org/44979 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2017-11-30curl: fix CVE-2017-8816Michael Stahl2-0/+68
* 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 * CVE-2017-8817 doesn't affect LO as CURLOPT_WILDCARDMATCH isn't used * CVE-2017-8818 doesn't affect the old 7.52 version Change-Id: I49ddb771ccdb93d5fe8f4b3544f74ab9b171c156 Reviewed-on: https://gerrit.libreoffice.org/45487 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-11-09Add ICU changeset-40324 fix for CVE-2017-14952Eike Rathke2-0/+12
(cherry picked from commit cebe1279665960b732c9cb05c18e481c33e778bb) Conflicts: external/icu/UnpackedTarball_icu.mk Change-Id: Ia457669c5ec6ef5c568f4550c44ef5df32a4be66 Reviewed-on: https://gerrit.libreoffice.org/44492 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-11-02tdf#108580 ship universal crts with the program as workaroundChristian Lohmaier2-0/+27
the universal crts redistributables are available as part of the Windows 10 SDK. Point to the dir (or a copy of the dir) using --with-ucrt-dir Use --without-ucrt-dir (or --with-ucrt-dir=no) if you don't want to ship them as part of LO and are annoyed by the configure warning. Change-Id: I5487e3f6e583222fa053b2fc03176f061d57746c Reviewed-on: https://gerrit.libreoffice.org/44074 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> (cherry picked from commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a) Reviewed-on: https://gerrit.libreoffice.org/44122
2017-09-26Avoid API present from macOS 10.13 if building to run on olderTor Lillqvist2-0/+69
utimensat() and futimens() are new in 10.13. (cherry picked from commit 018f875cb03aadd6fbb56cad463fef3ab932e274) Change-Id: I1a928f6324dca98d47fbd8ed2cdd75b4935e1b12 Reviewed-on: https://gerrit.libreoffice.org/42806 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Tor Lillqvist <tml@collabora.com>
2017-09-26connectx() is available only on Mac OS X 10.11 and newerTor Lillqvist2-0/+293
Compiling against the 10.13 SDK with --with-macosx-version-min- required set to 10.9 or 10.10 (or defaulted, meaning 10.9) causes a compilation error now. Earlier SDKs did not catch it if you were using connectx() even if targeting pre-10.11. Try the approach from https://github.com/curl/curl/pull/1336/commits . (cherry picked from commit eba34a557cdacd6a39d2e86fadc25eb1e2707b57) Change-Id: I9605e613c0a04d4eed508161d8870ddbb7d8637e Reviewed-on: https://gerrit.libreoffice.org/42796 Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2017-09-26external/libmspub: Update config.{guess,sub}Stephan Bergmann2-0/+943
...with versions of those files from the latest <http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz>. The current versions would fail for Flathub aarch64 builds. (cherry picked from commit 94c548ac6468a567aa352fc47e5d2acc34076130) Conflicts: external/libmspub/iOS.patch.0 Change-Id: I4b42fa7c04f0570b31170b72d8a42786ae1dc252 Reviewed-on: https://gerrit.libreoffice.org/42780 Tested-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-26external/firebird: Update config.{guess,sub}Stephan Bergmann2-0/+1970
...with versions of those files from the latest <http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz>. The current versions would fail for Flathub aarch64 builds. Change-Id: Id53754e989244134bdc533eb7f37e08c598b03e0 (cherry picked from commit 1bfcde620f82e17205b75f020e632657505f1d8b) Reviewed-on: https://gerrit.libreoffice.org/42774 Tested-by: Stephan Bergmann <sbergman@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-09-08external/openldap: Update config.{guess,sub}Stephan Bergmann2-0/+3657
...with versions of those files from the latest <http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz>. The current versions failed for a Flathub aarch64 test build, see <https://flathub.org/builds/#/builders/6/builds/304>. Change-Id: I782371c88cf1c46bdee4f14a82b58f673f40e982 (cherry picked from commit 8d1c4032ed284e656300801b62c982e212315a07) Reviewed-on: https://gerrit.libreoffice.org/42111 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-07Resolves: tdf#112269 libwpd fixCaolán McNamara2-0/+43
Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1 Reviewed-on: https://gerrit.libreoffice.org/42055 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com>
2017-09-07external/coinmp: Update config.{guess,sub}Stephan Bergmann4-460/+17578
...with versions of those files from the latest <http://ftp.gnu.org/gnu/automake/automake-1.15.tar.xz>. The current versions failed for a Flathub aarch64 test build, see <https://flathub.org/builds/#/builders/6/builds/274>. Some existing patches already did local modifications to those config.{guess,sub} files, apparently to address build issues on Android, iOS, and macOS. I removed all of them, hoping that the latest versions of the files already address all those issues. Change-Id: I13e58479d4e3a0598a00c69674885ca540092b53 Reviewed-on: https://gerrit.libreoffice.org/41987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 397e2f0cfb310ac606705c74e5907195e5ca7872) Conflicts: external/coinmp/UnpackedTarball_coinmp.mk external/coinmp/iOS.patch.1 Reviewed-on: https://gerrit.libreoffice.org/42001 Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-06Boost: Update last known MSVC version to VS2017.3David Ostrovsky2-0/+18
Change-Id: I41952279cc9d40769bfc51dd0f03c0b0624815d2 Reviewed-on: https://gerrit.libreoffice.org/41961 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Grzegorz Araminowicz <g.araminowicz@gmail.com> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 92012cfad0611f178ea0013674fc3e07008b8b03) Reviewed-on: https://gerrit.libreoffice.org/41983
2017-08-24libxml2: bunch of CVE fixesMichael Stahl6-0/+517
Change-Id: Ic786fef17cbdb574c342925a4c57875123ef3151 (cherry picked from commit 486d3b214c270fbd2651a0b0895d600e0f647750) Reviewed-on: https://gerrit.libreoffice.org/41459 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-08-17Re-add external/harfbuzz/ubsan.patchStephan Bergmann2-0/+33
...after 5aab2900dfdc9f12adda378470149670a2a069df "tdf#109142: Update to HarfBuzz 1.4.8". The parts that were still relevant for 'make check' are: * 6694ce6b542367074667e4445a6b7f50568a2729 "external/harfbuzz: Work around ASan out of bounds warning" * 99f7aacd5b39a0f79351d8d7568b2e43d39878cb "external/harfbuzz: -fsanitize=function" * ca9a08bbf7d42727a93b5f725784308a3590c0fe "external/harfbuzz: Silence -fsanitize=nonnull-attribute" (plus 83a9c8e046dfcaccdb1114ec5a386a11fcca3a02 "build fix") Change-Id: Ibff2a7c52c5de60ae00744acd2ef481bbb08706c (cherry picked from commit 014c30d12945f3c48e3b4758a01fa0721d1ec3c3) Reviewed-on: https://gerrit.libreoffice.org/41232 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-08-16tdf#109142: Update to HarfBuzz 1.4.8Khaled Hosny3-69/+1
Should fix the Tibetan long U issue. Also reverts this commit as depending on auto-detection for a required feature is not a very good idea. The underlying issue is fixed upstream: commit 5985bed1764358a515c378c80bb60b4d35bad6b1 Author: jan Iversen <jani@libreoffice.org> Date: Mon Jun 12 14:51:42 2017 +0200 iOS, harfbuzz libcoretext not found changed --with-libcoretext from "yes" to "auto" for IOS and MACOSX which seems to be a misguided attemp to fix the build breakage introduced in: commit b3559e5c6ce036b1a4fe96c0ffc935e0c94a7b10 Author: jan Iversen <jani@libreoffice.org> Date: Sun Jun 11 19:35:53 2017 +0200 iOS, patch harfbuzz Add support for arm64 Also had to drop ubsan.patch as it no longer applies, hopefully it is no longer needed, otherwise it is always good idea to submit such patches upstream. Change-Id: I91643c542c0a5a00f36d5564052787eedef8c9cf Reviewed-on: https://gerrit.libreoffice.org/41124 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 5aab2900dfdc9f12adda378470149670a2a069df) Reviewed-on: https://gerrit.libreoffice.org/41210
2017-08-11python3: upgrade to release 3.5.4David Ostrovsky3-44/+50
Change-Id: I9300b2ec1e1dcedbcbfe793e1450166af1bf1944 Reviewed-on: https://gerrit.libreoffice.org/40944 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit f0e68d4feaaa43f7450432ad1ebd92c2b572400f) Reviewed-on: https://gerrit.libreoffice.org/41026
2017-08-10curl: 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) Reviewed-on: https://gerrit.libreoffice.org/40936 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-08-10curl: disable more unnecessary stuffMichael Stahl1-5/+8
Only HTTP and FTP should be required. Add --without-libpsl --disable-ares --disable-rtsp --disable-smb, and --without-libidn was replaced with --without-libidn2. Change-Id: Icf6afc8bff4cc7ad7a5a95b0c3f9a345a7cf67a3 (cherry picked from commit 9fd26734d3cbbd9b58f4b08058a75063632f57d1) Reviewed-on: https://gerrit.libreoffice.org/40935 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-08-04CVE-2017-11742: Expat 2.2.3Caolán McNamara4-41/+3
Reviewed-on: https://gerrit.libreoffice.org/40718 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit f680e5a441cecba4d238f031fc417ef3bccfd792) Change-Id: I1a1de789eaa5a78d2dc0e41ef861d10fa97b689b Reviewed-on: https://gerrit.libreoffice.org/40746 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2017-07-13fix getrandom check in expat's configureChristian Lohmaier2-0/+41
https://github.com/libexpat/libexpat/issues/52 fixes /usr/include/sys/random.h:37:22: error: expected ')' misdetection of random.h feature, already fixed upstream: https://github.com/libexpat/libexpat/commit/602e6c78ca750c082b72f8cdf4a38839b312959f (cherry picked from commit f78ed1ec528604f6db9bdd2a07462c5e99e0ab99) Change-Id: I65e4aebaa838d2931a60cb34806d87b88861c4d8
2017-07-04xmlsecurity: implement support for building against system-xmlsecMiklos Vajna1-1/+1
The only remaining difference is that in the system-xmlsec case we work with the default key manager, not with the one that's only added by our xmlsec patches. This works for me for the uses I know of (see <https://lists.freedesktop.org/archives/libreoffice/2017-February/076947.html> for the motivation): signing and verifying of different signatures (bad signature, good with non-trusted CA, good with trusted CA) with software-based certificates all behave as expected. Change-Id: If3f3e2b8373ab7397db3f98070a5a2ce51fa7c06 Reviewed-on: https://gerrit.libreoffice.org/39075 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-on: https://gerrit.libreoffice.org/39274 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Rene Engelhard <rene@debian.org> Tested-by: Rene Engelhard <rene@debian.org>
2017-07-03fix crash on windows with nullptr in operator<<Markus Mohrhard2-0/+13
E.g. http://crashreport.libreoffice.org/stats/crash_details/8962b764-6550-45c9-b08b-e99f5c968d61 Change-Id: I1153c0ab35266006ada10611e79b770ef1c0cd4f Reviewed-on: https://gerrit.libreoffice.org/39413 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Reviewed-on: https://gerrit.libreoffice.org/39424 Reviewed-by: Eike Rathke <erack@redhat.com>
2017-06-16Resolves: tdf#75788 build jpeg-turbo without --with-jpeg8Caolán McNamara1-1/+0
Change-Id: I3da1559bd3434d574db65a3b492e1060c46143ee Reviewed-on: https://gerrit.libreoffice.org/38849 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 0c1fdff3efbb16836d679923828ebd7dda03b937) Reviewed-on: https://gerrit.libreoffice.org/38862
2017-06-15use correct sizeDavid Tardon2-0/+26
Change-Id: I620ada9b209bb2084eccaa81385beb6306d6a3d0 (cherry picked from commit d1ae31a1fc49ec7a68b2a07c5e5e97d95b346ca9) Signed-off-by: David Tardon <dtardon@redhat.com>
2017-06-06libstaroffice: use correct loop indexDavid Tardon2-0/+28
Change-Id: I1b862ed2d69c41361bc8c26d96c5329473fe64aa (cherry picked from commit cc2db25645ede743bdc3824fe7d26ea4beda6a96) Signed-off-by: David Tardon <dtardon@redhat.com>
2017-05-29Re-enable building with ICU 59, tdf#108043 follow-upEike Rathke7-5/+9
After having reverted to internal ICU 58, still be able to build with ICU 59. Change-Id: If2cf651aaacee5f64bee737f9da140b913ebd510 Reviewed-on: https://gerrit.libreoffice.org/38154 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-29Resolves: tdf#108043 Revert "Upgrade to ICU 59.1"Eike Rathke28-465/+340
As it would force us to not run on XP *AND* Vista anymore already with this 5.4 release. This is a combination of 4 commits. Revert "Add ICU ticket number for this patch" This reverts commit e24cd3818821971fe3c52820dafe0f5ccb4b023a. Revert "Add ICU ticket number for this patch" This reverts commit 8720877b8b6bc96e330842f7391ae49a21ec2f63. Revert "Upgrade to ICU 59.1 follow-up: only add icu/source/data/misc/icudata.rc" This reverts commit 89de6f62ae1e96d2c492cb5cd8f7d313b51e2f98. Revert "Upgrade to ICU 59.1" This reverts commit fabad007c60958f2ff87e8f636ff6a798ad1f963. Change-Id: Idd2bfecf7f3c148ee404322e7287ac236c46b6cf Reviewed-on: https://gerrit.libreoffice.org/38143 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-25upload poppler 0.55.0David Tardon2-2/+2
Change-Id: I19b7d324a2dc50d006b4d255ddb6a5c1f15bc616 Reviewed-on: https://gerrit.libreoffice.org/37998 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit b12e16f8fc186117cbb20cc3866bf052a3d75515) Signed-off-by: David Tardon <dtardon@redhat.com>
2017-05-17xmlsecurity: use xmlsec API instead of patching out cert verificationMiklos Vajna2-75/+0
This flag does exactly what we need since xmlsec-1.2.24. Change-Id: I3ae052d4bfe564c3234aef2511ef82ebdb452ebe Reviewed-on: https://gerrit.libreoffice.org/37700 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org>
2017-05-10Upgrade libxmlsec to 1.2.24Miklos Vajna10-1094/+475
Upstream changes interesting for us: - Added ECDSA-SHA1, ECDSA-SHA256, ECDSA-SHA512 support for xmlsec-nss, so we can drop 2 patches - Fixed XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS handling, which allows dropping xmlsec1-noverify.patch.1 in the future Also backport a patch from xmlsec master that fixes signature creation on Windows (the release regressed in this regard). Change-Id: I2c14328283bf7d4f8af5595ea4c1efc29ee81f9e
2017-05-09Use BOOST_USE_WINDOWS_H to avoid errors when building with clang-clStephan Bergmann1-1/+1
> [build CXX] workdir/UnpackedTarball/boost/libs/locale/src/shared/date_time.cpp [...] > In file included from C:/lo64/core/workdir/UnpackedTarball/boost/libs/locale/src/shared/date_time.cpp:11: > In file included from C:/lo64/core/workdir/UnpackedTarball/boost\boost/thread/mutex.hpp:14: > In file included from C:/lo64/core/workdir/UnpackedTarball/boost\boost/thread/win32/mutex.hpp:9: > In file included from C:/lo64/core/workdir/UnpackedTarball/boost\boost/thread/win32/basic_timed_mutex.hpp:14: > C:/lo64/core/workdir/UnpackedTarball/boost\boost/thread/win32/thread_primitives.hpp(172,55): error: conflicting types for 'CreateMutexA' > __declspec(dllimport) void* __stdcall CreateMutexA(_SECURITY_ATTRIBUTES*,int,char const*); > ^ > C:/PROGRA~2/WI3CF2~1/10/Include/10.0.15063.0/um\synchapi.h(489,1): note: previous declaration is here > CreateMutexA( > ^ [...] Change-Id: I141ea196250dc855c780f237436c0f19f0594cb1
2017-05-05libxmlsec: remove xmlsec1-nssmangleciphers.patch.1Miklos Vajna2-1146/+0
This was added in commit ebd1b95bb5f9235d1dba1b840fd746c9b53320d2 (INTEGRATION: CWS xmlsec08 (1.1.2); FILE ADDED, 2005-03-10). According to CWS history it was introduced in the 1.1.2.1 part, without any further comments. Before the gbuild conversion in commit ec6af4194e80f5f0b2e46ca59802ff397a2a4a24 (convert libxmlsec to gbuild, 2012-11-29) the makefile.mk had a comment for this patch: "Dubious, do we still need this ?". My best guess is that this was added as part of some effort to do ODF encryption (not just signing) in xmlsecurity, but code for that on the xmlsecurity part is already removed. Change-Id: I3a5f1fedd7ce10b8b874bb8a3c9e6260213fbd8f Reviewed-on: https://gerrit.libreoffice.org/37261 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-05-02Make some externals' libtool copies cope with -mllvmStephan Bergmann8-0/+247
...as needed e.g. for <https://bugs.llvm.org/show_bug.cgi?id=32349> "r294897 + NewGVN cause build failure with LibreOffice", by applying <http://git.savannah.gnu.org/cgit/libtool.git/commit/ ?id=d9a35fe9d3508b5c0d56e7f2ec80fc05e8415fa3> "libtool: Discard '-mllvm $arg' options when linking." Change-Id: Id2afc3c8af3c6c9595e7cb33cef5084a74f78cb0
2017-05-02Adapt bin/gen-boost-headers to Clang 5Stephan Bergmann99-0/+99
...since <http://llvm.org/viewvc/llvm-project?view=revision&revision=301647> "Use the -Wunknown-warning-option group for the 'unknown warning group' diagnostic in #pragma diagnostic". * external/boost/include/boost/{locale.hpp,locale/gnu_gettext.hpp} would have been removed by 'make cmd cmd=bin/gen-boost-headers' as they are still unused from c25eee44966703cb27d632bccb39b20978341ffd "build boost::locale library", but there's reportedly a patch in Gerrit to actually use them, so I fixed them manually for now. * The deviating comment style is to keep lines no wider than 80 characters. Change-Id: I64603ae8d8a82781eda46f12c9dd5c68dcf395b9
2017-04-28try without iconv, we probably don't need it in practiceCaolán McNamara3-8/+53
Change-Id: I14782971dd35f8d96f1e9b08fdf060aa917a1e37
2017-04-28build boost::locale libraryCaolán McNamara6-0/+160
Change-Id: I40b89a0df483645fc743fb092d3d39ea682c510c Reviewed-on: https://gerrit.libreoffice.org/37060 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2017-04-27Add ICU ticket number for this patchEike Rathke1-0/+1
https://ssl.icu-project.org/trac/ticket/13176 Change-Id: I1bf7a0787f46186895e7ee9144d5f219ea59e2df
2017-04-27Add ICU ticket number for this patchEike Rathke1-0/+1
https://ssl.icu-project.org/trac/ticket/13175 Change-Id: Ib7756f3c41d2395f65d898e39808616c04ee58ee
2017-04-26Upgrade to ICU 59.1 follow-up: only add icu/source/data/misc/icudata.rcEike Rathke1-4/+2
... instead of the entire icu4c-59_1-data.zip content. Change-Id: Icfbf7d4103059f525b303b194212b78935fb00b1 Reviewed-on: https://gerrit.libreoffice.org/37001 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-04-26Upgrade to ICU 59.1Eike Rathke28-340/+465
Also regenerated all patches using make icu.genpatch (hence the .1 suffix that indicates the path level) as some hunks did not apply anyway and all now have the correct offset. Using genpatch may have the future benefit to yield smaller diffs between different versions of patches. Also prefixed all patch names with icu4c- for a cleaner listing. New patches introduced are prefixed with icu4c-59-... Change-Id: Ia83754b0823839887fce1a1d4ed04f8375b113c2 Reviewed-on: https://gerrit.libreoffice.org/36809 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Eike Rathke <erack@redhat.com>
2017-04-26external: update pdfium to 3064Miklos Vajna6-31/+77
This contains the new FPDFPath_GetFillColor / FPDFPageObj_GetType APIs I want to use in CppunitTest_vcl_pdfexport. Change-Id: I275ff761188c07dbbab27a1e0715ac250cd306c9 Reviewed-on: https://gerrit.libreoffice.org/36974 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2017-04-21external/epoxy: Work around missing clang-cl DLL-init CONSTRUCT supportStephan Bergmann2-0/+15
Looks like neither the __GNUC__ specific __attribute__((constructor)) definition of CONSTRUCT nor the _MSC_VER specific one (if the #ifs were reordered so that clang-cl would pick the latter) with __declspec(allocate(".CRT$XCU")) are supported by clang-cl, and both are rather silently ignored. That means that library_init is not called, library_initialized remains false, and the first call to get_dlopen_handle aborts. But this whole "verify that get_dlopen_handle isn't called too early" business is somewhat pointless here (and that's the only use of the CONSTRUCT macro, and DESTRUCT isn't used at all), so just short-circuit it for clang-cl for now. Change-Id: I5d50df3574d350f9591e807ef0fb6a1b02dc34ec
2017-04-21gbuild: Remove MSVC 2013 legacy codeDavid Ostrovsky4-390/+1
Uwinapi is discontinued. Change-Id: I063b4d0d8fab2d60de168e960a63b8181158ac01 Reviewed-on: https://gerrit.libreoffice.org/23198 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: David Ostrovsky <david@ostrovsky.org>
2017-04-21nss: 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>
2017-04-21nss: upgrade to release 3.29.5Michael Stahl10-135/+51
- fixes CVE-2017-5461 and CVE-2017-5462 - drop ubsan-alignment.patch.0, there is apparently now some NO_SANITIZE_ALIGNMENT macro upstream to get this effect - drop some hunks to prevent hard-coding CC/CCC vars, upstream now respects environment vars (but doesn't quote them...) - drop first hunk of ubsan.patch.0, fixed upstream - drop hunk for gtest-internal.h, header looks much newer anyway Change-Id: I5c484c02c1235e185af1ef5166b069303d3378e1 Reviewed-on: https://gerrit.libreoffice.org/36756 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-04-21add ICU changeset-39671 fix for CVE-2017-7867 CVE-2017-7868Eike Rathke2-0/+156
http://bugs.icu-project.org/trac/changeset/39671 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=213 https://bugzilla.redhat.com/show_bug.cgi?id=1444101 Change-Id: I4e776ad4fe63c77057b0c823f8672a2b6703346f Reviewed-on: https://gerrit.libreoffice.org/36754 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-24 21:32:03 +0000