Skip to content

Commit

Permalink
(#18079) Adding Botan 3.0.0 recipe and make it compatible with Conan 2.x
Browse files Browse the repository at this point in the history
* adding Botan 3.0.0 recipe

* updated to conan 2

* ci lint fix

* ci lint fix

* ci lint fix

* replacing version check

* some more fixes to be ready for 2.0

* fixes

* Keep old test package for Conan 1.x

* Order imports

* Remove unused import

* Fix packaging

* Fix msvc build and test

* Use Version helper in package_info

* Small fixes

* Don't add -fPIC for msvc

* Fix msvc package info for Botan 3.0.0

* Add missing patch_description and patch_type

* Revert back to "sources" name for src folder

* Try fixing KB-H010 for Conan 1

* Remove base_path for patches and switch again to `src` for src folder

* Don't import from conan.tools.microsoft.subsystems

* Fix KB-H010 by using double quotes

conan-io/hooks#448

* Disable getentropy

* Move layout method

* Add check for minimal compiler version

* Fix getting env variables

* Remove some older Botan versions

* Fix removal of old versions

* Replace apple_deployment_target_flag with apple_min_version_flag

* Disable getrandom

* Set 11.2 as minimal GCC

* Set C++ standard in test package according to Botan version

* Add min version for apple-clang

* Remove redundant cpp_info.names["pkg_config"]

* Use leading _ for member variable extra_cxxflags

* Readd comment

* Further improvements

* Support for the OpenSSL provider was removed in Botan 2.19.2

* Add support for tools.build:sysroot

* add a patch to support getrandome() in glibc < 2.25

* add Botan 3.1.0 and 3.1.1

* add Botan 3.2.0

* Botan 2.x is not compatible with OpenSSL 3.x

* pin to specific OpenSSL version (1.1.1s)

* FIX: warnings KB-H043 and KB-H077

* don't explicitly disable getrandom/getentropy on Linux

* Apply suggestions from code review

Co-authored-by: Uilian Ries <[email protected]>

* add patch sources to patches

* Apply suggestions from code review

Co-authored-by: Uilian Ries <[email protected]>

* FIX: linter warnings

* FIX: default of CXXFLAGS

* update recipe's meta data

* use self.dependencies['boost'].options

* add -o disable_modules

* Workaround to support glibc < 2.25

This can (and should) be removed once CCI's CI images are
updated with a newer glibc.

* Apply suggestions from code review

Co-authored-by: Uilian Ries <[email protected]>

---------

Co-authored-by: Maaown (Leonard Viktor Pooch) <[email protected]>
Co-authored-by: memsharded <[email protected]>
Co-authored-by: Rubén Rincón <[email protected]>
Co-authored-by: Rene Meusel <[email protected]>
Co-authored-by: René Meusel <[email protected]>
Co-authored-by: Uilian Ries <[email protected]>
  • Loading branch information
7 people authored Feb 16, 2024
1 parent 77e1105 commit 8f62df8
Show file tree
Hide file tree
Showing 13 changed files with 315 additions and 228 deletions.
69 changes: 30 additions & 39 deletions recipes/botan/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,7 @@
sources:
"2.12.1":
url: "https://github.com/randombit/botan/archive/2.12.1.tar.gz"
sha256: "61d27332f053b0b1169659dc0fceb7de7d16cade230df3a14dfaa2c091888b98"
"2.13.0":
url: "https://github.com/randombit/botan/archive/2.13.0.tar.gz"
sha256: "29a57d8efd6ab297eab67cbf489a5a423b06e120e0520aff2583074e8aea151c"
"2.14.0":
url: "https://github.com/randombit/botan/archive/2.14.0.tar.gz"
sha256: "38e34b8ef7652e811382744425b82da1b1a7fb5f14cc281a7d3a18543eaf72f7"
"2.15.0":
url: "https://github.com/randombit/botan/archive/2.15.0.tar.gz"
sha256: "9a86b1a8adbac37fdff9cf5745b3a313020c33579d8fc51cb996c47d3adf5585"
"2.16.0":
url: "https://github.com/randombit/botan/archive/2.16.0.tar.gz"
sha256: "8f448b97120e884d755b946045753876d688b01f48f5e6a1cf37aebd5afecbe5"
"2.17.0":
url: "https://github.com/randombit/botan/archive/2.17.0.tar.gz"
sha256: "32874e4e14bf11428e1bc4919e5ee174a68e2f480d37bc79ed015b2b5ef87fef"
"2.17.1":
url: "https://github.com/randombit/botan/archive/2.17.1.tar.gz"
sha256: "ca562c00e61663c418bd9fdc6c70bdeaedafba8bef328cb6046a1d6390d39a71"
"2.17.2":
url: "https://github.com/randombit/botan/archive/2.17.2.tar.gz"
sha256: "3d99da64573abab6d6e8036a45f8c567a57721c8f23850e05aadd84fc2e0075c"
"2.17.3":
url: "https://github.com/randombit/botan/archive/2.17.3.tar.gz"
sha256: "544c62e43be0c60fff7ac8707ee99fe134c75bef06bded217d04f0a4b333519a"
"2.18.0":
url: "https://github.com/randombit/botan/archive/2.18.0.tar.gz"
sha256: "8556991402f9ecf5f84f1f2c4de20ca3fd14a5ebd775f065ea6676b36646a77d"
"2.18.1":
url: "https://github.com/randombit/botan/archive/2.18.1.tar.gz"
sha256: "4afebf2dbfa2f047d161437dcc544003d5822f47ceac97ada6a24948297bd3ed"
"2.18.2":
url: "https://github.com/randombit/botan/archive/2.18.2.tar.gz"
sha256: "10ded69c4fd4ade9d87527b394787beefa190b4ecb65ed04535bdd00e088cd96"
Expand All @@ -44,15 +14,36 @@ sources:
"2.19.3":
url: "https://github.com/randombit/botan/archive/2.19.3.tar.gz"
sha256: "8f568bf74c2e476d92ac8a1cfc2ba8407ec038fe9458bd0a11e7da827a9b8199"
"3.0.0":
url: "https://github.com/randombit/botan/archive/3.0.0.tar.gz"
sha256: "8bafe2e965fa9ccf92ef5741165d735c9fbbe6376c373bbf5702495ad2dfb814"
"3.1.0":
url: "https://github.com/randombit/botan/archive/3.1.0.tar.gz"
sha256: "f3680ab11122e581ac08993f149bf519030c7be13b32f5ac1e6bef0a2e6bb88e"
"3.1.1":
url: "https://github.com/randombit/botan/archive/3.1.1.tar.gz"
sha256: "2d0af0c3a7140572f3f7f1a22865f9c5eadc102a7fa58f03314709b0bee26c11"
"3.2.0":
url: "https://github.com/randombit/botan/archive/3.2.0.tar.gz"
sha256: "95af4935d56973000bb6ff20bb54ae56083f8764d5a2c89826cac26ac6127330"
patches:
"2.12.1":
- patch_file: "patches/dll-dir.patch"
base_path: "sources"
- patch_file: "patches/fix-unrecognized-linker-flag.patch"
base_path: "sources"
"2.17.2":
- patch_file: "patches/vs2015-install-fix.patch"
base_path: "sources"
"2.18.2":
- patch_file: "patches/fix-amalgamation-build.patch"
base_path: "sources"
patch_description: "Backport a fix for amalgamation build"
patch_type: "bugfix"
patch_source: "https://github.com/randombit/botan/pull/2835"
"3.0.0":
- patch_file: "patches/backport-getrandom-via-syscall-to-3.0.0.patch"
patch_description: "Backport a fix to support getrandom() with glibc < 2.25"
patch_type: "portability"
patch_source: "https://github.com/randombit/botan/pull/3688"
"3.1.0":
- patch_file: "patches/backport-getrandom-via-syscall-to-3.1.0.patch"
patch_description: "Backport a fix to support getrandom() with glibc < 2.25"
patch_type: "portability"
patch_source: "https://github.com/randombit/botan/pull/3688"
"3.1.1":
- patch_file: "patches/backport-getrandom-via-syscall-to-3.1.0.patch"
patch_description: "Backport a fix to support getrandom() with glibc < 2.25"
patch_type: "portability"
patch_source: "https://github.com/randombit/botan/pull/3688"
Loading

0 comments on commit 8f62df8

Please sign in to comment.