From 4bb50b28ee1dd5e636a53c79dac88fbe3ef330fd Mon Sep 17 00:00:00 2001 From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net> Date: Sun, 10 Nov 2019 16:10:14 +0700 Subject: [PATCH] [*] Bugfixes in vpn server [-] private network now is not running by default --- CMakeLists.txt | 2 +- dist/etc/network/{private.cfg => private.cfg.dbg} | 0 libdap | 2 +- libdap-chain-net-srv-vpn | 2 +- libdap-stream | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename dist/etc/network/{private.cfg => private.cfg.dbg} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf1e179ca..7a3500949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,7 +46,7 @@ SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 2) SET( CPACK_PACKAGE_VERSION_MINOR 6) -SET( CPACK_PACKAGE_VERSION_PATCH 4) +SET( CPACK_PACKAGE_VERSION_PATCH 6) SET( CPACK_SYSTEM_NAME "debian-9.9-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") diff --git a/dist/etc/network/private.cfg b/dist/etc/network/private.cfg.dbg similarity index 100% rename from dist/etc/network/private.cfg rename to dist/etc/network/private.cfg.dbg diff --git a/libdap b/libdap index ab957d57c..4fe024f63 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit ab957d57c0e55df8bdeac52cd36b7258b03dee20 +Subproject commit 4fe024f63fef5e7cd3c2352bc3c2d4592e12b854 diff --git a/libdap-chain-net-srv-vpn b/libdap-chain-net-srv-vpn index 9ef4252a2..60ac25179 160000 --- a/libdap-chain-net-srv-vpn +++ b/libdap-chain-net-srv-vpn @@ -1 +1 @@ -Subproject commit 9ef4252a206fac816b9566dc98fc727a0b83970b +Subproject commit 60ac25179c78312baa06c36591db8bfc8bdd5d93 diff --git a/libdap-stream b/libdap-stream index 88f2900f2..fa4145204 160000 --- a/libdap-stream +++ b/libdap-stream @@ -1 +1 @@ -Subproject commit 88f2900f2b031160ec6d6e34c96414a52cfeeda2 +Subproject commit fa41452041077260d18f3e70a45765c17b6a51dd -- GitLab