Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libcurl: honor default upstream values of with_ca_bundle & with_ca_path options #13914

Merged
merged 2 commits into from
Nov 4, 2022
Merged

libcurl: honor default upstream values of with_ca_bundle & with_ca_path options #13914

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad07569
honor default upstream values of with_ca_bundle & with_ca_path
SpaceIm Nov 1, 2022
f468b32
bump openssl & libnghttp2
SpaceIm Nov 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions recipes/libcurl/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ class LibcurlConan(ConanFile):
"with_symbol_hiding": [True, False],
"with_unix_sockets": [True, False],
"with_verbose_strings": [True, False],
"with_ca_bundle": [None, "ANY"],
"with_ca_path": [None, "ANY"],
"with_ca_bundle": [False, "auto", "ANY"],
"with_ca_path": [False, "auto", "ANY"],
}
default_options = {
"shared": False,
Expand Down Expand Up @@ -111,8 +111,8 @@ class LibcurlConan(ConanFile):
"with_symbol_hiding": False,
"with_unix_sockets": True,
"with_verbose_strings": True,
"with_ca_bundle": None,
"with_ca_path": None,
"with_ca_bundle": "auto",
"with_ca_path": "auto",
}

@property
Expand Down Expand Up @@ -179,11 +179,11 @@ def configure(self):

def requirements(self):
if self.options.with_ssl == "openssl":
self.requires("openssl/1.1.1q")
self.requires("openssl/1.1.1s")
elif self.options.with_ssl == "wolfssl":
self.requires("wolfssl/5.5.1")
if self.options.with_nghttp2:
self.requires("libnghttp2/1.49.0")
self.requires("libnghttp2/1.50.0")
if self.options.with_libssh2:
self.requires("libssh2/1.10.0")
if self.options.with_zlib:
Expand Down Expand Up @@ -450,15 +450,15 @@ def _generate_with_autotools(self):
if not self.options.with_ntlm_wb:
tc.configure_args.append("--disable-ntlm-wb")

if self.options.with_ca_bundle:
tc.configure_args.append(f"--with-ca-bundle={str(self.options.with_ca_bundle)}")
else:
if not self.options.with_ca_bundle:
tc.configure_args.append("--without-ca-bundle")
elif self.options.with_ca_bundle != "auto":
tc.configure_args.append(f"--with-ca-bundle={str(self.options.with_ca_bundle)}")

if self.options.with_ca_path:
tc.configure_args.append(f"--with-ca-path={str(self.options.with_ca_path)}")
else:
if not self.options.with_ca_path:
tc.configure_args.append("--without-ca-path")
elif self.options.with_ca_path != "auto":
tc.configure_args.append(f"--with-ca-path={str(self.options.with_ca_path)}")

# Cross building flags
if cross_building(self):
Expand Down