summaryrefslogtreecommitdiff
path: root/external/curl/ExternalProject_curl.mk
AgeCommit message (Collapse)AuthorFilesLines
2018-05-24Fix curl build on MSVC2013Mike Kaganski1-3/+2
Change-Id: Ie2e85d5c9945d4204f69135bc59e1d668294a83f Reviewed-on: https://gerrit.libreoffice.org/54770 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
2018-05-23curl: upgrade to release 7.60.0Andras Timar1-25/+23
Change-Id: Ic8510b424f52c059f979e26441e67ec15b332933
2017-08-11curl: 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/40938 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> (cherry picked from commit 3866238ace2bf6b5edde2bb3caaef463669c6925)
2016-11-02curl: upgrade to version 7.51.0Michael Stahl1-1/+1
- fixes about a dozen CVEs - tweak curl-7.26.0_win-proxy.patch: there is a "checksrc" thing now in curl that fails the build with: warning: use of strtok is banned (BANNEDFUNC) so use strtok_s instead (which is MSVC's name for standard strtok_r) - use Makefile.vc12 instead of Makefile.vc10 - remove strequal.obj from Makefile.vc12, it does not actually exist Change-Id: Ie2da64980d88c72b0c902376ffc01abf97a7bc91 Reviewed-on: https://gerrit.libreoffice.org/30484 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2016-07-09use EHs also for libcurlMarkus Mohrhard1-1/+1
Change-Id: Ibcd97e298e63074bbabb71d11af12bd3ff3266e7 Reviewed-on: https://gerrit.libreoffice.org/27070 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-07-08tdf#100295: try to cover second place in curl using GetTickCount64Markus Mohrhard1-1/+1
Change-Id: I08e51f70c7b0c92a8c1b8b06e7eb2f1437e2f3f4 Reviewed-on: https://gerrit.libreoffice.org/27025 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
2016-05-03Handle wchar_t as native C++11 type on windowsDavid Ostrovsky1-1/+1
The option /Zc:wchar_t- prevented to use wchar_t as a built-in type according to the C++ standard. In Visual C++ 6.0 and earlier, wchar_t was not implemented as a built-in type, but was declared in wchar.h as a typedef for unsigned short. Now, years later after the end of life this outdated toolchain, there is no reason not to use native type. The only issue could be the ABI compatibility. But on a quick look at least, it looks like none of the mangled C++ symbols in the stable URE interface actually depend on wchar_t. We forgot to get rid of /Zc:wchar_t- in 5.1. Do that for LibreOffice 5.2, though. Change-Id: I8d6b380660859efa44c83c830734978d31d756a0 Reviewed-on: https://gerrit.libreoffice.org/22589 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2016-03-11tdf#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>
2015-06-02curl: simplify SSL conditionalMichael Stahl1-4/+3
Change-Id: I210774ef7432257a3154e8981c0d53e9e63b2110
2015-06-02curl: disable loads more random stuff we don't needMichael Stahl1-2/+4
Change-Id: I0f4bcd73f9e0e7307ca0556a5f6990631eb9f2c5
2015-06-02curl: sigh... *actually* disable rtmp supportMichael Stahl1-1/+1
Change-Id: I07ffe3a9ad6556fb5da3149a3cbe12ffcc5f56b4
2015-06-02curl: disable rtmp supportMichael Stahl1-0/+1
configure will add a dependency on librtmp.so.0 if the development package happens to be installed. Change-Id: I8500cc166d70763118e5054680f1f8c70942ba3f
2014-11-28Fold URE: Linux ure/lib/* -> program/Stephan Bergmann1-1/+1
The ../../../program/ links in the URE jar Class-Paths are a temporary kludge (and juh.jar had lacked adaption for Mac OS X). Change-Id: I2542d8a582866485dd61c05df3fc6b4b39a8403d
2014-10-16MAC_OS_X_VERSION_MIN_REQUIRED is always >= 1080 nowTor Lillqvist1-1/+1
Change-Id: I40d03ab9acb67ab72b9047017452f069ce88fd4b
2014-08-29Simplify some $ENABLE_DEBUG expressionsStephan Bergmann1-2/+2
Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
2014-03-11normalize values of MINGW_SHARED_GCCLIB/MINGW_SHARED_GXXLIBMichael Stahl1-2/+2
Change-Id: I4f4cecd95f87b9d37fa1b1a270cf554d7707aaa2
2014-03-02curl (bundled): fix logic breakoutDouglas Mencken1-8/+5
use --with-nss only on platforms other than Mac OS X and iOS (see commit 4e8ab2198819551d07f303f80d2bd5f5ae53bc6e) Change-Id: Ie6cb35ea5f5db2d08f303f70d1559188912ba8e5 Reviewed-on: https://gerrit.libreoffice.org/8418 Tested-by: Michael Stahl <mstahl@redhat.com> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2014-03-01curl (bundled): with-darwinssl option is not compatible with OSX SDK 10.5Douglas Mencken1-2/+7
Change-Id: I3e8576926df875d73de10d5212adde2685c3a799 Reviewed-on: https://gerrit.libreoffice.org/8386 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2014-02-27normalize values of CROSS_COMPILINGMichael Stahl1-1/+1
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
2014-02-12fdo#74825: fix missing lcms2/libxslt/curl in installation setsMichael Stahl1-2/+2
The assumption that all configure variables had been normalized to TRUE/<empty> turned out not to hold; convert a bit more in that direction. (regression from 4af38b099c741c3676aefeb20c515913aaeed666) Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
2014-01-20Fake proper lib ID for macosx-change-install-names into external/curlStephan Bergmann1-0/+1
Change-Id: I4ce1123698ced152c076a4d0e4ad276be9a55bfe
2014-01-17curl: we really want --with-darwinssl on Mac for libcmisMichael Stahl1-2/+4
(regression from 2fd70b6bf799843d2d9987cc90a5b373f31039f7) Change-Id: I9e1d4d17582011a067aecf47144bb70643fac806
2014-01-17Get bundled curl to be used on OS X tooDouglas Mencken1-3/+2
Don't force "yes" on Darwin. Change-Id: I3a6a2ecdf15325d07fb22b9a6bb0da7b313036cb Reviewed-on: https://gerrit.libreoffice.org/7197 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2013-11-18curl: actually use Makefile.vc10 instead of Makefile.vc9Michael Stahl1-1/+1
... they are currently identical but it seems more appropriate. Change-Id: I5ecd7209bc29f32a2f04299d35364a10fe381a35
2013-11-18curl: try to use Mac OS X native SSL/TLS implementationMichael Stahl1-1/+3
This should give better OS integration for things like adding CAs. Change-Id: I9578f7194f920a9ebc6c18696e12c8c2e2bb2d80
2013-11-14nss: upgrade to 3.15.3Michael Stahl1-2/+2
- from nss_macosx.patch drop nmedit hunk (removed upstream) - adapt include and lib paths to changed tarball directory layout Change-Id: Ia5dcce8dfd9d10e7e4ba689eefa9f39a51596dfe Reviewed-on: https://gerrit.libreoffice.org/6670 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-10-31solver doesn't solve anything...Michael Stahl1-1/+1
... it is an abbreviation of "Solar Version". Since nobody can remember that: remove OUTDIR OUTDIR_FOR_BUILD SOLARVER SOLARVERSION solarpath and any mention thereof. Change-Id: Idb3031c4f25a76ac05b22ec67e3ca3e1e8e512ad Reviewed-on: https://gerrit.libreoffice.org/6515 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-10-30Fix build for Android: Don't use SYSBASE that wayTor Lillqvist1-0/+2
Change-Id: Ib4027a28a2e4b19842508a6006c1c56a06d021ed
2013-10-30curl: set the right RPATH tooMichael Stahl1-2/+2
Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0
2013-10-18fdo#70393: move curl to a subdir of externalKhaled Hosny1-0/+78
Change-Id: I76401636aab7d4de198912b154d6ec3da35a711d Reviewed-on: https://gerrit.libreoffice.org/6298 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>