summaryrefslogtreecommitdiff
path: root/external
AgeCommit message (Collapse)AuthorFilesLines
2016-08-23tdf#101077 make double->str conv. locale-agnosticDavid Tardon2-0/+61
Change-Id: Ibb87f4a14fda6957149ca52083387760ff6e60a3 (cherry picked from commit 8d26a169794083f047a57e5c8d3f5da0aaab2583) Reviewed-on: https://gerrit.libreoffice.org/28081 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit fc79186d80ffa8e734727c555456165af6dd51c4)
2016-08-10tdf#101385: don't try to get SharePoint folder outside of allowed rangeMike Kaganski2-0/+25
for a given site. This patch uses the fact that getFolderByServerRelativeUrl API returns site's root folder if used with empty path (''). Hopefully this isn't otherwise context-dependent, so that it doesn't return other folders in some unknown circumstances. More correct would be instead to use the site's root path directly, like '/sites/mysite'. But I don't know a reliable way to filter the API part from the base URI. To make use of the corrected SharePoint repository root id, the patch also redirects all cases where "/" object is queried, to session's getRootFolder(). Reviewed-on: https://gerrit.libreoffice.org/27987 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 1b482aec4e7b6aec86fb20bcda555c4060a80332) Change-Id: Id31b4c2be0d8d81b94c0e9307acdfbc9e6441828 Reviewed-on: https://gerrit.libreoffice.org/28015 Reviewed-by: Jan Holesovsky <kendy@collabora.com> Tested-by: Jan Holesovsky <kendy@collabora.com>
2016-07-20Fix typosAndrea Gelmini1-5/+5
Change-Id: Ice72f8d9971e15dd6ef365e64cd567b8581a92d3 Reviewed-on: https://gerrit.libreoffice.org/21797 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 534b2a4b58ba765dbc256d6297e33453524915e2)
2016-07-20Fix typosAndrea Gelmini2-5/+5
Reviewed-on: https://gerrit.libreoffice.org/21209 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Ashod Nakashian <ashnakash@gmail.com> (cherry picked from commit 64d624b65124ac02d8ee59b135593fd9d8eb9067) Change-Id: I9a5940027423ff0791fa7da0b79b617412ce6b86
2016-07-13tdf#100295 try to cover second place in curl using GetTickCount64Markus Mohrhard1-1/+1
Conflicts: external/curl/ExternalProject_curl.mk Change-Id: I08e51f70c7b0c92a8c1b8b06e7eb2f1437e2f3f4 Reviewed-on: https://gerrit.libreoffice.org/27027 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 6efd6c49003987a58c83bc23d6a3fbb67999ff9e)
2016-07-08libxmlsec: split the upstreamed part of xmlsec1-vc.patch.1 into a new patchMiklos Vajna3-39/+48
Reviewed-on: https://gerrit.libreoffice.org/24253 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit f7aa4344e4fec0e8bb49d6ba210bc3a78b7e1365) [ With this, external/libxmlsec is up to date with libreoffice-5-2. ] Change-Id: I1a6201a21cdf3a42475487a42cd80d11cd5e42b6
2016-07-08respect verbose in external/libxmlsec/ExternalProject_xmlsec.mkRene Engelhard1-0/+1
as for the other external libs Change-Id: I3d397b3d0afde3df9032cf52dd82d59427924c20 (cherry picked from commit e097ec339f581f394d6ec12082a45c9f7a9955f4)
2016-07-08pass original CFLAGSDavid Tardon1-1/+1
Change-Id: Ia37fa1ad21a9411d78b0c30c769b3934d43d1389 (cherry picked from commit 590d80cea8fcd7c51140cff38392c4c180327330)
2016-07-08Win build: Set default script engine for cscriptArmin Le Grand3-3/+3
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> (cherry picked from commit 7d69efd06dd1a1fee28c117e5ab79e557056f82c)
2016-07-08Upgrade libxmlsec to 1.2.20Miklos Vajna6-1100/+575
Obsoletes xmlsec1-update-config.guess.patch.1. Also update xmlsec1-ooxml.patch.1 as it was upstreamed at the end (with improved error checks, etc), which wasn't possible before without loads of conflicts. Reviewed-on: https://gerrit.libreoffice.org/24032 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 3dcd271f7e62e6d175cb187dbb2bbd099f5ca28e) Conflicts: download.lst Change-Id: I6fee428f73f8908289d87cc262ad323ec62e65cf
2016-07-08Upgrade libxmlsec to 1.2.19Miklos Vajna14-1015/+179
Obsoletes our xmlsec1-1.2.14-ansi.patch.1 and xmlsec1-android.patch.1. Reviewed-on: https://gerrit.libreoffice.org/23844 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit b87c4d8a7539c6b36250adc5626f13458a4c3016) Conflicts: download.lst Change-Id: Ic6499b1a79e3f5a6d94beb62c0c338789c782c86
2016-07-08Upgrade libxmlsec to 1.2.17Miklos Vajna9-312/+194
So we can drop xmlsec1-configure-libxml-libxslt.patch.1, as upstream commit be72c468dfd3165105ed5cdc949493332c4d3064 (fixed configure issue with emapty --with-libxml/libxsl and config scripts in /bin directory, 2010-07-19) fixes the same problem. Reviewed-on: https://gerrit.libreoffice.org/23498 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 7e7a156b4b1b1a22a077968810db9f9958130339) Conflicts: download.lst Change-Id: Ibb01fb2c5e4074d39168df487180fa88c7bb8035
2016-07-08xmlsec: clean up the nss keywrapper part of xmlsec1-customkeymanage.patch.1Miklos Vajna1-1261/+31
All of this is already provided by src/nss/kw_*.c. If I build xmlsec as a shared lib, I even get linker errors due to duplicated symbols. For some reason that does not show up in our situation where we build nss as a static lib and link to it in xmlsecurity. Change-Id: If6e00bf3a818a0146c9c30c51174d8e0acab43a9 Reviewed-on: https://gerrit.libreoffice.org/23443 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 5de18e6a1fe643f1cf15b8456587208ecb11e1c5)
2016-07-08Upgrade libxmlsec to 1.2.16Miklos Vajna14-257/+154
No instant drop of any of our patches this time, but a considerable amount of xmlsec1-customkeymanage.patch.1 is now redundant, as part of the key wrapper code is available in this upstream release for both mscrypto and nss. But that can be cleaned up in a separate follow-up commit. Reviewed-on: https://gerrit.libreoffice.org/23344 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> (cherry picked from commit 19a98755b9a9d90091c413cfa5f285ea4a06097e) Conflicts: download.lst Change-Id: I197eaffe3a52f2f9c02af982872185e017965006
2016-07-07Upgrade libxmlsec to 1.2.15Miklos Vajna20-2336/+1876
The primary benefit is that this release supports sha256 out of the box, so we can drop xmlsec1-nss-sha256.patch.1 and xmlsec1-mscrypto-sha256.patch.1. Reviewed-on: https://gerrit.libreoffice.org/23096 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 70c8d27892f811121a891ebd4742c97d19632f93) Conflicts: download.lst Change-Id: I78606c02591ac8ae7e347b0faa510ae2483e3183
2016-07-07libxmlsec: fix failing CryptCreateHash() with CALG_SHA_256Miklos Vajna1-10/+90
Previously it got a PROV_RSA_FULL provider, but SHA-256 needs PROV_RSA_AES. Change-Id: I6c689a4c5943920ce656c09d9d7d5e194ff47eb6 Reviewed-on: https://gerrit.libreoffice.org/22364 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 80be3959c608983880f47ed4ffb73325734f6c1d)
2016-07-07libxmlsec: move new files back to xmlsec1-customkeymanage.patchMiklos Vajna10-2926/+3028
That was the situation before commit ec6af4194e80f5f0b2e46ca59802ff397a2a4a24 (convert libxmlsec to gbuild, 2012-11-29), and if we ever manage to upstream this patch, then it'll just make the review process harder if half of the patch is in separate files. Change-Id: I0d12d72ea7a1a2591d1ef5232c006b6b7fea7aff Reviewed-on: https://gerrit.libreoffice.org/22973 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 9e3a15c728255a7874179c7104de366b0e056928)
2016-07-07libxmlsec: start tracking patch upstreaming effortMiklos Vajna1-16/+22
Change-Id: I45519896d745bcc4162d655746585051d47b732d (cherry picked from commit 3f9416d703a3d38f4ff59beddc06eb8e1efa52e4)
2016-07-07libxmlsec: remove no longer needed xmlsec1-olderlibxml2.patchMiklos Vajna2-24/+0
I assume this was needed for the Linux baseline. CentOS 6 has libxml 2.7.6, patch is needed for < 2.7.4. (CentOS 5 had 2.6.26, that is only used on libreoffice-5-0). Change-Id: Iae2edbf4f0d484944e399bd901d35a8260272700 Reviewed-on: https://gerrit.libreoffice.org/22659 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 6851e977f71075c2f43b967a52dc1d035a75b0f2)
2016-07-07tdf#76142 libxmlsec: implement SHA-256 support in the mscrypto backendMiklos Vajna2-0/+309
The only tricky part is PROV_RSA_FULL -> PROV_RSA_AES, otherwise SHA-256 is not recognized as a valid algo. MSDN documentation for PROV_RSA_FULL at <https://msdn.microsoft.com/en-us/library/windows/desktop/aa387448%28v=vs.85%29.aspx> and PROV_RSA_AES at <https://msdn.microsoft.com/en-us/library/windows/desktop/aa387447%28v=vs.85%29.aspx> say that AES is a superset of full, so should be no backwards-compatibility issue. I tested this on Windows 7, but according to the documentation, it should be no problem on Windows XP, either -- provided that the latest SP is installed. Change-Id: I3ae196679c2cbf0e9e55fab10584d9c46a480659 (cherry picked from commit e2ccc96482e770edb57edffbf653c18d3a0c4c23)
2016-07-07tdf#76142 libxmlsec: fix xmlSecNssDigestVerify() for SHA-256Miklos Vajna1-5/+26
With this, SfxObjectShell_Impl::showBrokenSignatureWarning() is no longer triggered for the SHA-256 bugdoc. Change-Id: I7a2c5c8517c757e2983f57a3a5908abb941e7a04 (cherry picked from commit c6967f6d1889e08bcd1d206d2b28a598f812641d)
2016-07-07libxmlsec: sort elements in OOXML RelationshipTransformMiklos Vajna1-11/+73
The spec says that the implementer shall sort relationship elements by Id value in lexicographical order, so do that before the filtering of these elements. With this, all streams validate for a test document that is supposed to be valid, though xmlSecDSigCtxVerify() still reports errors. Change-Id: I9d9cd511eaebad1f13f4e06891b2a3f61fee4500 (cherry picked from commit b2734fcc25cc30bb297b50ee5a7f37cfb5667050)
2016-07-07libxmlsec: initial OOXML RelationshipTransformMiklos Vajna1-14/+215
Replace the canonicalization with the steps of actions required by ECMA 376, part 2, pages 49 - 70: - parse arguments of the transformation, a SourceId whitelist - add missing TargetMode attributes The largest part is to actually keep the data unchanged, everything still needs to be printed, as the source is a parsed XML tree, while the output is a byte buffer. With this, the first _rels/.rels stream of the OOXML document validates for a test document that is supposed to be valid. Change-Id: Ie996d93de6a7611bac18a8c37c575363552fdab4 Reviewed-on: https://gerrit.libreoffice.org/21832 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 38aa954a0e1d383382e072de09c4e368caf83456)
2016-07-07tdf#76142 libxmlsec: extend SHA-256 support in the NSS backendMiklos Vajna1-8/+88
With this, the xmlSecTransformIdListFindByHref() call in xmlSecTransformNodeRead() recognizes the http://www.w3.org/2001/04/xmldsig-more#rsa-sha256 string as a valid signature method as well. Previously SHA-256 was recognized as a digest method only. Change-Id: Ib20ab97dd5bc86dff761f0c58a87afdde112e1e8 (cherry picked from commit 93fdb8dc67bf04c7a1e22c8dd15152212799c4f2)
2016-07-07libxmlsec: canonize in the OOXML RelationshipTransformMiklos Vajna1-22/+226
This is still a skeleton, but now we canonize the incoming data, not just eat it and output nothing -> at the end we don't hit an assertion that the output of the transform chain is nothing. Change-Id: I28509b8a493c6bf6cdcbb23b95ae7de8947790c1 (cherry picked from commit 937eb672f43fd26cea5f7dcf559f9ed3f662b804)
2016-07-07tdf#76142 libxmlsec: implement SHA-256 support in the NSS backendMiklos Vajna2-0/+137
This way we do not abort a signature verification when we see a <DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/> XML node. Note that this just extends the glue layer, both NSS and libxmlsec itself already supported SHA-256 already. Change-Id: I68de99578b839bd7eaa8f21af903aa924c892799 (cherry picked from commit 33cb676e582a57a469a0ea1ce7bdb2d57575992e)
2016-07-07libxmlsec: recognize OOXML RelationshipTransformMiklos Vajna2-0/+174
The transform itself doesn't do anything so far, but the verification is no longer aborted just because we see a transform that we don't know. Change-Id: Ife89157067f3af3326896df3053065c8302795d1 (cherry picked from commit 7fb16870bfe988661e3b1cb206ee6fed560e70a3)
2016-07-07libxmlsec: respect --enable-debug with GCCMiklos Vajna1-0/+1
So we compile using either '-O2' or '-O0 -g', instead of '-O2 -g' all the time. Change-Id: Iefc22f38be37ea876c713724657af460eb4c1606 (cherry picked from commit d4d2c7db766f8afc77e752c56cfa1cbc3636088f)
2016-07-04boost: suppress GCC6 -Wplacement-new=Michael Stahl2-0/+17
function_base.hpp line 308 error: placement new constructing an object of type "boost::..." and size ‘16’ in a region of type ‘char’ and size ‘1’ Change-Id: If905d56bd21dd30a957b50fa3d5eed3a63899d62 Reviewed-on: https://gerrit.libreoffice.org/26769 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 0a15048b075a9a610ce7b660dabd3b723d489a6a)
2016-06-29external/firebird: Adapt to GCC 6Stephan Bergmann2-5/+27
...which switched defaults from C++03 to C++14, so causes some errors now. Curiously, the throw(std::bad_alloc) vs. throw-anything mismatch between the global operator new replacements and the standard headers is OK for GCC only when there is no further declaration in between the standard header and the replacmenet definition. Change-Id: Ib54727fecf4ad07426b811a9cc04b08ea80e59dc (cherry picked from commit 3179e8f7e6ce550bbe766ed730e68b0374944dd5) Reviewed-on: https://gerrit.libreoffice.org/26768 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 0a5ec9de2d558a428fd31c258132bac0fe6d8e3f)
2016-06-26Resolves: tdf#90579 swap_single_to_multi_blocks is brokenCaolán McNamara2-0/+24
when there is associated data in the src. Its copies those pointers into the block that will appear in the destination. Then can destroy the source block, which deletes the contents of those pointers, and then inserts the new block which has dangling pointers to the deleted data. https://gitlab.com/mdds/mdds/merge_requests/2 (cherry picked from commit 9ec54e92407cd632c4e38317f914edd557835a86) (cherry picked from commit 6114072a59cfff36218aea70e1b52fa4c3ba64b4) Change-Id: Id9614d95652c8032b03cb5748a284917043d8d21 Reviewed-on: https://gerrit.libreoffice.org/26429 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 19312e13c4ab802c2bd878f4448556f245884a13)
2016-06-11Bundle Karla fontAndras Timar3-0/+35
Change-Id: I666665c801367ff760b14b9f474952e9894b4791 (cherry picked from commit 21dc27ab7834fe4d5783a9f4bd412c08cacc26b4)
2016-05-26CVE-2016-0718 and CVE-2015-1283 expat woesCaolán McNamara3-0/+794
Change-Id: I83691e616bf964db2cb1e708b57f65b92ea2697e Reviewed-on: https://gerrit.libreoffice.org/25401 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 b33fb0a8a09c2c383b5ed7915da52742cd457fec) Reviewed-on: https://gerrit.libreoffice.org/25407 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-05-25libxml2: upgrade to release 2.9.4Michael Stahl1-1/+1
Reviewed-on: https://gerrit.libreoffice.org/25412 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 469aa7fb9e42757267347b986f0e2b1184ebb508) Change-Id: Ia3109b704155b9baa28f2a5f224e55af161f4fa1 Reviewed-on: https://gerrit.libreoffice.org/25417 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-05-03Related tdf#98416 Libcmis: add a patch to fix Google Drive loginGiuseppe Castagno2-0/+107
The new Google login sequence uses two html pages: one for user email the other for password. The older sequence used only one page for both user email and user password. Reviewed-on: https://gerrit.libreoffice.org/24513 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Tardon <dtardon@redhat.com> (cherry picked from commit 3db082a75210bbf0fc657831443c589a4226b997) Signed-off-by: David Tardon <dtardon@redhat.com> Change-Id: If875ba3ec9680d7e8c700a269873e427ac037a8e Reviewed-on: https://gerrit.libreoffice.org/24588 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-04-14switch off 'warning treated as error' in external/nss in Win32Oliver Specht2-0/+15
This prevents errors from ms sdk sal_supp.h: warning '__useHeader': macro redefinition Change-Id: I122bbf6171c73d77970a549353dca67dd26d0300 Reviewed-on: https://gerrit.libreoffice.org/24055 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de> (cherry picked from commit 3f58746ab8080b4ada243afdfbc581df39ef0390) Reviewed-on: https://gerrit.libreoffice.org/24058 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
2016-03-24FREETYPE_CFLAGS is already set when using external freetypeKorrawit Pruegsanusak1-1/+1
When you're on Debian derivatives, using internal cairo but external (system's) freetype, the "ft2build.h" is in /usr/include/freetype2/, not /usr/include/, which is already in FREETYPE_CFLAGS since configure.ac Change-Id: I24c697776bd77d423ebeafd38315cb76cad28f9b Reviewed-on: https://gerrit.libreoffice.org/23334 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> (cherry picked from commit 856038857f566269d8b21fc1c86aa4b5eb7ae048) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2016-03-15fix nss build when targeting windows XP (using 7.1A SDK)Christian Lohmaier2-0/+11
otherwise build fails because of macro redefinitions warnings (that are now fatal because of warnings=errors) Change-Id: I0a15083d9ffd032c48ab491695319309f3053fb7 (cherry picked from commit 09e201fcf2813152335d50588dae0c38adc88d51) Reviewed-on: https://gerrit.libreoffice.org/23271 Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
2016-03-14tdf#98416 fix curl's configure check for nss (missing -lnssutil3)Christian Lohmaier2-0/+18
without -lnssutil3, the configure check for nss fails when using internal nss: configure:24028: checking for SSL_VersionRangeSet in -lnss3 […] …/UnpackedTarball/nss/dist/out/lib/libnss3.so: undefined reference to `NSSUTIL_ArgParseModuleSpecEx@NSSUTIL_3.21' causing curl to build without ssl support: SSL support: no (--with-{ssl,gnutls,nss,polarssl,cyassl,axtls,winssl,darwinssl} ) This makes gdrive and other remote file methods fail Change-Id: I098feb10a760c2f80a474d9205d6f1e403477efd (cherry picked from commit 98d48dad9e807a4a40f4c3d1b5280d9e5156cb18) Reviewed-on: https://gerrit.libreoffice.org/23189 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Andras Timar <andras.timar@collabora.com>
2016-03-14tdf#98416: Explicitly disable curl hardcoded CA certificate storeGiuseppe Castagno1-0/+1
Add --without-ca-bundle --without-ca-path options to curl configure in Linux, to explicitly disable the hardcoded curl CA certificate store. If the store is not disabled, curl configure will try to find one suitable for the Linux distro on which it's being built, leading to possible problems when building on a Linux distro type while targeting another Linux distro type (e.g. building on Red Hat derivative targeting Debian derivative). Change-Id: Id1ddf1d74e33bc66e4f7187e376d7379f5c4f36a Reviewed-on: https://gerrit.libreoffice.org/23141 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 30b9c6a457de61f3c94431ecc75716f866c3379e) Reviewed-on: https://gerrit.libreoffice.org/23149 Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2016-03-10Fix nss on MSVC 14.0 in debug modeDavid Ostrovsky2-0/+24
outdir doesn't seem to be created. Use current directory for pdb files as the obj files are already stored in the current directory. Change-Id: I41dd65714d314cd374cc5de073d48f1a58b18c56 Reviewed-on: https://gerrit.libreoffice.org/22888 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 1a056fdb25bd5c682f395ff94a6e1ce5618ed55a) Reviewed-on: https://gerrit.libreoffice.org/23099 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-03-10Bump nss to 3.22.1 and nspr to 4.12David Ostrovsky6-35/+63
It seems like nss has activated -Werror, even though the code is not warning free: [1]. This applies also to the additional patches that would need to be patched to be a warning free patch, endless recursion. To avoid messing around with something like that: [2], we disable -Werror option for now. Also note, that [2] doesn't fix all warnings, but only part of them so that we let with unsolved non-trivially to fix warnings on different supported compilers if we would choose the warning-free-compilation-path. [1] https://groups.google.com/d/topic/mozilla.dev.tech.crypto/TgnF3tIMxJ0/discussion [2] https://git.fedorahosted.org/cgit/nss-pem.git/commit/?id=ec2b9a90623b1ec5adb6ebe8d6651b35854786ec Reviewed-on: https://gerrit.libreoffice.org/22650 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: David Ostrovsky <david@ostrovsky.org> (cherry picked from commit 486c91147c587febdacf3fa95d56633dbd703d5f) Change-Id: I762c03acede6c4eac715d3b0589061eeabbcc7c2 Reviewed-on: https://gerrit.libreoffice.org/23097 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-03-10nss: Fix pointer truncation from 'char *' to 'long'David Ostrovsky1-0/+11
Change-Id: Ie1659c62cbf77f8b685fdf7d79cd62336fa99005 Reviewed-on: https://gerrit.libreoffice.org/22916 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 59907b36008010d87cc31b1f8ab581d5e4ac1c0b) Reviewed-on: https://gerrit.libreoffice.org/23098 Reviewed-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: David Ostrovsky <david@ostrovsky.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-03-09upgrade openssl to 1.0.2gCaolán McNamara7-76/+91
We can't "break symlinks after extracting tarball" because they populate that dir during the build now. So instead cripple mklink.pl to copy instead of link. (Configure no-symlinks simply skips the symlink step instead of copying, so that appears useless) Change-Id: Ib30b2c1b8b3de72511d09c478297a7a5a4bc691e Reviewed-on: https://gerrit.libreoffice.org/21880 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 01798050c13fdfc51aff95967f6b0177d5d7f5bd) Reviewed-on: https://gerrit.libreoffice.org/22999 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-03-08upgrade neon to 0.30.1Caolán McNamara2-47/+6
Reviewed-on: https://gerrit.libreoffice.org/22977 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 1827987fd11cd726005977e49d001283033f0419) Change-Id: If84ce83cdbde530f7a6743c93ae210b030a41c30 Reviewed-on: https://gerrit.libreoffice.org/22998 Reviewed-by: David Ostrovsky <david@ostrovsky.org> Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-03-07tdf#97462 reportbuilder SECOND() force rounding to nearest nanosecondLionel Elie Mamane2-0/+38
Change-Id: I690a81997c79956fc19ddf83f958768d5e7a313e Reviewed-on: https://gerrit.libreoffice.org/22930 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-03-03Update etonyek patch to apply with sle11 patchTomáš Chvátal1-4/+6
Change-Id: I86b43ba29a6b7d0d4c36491234c3354c3d6edf0c Reviewed-on: https://gerrit.libreoffice.org/22839 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-03-02Fix patch to apply on SLE11, just some unknown patch binary hickupTomáš Chvátal1-3/+4
Change-Id: I6cb707663e2abad8761b172773ee70f9caf4a87d Reviewed-on: https://gerrit.libreoffice.org/22836 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-02-22WaE vs2015 double defineNorbert Thiebaud1-1/+1
Change-Id: I279b5df3f9705ca266f2f4efb1e93e59cbbdabd7 Reviewed-on: https://gerrit.libreoffice.org/22603 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com> (cherry picked from commit 3e1782f05b9217d941eeff821df98df5f3e8da76) Signed-off-by: Michael Stahl <mstahl@redhat.com>
2016-02-18fdo#94009: harfbuzz: don't export symbols from VCLMichael Stahl1-0/+1
Should fix crashes due to symbol clashes in ELF global namespace where system's libharfbuzz.so.0 is loaded as well. Change-Id: I35ffcbe4ac4de5a25cd8bf0cb9a8f0c11f4554c5 (cherry picked from commit 549130ab5d9616f7eb5504db31546b386737ccb2) Reviewed-on: https://gerrit.libreoffice.org/22480 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>