Hotfix: Smack label should be set on RW dir

Change-Id: Ie57c3fb37e2a79d1aaa4f87b95c2805a53c27ed6
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21b5adb..f7c510c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,11 +28,12 @@ SET(TARGET_VCORE_LIB "cert-svc-vcore")
 SET(TARGET_CERT_SERVER "cert-server")
 
 SET(CERT_SVC_PATH ${TZ_SYS_RO_SHARE}/cert-svc)
-SET(CERT_SVC_DB_PATH ${TZ_SYS_SHARE}/cert-svc/dbspace)
+SET(CERT_SVC_RW_PATH ${TZ_SYS_SHARE}/cert-svc)
+SET(CERT_SVC_DB_PATH ${CERT_SVC_RW_PATH}/dbspace)
 ADD_DEFINITIONS("-DSIGNATURE_SCHEMA_PATH=\"${CERT_SVC_PATH}/schema.xsd\"")
+
 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/\"")
+ADD_DEFINITIONS("-DCERTSVC_PKCS12_STORAGE_DIR=\"${CERT_SVC_RW_PATH}/pkcs12/\"")
 
 ADD_DEFINITIONS("-DTZ_SYS_CA_CERTS=\"${TZ_SYS_CA_CERTS}\"")
 ADD_DEFINITIONS("-DTZ_SYS_CA_CERTS_ORIG=\"${TZ_SYS_CA_CERTS_ORIG}\"")

diff --git a/packaging/cert-svc.manifest.in b/packaging/cert-svc.manifest.in
index aed0ebd..1e13931 100644 (file)
--- a/packaging/cert-svc.manifest.in
+++ b/packaging/cert-svc.manifest.in
@@ -3,6 +3,6 @@
                <domain name="_" />
        </request>
        <assign>
-               <filesystem path="@CERT_SVC_PATH@" label="System" type="transmutable" />
+               <filesystem path="@CERT_SVC_RW_PATH@" label="System" type="transmutable" />
        </assign>
 </manifest>

diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec
index 1075c6c..7aaf352 100644 (file)
--- a/packaging/cert-svc.spec
+++ b/packaging/cert-svc.spec
@@ -98,7 +98,7 @@ 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_RO_SHARE/cert-svc/pkcs12
+mkdir -p %buildroot%TZ_SYS_SHARE/cert-svc/pkcs12
 mkdir -p %buildroot%TZ_SYS_SHARE/cert-svc/dbspace
 ln -s %TZ_SYS_CA_BUNDLE_RW %buildroot%TZ_SYS_RO_SHARE/cert-svc/ca-certificate.crt
 
@@ -132,6 +132,7 @@ fi
 %_libdir/libcert-svc-vcore.so.*
 %TZ_SYS_BIN/cert-server
 %attr(-, system, system) %TZ_SYS_RO_SHARE/cert-svc
+%dir %attr(-, system, system) %TZ_SYS_SHARE/cert-svc
 %attr(-, system, system) %TZ_SYS_SHARE/cert-svc/dbspace/*
 
 %files devel