Merge branch 'tizen' into nether

Change-Id: I8db77d4a5f4ebb57110a8707d84168fa506e95f2

diff --combined packaging/security-tests.spec
index def481e,f815452..8243ae7
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@ -32,8 -32,6 +32,8 @@@ BuildRequires: pkgconfig(security-privi
  Requires: perf
  Requires: gdb
  Requires: diffutils
 +Requires: iproute2
 +Requires: toybox-symlinks-ping
  
  %global ckm_test_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm-test/}%{!?TZ_SYS_SHARE:/usr/share/ckm-test/}
  %global ckm_rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm/}%{!?TZ_SYS_DATA:/opt/data/ckm/}
@@@ -61,7 -59,8 +61,8 @@@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefi
          -DAPP_USER="security_test_user" \
          -DCKM_TEST_DIR=%{ckm_test_dir} \
          -DCKM_RW_DATA_DIR=%{ckm_rw_data_dir} \
-         -DGLOBAL_APP_DIR=%{TZ_SYS_RW_APP}
+         -DGLOBAL_APP_DIR=%{TZ_SYS_RW_APP} \
+         -DLOCAL_APP_DIR="%{TZ_SYS_HOME}/security_test_user/apps_rw"
  make %{?jobs:-j%jobs}
  
  %install
@@@ -83,10 -82,6 +84,10 @@@ echo "security-tests postinst done ...
  /usr/bin/security-tests.sh
  /usr/bin/security-tests-all.sh
  /usr/bin/test-performance-check.sh
 +/usr/bin/setup-nether-tests-nns.sh
 +/usr/bin/teardown-nether-tests-nns.sh
 +/usr/bin/setup-nether-tests-dns.sh
 +/usr/bin/teardown-nether-tests-dns.sh
  
  /etc/dbus-1/system.d/security-tests.conf
  
@@@ -99,11 -94,11 +100,12 @@@
  /etc/smack/test_smack_rules
  /etc/smack/test_smack_rules_lnk
  %{TZ_SYS_RW_APP}*
+ %{TZ_SYS_HOME}/security_test_user/apps_rw/*
  /usr/bin/cynara-test
  /usr/bin/ckm-tests
  /usr/bin/ckm-integration-tests
  /usr/bin/yaca-test
 +/usr/bin/nether-tests
  %{ckm_test_dir}/*
  /etc/security-tests
  /usr/lib/security-tests/cynara-tests/plugins/single-policy/*