Skip to content
This repository has been archived by the owner on May 30, 2024. It is now read-only.

Commit

Permalink
(conan-io#18896) Adds opentdf-client versions 1.4.0 and 1.5.0
Browse files Browse the repository at this point in the history
* Adds versions 1.4.0 and 1.5.0

* Need magic_enum for 1.4.0 also

* Update to new release content

* Update to newest release tag content

* Change OpenSSL version references to ranges per CCI requirements

* fix typo

* Try different range spec for 1.1.x

* Try another range spec for openssl 1.1.x

* Another try at version ranges

* Still another try at ranges for openssl 1.1.x

* Pick a version range that is also compatible with jwt-cpp

* openssl/[>=3.1 <3.2] range is not compatible with jwt-cpp.  Use fixed version to override

* One more try with newer jwt-cpp and ranges

* Avoid jwt-cpp complaint about OpenSSL 1.1.1u

* Override 3.1.1 for openssl to avoid jwt-cpp complaint

* jwt-cpp requires are broken forr 0.5.0 and 0.6.0, avoid

* opentdf-client: update openssl version ranges

---------

Co-authored-by: Rubén Rincón Blanco <rubenrb@jfrog.com>
Co-authored-by: Luis Caro Campos <3535649+jcar87@users.noreply.github.com>
  • Loading branch information
3 people authored and ericLemanissier committed Sep 15, 2023
1 parent a871fdc commit 9210829
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 1 deletion.
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

0 comments on commit 9210829

Please sign in to comment.