Merge branch 'upstream' into tizen

Conflicts:
	packaging/iotivity.spec

Change-Id: I0ebb075dbed68e747ac78ebfc36ef2ffb2b5a24a

diff --cc iotivity.pc.in
index 382cbc6,59bd6b5..e98ed1b
--- 1/iotivity.pc.in
--- 2/iotivity.pc.in
+++ b/iotivity.pc.in
@@@ -11,8 -11,7 +11,7 @@@ Description: IoTivity is an open sourc
  Version: @VERSION@
  URL: https://www.iotivity.org
  Requires:
- Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction \
-                       @OCPMAPI_LIB@
 -Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction
++Libs: -L${libdir} -loc -loc_logger -loc_logger_core -loctbstack -lconnectivity_abstraction -locpmapi
  Cflags: -I${includedir}/resource \
                        -I${svcincludedir}/resource-encapsulation \
                        -I${svcincludedir}/resource-container \

diff --cc packaging/iotivity.spec
index 67fd1e2,2b7d51d..566761f
--- 1/packaging/iotivity.spec
--- 2/tools/tizen/iotivity.spec
+++ b/packaging/iotivity.spec
@@@ -36,6 -41,7 +36,7 @@@ Requires(post): /sbin/ldconfi
  %{!?ES_TARGET_ENROLLEE: %define ES_TARGET_ENROLLEE tizen}
  %{!?ES_ROLE: %define ES_ROLE enrollee}
  %{!?ES_SOFTAP_MODE: %define ES_SOFTAP_MODE MEDIATOR_SOFTAP}
 -%{!?VERBOSE: %define VERBOSE 1}
++%{!?VERBOSE: %define VERBOSE 0}
  
  %description
  An open source reference implementation of the OIC standard specifications
@@@ -101,10 -107,10 +102,10 @@@ cp %{SOURCE1001} ./%{name}-test.manifes
  %define RPM_ARCH "x86"
  %endif
  
- #VERBOSE=1
  scons -j2 --prefix=%{_prefix} \
+       VERBOSE=%{VERBOSE} \
        TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=%{TARGET_TRANSPORT} \
 -      RELEASE=%{RELEASE} SECURED=%{SECURED} LOGGING=%{LOGGING} ROUTING=%{ROUTING} \
 +      RELEASE=%{RELEASE} SECURED=1 LOGGING=%{LOGGING} ROUTING=%{ROUTING} \
        ES_TARGET_ENROLLEE=%{ES_TARGET_ENROLLEE} ES_ROLE=%{ES_ROLE} ES_SOFTAP_MODE=%{ES_SOFTAP_MODE} \
        LIB_INSTALL_DIR=%{_libdir}
  
@@@ -149,12 -155,12 +150,16 @@@ cp out/tizen/*/%{build_mode}/resource/e
  cp out/tizen/*/%{build_mode}/resource/examples/threadingsample %{ex_install_dir}
  cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_server.dat %{ex_install_dir}
  cp out/tizen/*/%{build_mode}/resource/examples/oic_svr_db_client.dat %{ex_install_dir}
 -cp out/tizen/*/%{build_mode}/libcoap.a %{buildroot}%{_libdir}
 -%if 0%{?SECURED} == 1
  mkdir -p %{ex_install_dir}/provisioning
 -mkdir -p %{ex_install_dir}/provision-sample
 +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/provisioningclient %{ex_install_dir}/provisioning/
 +cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_client.dat %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_justworks %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_server_justworks.dat %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/sampleserver_randompin %{ex_install_dir}/provisioning/
++cp out/tizen/*/%{build_mode}/resource/csdk/security/provisioning/sample/oic_svr_db_server_randompin.dat %{ex_install_dir}/provisioning/
  
  cp ./resource/csdk/security/include/pinoxmcommon.h %{buildroot}%{_includedir}
 +cp ./resource/csdk/security/include/securevirtualresourcetypes.h %{buildroot}%{_includedir}
  cp ./resource/csdk/security/provisioning/include/oxm/*.h %{buildroot}%{_includedir}
  cp ./resource/csdk/security/provisioning/include/internal/*.h %{buildroot}%{_includedir}
  cp ./resource/csdk/security/provisioning/include/*.h %{buildroot}%{_includedir}
@@@ -167,7 -179,10 +172,8 @@@ cp LICENSE.APLv2 %{buildroot}/%{_datadi
  cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-service
  cp LICENSE.APLv2 %{buildroot}/%{_datadir}/license/%{name}-test
  %endif
 -cp resource/c_common/*.h %{buildroot}%{_includedir}
 -cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
  
+ cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
  cp service/easy-setup/inc/*.h %{buildroot}%{_includedir}
  cp service/easy-setup/enrollee/inc/*.h %{buildroot}%{_includedir}
  

diff --cc resource/csdk/connectivity/api/cacommon.h
Simple merge

diff --cc resource/csdk/stack/include/ocstackconfig.h
Simple merge

diff --cc resource/csdk/stack/test/stacktests.cpp
Simple merge