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.

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

openssl: add 3.0.8 + add GitHub as mirror #15802

Merged
merged 2 commits into from
Feb 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 8 additions & 4 deletions recipes/openssl/3.x.x/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
sources:
3.0.8:
url:
- "https://www.openssl.org/source/openssl-3.0.8.tar.gz"
- "https://github.com/openssl/openssl/releases/download/openssl-3.0.8/openssl-3.0.8.tar.gz"
sha256: 6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e
3.0.7:
url: https://www.openssl.org/source/openssl-3.0.7.tar.gz
url:
- "https://www.openssl.org/source/openssl-3.0.7.tar.gz"
- "https://github.com/openssl/openssl/releases/download/openssl-3.0.7/openssl-3.0.7.tar.gz"
sha256: 83049d042a260e696f62406ac5c08bf706fd84383f945cf21bd61e9ed95c396e
3.0.5:
url: https://www.openssl.org/source/openssl-3.0.5.tar.gz
sha256: aa7d8d9bef71ad6525c55ba11e5f4397889ce49c2c9349dcea6d3e4f0b024a7a
3.0.4:
url: https://www.openssl.org/source/openssl-3.0.4.tar.gz
sha256: 2831843e9a668a0ab478e7020ad63d2d65e51f72977472dc73efcefbafc0c00f
8 changes: 8 additions & 0 deletions recipes/openssl/3.x.x/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ def build(self):
self._create_targets()
with self._make_context():
self._make()
self.run("perl source_subfolder/configdata.pm --dump")
Copy link
Contributor

Choose a reason for hiding this comment

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

what is it?

Copy link
Contributor

Choose a reason for hiding this comment

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

yes, it's code to dump OpenSSL configuration

Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

It was debug code from us testing it

Copy link
Contributor

Choose a reason for hiding this comment

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

After the results are posted i will remove it :)

Suggested change
self.run("perl source_subfolder/configdata.pm --dump")

Copy link
Contributor

Choose a reason for hiding this comment

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

it might be useful for troubleshooting in future, e.g. debugging bugs, it's worth keeping


@property
def _win_bash(self):
Expand Down Expand Up @@ -756,3 +757,10 @@ def package_info(self):
self.cpp_info.components["crypto"].names["cmake_find_package_multi"] = "Crypto"
self.cpp_info.components["ssl"].names["cmake_find_package"] = "SSL"
self.cpp_info.components["ssl"].names["cmake_find_package_multi"] = "SSL"

openssl_modules_dir = os.path.join(self.package_folder, "lib", "ossl-modules")
self.runenv_info.define_path("OPENSSL_MODULES", openssl_modules_dir)

# For legacy 1.x downstream consumers, remove once recipe is 2.0 only:
self.env_info.OPENSSL_MODULES = openssl_modules_dir
Copy link
Contributor

Choose a reason for hiding this comment

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

can we set more variables listed here? https://www.openssl.org/docs/man3.0/man7/openssl-env.html


4 changes: 2 additions & 2 deletions recipes/openssl/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
versions:
# 3.0.x releases
3.0.8:
folder: "3.x.x"
3.0.7:
folder: "3.x.x"
3.0.5:
folder: "3.x.x"
3.0.4:
folder: "3.x.x"

# 1.1.1x releases
1.1.1t:
Expand Down