From 05f80905c970d8cb8b2f8ed80c82e65393f9322e Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Fri, 23 Feb 2018 13:07:14 +0100 Subject: [PATCH] Build key-manager with openssl-1.1 Change-Id: I3b928d509d88479b0a2c37f2c05fe9316544b1c4 --- packaging/key-manager.spec | 4 ++-- src/CMakeLists.txt | 2 +- src/manager/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 2 +- tools/ckm_db_tool/CMakeLists.txt | 2 +- tools/ckm_initial_values/CMakeLists.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec index 95e55e1..13109ed 100644 --- a/packaging/key-manager.spec +++ b/packaging/key-manager.spec @@ -17,7 +17,7 @@ Source1004: libkey-manager-common.manifest BuildRequires: cmake BuildRequires: zip BuildRequires: pkgconfig(dlog) -BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl1.1) BuildRequires: libattr-devel BuildRequires: pkgconfig(libsmack) BuildRequires: pkgconfig(libsystemd-daemon) @@ -131,7 +131,7 @@ Summary: CKM initial values tool Group: Security/Libraries License: Apache-2.0 BuildRequires: cmake -BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(openssl1.1) BuildRequires: pkgconfig(libxml-2.0) Requires(post): %{sbin_dir}/ldconfig Requires(postun): %{sbin_dir}/ldconfig diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1dcfb8b..d6fed0d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -15,7 +15,7 @@ PKG_CHECK_MODULES(KEY_MANAGER_DEP REQUIRED dlog glib-2.0 - openssl + openssl1.1 libsmack libsystemd-daemon capi-base-common diff --git a/src/manager/CMakeLists.txt b/src/manager/CMakeLists.txt index d4f67b6..c22c6ca 100644 --- a/src/manager/CMakeLists.txt +++ b/src/manager/CMakeLists.txt @@ -1,7 +1,7 @@ PKG_CHECK_MODULES(COMMON_DEP REQUIRED dlog - openssl + openssl1.1 libsmack libsystemd-journal ) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8b1d31e..b8ee380 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,7 +19,7 @@ SET(KEY_MANAGER_PATH ${PROJECT_SOURCE_DIR}/src/manager) PKG_CHECK_MODULES(ENCRYPTION_SCHEME_DEP REQUIRED - openssl + openssl1.1 libsmack) SET(ENCRYPTION_SCHEME_SOURCES diff --git a/tools/ckm_db_tool/CMakeLists.txt b/tools/ckm_db_tool/CMakeLists.txt index cb7f759..1068aa0 100644 --- a/tools/ckm_db_tool/CMakeLists.txt +++ b/tools/ckm_db_tool/CMakeLists.txt @@ -10,7 +10,7 @@ ENDIF() PKG_CHECK_MODULES(CKM_DB_TOOL_DEP REQUIRED - openssl + openssl1.1 libsmack capi-base-common capi-system-info diff --git a/tools/ckm_initial_values/CMakeLists.txt b/tools/ckm_initial_values/CMakeLists.txt index c23f1e6..4d2b792 100644 --- a/tools/ckm_initial_values/CMakeLists.txt +++ b/tools/ckm_initial_values/CMakeLists.txt @@ -15,7 +15,7 @@ SET(CKM_INITIAL_VALUES "ckm_initial_values") PKG_CHECK_MODULES(CKM_INITIAL_VALUES_DEP REQUIRED - openssl + openssl1.1 libxml-2.0 ) -- 2.7.4