Add platform upgrade script on ca-bundle

* About Tizen 2.4 -> 3.0

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c168698734edffde70728dff7ecdac2aa9bda885..a526e9f0dd64dad58a113a811a9611413fff421e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@ ENDIF(ERROR_CODE)
 
 INSTALL(FILES
        ${PATH_CRT_FILE}
-       DESTINATION /var/lib/ca-certificates
+       DESTINATION ${TZ_SYS_CA_BUNDLE_DIR}
 )
 
 CONFIGURE_FILE(packaging/ca-certificates.manifest.in ca-certificates.manifest @ONLY)

diff --git a/packaging/ca-certificates.spec b/packaging/ca-certificates.spec
index 3f97d3ae90037c1306bc2520c99abe953260fe6a..14730ff21f1686bfd80640afab90d54904cea6cd 100644 (file)
--- a/packaging/ca-certificates.spec
+++ b/packaging/ca-certificates.spec
@@ -32,6 +32,7 @@ for ca-bundle and ssl certs directory
 %define smack_domain_name System::Shared
 
 # prefix macro
+%define var_dir     %{?TZ_SYS_VAR:%TZ_SYS_VAR}%{!?TZ_SYS_VAR:/opt/var}
 %define etc_dir     %{?TZ_SYS_ETC:%TZ_SYS_ETC}%{!?TZ_SYS_ETC:/opt/etc}
 %define ro_etc_dir  %{?TZ_SYS_RO_ETC:%TZ_SYS_RO_ETC}%{!?TZ_SYS_RO_ETC:%_sysconfdir}
 %define ssl_dir     %{etc_dir}/ssl
@@ -44,16 +45,18 @@ for ca-bundle and ssl certs directory
 %define ca_certs_dir         %{ssl_dir}/certs
 
 # CA bundle macro
-%define ca_bundle_dir /var/lib/ca-certificates
-%define ca_bundle     %{ca_bundle_dir}/ca-bundle.pem
-%define ro_ca_bundle  %{ro_ssl_dir}/ca-bundle.pem
+%define ca_bundle_dir     %{var_dir}/lib/ca-certificates
+%define ca_bundle         %{ca_bundle_dir}/ca-bundle.pem
+%define ro_ca_bundle      %{ro_ssl_dir}/ca-bundle.pem
+%define old_ca_bundle_dir /opt/share/ca-certificates
 
 # define system macro
 %define macro_ca_certificates %{ro_etc_dir}/rpm/macros.ca-certificates
 
 # upgrade macro
-%define upgrade_dir         %{ro_data_dir}
+%define upgrade_dir         %{ro_data_dir}/upgrade
 %define upgrade_script_dir  %{upgrade_dir}/scripts
+%define upgrade_data_dir    %{upgrade_dir}/data
 
 %prep
 %setup -q
@@ -65,8 +68,12 @@ for ca-bundle and ssl certs directory
          -DSMACK_DOMAIN_NAME=%smack_domain_name \
          -DTZ_SYS_CA_CERTS=%ca_certs_dir \
          -DTZ_SYS_CA_BUNDLE=%ca_bundle \
+         -DTZ_SYS_RO_CA_BUNDLE=%ro_ca_bundle \
+         -DTZ_SYS_CA_BUNDLE_DIR=%ca_bundle_dir \
          -DTZ_SYS_RO_CA_CERTS_ORIG=%ro_ca_certs_orig_dir \
-         -DUPGRADE_SCRIPT_DIR=%upgrade_script_dir
+         -DOLD_CA_BUNDLE_DIR=%old_ca_bundle_dir \
+         -DUPGRADE_SCRIPT_DIR=%upgrade_script_dir \
+         -DUPGRADE_DATA_DIR=%upgrade_data_dir
 
 %install
 
@@ -101,6 +108,10 @@ mkdir -p %{buildroot}%{ca_bundle_dir}
 # link file : for bundle
 ln -sf %{ca_bundle} %{buildroot}%{ro_ca_bundle}
 
+# data for platform upgrade (Tizen 2.4 -> 3.0)
+mkdir -p %{buildroot}%{upgrade_data_dir}
+cp %{buildroot}%{ca_bundle} %{buildroot}%{upgrade_data_dir}
+
 %files
 %manifest %{name}.manifest
 %license LICENSE
@@ -116,9 +127,11 @@ ln -sf %{ca_bundle} %{buildroot}%{ro_ca_bundle}
 %dir %{ca_bundle_dir}
 %attr(664, root, %{group_name}) %{ca_bundle}
 # symbol CA bundle
-%attr(664, root, %{group_name}) %{ro_ca_bundle}
-# script for platform upgrade (Tizen 2.4 -> 3.0)
+%{ro_ca_bundle}
+# support for platform upgrade (Tizen 2.4 -> 3.0)
 %attr(755, root, root) %{upgrade_script_dir}/ca-certificates-certs-upgrade.sh
+%attr(755, root, root) %{upgrade_script_dir}/ca-certificates-bundle-upgrade.sh
+%attr(664, root, %{group_name}) %{upgrade_data_dir}/ca-bundle.pem
 
 %files devel
 %config %{macro_ca_certificates}

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 062f0c05853f1ed296f88c5b308d72bd4db2e75b..8138e0b2a18025e5fd16e7b8d12c94be33bdfcc2 100755 (executable)
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -17,13 +17,13 @@
 #
 
 CONFIGURE_FILE(
-       ca-certificates-certs-upgrade.sh.in
-       ca-certificates-certs-upgrade.sh
-       @ONLY
-)
+       ca-certificates-certs-upgrade.sh.in ca-certificates-certs-upgrade.sh
+       @ONLY)
+CONFIGURE_FILE(
+       ca-certificates-bundle-upgrade.sh.in ca-certificates-bundle-upgrade.sh
+       @ONLY)
 
-INSTALL(
-       FILES
-               ca-certificates-certs-upgrade.sh
-       DESTINATION ${UPGRADE_SCRIPT_DIR}
-)
+INSTALL(FILES
+       ca-certificates-certs-upgrade.sh
+       ca-certificates-bundle-upgrade.sh
+       DESTINATION ${UPGRADE_SCRIPT_DIR})

diff --git a/scripts/ca-certificates-bundle-upgrade.sh.in b/scripts/ca-certificates-bundle-upgrade.sh.in
new file mode 100644 (file)
index 0000000..e0cbfeb
--- /dev/null
+++ b/scripts/ca-certificates-bundle-upgrade.sh.in
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+# @file        ca-certificates-bundle-upgrade.sh.in
+# @author      Sangwan Kwon (sangwan.kwon@samsung.com)
+# @brief       CA bundle migration scripts for platform upgrade 2.4 -> 3.0
+#
+
+# delete old ca bundle
+rm -rf @OLD_CA_BUNDLE_DIR@
+
+# upgrade bundle file
+mkdir -p @TZ_SYS_CA_BUNDLE_DIR@
+cp @UPGRADE_DATA_DIR@/ca-bundle.pem @TZ_SYS_CA_BUNDLE_DIR@
+
+# change permission
+chsmack -a @SMACK_DOMAIN_NAME@ @TZ_SYS_CA_BUNDLE@
+chown root:@GROUP_NAME@ @TZ_SYS_CA_BUNDLE@
+chmod 664 @TZ_SYS_CA_BUNDLE@
+
+# make link files on RO area
+ln -sf @TZ_SYS_CA_BUNDLE@ @TZ_SYS_RO_CA_BUNDLE@