From 776979b2ee38273fd4aa907161cd2bd36380b967 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 23 Sep 2024 13:11:06 +0200 Subject: [PATCH 1/2] Bump s2n to 1.4.11 to match aws-sdk usage --- recipes/aws-c-io/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/aws-c-io/all/conanfile.py b/recipes/aws-c-io/all/conanfile.py index a0bc513a7bf85..4e43dd3e1d24b 100644 --- a/recipes/aws-c-io/all/conanfile.py +++ b/recipes/aws-c-io/all/conanfile.py @@ -43,7 +43,7 @@ def requirements(self): self.requires("aws-c-common/0.9.15", transitive_headers=True, transitive_libs=True) self.requires("aws-c-cal/0.6.14") if self.settings.os in ["Linux", "FreeBSD", "Android"]: - self.requires("s2n/1.4.1") + self.requires("s2n/1.4.11") if self.version == "0.10.9": self.requires("aws-c-common/0.6.11", transitive_headers=True, transitive_libs=True) self.requires("aws-c-cal/0.5.12") From e071923c65ad57a34de822e27d3271094556b13b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abril=20Rinc=C3=B3n=20Blanco?= Date: Mon, 23 Sep 2024 13:22:40 +0200 Subject: [PATCH 2/2] Use a version that is actually available --- recipes/aws-c-io/all/conanfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/aws-c-io/all/conanfile.py b/recipes/aws-c-io/all/conanfile.py index 4e43dd3e1d24b..905e4e5512632 100644 --- a/recipes/aws-c-io/all/conanfile.py +++ b/recipes/aws-c-io/all/conanfile.py @@ -39,11 +39,13 @@ def layout(self): cmake_layout(self, src_folder="src") def requirements(self): + # These versions come from aws-sdl-cpp prefetch_crt_dependency.sh file, + # dont bump them independently, check the file and update all the dependencies at once if self.version == "0.14.7": self.requires("aws-c-common/0.9.15", transitive_headers=True, transitive_libs=True) self.requires("aws-c-cal/0.6.14") if self.settings.os in ["Linux", "FreeBSD", "Android"]: - self.requires("s2n/1.4.11") + self.requires("s2n/1.4.16") # 1.4.11 not available, using next available version if self.version == "0.10.9": self.requires("aws-c-common/0.6.11", transitive_headers=True, transitive_libs=True) self.requires("aws-c-cal/0.5.12")