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

Adds opentdf-client versions 1.4.0 and 1.5.0 #18896

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
a30a8ed
Adds versions 1.4.0 and 1.5.0
patmantru Jul 25, 2023
91a29d5
Need magic_enum for 1.4.0 also
patmantru Jul 25, 2023
abbaa72
Merge branch 'master' into opentdf-client-version-1.5.0
AbrilRBS Aug 10, 2023
1b9cb5a
Update to new release content
patmantru Aug 10, 2023
449351b
Merge branch 'opentdf-client-version-1.5.0' of github.com:patmantru/c…
patmantru Aug 10, 2023
fd6ce0e
Merge branch 'master' into opentdf-client-version-1.5.0
patmantru Aug 10, 2023
628a83e
Update to newest release tag content
patmantru Aug 10, 2023
e890d3f
Merge branch 'master' into opentdf-client-version-1.5.0
patmantru Aug 10, 2023
80a3261
Merge branch 'opentdf-client-version-1.5.0' of github.com:patmantru/c…
patmantru Aug 10, 2023
82c2a3f
Merge branch 'master' into opentdf-client-version-1.5.0
AbrilRBS Aug 11, 2023
32082cd
Change OpenSSL version references to ranges per CCI requirements
patmantru Aug 11, 2023
d27b840
fix typo
patmantru Aug 11, 2023
122bfa5
Try different range spec for 1.1.x
patmantru Aug 11, 2023
fd21b7f
Try another range spec for openssl 1.1.x
patmantru Aug 11, 2023
50342a7
Another try at version ranges
patmantru Aug 11, 2023
813e0df
Still another try at ranges for openssl 1.1.x
patmantru Aug 11, 2023
56cfc6d
Pick a version range that is also compatible with jwt-cpp
patmantru Aug 11, 2023
edce36d
openssl/[>=3.1 <3.2] range is not compatible with jwt-cpp. Use fixed…
patmantru Aug 11, 2023
e7593af
One more try with newer jwt-cpp and ranges
patmantru Aug 14, 2023
667d4c6
Avoid jwt-cpp complaint about OpenSSL 1.1.1u
patmantru Aug 14, 2023
1b273e1
Override 3.1.1 for openssl to avoid jwt-cpp complaint
patmantru Aug 14, 2023
ebb08c7
jwt-cpp requires are broken forr 0.5.0 and 0.6.0, avoid
patmantru Aug 14, 2023
61d8cf7
opentdf-client: update openssl version ranges
jcar87 Aug 16, 2023
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
6 changes: 6 additions & 0 deletions recipes/opentdf-client/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
sources:
"1.5.0":
url: "https://github.com/opentdf/client-cpp/archive/1.5.0.tar.gz"
sha256: "0d6134634c0c6fde5e8457361332242259e1ef238e5254ccbed2f94549998c48"
"1.4.0":
url: "https://github.com/opentdf/client-cpp/archive/1.4.0.tar.gz"
sha256: "0ef9cdf5e49f83a8ddcde10d64cdf9108652e781396cfab000f50cc067e6f795"
"1.3.10":
url: "https://github.com/opentdf/client-cpp/archive/1.3.10.tar.gz"
sha256: "539bd5e64bceb86f63b3f7db75de470d5ea1d52ae6436a6a2d6789f7d0710dd4"
Expand Down
11 changes: 10 additions & 1 deletion recipes/opentdf-client/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@ def validate(self):
raise ConanInvalidConfiguration(f'{self.name} can not be built with MT or MTd at this time')

def requirements(self):
self.requires("openssl/1.1.1q")
# Uses openssl 3.x for 1.5.0 and newer
if Version(self.version) >= "1.5.0":
self.requires("openssl/[>=3.1 <4]")
else:
self.requires("openssl/1.1.1u")
# Uses magic_enum for 1.4.0 and newer
if Version(self.version) >= "1.4.0":
self.requires("magic_enum/0.8.2")
self.requires("ms-gsl/2.1.0")
self.requires("nlohmann_json/3.11.1")
self.requires("jwt-cpp/0.4.0")
Expand Down Expand Up @@ -121,3 +128,5 @@ def package_info(self):
self.cpp_info.components["libopentdf"].requires = ["openssl::openssl", "boost::boost", "ms-gsl::ms-gsl", "libxml2::libxml2", "jwt-cpp::jwt-cpp", "nlohmann_json::nlohmann_json"]
if Version(self.version) < "1.1.0":
self.cpp_info.components["libopentdf"].requires.append("libarchive::libarchive")
if Version(self.version) >= "1.4.0":
self.cpp_info.components["libopentdf"].requires.append("magic_enum::magic_enum")
4 changes: 4 additions & 0 deletions recipes/opentdf-client/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
versions:
"1.5.0":
folder: all
"1.4.0":
folder: all
"1.3.10":
folder: all
"1.3.9":
Expand Down