Merge branch 'master' into update/elfutils

.c3i/authorized_users.yml

@@ -1243,3 +1243,6 @@ authorized_users:
 - NelDav
 - utelle
 - har-bw
+- abedra
+- bennettgoble
+- juansblanco

.c3i/conan_v2_ready_references.yml

@@ -268,6 +268,7 @@ required_for_references:
 - decimal_for_cpp
 - deco
 - detools
+- dfp
 - di
 - dice-template-library
 - dime

.c3i/reviewers.yml

@@ -84,3 +84,6 @@ reviewers:
   - user: "davidsanfal"
     type: "team"
     request_reviews: false
+  - user: "juansblanco"
+    type: "team"
+    request_reviews: false

recipes/aws-c-auth/all/conandata.yml

@@ -1,4 +1,7 @@
 sources:
+  "0.7.7":
+    url: "https://github.com/awslabs/aws-c-auth/archive/v0.7.7.tar.gz"
+    sha256: "ea3c9e75b59b36aaf9147deec655d1669f197745bbe914cd3b8e234740be29ba"
   "0.6.17":
     url: "https://github.com/awslabs/aws-c-auth/archive/v0.6.17.tar.gz"
     sha256: "b43678ad3a779c9c7fccf8f931c162eaaf4d5d64d2955ac1fcfd32e538545c0f"
@@ -14,3 +17,9 @@ sources:
   "0.6.0":
     url: "https://github.com/awslabs/aws-c-auth/archive/v0.6.0.tar.gz"
     sha256: "5f5fff63110c3e8f619385ca563f77886bc101d3e054987eecbb87586e27b651"
+patches:
+  "0.6.17":
+    - patch_file: "patches/0.6.17-0001-fix-macro-usage.patch"
+      patch_description: "Fix inconsistent usage of macros"
+      patch_type: "backport"
+      patch_source: "https://github.com/awslabs/aws-c-auth/pull/181"

recipes/aws-c-auth/all/conanfile.py

@@ -1,6 +1,6 @@
 from conan import ConanFile
 from conan.tools.cmake import CMake, CMakeDeps, CMakeToolchain, cmake_layout
-from conan.tools.files import get, copy, rmdir, save
+from conan.tools.files import get, copy, rmdir, save, export_conandata_patches, apply_conandata_patches
 from conan.tools.scm import Version
 
 import os
@@ -30,6 +30,9 @@ class AwsCAuth(ConanFile):
         "fPIC": True,
     }
 
+    def export_sources(self):
+        export_conandata_patches(self)
+
     def config_options(self):
         if self.settings.os == "Windows":
             del self.options.fPIC
@@ -44,19 +47,26 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
-        self.requires("aws-c-cal/0.5.13")
-        if Version(self.version) < "0.6.17":
-            self.requires("aws-c-io/0.10.20", transitive_headers=True)
-            self.requires("aws-c-http/0.6.13", transitive_headers=True)
+        if Version(self.version) <= "0.6.17":
+            self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-cal/0.5.13")
+            if Version(self.version) < "0.6.17":
+                self.requires("aws-c-io/0.10.20", transitive_headers=True, transitive_libs=True)
+                self.requires("aws-c-http/0.6.13", transitive_headers=True)
+            else:
+                self.requires("aws-c-io/0.13.4", transitive_headers=True, transitive_libs=True)
+                self.requires("aws-c-http/0.6.22", transitive_headers=True)
+            if Version(self.version) >= "0.6.5":
+                self.requires("aws-c-sdkutils/0.1.3", transitive_headers=True)
         else:
-            self.requires("aws-c-io/0.13.4", transitive_headers=True)
-            self.requires("aws-c-http/0.6.22", transitive_headers=True)
-        if Version(self.version) >= "0.6.5":
-            self.requires("aws-c-sdkutils/0.1.3", transitive_headers=True)
+            self.requires("aws-c-common/0.9.6", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-cal/0.6.9")
+            self.requires("aws-c-io/0.13.32", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-http/0.7.14", transitive_headers=True)
+            self.requires("aws-c-sdkutils/0.1.12", transitive_headers=True)
 
     def source(self):
-        get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def generate(self):
         tc = CMakeToolchain(self)
@@ -67,6 +77,7 @@ def generate(self):
         deps.generate()
 
     def build(self):
+        apply_conandata_patches(self)
         cmake = CMake(self)
         cmake.configure()
         cmake.build()

recipes/aws-c-auth/all/patches/0.6.17-0001-fix-macro-usage.patch

@@ -0,0 +1,132 @@
+diff --git a/source/aws_signing.c b/source/aws_signing.c
+index 940d7be..ecc1144 100644
+--- a/source/aws_signing.c
++++ b/source/aws_signing.c
+@@ -2500,7 +2500,7 @@ int aws_verify_sigv4a_signing(
+         aws_credentials_release(signing_state->config.credentials);
+         signing_state->config.credentials = ecc_credentials;
+         if (signing_state->config.credentials == NULL) {
+-            AWS_LOGF_ERROR(AWS_LS_AUTH_SIGNING, "Unable to create ECC from provided credentials")
++            AWS_LOGF_ERROR(AWS_LS_AUTH_SIGNING, "Unable to create ECC from provided credentials");
+             goto done;
+         }
+     }
+diff --git a/source/credentials_provider_process.c b/source/credentials_provider_process.c
+index 655df86..29f99d0 100644
+--- a/source/credentials_provider_process.c
++++ b/source/credentials_provider_process.c
+@@ -187,7 +187,7 @@ static struct aws_string *s_get_command(struct aws_allocator *allocator, struct
+     if (!command_buf.len) {
+         AWS_LOGF_ERROR(
+             AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-            "Failed to resolve credentials_process command during process credentials provider initialization.")
++            "Failed to resolve credentials_process command during process credentials provider initialization.");
+         goto on_finish;
+     }
+
+@@ -202,7 +202,7 @@ static struct aws_string *s_get_command(struct aws_allocator *allocator, struct
+
+     AWS_LOGF_DEBUG(
+         AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-        "Successfully loaded credentials_process command for process credentials provider.")
++        "Successfully loaded credentials_process command for process credentials provider.");
+
+ on_finish:
+     aws_string_destroy(profile_name);
+diff --git a/source/credentials_provider_sts_web_identity.c b/source/credentials_provider_sts_web_identity.c
+index cb03cb5..c3e4697 100644
+--- a/source/credentials_provider_sts_web_identity.c
++++ b/source/credentials_provider_sts_web_identity.c
+@@ -231,7 +231,7 @@ static bool s_parse_retryable_error_from_response(struct aws_allocator *allocato
+     if (xml_parser == NULL) {
+         AWS_LOGF_ERROR(
+             AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-            "Failed to init xml parser for sts web identity credentials provider to parse error information.")
++            "Failed to init xml parser for sts web identity credentials provider to parse error information.");
+         return false;
+     }
+     bool get_retryable_error = false;
+@@ -330,14 +330,14 @@ static struct aws_credentials *s_parse_credentials_from_response(
+     if (xml_parser == NULL) {
+         AWS_LOGF_ERROR(
+             AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-            "Failed to init xml parser for sts web identity credentials provider to parse error information.")
++            "Failed to init xml parser for sts web identity credentials provider to parse error information.");
+         return NULL;
+     }
+     uint64_t now = UINT64_MAX;
+     if (aws_sys_clock_get_ticks(&now) != AWS_OP_SUCCESS) {
+         AWS_LOGF_ERROR(
+             AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-            "Failed to get sys clock for sts web identity credentials provider to parse error information.")
++            "Failed to get sys clock for sts web identity credentials provider to parse error information.");
+         goto on_finish;
+     }
+     uint64_t now_seconds = aws_timestamp_convert(now, AWS_TIMESTAMP_NANOS, AWS_TIMESTAMP_SECS, NULL);
+@@ -998,7 +998,7 @@ static struct sts_web_identity_parameters *s_parameters_new(struct aws_allocator
+             AWS_LOGF_ERROR(
+                 AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+                 "Failed to resolve either region, role arn or token file path during sts web identity provider "
+-                "initialization.")
++                "initialization.");
+             goto on_finish;
+
+         } else {
+@@ -1021,7 +1021,7 @@ static struct sts_web_identity_parameters *s_parameters_new(struct aws_allocator
+         aws_byte_buf_init_copy_from_cursor(&parameters->role_arn, allocator, aws_byte_cursor_from_string(role_arn))) {
+         AWS_LOGF_ERROR(
+             AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-            "Failed to resolve role arn during sts web identity provider initialization.")
++            "Failed to resolve role arn during sts web identity provider initialization.");
+         goto on_finish;
+     }
+
+@@ -1031,7 +1031,7 @@ static struct sts_web_identity_parameters *s_parameters_new(struct aws_allocator
+             &parameters->token_file_path, allocator, aws_byte_cursor_from_string(token_file_path))) {
+         AWS_LOGF_ERROR(
+             AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-            "Failed to resolve token file path during sts web identity provider initialization.")
++            "Failed to resolve token file path during sts web identity provider initialization.");
+         goto on_finish;
+     }
+
+@@ -1047,7 +1047,7 @@ static struct sts_web_identity_parameters *s_parameters_new(struct aws_allocator
+
+     AWS_LOGF_DEBUG(
+         AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-        "Successfully loaded all required parameters for sts web identity credentials provider.")
++        "Successfully loaded all required parameters for sts web identity credentials provider.");
+     success = true;
+
+ on_finish:
+diff --git a/source/credentials_utils.c b/source/credentials_utils.c
+index 061e26b..2cb61d6 100644
+--- a/source/credentials_utils.c
++++ b/source/credentials_utils.c
+@@ -98,7 +98,7 @@ static bool s_parse_expiration_value_from_json_object(
+
+             if (expiration_cursor.len == 0) {
+                 AWS_LOGF_INFO(
+-                    AWS_LS_AUTH_CREDENTIALS_PROVIDER, "Parsed a credentials json document with empty expiration.")
++                    AWS_LS_AUTH_CREDENTIALS_PROVIDER, "Parsed a credentials json document with empty expiration.");
+                 return false;
+             }
+
+@@ -211,7 +211,7 @@ struct aws_credentials *aws_parse_credentials_from_aws_json_object(
+     if (access_key_id_cursor.len == 0 || secrete_access_key_cursor.len == 0) {
+         AWS_LOGF_ERROR(
+             AWS_LS_AUTH_CREDENTIALS_PROVIDER,
+-            "Parsed an unexpected credentials json document, either access key, secret key is empty.")
++            "Parsed an unexpected credentials json document, either access key, secret key is empty.");
+         goto done;
+     }
+
+@@ -222,7 +222,7 @@ struct aws_credentials *aws_parse_credentials_from_aws_json_object(
+         aws_json_value_get_string(token, &session_token_cursor);
+         if (options->token_required && session_token_cursor.len == 0) {
+             AWS_LOGF_ERROR(
+-                AWS_LS_AUTH_CREDENTIALS_PROVIDER, "Parsed an unexpected credentials json document with empty token.")
++                AWS_LS_AUTH_CREDENTIALS_PROVIDER, "Parsed an unexpected credentials json document with empty token.");
+             goto done;
+         }
+     }

recipes/aws-c-auth/config.yml

@@ -1,4 +1,6 @@
 versions:
+  "0.7.7":
+    folder: all
   "0.6.17":
     folder: all
   "0.6.11":

recipes/aws-c-mqtt/all/conandata.yml

@@ -1,4 +1,10 @@
 sources:
+  "0.9.10":
+    url: "https://github.com/awslabs/aws-c-mqtt/archive/v0.9.10.tar.gz"
+    sha256: "a8f92cb045e2c1e0b7e87e5c43ca373eb020014b5d3ebd75ed67ffff430d9ab6"
+  "0.8.12":
+    url: "https://github.com/awslabs/aws-c-mqtt/archive/v0.8.12.tar.gz"
+    sha256: "df02de478ab1806bb57bcb78e5faa21b567716dcb64f8a52ae90a2b84f43cba1"
   "0.7.12":
     url: "https://github.com/awslabs/aws-c-mqtt/archive/v0.7.12.tar.gz"
     sha256: "cf80f1b4f37aa8a6b8698315fae32cbf2bd944b67784f07b5762f392f18e64df"

recipes/aws-c-mqtt/all/conanfile.py

@@ -41,14 +41,16 @@ def layout(self):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
-        self.requires("aws-c-cal/0.5.13")
-        if Version(self.version) < "0.7.12":
+        if Version(self.version) <= "0.7.12":
+            self.requires("aws-c-common/0.8.2", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-cal/0.5.13")
             self.requires("aws-c-io/0.10.20", transitive_headers=True)
             self.requires("aws-c-http/0.6.13")
         else:
-            self.requires("aws-c-io/0.13.4", transitive_headers=True)
-            self.requires("aws-c-http/0.6.22")
+            self.requires("aws-c-common/0.9.6", transitive_headers=True, transitive_libs=True)
+            self.requires("aws-c-cal/0.6.9")
+            self.requires("aws-c-io/0.13.32", transitive_headers=True)
+            self.requires("aws-c-http/0.7.14")
 
     def source(self):
         get(self, **self.conan_data["sources"][self.version], strip_root=True)

recipes/aws-c-mqtt/config.yml

@@ -1,4 +1,8 @@
 versions:
+  "0.9.10":
+    folder: all
+  "0.8.12":
+    folder: all
   "0.7.12":
     folder: all
   "0.7.10":

recipes/backport-cpp/all/conanfile.py

@@ -9,22 +9,22 @@
 class BackportCppRecipe(ConanFile):
     name = "backport-cpp"
     description = "An ongoing effort to bring modern C++ utilities to be compatible with C++11"
-    topics = ("backport-cpp", "header-only", "backport")
+    topics = ("header-only", "backport")
     homepage = "https://github.com/bitwizeshift/BackportCpp"
     url = "https://github.com/conan-io/conan-center-index"
     license = "MIT"
+    package_type = "header-library"
     settings = "os", "arch", "compiler", "build_type"
     no_copy_source=True
 
-    def package_id(self):
-        self.info.clear()
-
     def layout(self):
         basic_layout(self, src_folder="src")
 
+    def package_id(self):
+        self.info.clear()
+
     def source(self):
-        get(self, **self.conan_data["sources"][self.version],
-            destination=self.source_folder, strip_root=True)
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
 
     def build(self):
         pass
@@ -37,9 +37,7 @@ def package_info(self):
         self.cpp_info.set_property("cmake_file_name", "Backport")
         self.cpp_info.set_property("cmake_target_name", "Backport::Backport")
         self.cpp_info.bindirs = []
-        self.cpp_info.frameworkdirs = []
         self.cpp_info.libdirs = []
-        self.cpp_info.resdirs = []
 
         # TODO: to remove in conan v2 once cmake_find_package* generators removed
         self.cpp_info.names["cmake_find_package"] = "Backport"