Merge branches 'ckm', 'security-manager' and 'cynara' into 'tizen'

This merge is necessary to introduce common changes to onlycap handling in a
following commit.

Change-Id: I78a26f9d4820067fca2f0bcc2ab7ce96f5d4e4e4

diff --cc packaging/security-tests.spec
index 9208e725b08ed0ccd159170d74f25ca072d9425d,47f0c7a3ccd6e0df27c3841a2dbb5c6957815748,f96f79bac0e0675a63db9ca06105c9d888eeeac0,2dfcfe4cdcb640a17c7d6cfb05784482a3fae562..4652696d486062589e09faed85abc8dc7cd5c4e2
--- 1/packaging/security-tests.spec
--- 2/packaging/security-tests.spec
--- 3/packaging/security-tests.spec
--- 4/packaging/security-tests.spec
+++ b/packaging/security-tests.spec
@@@@@ -70,9 -73,11 -71,8 -73,8 +78,9 @@@@@ id -u  security_test_user 1>/dev/null 2
    %install
    %make_install
    ln -sf /etc/smack/test_smack_rules %{buildroot}/etc/smack/test_smack_rules_lnk
 +++cp -a %{SOURCE1} %{buildroot}%{_datadir}/
    
    %post
 -  id -u  security_test_user 1>/dev/null 2>&1 || \
 -      gum-utils -o -a --username=security_test_user --usertype=normal
 -  
    # Reload dbus daemon to apply newly installed configuration
    systemctl reload dbus
    

diff --cc src/common/CMakeLists.txt
index caccd7287eb04010bebd4116494407cf7943bf6e,4fd89535fc74c97c06e8d13ecab1e02ae6401188,dc9aeeb19e2c5768d821f4cddaca38150a3125a2,b75ce1b766a9efe6c228134410b16fbe72167b00..9d00f3632eaef6dcc70962ee4e2ba60333a41c81
--- 1/src/common/CMakeLists.txt
--- 2/src/common/CMakeLists.txt
--- 3/src/common/CMakeLists.txt
--- 4/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@@@@ -12,7 -11,6 -12,8 -12,8 +12,9 @@@@@ PKG_CHECK_MODULES(COMMON_TARGET_DE
        cynara-creds-socket
        cynara-creds-dbus
        cynara-creds-gdbus
+++     cynara-creds-sd-bus
 +      security-manager
++ +    security-privilege-manager
        REQUIRED
        )
    
@@@@@ -35,15 -33,6 -36,16 -36,15 +37,16 @@@@@ SET(COMMON_TARGET_TEST_SOURCE
        ${PROJECT_SOURCE_DIR}/src/common/timeout.cpp
        ${PROJECT_SOURCE_DIR}/src/common/temp_test_user.cpp
        ${PROJECT_SOURCE_DIR}/src/common/cynara_helpers_creds.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/label_generator.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/app_install_helper.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_api.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_label_monitor.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_request.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_sharing_request.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_user_request.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/sm_policy_request.cpp
 +      ${PROJECT_SOURCE_DIR}/src/common/tzplatform.cpp
++ +    ${PROJECT_SOURCE_DIR}/src/common/privilege_manager.cpp
        )
    
    #system and local includes