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

openssh: Allow all openssl 3.1.x releases #23945

Merged
merged 5 commits into from
May 10, 2024
Merged

openssh: Allow all openssl 3.1.x releases #23945

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30a0c02
openssh: Allow all openssl 3.1.x releases
klausholstjacobsen May 10, 2024
4435cf1
updates openssl requirements to [>=1.1 <4]
klausholstjacobsen May 10, 2024
8d9889d
openssh: differentiate openssl version requirement between 9.1p1 and …
klausholstjacobsen May 10, 2024
df3af52
openssh: use OpenSSL in the 3.x range
jcar87 May 10, 2024
fd701af
openssh: backport configure script fix to accept openssl in the 3.x r…
jcar87 May 10, 2024
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
8 changes: 6 additions & 2 deletions recipes/openssh/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 <4]")
elif self.options.with_libcrypto == "libressl":
self.requires("libressl/3.9.1")
if self.options.with_pam == "openpam":
Expand All @@ -66,6 +66,10 @@ def validate(self):

def source(self):
get(self, **self.conan_data["sources"][self.version], strip_root=True)
if self.version in ["9.1p1", "9.6p1"]:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

version 9.1p1 would have not accepted version 3.2,
and version 9.6p1 would have not accepted versions higher than than 3.2, so the recipe would've started failing once OpenSSL 3.3 or higher was released. Newer versions should already have the fix to accept any in the 3.x range, as per the OpenSSL versioning guidelines

# 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)
Expand Down
Loading