Merge pull request 'add back unbound' (#403) from wowario/wownero:v3 into master

Reviewed-on: #403

.github/workflows/build.yml

@@ -54,7 +54,7 @@ jobs:
     - uses: eine/setup-msys2@v2
       with:
         update: true
-        install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb mingw-w64-x86_64-unbound git
+        install: mingw-w64-x86_64-toolchain make mingw-w64-x86_64-cmake mingw-w64-x86_64-ccache mingw-w64-x86_64-boost mingw-w64-x86_64-openssl mingw-w64-x86_64-zeromq mingw-w64-x86_64-libsodium mingw-w64-x86_64-hidapi mingw-w64-x86_64-protobuf-c mingw-w64-x86_64-libusb git
     - name: build
       run: |
         ccache --max-size=150M

.gitmodules

@@ -12,3 +12,7 @@
 	path = external/RandomWOW
 	url = https://git.wownero.com/wownero/RandomWOW
 	branch = 1.1.9-wow
+[submodule "external/unbound"]
+	path = external/unbound
+	url = https://github.com/monero-project/unbound
+	branch = monero

CMakeLists.txt

@@ -307,6 +307,7 @@ if(NOT MANUAL_SUBMODULES)
     
     message(STATUS "Checking submodules")
     check_submodule(external/miniupnp)
+    check_submodule(external/unbound)
     check_submodule(external/rapidjson)
     check_submodule(external/RandomWOW)
     check_submodule(external/supercop)
@@ -611,7 +612,8 @@ include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
 add_subdirectory(external)
 
 # Final setup for libunbound
-include_directories(${UNBOUND_INCLUDE_DIR})
+include_directories(${UNBOUND_INCLUDE})
+link_directories(${UNBOUND_LIBRARY_DIRS})
 
 # Final setup for easylogging++
 include_directories(${EASYLOGGING_INCLUDE})

contrib/depends/packages/expat.mk

@@ -1,8 +1,8 @@
 package=expat
-$(package)_version=2.4.1
+$(package)_version=2.2.4
-$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_2_4_1
+$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_2_2_4
 $(package)_file_name=$(package)-$($(package)_version).tar.bz2
-$(package)_sha256_hash=2f9b6a580b94577b150a7d5617ad4643a4301a6616ff459307df3e225bcfbf40
+$(package)_sha256_hash=03ad85db965f8ab2d27328abcf0bc5571af6ec0a414874b2066ee3fdd372019e
 
 define $(package)_set_vars
 $(package)_config_opts=--enable-static

contrib/depends/packages/ldns.mk

@@ -1,8 +1,8 @@
 package=ldns
-$(package)_version=1.7.1
+$(package)_version=1.6.17
-$(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/
+$(package)_download_path=https://www.nlnetlabs.nl/downloads/ldns/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=8ac84c16bdca60e710eea75782356f3ac3b55680d40e1530d7cea474ac208229
+$(package)_sha256_hash=8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd
 $(package)_dependencies=openssl
 
 define $(package)_set_vars

contrib/depends/packages/packages.mk

@@ -1,4 +1,4 @@
-packages:=boost openssl zeromq libiconv expat ldns unbound
+packages:=boost openssl zeromq libiconv
 
 native_packages := native_ccache
 

contrib/depends/packages/unbound.mk

@@ -1,12 +1,12 @@
 package=unbound
-$(package)_version=1.13.1
+$(package)_version=1.6.8
-$(package)_download_path=https://www.nlnetlabs.nl/downloads/$(package)/
+$(package)_download_path=https://www.unbound.net/downloads/
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
-$(package)_sha256_hash=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8
+$(package)_sha256_hash=e3b428e33f56a45417107448418865fe08d58e0e7fea199b855515f60884dd49
 $(package)_dependencies=openssl expat ldns
 
 define $(package)_set_vars
-  $(package)_config_opts=--disable-shared --enable-static --without-pyunbound --prefix=$(host_prefix) --with-libexpat=$(host_prefix) --with-ssl=$(host_prefix) --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads --with-libunbound-only
+  $(package)_config_opts=--disable-shared --enable-static --without-pyunbound --prefix=$(host_prefix) --with-libexpat=$(host_prefix) --with-ssl=$(host_prefix) --with-libevent=no --without-pythonmodule --disable-flto --with-pthreads
   $(package)_config_opts_linux=--with-pic
   $(package)_config_opts_w64=--enable-static-exe --sysconfdir=/etc --prefix=$(host_prefix) --target=$(host_prefix)
   $(package)_build_opts_mingw32=LDFLAGS="$($(package)_ldflags) -lpthread"

contrib/depends/toolchain.cmake.in

@@ -24,8 +24,6 @@ SET(Readline_INCLUDE_DIR @prefix@/include)
 SET(Readline_LIBRARY @prefix@/lib/libreadline.a)
 SET(Terminfo_LIBRARY @prefix@/lib/libtinfo.a)
 
-SET(UNBOUND_INCLUDE_DIR @prefix@/include)
-SET(UNBOUND_LIBRARIES @prefix@/lib/libunbound.a)
 
 SET(LRELEASE_PATH @prefix@/native/bin CACHE FILEPATH "path to lrelease" FORCE)
 

external/CMakeLists.txt

@@ -55,12 +55,26 @@ set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
 
 find_package(Unbound)
 
-if(NOT UNBOUND_INCLUDE_DIR)
+if(NOT UNBOUND_INCLUDE_DIR OR STATIC)
-  die("Could not find libunbound")
+  # NOTE: If STATIC is true, CMAKE_FIND_LIBRARY_SUFFIXES has been reordered.
+  # unbound has config tests which used OpenSSL libraries, so -ldl may need to
+  # be set in this case.
+  # The unbound CMakeLists.txt can set it, since it's also needed for the
+  # static OpenSSL libraries set up there after with target_link_libraries.
+  add_subdirectory(unbound)
+
+  set(UNBOUND_STATIC true PARENT_SCOPE)
+  set(UNBOUND_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/unbound/libunbound" PARENT_SCOPE)
+  set(UNBOUND_LIBRARY "unbound" PARENT_SCOPE)
+  set(UNBOUND_LIBRARY_DIRS "${LIBEVENT2_LIBDIR}" PARENT_SCOPE)
 else()
   message(STATUS "Found libunbound include (unbound.h) in ${UNBOUND_INCLUDE_DIR}")
   if(UNBOUND_LIBRARIES)
-    message(STATUS "Found libunbound library")
+    message(STATUS "Found libunbound shared library")
+    set(UNBOUND_STATIC false PARENT_SCOPE)
+    set(UNBOUND_INCLUDE ${UNBOUND_INCLUDE_DIR} PARENT_SCOPE)
+    set(UNBOUND_LIBRARY ${UNBOUND_LIBRARIES} PARENT_SCOPE)
+    set(UNBOUND_LIBRARY_DIRS "" PARENT_SCOPE)
   else()
     die("Found libunbound includes, but could not find libunbound library. Please make sure you have installed libunbound or libunbound-dev or the equivalent")
   endif()

external/unbound

@@ -0,0 +1 @@
+Subproject commit 0f6c0579d66b65f86066e30e7876105ba2775ef4

src/common/CMakeLists.txt

@@ -99,7 +99,7 @@ monero_add_library(common
 target_link_libraries(common
   PUBLIC
     cncrypto
-    ${UNBOUND_LIBRARIES}
+    ${UNBOUND_LIBRARY}
     ${LIBUNWIND_LIBRARIES}
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_FILESYSTEM_LIBRARY}

src/p2p/net_node.inl

@@ -680,7 +680,7 @@ namespace nodetool
     if (m_nettype == cryptonote::TESTNET)
     {
       full_addrs.insert("207.254.29.107:11180");
-      full_addrs.insert("51.81.32.130:11180");
+      full_addrs.insert("135.148.138.255:11180");
     }
     else if (m_nettype == cryptonote::STAGENET)
     {
@@ -697,6 +697,8 @@ namespace nodetool
       full_addrs.insert("188.166.237.187:34567"); //  sg1.wownodes.com      
       full_addrs.insert("51.161.131.176:34567");  //  node.suchwow.xyz
       full_addrs.insert("167.114.196.241:34567"); //  wowbux.org
+      full_addrs.insert("135.148.138.255:34567");
+      full_addrs.insert("207.254.29.107:34567");
     }
     return full_addrs;
   }