Fix libvoice-transport.so to avoid libcrypto crash

Change-Id: I89e148e6b78c024525a9f7478fbebadf3230958a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb5920a516b672677a8e99f075d678ae328c47e6..62e1898e286ede2fb0e9d4c1546f1fae2e262f27 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,12 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libboost_system.so DESTINATION ${AP
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libboost_system.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libboost_thread.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libcrypto.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libcrypto.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libcrypto.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libssl.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libssl.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/armv7l/libssl.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/armv7l/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ELSEIF("${ARCH}" MATCHES "^i586.*")
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libn66asr.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0/engine/ COMPONENT RuntimeLibraries)
@@ -39,6 +45,12 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_system.so DESTINATION ${APP_
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_system.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_thread.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libcrypto.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libcrypto.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libcrypto.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libssl.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libssl.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libssl.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ELSEIF("${ARCH}" MATCHES "^i686.*")
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libn66asr.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0/engine/ COMPONENT RuntimeLibraries)
@@ -57,6 +69,12 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_system.so DESTINATION ${APP_
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_system.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libboost_thread.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libcrypto.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libcrypto.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libcrypto.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libssl.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libssl.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/i586/libssl.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ELSEIF("${ARCH}" MATCHES "^aarch64.*")
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libn66asr.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0/engine/ COMPONENT RuntimeLibraries)
@@ -75,6 +93,12 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libboost_system.so DESTINATION ${A
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libboost_system.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libboost_thread.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libcrypto.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libcrypto.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libcrypto.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libssl.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libssl.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/aarch64/libssl.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/aarch64/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ELSEIF("${ARCH}" MATCHES "^x86_64.*")
 #INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libn66asr.so DESTINATION ${TZ_SYS_RO_SHARE}/voice/stt/1.0/engine/ COMPONENT RuntimeLibraries)
@@ -93,6 +117,12 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libboost_system.so DESTINATION ${AP
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libboost_system.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libboost_thread.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libboost_thread.so.1.58.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libcrypto.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libcrypto.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libcrypto.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libssl.so DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libssl.so.1 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/lib/x86_64/libssl.so.1.0.0 DESTINATION ${APP_INSTALL_PREFIX}/lib/ COMPONENT RuntimeLibraries)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/x86_64/org.tizen.stt-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
 ENDIF()
 

diff --git a/bin/armv7l/org.tizen.stt-engine-default b/bin/armv7l/org.tizen.stt-engine-default
index 2cd0a3cf58c8f2ac174f1d3892807873caac53e4..f0de84037150ec44d02837fcce29af83ab418f72 100755 (executable)
Binary files a/bin/armv7l/org.tizen.stt-engine-default and b/bin/armv7l/org.tizen.stt-engine-default differ

diff --git a/bin/i586/org.tizen.stt-engine-default b/bin/i586/org.tizen.stt-engine-default
index 34931002090b5b6cb3169494068a26c2b0582c8a..2729883b138aa90aba5e3d8ce8e15605d5eeea82 100755 (executable)
Binary files a/bin/i586/org.tizen.stt-engine-default and b/bin/i586/org.tizen.stt-engine-default differ

diff --git a/lib/armv7l/libcrypto.so b/lib/armv7l/libcrypto.so
new file mode 100644 (file)
index 0000000..c6e8e68
Binary files /dev/null and b/lib/armv7l/libcrypto.so differ

diff --git a/lib/armv7l/libcrypto.so.1 b/lib/armv7l/libcrypto.so.1
new file mode 100644 (file)
index 0000000..c6e8e68
Binary files /dev/null and b/lib/armv7l/libcrypto.so.1 differ

diff --git a/lib/armv7l/libcrypto.so.1.0.0 b/lib/armv7l/libcrypto.so.1.0.0
new file mode 100644 (file)
index 0000000..c6e8e68
Binary files /dev/null and b/lib/armv7l/libcrypto.so.1.0.0 differ

diff --git a/lib/armv7l/libssl.so b/lib/armv7l/libssl.so
new file mode 100644 (file)
index 0000000..5800d5d
Binary files /dev/null and b/lib/armv7l/libssl.so differ

diff --git a/lib/armv7l/libssl.so.1 b/lib/armv7l/libssl.so.1
new file mode 100644 (file)
index 0000000..5800d5d
Binary files /dev/null and b/lib/armv7l/libssl.so.1 differ

diff --git a/lib/armv7l/libssl.so.1.0.0 b/lib/armv7l/libssl.so.1.0.0
new file mode 100644 (file)
index 0000000..5800d5d
Binary files /dev/null and b/lib/armv7l/libssl.so.1.0.0 differ

diff --git a/lib/armv7l/libvoice-transport.so b/lib/armv7l/libvoice-transport.so
index 2e5aac204ace1db0a992857e1ad18b969d9b9f4e..84b68f6c314e01281753929a4b763ff694e49c09 100644 (file)
Binary files a/lib/armv7l/libvoice-transport.so and b/lib/armv7l/libvoice-transport.so differ

diff --git a/lib/i586/libcrypto.so b/lib/i586/libcrypto.so
new file mode 100644 (file)
index 0000000..ef0145e
Binary files /dev/null and b/lib/i586/libcrypto.so differ

diff --git a/lib/i586/libcrypto.so.1 b/lib/i586/libcrypto.so.1
new file mode 100644 (file)
index 0000000..ef0145e
Binary files /dev/null and b/lib/i586/libcrypto.so.1 differ

diff --git a/lib/i586/libcrypto.so.1.0.0 b/lib/i586/libcrypto.so.1.0.0
new file mode 100644 (file)
index 0000000..ef0145e
Binary files /dev/null and b/lib/i586/libcrypto.so.1.0.0 differ

diff --git a/lib/i586/libssl.so b/lib/i586/libssl.so
new file mode 100644 (file)
index 0000000..85d654f
Binary files /dev/null and b/lib/i586/libssl.so differ

diff --git a/lib/i586/libssl.so.1 b/lib/i586/libssl.so.1
new file mode 100644 (file)
index 0000000..85d654f
Binary files /dev/null and b/lib/i586/libssl.so.1 differ

diff --git a/lib/i586/libssl.so.1.0.0 b/lib/i586/libssl.so.1.0.0
new file mode 100644 (file)
index 0000000..85d654f
Binary files /dev/null and b/lib/i586/libssl.so.1.0.0 differ

diff --git a/lib/i586/libvoice-transport.so b/lib/i586/libvoice-transport.so
index fc3f91bacb1334b59fb27197e7d4ab6235a62cbd..4eb9b1ce01bf2a743b475cfd891a767cac70fa0d 100644 (file)
Binary files a/lib/i586/libvoice-transport.so and b/lib/i586/libvoice-transport.so differ

diff --git a/packaging/org.tizen.stt-engine-default.spec b/packaging/org.tizen.stt-engine-default.spec
index d383cc433104176e33db3aa00dbd9b168104f31c..180162beffa2b198fa8da0072650838ca47bd764 100644 (file)
--- a/packaging/org.tizen.stt-engine-default.spec
+++ b/packaging/org.tizen.stt-engine-default.spec
@@ -17,7 +17,7 @@ BuildRequires: cmake
 BuildRequires: pkgconfig(libtzplatform-config)
 
 # Exclude boost requires/provides
-%global _privatelibs libboost_iostreams.so.1.58.0|libboost_system.so.1.58.0|libboost_thread.so.1.58.0
+%global _privatelibs libboost_iostreams.so.1.58.0|libboost_system.so.1.58.0|libboost_thread.so.1.58.0|libcrypto.so.1.0.0|libssl.so.1.0.0
 %global __provides_exclude %{_privatelibs}
 %global __requires_exclude %{_privatelibs}