From 41ca57ca7c528395066fa27bb630d062fe5ab486 Mon Sep 17 00:00:00 2001 From: Dmitriy Gerasimov <naeper@demlabs.net> Date: Wed, 5 Jun 2019 16:25:21 +0700 Subject: [PATCH] [*] New 0.9-12 version: merged all latest changes --- CMakeLists.txt | 6 +++--- libdap | 2 +- libdap-chain | 2 +- libdap-chain-gdb | 2 +- libdap-chain-global-db | 2 +- libdap-chain-mempool | 2 +- libdap-chain-net | 2 +- libdap-client | 2 +- libdap-server | 2 +- libdap-server-core | 2 +- libdap-server-udp | 2 +- libdap-stream | 2 +- libdap-stream-ch | 2 +- libdap-stream-ch-chain | 2 +- libdap-stream-ch-chain-net | 2 +- libdap-stream-ch-chain-net-srv | 2 +- libdap-stream-ch-vpn | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64bfc183..ddeb2aa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 0) SET( CPACK_PACKAGE_VERSION_MINOR 9) -SET( CPACK_PACKAGE_VERSION_PATCH 10) +SET( CPACK_PACKAGE_VERSION_PATCH 12) #SET( CPACK_SYSTEM_NAME "debian-9.5-amd64") set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") @@ -86,7 +86,7 @@ add_executable(${PROJECT_NAME} "sources/main.c" "sources/sig_unix_handler.c") add_executable(${PROJECT_NAME}-cli "sources/main_node_cli.c" "sources/main_node_cli_shell.c" "sources/main_node_cli_net.c" ) add_executable(${PROJECT_NAME}-tool "sources/main_node_tool.c" ) -target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_core_server dap_enc_server dap_udp_server dap_session +target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos @@ -94,7 +94,7 @@ target_link_libraries(${PROJECT_NAME} dap_core dap_crypto dap_core_server dap_en dap_chain_net_srv_datum dap_chain_net_srv_datum_pool dap_chain_net_srv_vpn dap_chain_wallet dap_chain_global_db dap_chain_mempool dap_chain_gdb m pthread magic dap_server_http_db_auth) target_link_libraries(${PROJECT_NAME}-cli m dap_chain_net curl) -target_link_libraries(${PROJECT_NAME}-tool dap_core dap_crypto dap_core_server dap_enc_server dap_udp_server dap_session +target_link_libraries(${PROJECT_NAME}-tool dap_core dap_crypto dap_server_core dap_enc_server dap_udp_server dap_session dap_enc_server dap_stream dap_stream_ch_vpn dap_stream_ch_chain dap_stream_ch_chain_net dap_stream_ch_chain_net_srv dap_chain dap_chain_crypto dap_client dap_chain_cs_dag dap_chain_cs_dag_poa dap_chain_cs_dag_pos diff --git a/libdap b/libdap index d37b2aa2..4ab41cdc 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit d37b2aa26d2a7cc068529db343a87fd728904d33 +Subproject commit 4ab41cdcaa8087323652cd5fef702876ccc25dab diff --git a/libdap-chain b/libdap-chain index a5ed7b7f..a494537d 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit a5ed7b7f5e622ed346c9cdac1eac5a986c1ec3e7 +Subproject commit a494537dbab1dbb6bed3588e495f7465b46c56da diff --git a/libdap-chain-gdb b/libdap-chain-gdb index d5d15ff2..349fd368 160000 --- a/libdap-chain-gdb +++ b/libdap-chain-gdb @@ -1 +1 @@ -Subproject commit d5d15ff217801c17bbdb57aca9f6614a8b868113 +Subproject commit 349fd3681368f0ad2cf7b403710317077ca088e6 diff --git a/libdap-chain-global-db b/libdap-chain-global-db index 739a61ab..f6fc3659 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit 739a61ab34c856df96b58f1917f9bd93e0a33b95 +Subproject commit f6fc365980ec2eb059db90291a0443aa49582566 diff --git a/libdap-chain-mempool b/libdap-chain-mempool index 3563c497..7e6e7271 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit 3563c497769de7b224d107a18db98e2949966eaf +Subproject commit 7e6e7271e57bc80e6b956513afa145fd686cef65 diff --git a/libdap-chain-net b/libdap-chain-net index 724dc42f..b98f60cf 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit 724dc42f966bc86a154debff9ab82743fc2b6ce1 +Subproject commit b98f60cfe003226b2f84ff205a0071fe127f046c diff --git a/libdap-client b/libdap-client index 098a2169..e02feb4d 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit 098a2169e83eb52ba4526177def1b1051b9223a5 +Subproject commit e02feb4dbb3d88ffaeb6275098c3c62043ff343a diff --git a/libdap-server b/libdap-server index 41642775..2cc113d3 160000 --- a/libdap-server +++ b/libdap-server @@ -1 +1 @@ -Subproject commit 41642775d56f9ee43128314149efe33ccf9ae491 +Subproject commit 2cc113d3ef8234037016ac21f33731998bba6552 diff --git a/libdap-server-core b/libdap-server-core index 4b9ee4ac..7b9bd8a0 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit 4b9ee4ac3f442c763d179d6341e7311287441037 +Subproject commit 7b9bd8a0bc0d948086fd0759df0e99154be58750 diff --git a/libdap-server-udp b/libdap-server-udp index a2f6610e..bbf1b9db 160000 --- a/libdap-server-udp +++ b/libdap-server-udp @@ -1 +1 @@ -Subproject commit a2f6610eac205f285a33b99bb97afc4ebb850775 +Subproject commit bbf1b9db2c3af9a3a59f6debb90ddc8db55ae2eb diff --git a/libdap-stream b/libdap-stream index 550a5462..7f60a509 160000 --- a/libdap-stream +++ b/libdap-stream @@ -1 +1 @@ -Subproject commit 550a546222f8b07c0687c9feaea32d3f2c66e87c +Subproject commit 7f60a5090581e9d187e01f5844425c8989e39697 diff --git a/libdap-stream-ch b/libdap-stream-ch index 268f422b..09e76911 160000 --- a/libdap-stream-ch +++ b/libdap-stream-ch @@ -1 +1 @@ -Subproject commit 268f422bde88a5f4f254a31b7d52b18d2cad71fc +Subproject commit 09e76911c2f76c6cc1c4651a99f0e545c1c1c840 diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index 844714ca..ea3038b8 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit 844714ca4d13e076d1c49ad23b5a731abfd1f731 +Subproject commit ea3038b8f6ec329bac39d13ec2ad1cce1c97a099 diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net index 6b0a3a87..bc93ab16 160000 --- a/libdap-stream-ch-chain-net +++ b/libdap-stream-ch-chain-net @@ -1 +1 @@ -Subproject commit 6b0a3a873046b64e688de8c58eaabd0a77780973 +Subproject commit bc93ab163fe230dc8f25ad090c66c79f73d43b5a diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv index 8b379cd8..149b6ee5 160000 --- a/libdap-stream-ch-chain-net-srv +++ b/libdap-stream-ch-chain-net-srv @@ -1 +1 @@ -Subproject commit 8b379cd8ce95f5e0b4912fa0d1b788bac0fa8e34 +Subproject commit 149b6ee5ca744621ab6168b671ee3811f62d757f diff --git a/libdap-stream-ch-vpn b/libdap-stream-ch-vpn index 967deba3..d50a0f4d 160000 --- a/libdap-stream-ch-vpn +++ b/libdap-stream-ch-vpn @@ -1 +1 @@ -Subproject commit 967deba3906a9a9b60e0e057d6d93bd9dd31975d +Subproject commit d50a0f4dc2672fbbcc5ef31899e1b81f4e7776a9 -- GitLab