From: Dongsun Lee <ds73.lee@samsung.com>
Date: Mon, 26 Dec 2022 09:26:00 +0000 (+0900)
Subject: use /usr/lib64 as PLUGIN_PATH for 64bit machine
X-Git-Tag: accepted/tizen/unified/20221228.165939^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4a6c3f5f4655f49a6a421710a3a9aae599ba4a19;p=platform%2Fcore%2Fsecurity%2Fcert-svc.git

use /usr/lib64 as PLUGIN_PATH for 64bit machine

Change-Id: I063d43e524eaa725f6155db8c936674442beca37
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index deff16c..f5b5c8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,8 @@ ADD_DEFINITIONS("-DTZ_SYS_CA_BUNDLE=\"${TZ_SYS_CA_BUNDLE}\"")
 ADD_DEFINITIONS("-DTZ_SYS_RO_CA_CERTS=\"${TZ_SYS_RO_CA_CERTS}\"")
 ADD_DEFINITIONS("-DTZ_SYS_RO_CA_BUNDLE=\"${TZ_SYS_RO_CA_BUNDLE}\"")
 
+ADD_DEFINITIONS("-DLIB_DIR=\"${LIB_DIR}\"")
+
 SET(CA_CERTS_PATH ${RO_DATA_DIR}/ca-certificates)
 ADD_DEFINITIONS("-DTZ_SYS_CA_CERTS_TIZEN=\"${CA_CERTS_PATH}/tizen\"")
 ADD_DEFINITIONS("-DFINGERPRINT_LIST_PATH=\"${CA_CERTS_PATH}/fingerprint/fingerprint_list.xml\"")
diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 6c05755..b49889f 100644
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -2,7 +2,7 @@
 
 Name:    cert-svc
 Summary: Certification service
-Version: 2.2.1
+Version: 2.2.2
 Release: 0
 Group:   Security/Certificate Management
 License: Apache-2.0
@@ -39,6 +39,7 @@ Requires: security-config
 %global smack_domain_name System
 
 %global bin_dir                 %{?TZ_SYS_BIN:%TZ_SYS_BIN}%{!?TZ_SYS_BIN:%_bindir}
+%global lib_dir                 %{?TZ_SYS_LIB:%TZ_SYS_LIB}%{!?TZ_SYS_LIB:%_libdir}
 %global etc_dir                 %{?TZ_SYS_ETC:%TZ_SYS_ETC}%{!?TZ_SYS_ETC:/opt/etc}
 %global rw_data_dir             %{?TZ_SYS_SHARE:%TZ_SYS_SHARE}%{!?TZ_SYS_SHARE:/opt/share}
 %global ro_data_dir             %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:%_datadir}
@@ -113,6 +114,7 @@ export CXXFLAGS="$CXXFLAGS -Wno-stringop-truncation -Wno-stringop-overflow"
          -DSMACK_DOMAIN_NAME=%smack_domain_name \
          -DRO_DATA_DIR=%ro_data_dir \
          -DBIN_DIR=%bin_dir \
+         -DLIB_DIR=%lib_dir \
          -DTZ_SYS_CA_CERTS=%TZ_SYS_CA_CERTS \
          -DTZ_SYS_CA_CERTS_ORIG=%TZ_SYS_CA_CERTS_ORIG \
          -DTZ_SYS_CA_BUNDLE=%TZ_SYS_CA_BUNDLE \
diff --git a/src/vcore/ValidatorPluginApi.h b/src/vcore/ValidatorPluginApi.h
index 4248fb5..1374564 100644
--- a/src/vcore/ValidatorPluginApi.h
+++ b/src/vcore/ValidatorPluginApi.h
@@ -30,7 +30,7 @@
 
 namespace ValidationCore {
 
-const std::string PLUGIN_PATH = "/usr/lib/libcert-svc-validator-plugin.so";
+const std::string PLUGIN_PATH = LIB_DIR "/libcert-svc-validator-plugin.so";
 
 class ValidatorPlugin {
 public: