]> code.ossystems Code Review - openembedded-core.git/commit
curl: fix build when proxy is not enabled in PACKAGECONFIG
authorAnuj Mittal <anuj.mittal@intel.com>
Thu, 24 Jun 2021 07:42:43 +0000 (15:42 +0800)
committerAnuj Mittal <anuj.mittal@intel.com>
Wed, 30 Jun 2021 06:09:07 +0000 (14:09 +0800)
commite900a44e76dc2bb20ff725f24333c1c2b330bf41
tree54f11dceb3c5ed1768240748919b730c5d4e88fa
parent8cb77273abd6985242cf45100b2fb732db74e909
curl: fix build when proxy is not enabled in PACKAGECONFIG

Backport upstream patches to fix issues introduced by a backported CVE
patch. Fixes:

| ../../curl-7.75.0/lib/vtls/vtls.c: In function ‘Curl_ssl_addsessionid’:
| ../../curl-7.75.0/lib/vtls/vtls.c:508:14: error: ‘isProxy’ redeclared as different kind of symbol
|   508 |   const bool isProxy = FALSE;
|       |              ^~~~~~~
| ../../curl-7.75.0/lib/vtls/vtls.c:488:37: note: previous definition of ‘isProxy’ with type ‘_Bool’
|   488 |                                bool isProxy,
|       |                                     ^

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
meta/recipes-support/curl/curl/vtls-fix-addsessionid.patch [new file with mode: 0644]
meta/recipes-support/curl/curl/vtls-fix-warning.patch [new file with mode: 0644]
meta/recipes-support/curl/curl_7.75.0.bb