summaryrefslogtreecommitdiff
path: root/external/curl
AgeCommit message (Collapse)Author
2016-11-02curl: upgrade to version 7.51.0Michael Stahl
- 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-08-01curl: drop curl-android.patchMichael Stahl
fixed in new upstream autoconf Change-Id: I8c88330b2ed522a160fedac6abd962f92b32d2f0
2016-07-30fix curl android patch to applyCaolán McNamara
Change-Id: I554f483ddf7bdc8b0347d7ae4d1fe7bb6aad8336
2016-07-29bump curl to 7.50.0Caolán McNamara
Change-Id: I368a18f70dfac51770afeb1f9e84ff83c19f0989 Reviewed-on: https://gerrit.libreoffice.org/27671 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-07-09use EHs also for libcurlMarkus Mohrhard
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 Mohrhard
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-07-07tdf#100295 force curl to build for XPMarkus Mohrhard
Change-Id: Ia705704bc80a951f0da04936783dd8965bda842b Reviewed-on: https://gerrit.libreoffice.org/26886 Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com> Tested-by: Jenkins <ci@libreoffice.org>
2016-05-03Handle wchar_t as native C++11 type on windowsDavid Ostrovsky
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-13tdf#98416 fix curl's configure check for nss (missing -lnssutil3)Christian Lohmaier
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
2016-03-11tdf#98416: Explicitly disable curl hardcoded CA certificate storeGiuseppe Castagno
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>
2016-02-16use consistent #define checks for the Windows platformNoel Grandin
stage 1 of replacing usage of various checks for the windows platform with the compiler-defined '_WIN32' macro Change-Id: Iece73abdee530937e0737190b1aa97a46cd3075f Reviewed-on: https://gerrit.libreoffice.org/22390 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2015-07-03curl: upgrade to release 7.43.0Michael Stahl
Change-Id: Ic16111f21625fc510e79bba8122eaa60662f7a59
2015-06-02curl: simplify SSL conditionalMichael Stahl
Change-Id: I210774ef7432257a3154e8981c0d53e9e63b2110
2015-06-02curl: disable loads more random stuff we don't needMichael Stahl
Change-Id: I0f4bcd73f9e0e7307ca0556a5f6990631eb9f2c5
2015-06-02curl: sigh... *actually* disable rtmp supportMichael Stahl
Change-Id: I07ffe3a9ad6556fb5da3149a3cbe12ffcc5f56b4
2015-06-02curl: disable rtmp supportMichael Stahl
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 Bergmann
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 Lillqvist
Change-Id: I40d03ab9acb67ab72b9047017452f069ce88fd4b
2014-08-29Simplify some $ENABLE_DEBUG expressionsStephan Bergmann
Change-Id: I9f60fd317f3a2995a182d51d06059bd994cf837c
2014-06-09curl: work around mysterious xcopy failureMichael Stahl
When building with Win32 make, the xcopy at the end of the build fails with "Invalid arguments" error, which is clearly wrong, since the arguments are exactly the same as before, and furthermore curl is not built with GNU make at all, but with nmake! W-T-F? Change-Id: Idc0b362202e1d14722573662bebeda0bc7070660
2014-05-11upgrade to curl-7.36.0Thomas Arnhold
CERTINFO was included upstream: commit f6c335d63f2da025a0a3efde1fe59e3bb7189b70 Author: Patrick Monnerat <pm@datasphere.ch> Date: Wed Oct 30 11:12:06 2013 +0100 NSS: support for CERTINFO feature Change-Id: I83de2fd863f9387b83b5ebcbec70cbe6df7681d4 Reviewed-on: https://gerrit.libreoffice.org/9307 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
2014-03-11normalize values of MINGW_SHARED_GCCLIB/MINGW_SHARED_GXXLIBMichael Stahl
Change-Id: I4f4cecd95f87b9d37fa1b1a270cf554d7707aaa2
2014-03-02curl (bundled): fix logic breakoutDouglas Mencken
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 Mencken
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 Stahl
Change-Id: I0cc43cef91e3fcd82a3558a16ab0afbd4d56b141
2014-02-12fdo#74825: fix missing lcms2/libxslt/curl in installation setsMichael Stahl
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 Bergmann
Change-Id: I4ce1123698ced152c076a4d0e4ad276be9a55bfe
2014-01-17curl: we really want --with-darwinssl on Mac for libcmisMichael Stahl
(regression from 2fd70b6bf799843d2d9987cc90a5b373f31039f7) Change-Id: I9e1d4d17582011a067aecf47144bb70643fac806
2014-01-17Get bundled curl to be used on OS X tooDouglas Mencken
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-19Backported commit f6c335d63f2da025a0a3efde1fe59e3bb7189b70 from curlCédric Bosdonnat
This commit enables CURLINFO_CERTINFO when curl is built with NSS support but not openssl. Change-Id: I1482b34d83a0ae0f47d524a940bb90ed072363a6
2013-11-19curl: use WNT native Schannel SSL/TLS implementationMichael Stahl
This should give better OS integration for things like adding CAs. Change-Id: I53fbfad402618e98d4116a0fecf0bf59e905e292
2013-11-18curl: actually use Makefile.vc10 instead of Makefile.vc9Michael Stahl
... 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 Stahl
This should give better OS integration for things like adding CAs. Change-Id: I9578f7194f920a9ebc6c18696e12c8c2e2bb2d80
2013-11-18curl: upgrade to version 7.33.0Michael Stahl
- from curl-7.26.0.patch: * drop ADDCFLAGS stuff, must be some dmake relic * drop wspiapi.h, presumably for backward compat with NT 5.0/Win2000 which is unsupported (and ws2_32.lib is linked anyway...) * split out curl-freebsd.patch.1 - curl-7.26.0_win.patch: * drop the library renaming stuff - can be handled in Package and RepositoryExternal.mk without patch * rename the rest to curl-msvc.patch.1 - drop curl-aix.patch: presumably don't need special check for V7BETA since it's released now - drop curl-7.26.0_strlcat.patch (obsolete) Change-Id: Ie8c1d9e72f82ada95f42c49d22d90e43b1a6c3c0 Reviewed-on: https://gerrit.libreoffice.org/6642 Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2013-11-14nss: upgrade to 3.15.3Michael Stahl
- 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 Stahl
... 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 Lillqvist
Change-Id: Ib4027a28a2e4b19842508a6006c1c56a06d021ed
2013-10-30curl: set the right RPATH tooMichael Stahl
Change-Id: I409bb44541748ad69b5087243f4ea8142e424fe0
2013-10-28gbuild: set Package default target to INSTDIRMichael Stahl
Change-Id: I2bc45e4ba63f5faaee7389bcd9d7b3f563503186
2013-10-27gbuild: remove gb_ExternalPackage_add_library_for_installMichael Stahl
Deliver all external libraries to INSTDIR directly. Change-Id: I8d3e035e5cfa07bd0f53ee4a226c48d4b86a4032
2013-10-24curl: use libraries from WORKDIRMichael Stahl
Change-Id: Ib4a3aef1ff1d42270e737659b3f663260d3f1175
2013-10-24curl: libcurl.so.4 goes into instset, not libcurl.so!Michael Stahl
Currently we ship a libucpftp1.so with NEEDED libcurl.so.4 but that file is not actually in the instset, just a libcurl.so with SONAME libcurl.so.4. (regression in LO 4.0.0) Change-Id: I3a194c83c408587dd83ed4c690aa381664040c6f
2013-10-23nss: remove nss-config and nspr-configMichael Stahl
Apparently curl is the only external that is looking for these, but it turns out that we already pass --with-nss=dir to its configure which overrides the nss-config/nspr-config calls. Change-Id: I967e74a74690a64b5bccfd98d1509bba1dd12259
2013-10-18Fix building from inside modules moved to externalKhaled Hosny
Change-Id: Id6023dc3751fe70984f489682be17d1ab1855f71
2013-10-18fdo#70393: move curl to a subdir of externalKhaled Hosny
Change-Id: I76401636aab7d4de198912b154d6ec3da35a711d Reviewed-on: https://gerrit.libreoffice.org/6298 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>