From 30a0c02f547b73dd4bff897d6bcfa764840e7043 Mon Sep 17 00:00:00 2001 From: klausholstjacobsen Date: Fri, 10 May 2024 10:35:39 +0200 Subject: [PATCH 1/5] openssh: Allow all openssl 3.1.x releases --- recipes/openssh/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssh/all/conanfile.py b/recipes/openssh/all/conanfile.py index 19003f0d0b8c0..ff999a4e41d94 100644 --- a/recipes/openssh/all/conanfile.py +++ b/recipes/openssh/all/conanfile.py @@ -52,7 +52,7 @@ def layout(self): def requirements(self): self.requires("zlib/[>=1.2.11 <2]") if self.options.with_libcrypto == "openssl": - self.requires("openssl/[>=1.1 <=3.1]") + self.requires("openssl/[>=1.1 <3.2]") elif self.options.with_libcrypto == "libressl": self.requires("libressl/3.9.1") if self.options.with_pam == "openpam": From 4435cf172cb6689cb3abae92ff22289173466850 Mon Sep 17 00:00:00 2001 From: Klaus Holst Jacobsen <48069914+klausholstjacobsen@users.noreply.github.com> Date: Fri, 10 May 2024 10:52:38 +0200 Subject: [PATCH 2/5] updates openssl requirements to [>=1.1 <4] Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> --- recipes/openssh/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssh/all/conanfile.py b/recipes/openssh/all/conanfile.py index ff999a4e41d94..1f7b9e9cf2be9 100644 --- a/recipes/openssh/all/conanfile.py +++ b/recipes/openssh/all/conanfile.py @@ -52,7 +52,7 @@ def layout(self): def requirements(self): self.requires("zlib/[>=1.2.11 <2]") if self.options.with_libcrypto == "openssl": - self.requires("openssl/[>=1.1 <3.2]") + self.requires("openssl/[>=1.1 <4]") elif self.options.with_libcrypto == "libressl": self.requires("libressl/3.9.1") if self.options.with_pam == "openpam": From 8d9889df428bf4378598df9e9e51dd72e60d696a Mon Sep 17 00:00:00 2001 From: klausholstjacobsen Date: Fri, 10 May 2024 11:59:42 +0200 Subject: [PATCH 3/5] openssh: differentiate openssl version requirement between 9.1p1 and 9.6p1 --- recipes/openssh/all/conanfile.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/openssh/all/conanfile.py b/recipes/openssh/all/conanfile.py index 1f7b9e9cf2be9..d97e202d5a796 100644 --- a/recipes/openssh/all/conanfile.py +++ b/recipes/openssh/all/conanfile.py @@ -52,7 +52,10 @@ def layout(self): def requirements(self): self.requires("zlib/[>=1.2.11 <2]") if self.options.with_libcrypto == "openssl": - self.requires("openssl/[>=1.1 <4]") + if self.version == "9.1p1": + self.requires("openssl/[>=1.1 <3.2]") + else: + self.requires("openssl/[>=1.1 <4]") elif self.options.with_libcrypto == "libressl": self.requires("libressl/3.9.1") if self.options.with_pam == "openpam": From df3af526cc4c86f3d2bd59812f34396a97fe4bec Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Fri, 10 May 2024 11:20:19 +0100 Subject: [PATCH 4/5] openssh: use OpenSSL in the 3.x range --- recipes/openssh/all/conanfile.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/recipes/openssh/all/conanfile.py b/recipes/openssh/all/conanfile.py index d97e202d5a796..58830540b275c 100644 --- a/recipes/openssh/all/conanfile.py +++ b/recipes/openssh/all/conanfile.py @@ -4,7 +4,7 @@ from conan.errors import ConanInvalidConfiguration from conan.tools.build import cross_building from conan.tools.env import VirtualBuildEnv, VirtualRunEnv -from conan.tools.files import copy, get, rmdir, export_conandata_patches +from conan.tools.files import copy, get, replace_in_file, rmdir, export_conandata_patches from conan.tools.gnu import Autotools, AutotoolsToolchain, AutotoolsDeps from conan.tools.layout import basic_layout @@ -52,10 +52,7 @@ def layout(self): def requirements(self): self.requires("zlib/[>=1.2.11 <2]") if self.options.with_libcrypto == "openssl": - if self.version == "9.1p1": - self.requires("openssl/[>=1.1 <3.2]") - else: - self.requires("openssl/[>=1.1 <4]") + self.requires("openssl/[>=1.1 <4]") elif self.options.with_libcrypto == "libressl": self.requires("libressl/3.9.1") if self.options.with_pam == "openpam": @@ -69,6 +66,10 @@ def validate(self): def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) + if self.version == "9.1p1": + # Backport configure script fix to accept OpenSSL versions in the 3.x series + # See https://github.com/openssh/openssh-portable/commit/2eded551ba96e66bc3afbbcc883812c2eac02bd7 + replace_in_file(self, join(self.source_folder, "configure"), "300*", "30*") def generate(self): env = VirtualBuildEnv(self) From fd701afaaa29a304d45af871fffdabc6e03a1b52 Mon Sep 17 00:00:00 2001 From: Luis Caro Campos <3535649+jcar87@users.noreply.github.com> Date: Fri, 10 May 2024 11:39:23 +0100 Subject: [PATCH 5/5] openssh: backport configure script fix to accept openssl in the 3.x range --- recipes/openssh/all/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/openssh/all/conanfile.py b/recipes/openssh/all/conanfile.py index 58830540b275c..15aec4e432753 100644 --- a/recipes/openssh/all/conanfile.py +++ b/recipes/openssh/all/conanfile.py @@ -66,7 +66,7 @@ def validate(self): def source(self): get(self, **self.conan_data["sources"][self.version], strip_root=True) - if self.version == "9.1p1": + if self.version in ["9.1p1", "9.6p1"]: # Backport configure script fix to accept OpenSSL versions in the 3.x series # See https://github.com/openssh/openssh-portable/commit/2eded551ba96e66bc3afbbcc883812c2eac02bd7 replace_in_file(self, join(self.source_folder, "configure"), "300*", "30*")