diff --git a/recipes/openssl/3.x.x/conandata.yml b/recipes/openssl/3.x.x/conandata.yml index fda0f1e1cf28a..591e74ccaaac9 100644 --- a/recipes/openssl/3.x.x/conandata.yml +++ b/recipes/openssl/3.x.x/conandata.yml @@ -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 diff --git a/recipes/openssl/3.x.x/conanfile.py b/recipes/openssl/3.x.x/conanfile.py index 05de257a52c5f..beaea42777422 100644 --- a/recipes/openssl/3.x.x/conanfile.py +++ b/recipes/openssl/3.x.x/conanfile.py @@ -610,6 +610,7 @@ def build(self): self._create_targets() with self._make_context(): self._make() + self.run("perl source_subfolder/configdata.pm --dump") @property def _win_bash(self): @@ -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 + diff --git a/recipes/openssl/config.yml b/recipes/openssl/config.yml index ee39b2e250bb5..f0e160be03021 100644 --- a/recipes/openssl/config.yml +++ b/recipes/openssl/config.yml @@ -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: