diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake index 256f58f9e..264252d03 100644 --- a/cmake/StaticBuild.cmake +++ b/cmake/StaticBuild.cmake @@ -11,25 +11,25 @@ set(OPENSSL_SOURCE openssl-${OPENSSL_VERSION}.tar.gz) set(OPENSSL_HASH SHA256=892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5 CACHE STRING "openssl source hash") -set(EXPAT_VERSION 2.2.9 CACHE STRING "expat version") +set(EXPAT_VERSION 2.3.0 CACHE STRING "expat version") string(REPLACE "." "_" EXPAT_TAG "R_${EXPAT_VERSION}") set(EXPAT_MIRROR ${LOCAL_MIRROR} https://github.com/libexpat/libexpat/releases/download/${EXPAT_TAG} CACHE STRING "expat download mirror(s)") set(EXPAT_SOURCE expat-${EXPAT_VERSION}.tar.xz) -set(EXPAT_HASH SHA512=e082874efcc4b00709e2c0192c88fb15dfc4f33fc3a2b09e619b010ea93baaf7e7572683f738463db0ce2350cab3de48a0c38af6b74d1c4f5a9e311f499edab0 +set(EXPAT_HASH SHA512=dde8a9a094b18d795a0e86ca4aa68488b352dc67019e0d669e8b910ed149628de4c2a49bc3a5b832f624319336a01f9e4debe03433a43e1c420f36356d886820 CACHE STRING "expat source hash") -set(UNBOUND_VERSION 1.12.0 CACHE STRING "unbound version") +set(UNBOUND_VERSION 1.13.1 CACHE STRING "unbound version") set(UNBOUND_MIRROR ${LOCAL_MIRROR} https://nlnetlabs.nl/downloads/unbound CACHE STRING "unbound download mirror(s)") set(UNBOUND_SOURCE unbound-${UNBOUND_VERSION}.tar.gz) -set(UNBOUND_HASH SHA256=5b9253a97812f24419bf2e6b3ad28c69287261cf8c8fa79e3e9f6d3bf7ef5835 +set(UNBOUND_HASH SHA256=8504d97b8fc5bd897345c95d116e0ee0ddf8c8ff99590ab2b4bd13278c9f50b8 CACHE STRING "unbound source hash") -set(SQLITE3_VERSION 3330000 CACHE STRING "sqlite3 version") -set(SQLITE3_MIRROR ${LOCAL_MIRROR} https://www.sqlite.org/2020 +set(SQLITE3_VERSION 3350500 CACHE STRING "sqlite3 version") +set(SQLITE3_MIRROR ${LOCAL_MIRROR} https://www.sqlite.org/2021 CACHE STRING "sqlite3 download mirror(s)") set(SQLITE3_SOURCE sqlite-autoconf-${SQLITE3_VERSION}.tar.gz) -set(SQLITE3_HASH SHA512=c0d79d4012a01f12128ab5044b887576a130663245b85befcc0ab82ad3a315dd1e7f54b6301f842410c9c21b73237432c44a1d7c2fe0e0709435fec1f1a20a11 +set(SQLITE3_HASH SHA512=039af796f79fc4517be0bd5ba37886264d49da309e234ae6fccdb488ef0109ed2b917fc3e6c1fc7224dff4f736824c653aaf8f0a37550c5ebc14d035cb8ac737 CACHE STRING "sqlite3 source hash") set(SODIUM_VERSION 1.0.18 CACHE STRING "libsodium version") @@ -48,11 +48,11 @@ set(ZMQ_SOURCE zeromq-${ZMQ_VERSION}.tar.gz) set(ZMQ_HASH SHA512=e198ef9f82d392754caadd547537666d4fba0afd7d027749b3adae450516bcf284d241d4616cad3cb4ad9af8c10373d456de92dc6d115b037941659f141e7c0e CACHE STRING "libzmq source hash") -set(LIBUV_VERSION 1.40.0 CACHE STRING "libuv version") +set(LIBUV_VERSION 1.41.0 CACHE STRING "libuv version") set(LIBUV_MIRROR ${LOCAL_MIRROR} https://dist.libuv.org/dist/v${LIBUV_VERSION} CACHE STRING "libuv mirror(s)") set(LIBUV_SOURCE libuv-v${LIBUV_VERSION}.tar.gz) -set(LIBUV_HASH SHA256=61a90db95bac00adec1cc5ddc767ebbcaabc70242bd1134a7a6b1fb1d498a194 +set(LIBUV_HASH SHA512=33613fa28e8136507300eba374351774849b6b39aab4e53c997a918d3bc1d1094c6123e0e509535095b14dc5daa885eadb1a67bed46622ad3cc79d62dc817e84 CACHE STRING "libuv source hash") set(ZLIB_VERSION 1.2.11 CACHE STRING "zlib version") @@ -62,11 +62,11 @@ set(ZLIB_SOURCE zlib-${ZLIB_VERSION}.tar.gz) set(ZLIB_HASH SHA512=73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae CACHE STRING "zlib source hash") -set(CURL_VERSION 7.74.0 CACHE STRING "curl version") +set(CURL_VERSION 7.76.1 CACHE STRING "curl version") set(CURL_MIRROR ${LOCAL_MIRROR} https://curl.haxx.se/download https://curl.askapache.com CACHE STRING "curl mirror(s)") set(CURL_SOURCE curl-${CURL_VERSION}.tar.xz) -set(CURL_HASH SHA256=999d5f2c403cf6e25d58319fdd596611e455dd195208746bc6e6d197a77e878b +set(CURL_HASH SHA256=64bb5288c39f0840c07d077e30d9052e1cbb9fa6c2dc52523824cc859e679145 CACHE STRING "curl source hash") @@ -273,7 +273,6 @@ add_static_target(expat expat_external libexpat.a) build_external(unbound DEPENDS openssl_external expat_external - PATCH_COMMAND patch -p1 -i ${PROJECT_SOURCE_DIR}/contrib/patches/unbound-no-apple-dontfrag.patch CONFIGURE_COMMAND ./configure ${cross_host} ${cross_rc} --prefix=${DEPS_DESTDIR} --disable-shared --enable-static --with-libunbound-only --with-pic --$,enable,disable>-flto --with-ssl=${DEPS_DESTDIR} @@ -411,7 +410,7 @@ set(libcurl_link_libs zlib) if(CMAKE_CROSSCOMPILING AND ARCH_TRIPLET MATCHES mingw) list(APPEND libcurl_link_libs crypt32) elseif(APPLE) - list(APPEND libcurl_link_libs "-framework Security") + list(APPEND libcurl_link_libs "-framework Security -framework CoreFoundation") endif() set_target_properties(CURL::libcurl PROPERTIES INTERFACE_LINK_LIBRARIES "${libcurl_link_libs}" diff --git a/contrib/patches/unbound-no-apple-dontfrag.patch b/contrib/patches/unbound-no-apple-dontfrag.patch deleted file mode 100644 index e6dfa6710..000000000 --- a/contrib/patches/unbound-no-apple-dontfrag.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/services/listen_dnsport.c 2020-11-16 20:07:44.494582149 -0400 -+++ b/services/listen_dnsport.c 2020-11-16 20:07:31.074585943 -0400 -@@ -533,7 +533,7 @@ - return -1; - } - } --# elif defined(IP_DONTFRAG) -+# elif defined(IP_DONTFRAG) && !defined(__APPLE__) - int off = 0; - if (setsockopt(s, IPPROTO_IP, IP_DONTFRAG, - &off, (socklen_t)sizeof(off)) < 0) { diff --git a/external/ghc-filesystem b/external/ghc-filesystem index d8abf146a..2a8b380f8 160000 --- a/external/ghc-filesystem +++ b/external/ghc-filesystem @@ -1 +1 @@ -Subproject commit d8abf146a43ea12d28b09dfa71ece3bad4168185 +Subproject commit 2a8b380f8d4e77b389c42a194ab9c70d8e3a0f1e diff --git a/external/ngtcp2 b/external/ngtcp2 index c13095baf..51e95c8d8 160000 --- a/external/ngtcp2 +++ b/external/ngtcp2 @@ -1 +1 @@ -Subproject commit c13095baf1c10e174414f434cc061f822264ac2b +Subproject commit 51e95c8d8972abd69515d9790e8fbb774262d9ea diff --git a/external/oxen-mq b/external/oxen-mq index e3e79e1fb..51754037e 160000 --- a/external/oxen-mq +++ b/external/oxen-mq @@ -1 +1 @@ -Subproject commit e3e79e1fb776b35ae28b3578ccb1ec6790732010 +Subproject commit 51754037ea19204610751c2ea8ae72b7ed6c1818 diff --git a/external/pybind11 b/external/pybind11 index 3b1dbebab..8de7772cc 160000 --- a/external/pybind11 +++ b/external/pybind11 @@ -1 +1 @@ -Subproject commit 3b1dbebabc801c9cf6f0953a4c20b904d444f879 +Subproject commit 8de7772cc72daca8e947b79b83fea46214931604 diff --git a/external/sqlite_orm b/external/sqlite_orm index b30ddc6a5..4c6a46bd4 160000 --- a/external/sqlite_orm +++ b/external/sqlite_orm @@ -1 +1 @@ -Subproject commit b30ddc6a50dc582c93cd49d8d0cf8f5025ba1d2b +Subproject commit 4c6a46bd4dcfba14a650e0fafb86331526878587 diff --git a/llarp/quic/address.hpp b/llarp/quic/address.hpp index 5f7bc3522..42150ed3e 100644 --- a/llarp/quic/address.hpp +++ b/llarp/quic/address.hpp @@ -21,7 +21,7 @@ namespace llarp::quic class Address { sockaddr_in6 saddr{}; - ngtcp2_addr a{sizeof(saddr), reinterpret_cast(&saddr)}; + ngtcp2_addr a{sizeof(saddr), reinterpret_cast(&saddr), nullptr}; public: Address() = default; @@ -102,7 +102,8 @@ namespace llarp::quic Address local_, remote_; public: - ngtcp2_path path{{local_.sockaddr_size(), local_}, {remote_.sockaddr_size(), remote_}, nullptr}; + ngtcp2_path path{ + {local_.sockaddr_size(), local_, nullptr}, {remote_.sockaddr_size(), remote_, nullptr}}; // Public accessors are const: const Address& local = local_;