summaryrefslogtreecommitdiff
path: root/external/curl
AgeCommit message (Collapse)AuthorFilesLines
2019-05-22curl: upgrade to release 7.65.0Michael Stahl1-10/+0
Fixes CVE-2019-5435. It looks like this is not a problem on 32-bit Windows because fortunately we don't use /LARGEADDRESSAWARE flag to set IMAGE_FILE_LARGE_ADDRESS_AWARE... but on 32-bit Linux the user-space VM is 3GB so an exploit might be possible. Apparently there's no code in LO that uses the CURLU_URLENCODE flag. The other one, CVE-2019-5436, doesn't matter because we disable tftp. Change-Id: I0d4f087befa5a3c4fb21ec36761dad68932425d9 Reviewed-on: https://gerrit.libreoffice.org/72732 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
2019-05-05Fix remaining uses of gb_SYMBOLStephan Bergmann1-1/+1
...after eeeec33ada5923f1f534334b22c15d6e2c6f1d35 "merge --enable-selective-debuginfo into --enable-symbols" had removed it Change-Id: I83aed6e21c4b983d8645707daa65bd85ec16ff6b Reviewed-on: https://gerrit.libreoffice.org/71798 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
2019-03-01Some more WIN32 -> _WIN32Stephan Bergmann1-2/+2
...at least some of which have presumably been missing from ce43d0ae9279edbf1ad108fe0d8325327a038d49 "use consistent #define checks for the Windows platform" by accident (and some just clean up comments) Change-Id: I5532685c7df96ae3c8a25b73d8064d7433964a9b Reviewed-on: https://gerrit.libreoffice.org/68580 Reviewed-by: Stephan Bergmann <sbergman@redhat.com> Tested-by: Stephan Bergmann <sbergman@redhat.com>
2018-11-29Rename Mac OS X to official name macOS in comments and documentationBartosz Kosiorek1-2/+2
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95 Reviewed-on: https://gerrit.libreoffice.org/64102 Tested-by: Jenkins Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
2018-11-01gbuild: rename value OS=IOS to OS=iOSMichael Stahl1-1/+1
This gets rid of the horrible hack in gbuild.mk to accomodate the case-incorrect iOS platform makefiles that cannot be renamed without upsetting git on file systems that sadly lack the case sensitivity feature. Keep the macro defined to IOS though. Change-Id: I1022bfef4900da00e75fc1ccce786b20f8673234 Reviewed-on: https://gerrit.libreoffice.org/62705 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de> Reviewed-by: Tor Lillqvist <tml@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com>
2018-05-17curl: upgrade to release 7.60.0Thorsten Behrens1-4/+4
This fixes the following CVEs: * FTP: shutdown response buffer overflow CVE-2018-1000300 * RTSP: bad headers buffer over-read CVE-2018-1000301 Change-Id: Ic3229577083286501162aa5979a94ce934739557 Reviewed-on: https://gerrit.libreoffice.org/54418 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-05-04Removed executable permission on data filesAndrea Gelmini1-0/+0
chmod -x for .patch, .pptm, and .vb Change-Id: I98e1221e48df22e8b58aaf305898cbe301f187ce Reviewed-on: https://gerrit.libreoffice.org/52568 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2018-01-24curl: upgrade to release 7.58.0Michael Stahl1-1/+2
* fixes 2 CVEs * disable some new optional dependencies Change-Id: If7725d126e68de04b67969a83c0ea08573a43679 Reviewed-on: https://gerrit.libreoffice.org/48493 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-11-01external: consistently use gb_ExternalProject_use_nmakeMichael Stahl1-2/+3
... 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>
2017-10-27external/curl: Work around clang-cl not knowing /FDStephan Bergmann2-0/+17
("IDE Minimal Rebuild", according to <https://msdn.microsoft.com/en-us/library/6ce2bkt7.aspx>) Change-Id: I1b549c50bea4285bc6c89302f757f2e7e0bf1784
2017-10-24curl: upgrade to release 7.56.1Michael Stahl9-378/+73
- fixes a very minor CVE: CVE-2017-1000254 - the Windows nmakefiles we were previously using have been removed, so we use the *other* Windows nmake build system now - /EHs override is pointless, default /EHsc should work fine - the macros defined in ExternalProject are not needed any more - curl-msvc-schannel.patch.1: drop, not needed with new makefiles - curl-osx.patch.1: none of it applies, presumably fixed upstream Change-Id: I15c71b9c82c31d286d935b57543a1b0216123b66 Reviewed-on: https://gerrit.libreoffice.org/43724 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
2017-09-20Pass --with-macosx-version-min-required into external/curlStephan Bergmann1-0/+2
...which wants to take it from CFLAGS, otherwise defaults to 10.8 Change-Id: I1b086ee8abba1e4b46c67b6b4fe6a05c4ef7a3d8
2017-09-19connectx() 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 . Change-Id: I7cac294931c8afa6ff26a6ca9cf4491aff249de0
2017-09-07Pass --without-system-zlib into external/curlStephan Bergmann3-0/+102
For (implicit) --with-zlib, curl's configure would insist on calling pkg-config and insist on using -lz to link against the zlib library. None of that fits LO's --without-system-zlib option. So make curl's configure honor any passed in ZLIB_CLFAGS/LIBS (unless --without- zlib were explicitly specified; also, ZLIB_CLFAGS/LIBS would override any explicitly specified --with-zlib=PATH, which could be considered an error, but we do never explicitly specify --with-zlib=PATH in external/curl/ExternalProject_curl.mk, anyway). Both ZLIB_CLFAGS/LIBS are set in config_host.mk, so are always set as env vars, so would already be visible to curl's configure. I nevertheless pass them into curl's configure explicitly in external/curl/ExternalProject_curl.mk, to make that more obvious. With (implicit) --with-system-zlib, LO's configure.ac will set ZLIB_LIBS and leave ZLIB_CFLAGS empty (and checks that zlib.h is indeed available without any ZLIB_CLFAGS being necessary). And with --without-system-zlib, LO's configure.ac will set both ZLIB_CFLAGS/LIBS. So curl's configure, as invoked from external/curl/ExternalProject_curl.mk, will now always go into the newly added case honoring any passed in ZLIB_CLFAGS/LIBS, which should thus always work out nicely and use the same zlib settings as configured for LO itself. (For documentation purposes, external/curl/zlib.patch.0 also contains the changes to curl's configure.ac that are reflected in the changes to curl's configure.) Change-Id: Icf5eefe44a7f9beb8a43a9af381f46e5c8b98b04 Reviewed-on: https://gerrit.libreoffice.org/42032 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-09-07Clean up passing CPPFLAGS/LDFLAGS into external/curlStephan Bergmann1-3/+3
Change-Id: I3a4730c9a43f5e4904504bb136b3ccbcf29207b4 Reviewed-on: https://gerrit.libreoffice.org/42030 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
2017-09-06Pass "verbose" flag into external/curlStephan Bergmann1-0/+1
Change-Id: Ic42bbeaee8faa8a5e99fbdd22775870bd2e5bae0
2017-08-09curl: disable protocols nobody needs in MSVC buildMichael Stahl2-0/+25
These are disabled via configure on other platforms. Change-Id: I4e27865396f3817ceb5645ab8589c21fdaa5afab
2017-08-09curl: 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
2017-05-30curl: remove curl-xp.patch.1Michael Stahl3-14/+1
Change-Id: I329289c97b857370852c982a8b74b739b9ac3d78
2017-02-10Remove MinGW supportStephan Bergmann4-43/+1
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>
2017-01-26curl: get winProxy support backThorsten Behrens1-0/+117
with properly aligned asterisks Change-Id: I48b31bce45cdce378fa1cfdd9ddde82b9e669cf5 Reviewed-on: https://gerrit.libreoffice.org/33500 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
2017-01-23curl: upgrade to version 7.52.1Thorsten Behrens2-125/+0
- fixes some four CVEs - and a ton of other fixes & improvements Change-Id: I2312f30f72c914c7e930c59ddbe44fb8a282c0a5 Reviewed-on: https://gerrit.libreoffice.org/33471 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
2016-12-20use new ENABLE_NSS for code which needs nssCaolán McNamara1-2/+2
which isn't available on a static-only build (iOS and fuzzing) and android Change-Id: I99bb7c0b45d4499579ddf73f469a762ddcae99ab Reviewed-on: https://gerrit.libreoffice.org/32182 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
2016-12-19with missing nss build curl and vcl appropiatelyCaolán McNamara1-2/+2
Change-Id: Iaef197e9ab736c219897933a76f4c75a3e3acaa6
2016-11-02curl: upgrade to version 7.51.0Michael Stahl5-12/+21
- 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 Stahl2-22/+0
fixed in new upstream autoconf Change-Id: I8c88330b2ed522a160fedac6abd962f92b32d2f0
2016-07-30fix curl android patch to applyCaolán McNamara1-7/+7
Change-Id: I554f483ddf7bdc8b0347d7ae4d1fe7bb6aad8336
2016-07-29bump curl to 7.50.0Caolán McNamara4-51/+18
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 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-07-07tdf#100295 force curl to build for XPMarkus Mohrhard2-0/+13
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 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-13tdf#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
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>
2016-02-16use consistent #define checks for the Windows platformNoel Grandin1-3/+3
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 Stahl2-8/+5
Change-Id: Ic16111f21625fc510e79bba8122eaa60662f7a59
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-06-09curl: work around mysterious xcopy failureMichael Stahl1-1/+1
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 Arnhold2-392/+0
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 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-22 16:36:13 +0000