Update tizen 3.0 directory structure

* delete hard coded path
* apply new directory structure

Change-Id: Id7f15259542d39523fa2a44124a32e1dcdc0ec43
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a827dd..21b5adb 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,9 +27,10 @@ ADD_DEFINITIONS("-Werror")
 SET(TARGET_VCORE_LIB "cert-svc-vcore")
 SET(TARGET_CERT_SERVER "cert-server")
 
-SET(CERT_SVC_PATH ${TZ_SYS_SHARE}/cert-svc)
+SET(CERT_SVC_PATH ${TZ_SYS_RO_SHARE}/cert-svc)
+SET(CERT_SVC_DB_PATH ${TZ_SYS_SHARE}/cert-svc/dbspace)
 ADD_DEFINITIONS("-DSIGNATURE_SCHEMA_PATH=\"${CERT_SVC_PATH}/schema.xsd\"")
-ADD_DEFINITIONS("-DCERTSVC_SYSTEM_STORE_DB=\"${CERT_SVC_PATH}/dbspace/certs-meta.db\"")
+ADD_DEFINITIONS("-DCERTSVC_SYSTEM_STORE_DB=\"${CERT_SVC_DB_PATH}/certs-meta.db\"")
 ADD_DEFINITIONS("-DCERTSVC_DIR=\"${CERT_SVC_PATH}/certs/\"")
 ADD_DEFINITIONS("-DCERTSVC_PKCS12_STORAGE_DIR=\"${CERT_SVC_PATH}/pkcs12/\"")
 
@@ -37,7 +38,7 @@ ADD_DEFINITIONS("-DTZ_SYS_CA_CERTS=\"${TZ_SYS_CA_CERTS}\"")
 ADD_DEFINITIONS("-DTZ_SYS_CA_CERTS_ORIG=\"${TZ_SYS_CA_CERTS_ORIG}\"")
 ADD_DEFINITIONS("-DTZ_SYS_CA_BUNDLE_RW=\"${TZ_SYS_CA_BUNDLE_RW}\"")
 
-SET(CA_CERTS_PATH ${TZ_SYS_SHARE}/ca-certificates)
+SET(CA_CERTS_PATH ${TZ_SYS_RO_SHARE}/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\"")
 ADD_DEFINITIONS("-DFINGERPRINT_LIST_SCHEMA_PATH=\"${CA_CERTS_PATH}/fingerprint/fingerprint_list.xsd\"")
@@ -56,3 +57,5 @@ IF (DEFINED CERTSVC_TEST_BUILD)
 ADD_DEFINITIONS("-DTESTAPP_RES_DIR=\"${TZ_SYS_RO_APP}/cert-svc-tests/\"")
 ADD_SUBDIRECTORY(tests)
 ENDIF (DEFINED CERTSVC_TEST_BUILD)
+
+CONFIGURE_FILE(packaging/cert-svc.manifest.in cert-svc.manifest @ONLY)

diff --git a/etc/CMakeLists.txt b/etc/CMakeLists.txt
index cfac641..a474f85 100644 (file)
--- a/etc/CMakeLists.txt
+++ b/etc/CMakeLists.txt
@@ -2,7 +2,7 @@ SET(ETC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 
 INSTALL(FILES
     ${ETC_DIR}/schema.xsd
-    DESTINATION ${TZ_SYS_SHARE}/cert-svc
+    DESTINATION ${CERT_SVC_PATH}
     )
 
 MESSAGE("Add ssl table to certs-meta.db")
@@ -34,5 +34,5 @@ ENDIF (ERROR_CODE)
 INSTALL(FILES
     ${ETC_DIR}/certs-meta.db
     ${ETC_DIR}/certs-meta.db-journal
-    DESTINATION ${TZ_SYS_SHARE}/cert-svc/dbspace
+    DESTINATION ${CERT_SVC_DB_PATH}
     )

diff --git a/packaging/cert-svc.manifest b/packaging/cert-svc.manifest
deleted file mode 100644 (file)
index 7a98c2b..0000000
--- a/packaging/cert-svc.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-       <assign>
-               <filesystem path="/usr/share/cert-svc" label="System" type="transmutable" />
-               <filesystem path="/usr/share/cert-svc/ca-certificate.crt" label="_" />
-               <filesystem path="/usr/share/cert-svc/schema.xsd" label="_" />
-       </assign>
-</manifest>

diff --git a/packaging/cert-svc.manifest.in b/packaging/cert-svc.manifest.in
new file mode 100644 (file)
index 0000000..aed0ebd
--- /dev/null
+++ b/packaging/cert-svc.manifest.in
@@ -0,0 +1,8 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+       <assign>
+               <filesystem path="@CERT_SVC_PATH@" label="System" type="transmutable" />
+       </assign>
+</manifest>

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index d2550c3..c4c8810 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -7,7 +7,6 @@ Release: 0
 Group:   Security/Libraries
 License: Apache-2.0
 Source0: %{name}-%{version}.tar.gz
-Source1001: %{name}.manifest
 BuildRequires: cmake
 BuildRequires: findutils
 BuildRequires: openssl
@@ -28,6 +27,14 @@ BuildRequires: ca-certificates-devel
 Requires: ca-certificates
 Requires: ca-certificates-tizen
 
+%global TZ_SYS_BIN      %{?TZ_SYS_BIN:%TZ_SYS_BIN}%{!?TZ_SYS_BIN:%_bindir}
+%global TZ_SYS_SHARE    %{?TZ_SYS_SHARE:%TZ_SYS_SHARE}%{!?TZ_SYS_SHARE:/opt/share}
+%global TZ_SYS_RO_SHARE %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE}%{!?TZ_SYS_RO_SHARE:%_datadir}
+%global TZ_SYS_RO_APP   %{?TZ_SYS_RO_APP:%TZ_SYS_RO_APP}%!?TZ_SYS_RO_APP:/usr/apps}
+%global TZ_SYS_CA_CERTS %{?TZ_SYS_CA_CERTS:%TZ_SYS_CA_CERTS}%{!?TZ_SYS_CA_CERTS:/etc/ssl/certs}
+%global TZ_SYS_CA_CERTS_ORIG %{?TZ_SYS_CA_CERTS_ORIG:%TZ_SYS_CA_CERTS_ORIG}%{!?TZ_SYS_CA_CERTS_ORGIN:%TZ_SYS_RO_SHARE/ca-certificates/certs}
+%global TZ_SYS_CA_BUNDLE_RW  %{?TZ_SYS_CA_BUNDLE_RW:%TZ_SYS_CA_BUNDLE_RW}%{!?TZ_SYS_CA_BUNDLE_RW:/var/lib/ca-certificates/ca-bundle.pem}
+
 %description
 Certification service
 
@@ -52,7 +59,6 @@ Certification service (tests)
 
 %prep
 %setup -q
-cp -a %SOURCE1001 .
 
 %build
 export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
@@ -73,6 +79,7 @@ export FFLAGS="$FFLAGS -DTIZEN_EMULATOR_MODE"
 %cmake . -DVERSION=%version \
         -DINCLUDEDIR=%_includedir \
         -DTZ_SYS_SHARE=%TZ_SYS_SHARE \
+        -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE \
         -DTZ_SYS_BIN=%TZ_SYS_BIN \
         -DTZ_SYS_CA_CERTS=%TZ_SYS_CA_CERTS \
         -DTZ_SYS_CA_CERTS_ORIG=%TZ_SYS_CA_CERTS_ORIG \
@@ -91,9 +98,9 @@ make %{?_smp_mflags}
 %install_service multi-user.target.wants cert-server.service
 %install_service sockets.target.wants cert-server.socket
 
-mkdir -p %buildroot%TZ_SYS_SHARE/cert-svc/pkcs12
+mkdir -p %buildroot%TZ_SYS_RO_SHARE/cert-svc/pkcs12
 mkdir -p %buildroot%TZ_SYS_SHARE/cert-svc/dbspace
-ln -s %TZ_SYS_CA_BUNDLE_RW %buildroot%TZ_SYS_SHARE/cert-svc/ca-certificate.crt
+ln -s %TZ_SYS_CA_BUNDLE_RW %buildroot%TZ_SYS_RO_SHARE/cert-svc/ca-certificate.crt
 
 %preun
 # erase
@@ -124,7 +131,7 @@ fi
 %_unitdir/sockets.target.wants/cert-server.socket
 %_libdir/libcert-svc-vcore.so.*
 %TZ_SYS_BIN/cert-server
-%attr(-, system, system) %TZ_SYS_SHARE/cert-svc
+%attr(-, system, system) %TZ_SYS_RO_SHARE/cert-svc
 
 %files devel
 %_includedir/*

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index ede78be..ae4aa87 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,6 +1,10 @@
+SET(CERT_SERVER "cert-server")
+
+CONFIGURE_FILE(${CERT_SERVER}.service.in ${CERT_SERVER}.service @ONLY)
+
 INSTALL(
        FILES
-               ${PROJECT_SOURCE_DIR}/systemd/cert-server.socket
-               ${PROJECT_SOURCE_DIR}/systemd/cert-server.service
+               ${PROJECT_SOURCE_DIR}/systemd/${CERT_SERVER}.socket
+               ${PROJECT_SOURCE_DIR}/systemd/${CERT_SERVER}.service
        DESTINATION ${SYSTEMD_UNIT_DIR}
        )

diff --git a/systemd/cert-server.service b/systemd/cert-server.service.in
similarity index 83%
rename from systemd/cert-server.service
rename to systemd/cert-server.service.in
index 15a98d7..1851379 100644 (file)
--- a/systemd/cert-server.service
+++ b/systemd/cert-server.service.in
@@ -2,7 +2,7 @@
 Description=Start cert server for cert-svc managing root ssl certs
 
 [Service]
-ExecStart=/usr/bin/cert-server
+ExecStart=@TZ_SYS_BIN@/cert-server
 User=system
 Group=system
 Sockets=cert-server.socket

diff --git a/tests/pkcs12/CMakeLists.txt b/tests/pkcs12/CMakeLists.txt
index b0d21cf..64a729f 100644 (file)
--- a/tests/pkcs12/CMakeLists.txt
+++ b/tests/pkcs12/CMakeLists.txt
@@ -18,6 +18,11 @@
 # @brief       This package provides bacis check of internal OpenSSL's PKCS#12 routines.
 #
 
+PKG_CHECK_MODULES(PKCS12_TEST_DEP
+    REQUIRED
+    libtzplatform-config
+    )
+
 SET(PKCS12_TEST_SOURCES
     pkcs12_test.cpp
     new_test_cases.cpp
@@ -25,6 +30,7 @@ SET(PKCS12_TEST_SOURCES
     )
 
 INCLUDE_DIRECTORIES(
+    ${PKCS12_TEST_DEP_INCLUDE_DIRS}
     ${PROJECT_SOURCE_DIR}/vcore/src
     .
     )
@@ -34,6 +40,7 @@ ADD_EXECUTABLE(${TARGET_PKCS12_TEST} ${PKCS12_TEST_SOURCES} ${DPL_TEST_SOURCES})
 TARGET_LINK_LIBRARIES(${TARGET_PKCS12_TEST}
     ${TARGET_VCORE_LIB}
     ${TEST_DEP_LIBRARIES}
+    ${PKCS12_TEST_DEP_LIBRARIES}
     )
 
 INSTALL(TARGETS ${TARGET_PKCS12_TEST}

diff --git a/tests/pkcs12/new_test_cases.cpp b/tests/pkcs12/new_test_cases.cpp
index 5e60422..391b8bf 100644 (file)
--- a/tests/pkcs12/new_test_cases.cpp
+++ b/tests/pkcs12/new_test_cases.cpp
@@ -31,6 +31,8 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
+#include <tzplatform_config.h>
+
 #include <cert-svc/cinstance.h>
 #include <cert-svc/ccert.h>
 #include <cert-svc/cpkcs12.h>
@@ -669,7 +671,13 @@ RUNNER_TEST(CERTSVC_PKCS12_1017_load_cert_list_from_store)
 
 RUNNER_TEST(CERTSVC_PKCS12_1018_get_duplicate_private_key)
 {
-       const char *privatekey_path = "/usr/share/cert-svc/pkcs12/temp.txt";
+// FIXME : Delete macro when tizen 3.0 directory structure is fully updated
+#ifdef TZ_SYS_RO_SHARE
+       const char *privatekey_path = tzplatform_mkpath(TZ_SYS_RO_SHARE, "cert-svc/pkcs12/temp.txt");
+#else
+       const char *privatekey_path = tzplatform_mkpath(TZ_SYS_SHARE, "cert-svc/pkcs12/temp.txt");
+#endif
+
        int result;
 
        CREATE_INSTANCE
@@ -981,7 +989,15 @@ RUNNER_TEST(CERTSVC_PKCS12_1027_get_alias_name_from_gname_from_store)
                result = certsvc_certificate_dup_x509(user_certificate, &x509);
 
                char user_cert_path[512];
-               sprintf(user_cert_path, "/usr/share/cert-svc/pkcs12/file_%d", count++);
+
+// FIXME : Delete macro when tizen 3.0 directory structure is fully updated
+#ifdef TZ_SYS_RO_SHARE
+               const char *output_template = tzplatform_mkpath(TZ_SYS_RO_SHARE, "cert-svc/pkcs12/file_%d");
+#else
+               const char *output_template = tzplatform_mkpath(TZ_SYS_SHARE, "cert-svc/pkcs12/file_%d");
+#endif
+
+               sprintf(user_cert_path, output_template, count++);
                FILE *fp = fopen(user_cert_path, "w");
                RUNNER_ASSERT_MSG(fp != NULL, "Failed to open the file for writing");