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

Adding Botan 3.0.0 recipe and make it compatible with Conan 2.x #18079

Merged
merged 57 commits into from
Feb 16, 2024
Merged

Adding Botan 3.0.0 recipe and make it compatible with Conan 2.x #18079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
506c84e
adding Botan 3.0.0 recipe
Maaown May 2, 2023
e15db3e
updated to conan 2
Maaown May 9, 2023
1ae7f48
ci lint fix
Maaown May 9, 2023
fa36a8d
ci lint fix
Maaown May 9, 2023
c59b651
ci lint fix
Maaown May 9, 2023
434a062
replacing version check
Maaown May 9, 2023
538273e
some more fixes to be ready for 2.0
memsharded May 10, 2023
4edba84
fixes
Maaown May 17, 2023
4d4ac88
Keep old test package for Conan 1.x
lieser May 23, 2023
057e16f
Order imports
lieser May 23, 2023
5ef9c7b
Remove unused import
lieser May 23, 2023
1bd7805
Fix packaging
lieser May 23, 2023
8c35266
Fix msvc build and test
lieser May 23, 2023
c36f70a
Use Version helper in package_info
lieser May 23, 2023
4711f28
Small fixes
lieser May 23, 2023
d3d1cdf
Don't add -fPIC for msvc
lieser May 23, 2023
1c03491
Fix msvc package info for Botan 3.0.0
lieser May 23, 2023
0e38f72
Add missing patch_description and patch_type
lieser Jun 27, 2023
bd486ed
Revert back to "sources" name for src folder
lieser Jun 27, 2023
b00ed3c
Try fixing KB-H010 for Conan 1
lieser Jun 27, 2023
58e1082
Remove base_path for patches and switch again to `src` for src folder
lieser Jun 27, 2023
1cfa026
Don't import from conan.tools.microsoft.subsystems
lieser Jun 27, 2023
1479347
Fix KB-H010 by using double quotes
lieser Jun 28, 2023
28ba807
Disable getentropy
lieser Jun 29, 2023
0625d76
Move layout method
lieser Jun 29, 2023
23ccba0
Add check for minimal compiler version
lieser Jun 29, 2023
de1edb8
Fix getting env variables
lieser Jun 30, 2023
fcb0fc9
Remove some older Botan versions
lieser Jun 30, 2023
0db2689
Fix removal of old versions
lieser Jun 30, 2023
0a16d99
Replace apple_deployment_target_flag with apple_min_version_flag
lieser Jun 30, 2023
3823a16
Disable getrandom
lieser Jun 30, 2023
00fdd96
Set 11.2 as minimal GCC
lieser Jul 4, 2023
fe6a674
Set C++ standard in test package according to Botan version
lieser Jul 6, 2023
669edab
Add min version for apple-clang
lieser Jul 7, 2023
d70872d
Remove redundant cpp_info.names["pkg_config"]
lieser Jul 10, 2023
9a7504c
Use leading _ for member variable extra_cxxflags
lieser Jul 10, 2023
0df7c2b
Readd comment
lieser Jul 10, 2023
fb2ca6d
Further improvements
AbrilRBS Aug 30, 2023
2d04e27
Support for the OpenSSL provider was removed in Botan 2.19.2
lieser Sep 4, 2023
ea11907
Add support for tools.build:sysroot
lieser Sep 4, 2023
27744a3
add a patch to support getrandome() in glibc < 2.25
reneme Oct 9, 2023
42f87c6
add Botan 3.1.0 and 3.1.1
reneme Oct 9, 2023
3a1db0e
add Botan 3.2.0
reneme Oct 10, 2023
821dca3
Botan 2.x is not compatible with OpenSSL 3.x
reneme Oct 10, 2023
d47adc9
pin to specific OpenSSL version (1.1.1s)
reneme Oct 11, 2023
12ca6c7
FIX: warnings KB-H043 and KB-H077
reneme Oct 23, 2023
3a06093
don't explicitly disable getrandom/getentropy on Linux
reneme Oct 24, 2023
d29e8c9
Apply suggestions from code review
reneme Oct 27, 2023
e029672
add patch sources to patches
reneme Nov 14, 2023
2ab02ec
Apply suggestions from code review
reneme Jan 15, 2024
3060781
FIX: linter warnings
reneme Jan 15, 2024
6a69bc3
FIX: default of CXXFLAGS
reneme Jan 15, 2024
3379fd0
update recipe's meta data
reneme Jan 31, 2024
16aca89
use self.dependencies['boost'].options
reneme Jan 31, 2024
4915388
add -o disable_modules
reneme Jan 31, 2024
6c52402
Workaround to support glibc < 2.25
reneme Feb 1, 2024
8caf736
Apply suggestions from code review
reneme Feb 1, 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
69 changes: 30 additions & 39 deletions recipes/botan/all/conandata.yml
View file
Open in desktop
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"
Copy link
Member

Choose a reason for hiding this comment

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

I don't remember if was discussed before, but these patches are in the upstream already or is there a PR? It would be nice including it in the upstream first.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This backport is partly from one of the PRs you yourself created upstream 😁. It combines the merged PRs:

Copy link
Contributor

Choose a reason for hiding this comment

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

Please also note that the recipe applies these patches to Botan 3.0.0 and 3.1.x, only. Besides those two versions, this pull request also adds Botan 3.2.0, which already includes them in the upstream release.

Copy link
Contributor

Choose a reason for hiding this comment

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

@uilianries poke, poke 😅

Copy link
Member

Choose a reason for hiding this comment

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

@lieser Could you please add patch_source then? Try to keep it as a standard, so we can track any new patch easier 😉 https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patch_source

Copy link
Contributor

@reneme reneme Nov 14, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

That's a nice one! Thanks for pointing that out. Fixed now in: 616e0df (along with changing the patch_type on the 2.18.2 release to "bugfix" as this is more suitable for the backported build fix).

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
Loading