Merge remote-tracking branch 'origin/dev' into stable

pouyapayandeh · Aug 31, 2022 · 2a70f32 · 2a70f32
2 parents 1ba2086 + c4397d2
commit 2a70f32
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 deletions.
diff --git a/.drone.jsonnet b/.drone.jsonnet
@@ -51,6 +51,7 @@ local debian_pipeline(name,
                       extra_cmds=[],
                       extra_steps=[],
                       jobs=6,
+                      kitware_cmake_distro='',
                       allow_fail=false) = {
   kind: 'pipeline',
   type: 'docker',
@@ -69,6 +70,15 @@ local debian_pipeline(name,
         apt_get_quiet + ' update',
         apt_get_quiet + ' install -y eatmydata',
         'eatmydata ' + apt_get_quiet + ' dist-upgrade -y',
+      ] + (
+        if kitware_cmake_distro != '' then
+          [
+            'eatmydata ' + apt_get_quiet + ' install --no-install-recommends -y curl ca-certificates',
+            'curl https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - >/etc/apt/trusted.gpg.d/kitware.gpg',
+            'echo deb https://apt.kitware.com/ubuntu/ ' + kitware_cmake_distro + ' main >/etc/apt/sources.list.d/kitware.list',
+            apt_get_quiet + ' update',
+          ] else []
+      ) + [
         'eatmydata ' + apt_get_quiet + ' install -y --no-install-recommends cmake git ninja-build ccache '
         + (if test_oxend then 'gdb ' else '') + std.join(' ', deps),
         'mkdir build',
@@ -252,6 +262,7 @@ local gui_wallet_step_darwin = {
     build_tests=false,
     lto=true,
     extra_cmds=static_check_and_upload,
+    kitware_cmake_distro='bionic',
     /*extra_steps=[gui_wallet_step('ubuntu:bionic')]*/
   ),
 

diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake
@@ -27,11 +27,11 @@ set(READLINE_SOURCE readline-${READLINE_VERSION}.tar.gz)
 set(READLINE_HASH SHA512=27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
     CACHE STRING "readline source hash")
 
-set(SQLITE3_VERSION 3380200 CACHE STRING "sqlite3 version")
+set(SQLITE3_VERSION 3390200 CACHE STRING "sqlite3 version")
 set(SQLITE3_MIRROR ${LOCAL_MIRROR} https://www.sqlite.org/2022
     CACHE STRING "sqlite3 download mirror(s)")
 set(SQLITE3_SOURCE sqlite-autoconf-${SQLITE3_VERSION}.tar.gz)
-set(SQLITE3_HASH SHA512=2192675d8638a933ec75ec78dc4185f005c9d37453bc2bbe590b72235066f68ba2cac1be3b491a47d6a7ca74d5b3bfe4e548d576a6b324383bb9bc7739d0b635
+set(SQLITE3_HASH SHA512=c16b50ade3c182d5473014ac0a51e2bb8a5cfc46e532c2bda77ae4d530336e2b57aa4f12dccb6aa2148d60e9289305bf20842ac95dc52f2d31df8eb5f0599de6
     CACHE STRING "sqlite3 source hash")
 
 if(SQLITE3_VERSION MATCHES "^([0-9]+)(0([0-9])|([1-9][0-9]))(0([0-9])|([1-9][0-9]))[0-9][0-9]$")
@@ -95,11 +95,11 @@ set(ZLIB_SOURCE zlib-${ZLIB_VERSION}.tar.gz)
 set(ZLIB_HASH SHA512=cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
     CACHE STRING "zlib source hash")
 
-set(CURL_VERSION 7.82.0 CACHE STRING "curl version")
+set(CURL_VERSION 7.85.0 CACHE STRING "curl version")
 set(CURL_MIRROR ${LOCAL_MIRROR} https://curl.se/download https://curl.askapache.com
   CACHE STRING "curl mirror(s)")
 set(CURL_SOURCE curl-${CURL_VERSION}.tar.xz)
-set(CURL_HASH SHA256=0aaa12d7bd04b0966254f2703ce80dd5c38dbbd76af0297d3d690cdce58a583c
+set(CURL_HASH SHA512=b57cc31649a4f47cc4b482f56a85c86c8e8aaeaf01bc1b51b065fdb9145a9092bc52535e52a85a66432eb163605b2edbf5bc5c33ea6e40e50f26a69ad1365cbd
   CACHE STRING "curl source hash")
 
 

diff --git a/external/libuv b/external/libuv
diff --git a/external/oxen-encoding b/external/oxen-encoding
diff --git a/external/oxen-mq b/external/oxen-mq
+32 −0		.github/workflows/CI-sample.yml
+53 −42		.github/workflows/CI-unix.yml
+51 −0		.github/workflows/CI-win.yml
+19 −4		.github/workflows/sanitizer.yml
+9 −0		AUTHORS
+9 −1		CMakeLists.txt
+129 −1		ChangeLog
+7 −6		MAINTAINERS.md
+10 −2		Makefile.am
+0 −1		SUPPORTED_PLATFORMS.md
+32 −3		autogen.sh
+5 −2		configure.ac
+51 −0		docs/code/CMakeLists.txt
+2 −2		docs/code/cgi/main.c
+7 −7		docs/code/interfaces/main.c
+2 −3		docs/code/thread-create/main.c
+2 −1		docs/code/udp-dhcp/main.c
+0 −1		docs/code/uvcat/main.c
+0 −1		docs/code/uvtee/main.c
+1 −1		docs/src/guide/introduction.rst
+1 −1		docs/src/guide/utilities.rst
+1 −1		include/uv/version.h
+6 −0		include/uv/win.h
+16 −0		m4/libuv-check-flags.m4
+7 −0		m4/libuv-check-versions.m4
+52 −0		src/strtok.c
+27 −0		src/strtok.h
+8 −7		src/unix/atomic-ops.h
+59 −51		src/unix/core.c
+2 −1		src/unix/fs.c
+0 −1		src/unix/internal.h
+1 −1		src/unix/kqueue.c
+19 −17		src/unix/os390-syscalls.c
+232 −57		src/unix/os390.c
+4 −2		src/unix/pipe.c
+22 −18		src/unix/process.c
+25 −70		src/unix/stream.c
+29 −7		src/unix/sunos.c
+13 −4		src/unix/tcp.c
+62 −16		src/unix/tty.c
+9 −0		src/unix/udp.c
+3 −1		src/uv-common.c
+10 −3		src/win/core.c
+1 −1		src/win/error.c
+7 −2		src/win/internal.h
+251 −199		src/win/pipe.c
+3 −10		src/win/req-inl.h
+9 −2		src/win/stream.c
+67 −64		src/win/tcp.c
+34 −32		src/win/tty.c
+3 −2		src/win/udp.c
+0 −77		test/test-callback-order.c
+38 −98		test/test-embed.c
+41 −19		test/test-fs-event.c
+9 −8		test/test-getsockname.c
+26 −0		test/test-idle.c
+20 −4		test/test-list.h
+16 −0		test/test-pipe-bind-error.c
+1 −2		test/test-pipe-set-non-blocking.c
+34 −3		test/test-spawn.c
+90 −0		test/test-strtok.c
+18 −0		test/test-tcp-bind-error.c
+183 −0		test/test-tcp-close-after-read-timeout.c
+46 −0		test/test-tcp-close-reset.c
+107 −0		test/test-tcp-rst.c
+25 −2		test/test-timer.c
+0 −4		test/test-udp-connect.c
+0 −4		test/test-udp-connect6.c
+3 −1		CMakeLists.txt
+24 −11		oxenc/bt_producer.h
+37 −1		tests/test_bt.cpp