Upgrade some dependencies to their latest version.

OrchidTechnologies · May 6, 2024 · ce2305a · ce2305a
1 parent f28cd86
commit ce2305a
Show file tree

Hide file tree

Showing 44 changed files with 54 additions and 42 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -226,3 +226,6 @@
 [submodule "mingw-w64"]
 	path = env/mingw-w64
 	url = https://git.code.sf.net/p/mingw-w64/mingw-w64
+[submodule "base"]
+	path = min-v8/base
+	url = https://chromium.googlesource.com/chromium/src/base
diff --git a/app-shared/flutter-desktop-embedding b/app-shared/flutter-desktop-embedding
diff --git a/env/output.mk b/env/output.mk
@@ -111,11 +111,11 @@ $(shell env/meson.sh $(1) $(output) '$(CURDIR)' '$(meson) $(meson/$(1))' '$(ar/$
 endef
 $(each)
 
-%/configure: %/configure.ac
+%/configure: %/configure.ac $$(call head,$$(dir $$@))
 	cd $(dir $@) && git clean -fxd .
 	@# XXX: https://gitlab.freedesktop.org/pkg-config/pkg-config/-/issues/55
 	@sed -i -e 's/^m4_copy(/m4_copy_force(/' $(dir $@)/glib/m4macros/glib-gettext.m4 || true
-	env/autogen.sh $(dir $@)
+	env/autogen.sh $(dir $@) --maintainer # XXX: this argument is for libpng
 
 $(output)/%/Makefile: $$(specific) $$(folder)/configure $(sysroot) $$(call head,$$(folder)) $(output)/$$(arch)/usr/bin/pkg-config
 	$(specific)

diff --git a/env/target-win.mk b/env/target-win.mk
@@ -121,10 +121,10 @@ qflags += -I$(CURDIR)/$(pwd)/mingw
 # XXX: I need gcc as I don't have windows compiler-rt in NDK
 #qflags += --rtlib=compiler-rt
 
-mingw := git-10.0.0.r258.g530c58e17
+mingw := git-11.0.0.r680.g257321cea
 
 msys2 := 
-msys2 += crt-$(mingw)-2
+msys2 += crt-$(mingw)-1
 msys2 += dlfcn-1.4.0-1
 msys2 += gcc-13.2.0-5
 msys2 += headers-$(mingw)-1

diff --git a/min-cairo/libpng b/min-cairo/libpng
diff --git a/min-krypton/vpn-libraries b/min-krypton/vpn-libraries
diff --git a/min-pcre2/pcre2 b/min-pcre2/pcre2
diff --git a/min-v8/_/base b/min-v8/_/base
@@ -0,0 +1 @@
+../base
diff --git a/min-v8/base b/min-v8/base
diff --git a/min-v8/target-win.mk b/min-v8/target-win.mk
@@ -20,8 +20,8 @@ cflags/$(pwd/v8)/src/base/platform/platform-win32.cc += -U__MINGW32__ -DPAGE_TAR
 cflags/$(pwd/v8)/src/base/platform/time.cc += -include $(pwd/v8)/../time.hpp
 
 # XXX: https://bugs.chromium.org/p/v8/issues/detail?id=12099
-cflags/$(pwd/v8)/src/base/platform/ += -include vista.hpp
-cflags/$(pwd/v8)/src/diagnostics/unwinding-info-win64.cc += -include vista.hpp
+cflags/$(pwd/v8)/src/base/platform/ += -include $(pwd/v8)/../vista.hpp
+cflags/$(pwd/v8)/src/diagnostics/unwinding-info-win64.cc += -include $(pwd/v8)/../vista.hpp
 #cflags/$(pwd/v8)/src/diagnostics/unwinding-info-win64.cc += -U_WIN32_WINNT -D_WIN32_WINNT=0x0602
 
 cflags/$(pwd)/v8/ += -Wno-format

diff --git a/min-v8/target.mk b/min-v8/target.mk
@@ -238,6 +238,7 @@ header += $(filter %.h %.inc,$(tqsrc))
 
 cflags += -I$(pwd/v8)/src
 cflags += -I$(pwd/v8)/include
+cflags += -I$(pwd)/_
 cflags += -I$(pwd)/extra
 
 # XXX: this is un-breaking something the -iquote for sed hacks is breaking in cppgc

diff --git a/min-v8/trace_event b/min-v8/trace_event
diff --git a/min-v8/extra/vista.hpp → min-v8/vista.hpp b/min-v8/extra/vista.hpp → min-v8/vista.hpp
diff --git a/min-webrtc/libsrtp b/min-webrtc/libsrtp
diff --git a/min-webrtc/webrtc b/min-webrtc/webrtc
diff --git a/min-wireshark/libgcrypt b/min-wireshark/libgcrypt
diff --git a/min-wireshark/libgpg-error b/min-wireshark/libgpg-error
diff --git a/min-zlib/googletest b/min-zlib/googletest
diff --git a/min-zlib/libz b/min-zlib/libz
diff --git a/modules b/modules
@@ -21,6 +21,8 @@ head[env/libcxxabi]=origin/release_90
 head[app-shared/flutter]=3.13.9
 head[app-shared/engine]=$(cat app-shared/flutter/bin/internal/engine.version)
 
+# cairo and pixman decided to drop autotools, which is really annoying :/
+# intx is stuck due to use of concepts (so need a newer version of libc++)
 # pcre2 is stuck due to https://github.com/PCRE2Project/pcre2/issues/205
 
 # url is stuck due to https://forums.developer.apple.com/thread/120977 :/

diff --git a/p2p/asio.mk b/p2p/asio.mk
@@ -69,6 +69,7 @@ boost += random
 boost += range
 boost += rational
 boost += regex
+boost += scope
 boost += serialization
 boost += signals2
 boost += smart_ptr

diff --git a/p2p/boost b/p2p/boost
diff --git a/p2p/boringtun b/p2p/boringtun
diff --git a/p2p/c-ares b/p2p/c-ares
diff --git a/p2p/challenge-bypass-ristretto-ffi b/p2p/challenge-bypass-ristretto-ffi
diff --git a/p2p/ctre b/p2p/ctre
diff --git a/p2p/curl b/p2p/curl
diff --git a/p2p/expected b/p2p/expected
diff --git a/p2p/extra/sockets.h b/p2p/extra/sockets.h
@@ -6,7 +6,6 @@
 #include <sys/filio.h>
 typedef int msg_iovlen_t;
 #else
-#define TCP_KEEPALIVE 0
 typedef size_t msg_iovlen_t;
 #endif
 

diff --git a/p2p/intx b/p2p/intx
diff --git a/p2p/lwip b/p2p/lwip
diff --git a/p2p/lz4 b/p2p/lz4
diff --git a/p2p/pugixml b/p2p/pugixml
diff --git a/p2p/secp256k1 b/p2p/secp256k1
diff --git a/p2p/snappy b/p2p/snappy
diff --git a/p2p/source/connection.hpp b/p2p/source/connection.hpp
@@ -44,8 +44,6 @@
 #define TCP_KEEPIDLE TCP_KEEPALIVE
 #define TCP_KEEPCNT 16
 #define TCP_KEEPINTVL 17
-#elif defined(__linux__)
-#define TCP_USER_TIMEOUT 18
 #endif
 
 namespace orc {

diff --git a/p2p/tap-windows6 b/p2p/tap-windows6
diff --git a/p2p/target.mk b/p2p/target.mk
@@ -73,6 +73,12 @@ endif
 cflags += -I$(pwd)/lwip/src/include
 
 cflags += -DLWIP_ERRNO_STDINCLUDE
+cflags += -DLWIP_TCP
+
+ifeq ($(target),lnx)
+cflags += -DTCP_USER_TIMEOUT=18
+cflags/$(pwd)/lwip/ += -DTCP_KEEPALIVE=0xFF
+endif
 
 
 # Android sockaddr_storage is more indirect
@@ -169,9 +175,9 @@ cflags += -I$(pwd)/challenge-bypass-ristretto-ffi/src
 source += $(pwd)/challenge-bypass-ristretto-ffi/src/wrapper.cpp
 
 
-linked += $(pwd)/boringtun/librust.a
+linked += $(pwd)/boringtun/boringtun/librust.a
 cflags += -I$(pwd)/boringtun/boringtun/src
-features/$(pwd)/boringtun += ffi-bindings
+features/$(pwd)/boringtun/boringtun += ffi-bindings
 
 
 source += $(pwd)/SPCDNS/src/codec.c

diff --git a/srv-worker/capnproto b/srv-worker/capnproto
diff --git a/srv-worker/workerd b/srv-worker/workerd
diff --git a/vpn-shared/libevent b/vpn-shared/libevent
diff --git a/vpn-shared/libmaxminddb b/vpn-shared/libmaxminddb
diff --git a/vpn-shared/libssh b/vpn-shared/libssh
diff --git a/vpn-shared/tor b/vpn-shared/tor
+42 −10		.github/workflows/ci.yml
+131 −0		.github/workflows/release-cmake.yml
+0 −60		.github/workflows/release.yml
+10 −0		.gitmodules
+1 −1		CMakeLists.txt
+1 −1		Jamroot
+1 −1		libs/any
+1 −1		libs/array
+1 −1		libs/asio
+1 −1		libs/assert
+1 −1		libs/atomic
+1 −1		libs/beast
+1 −1		libs/bimap
+1 −1		libs/bind
+1 −0		libs/charconv
+1 −1		libs/chrono
+1 −1		libs/cobalt
+1 −1		libs/compat
+1 −1		libs/config
+1 −1		libs/container
+1 −1		libs/container_hash
+1 −1		libs/context
+1 −1		libs/conversion
+1 −1		libs/core
+1 −1		libs/describe
+1 −1		libs/detail
+1 −1		libs/dll
+1 −1		libs/exception
+1 −1		libs/filesystem
+1 −1		libs/function
+1 −1		libs/geometry
+1 −1		libs/hana
+1 −1		libs/integer
+1 −1		libs/interprocess
+1 −1		libs/intrusive
+1 −1		libs/iterator
+1 −1		libs/json
+1 −1		libs/lambda2
+1 −1		libs/leaf
+1 −1		libs/lexical_cast
+1 −1		libs/local_function
+1 −1		libs/locale
+1 −1		libs/log
+5 −3		libs/maintainers.txt
+1 −1		libs/math
+1 −1		libs/move
+1 −1		libs/mp11
+1 −1		libs/msm
+1 −1		libs/multi_index
+1 −1		libs/multiprecision
+1 −1		libs/mysql
+1 −1		libs/nowide
+1 −1		libs/numeric/odeint
+1 −1		libs/outcome
+1 −1		libs/parameter
+1 −1		libs/pfr
+1 −1		libs/pool
+1 −1		libs/preprocessor
+1 −1		libs/process
+1 −1		libs/program_options
+1 −1		libs/property_tree
+1 −1		libs/qvm
+1 −1		libs/random
+1 −1		libs/range
+1 −1		libs/redis
+1 −0		libs/scope
+1 −1		libs/signals2
+1 −1		libs/smart_ptr
+1 −1		libs/spirit
+1 −1		libs/stacktrace
+1 −1		libs/stl_interfaces
+1 −1		libs/system
+1 −1		libs/test
+1 −1		libs/throw_exception
+1 −1		libs/timer
+1 −1		libs/type_index
+1 −1		libs/type_traits
+1 −1		libs/unordered
+1 −1		libs/url
+1 −1		libs/utility
+1 −1		libs/uuid
+1 −1		libs/variant
+1 −1		libs/variant2
+1 −1		libs/wave
+1 −1		more
+1 −1		tools/auto_index
+1 −1		tools/boost_install
+1 −1		tools/boostbook
+1 −1		tools/build
+1 −1		tools/cmake
+1 −1		tools/inspect
+1 −1		tools/quickbook
+15 −0		.github/dependabot.yml
+187 −114		Cargo.lock
+3 −1		README.md
+5 −4		boringtun-cli/Cargo.toml
+3 −3		boringtun-cli/src/main.rs
+23 −9		boringtun/Cargo.toml
+1 −1		boringtun/benches/crypto_benches/x25519_public_key_benching.rs
+5 −9		boringtun/benches/crypto_benches/x25519_shared_key_benching.rs
+5 −0		boringtun/src/device/api.rs
+3 −3		boringtun/src/device/dev_lock.rs
+10 −4		boringtun/src/device/drop_privileges.rs
+11 −10		boringtun/src/device/epoll.rs
+20 −24		boringtun/src/device/integration_tests/mod.rs
+5 −4		boringtun/src/device/kqueue.rs
+108 −97		boringtun/src/device/mod.rs
+30 −29		boringtun/src/device/peer.rs
+10 −19		boringtun/src/device/tun_darwin.rs
+8 −17		boringtun/src/device/tun_linux.rs
+0 −375		boringtun/src/device/udp_unix.rs
+9 −17		boringtun/src/ffi/mod.rs
+1 −1		boringtun/src/lib.rs
+13 −14		boringtun/src/noise/handshake.rs
+14 −19		boringtun/src/noise/mod.rs
+2 −2		boringtun/src/sleepyinstant/unix.rs
+4 −2		Makefile
+12 −3		include/ctre/first.hpp
+12 −3		single-header/ctre-unicode.hpp
+12 −3		single-header/ctre.hpp
+1 −0		tests/_bad_cycle.cpp
+4 −2		tests/matching3.cpp
+9 −0		.gitignore
+0 −3		.gitmodules
+1 −1		CMakeLists.txt
+2 −0		README.md
+0 −1		cmake/tl-cmake
+85 −9		include/tl/expected.hpp
+18 −0		tests/assertions.cpp
+245 −0		tests/extensions.cpp
+10 −1		tests/issues.cpp
+6 −0		tests/swap.cpp
+1 −1		.bumpversion.cfg
+1 −0		.clang-tidy
+9 −0		CHANGELOG.md
+3 −3		CMakeLists.txt
+4 −6		README.md
+1 −5		appveyor.yml
+27 −14		circle.yml
+21 −33		cmake/CableCompilerSettings.cmake
+34 −42		include/intx/intx.hpp
+4 −3		test/CMakeLists.txt
+1 −31		test/unittests/test_builtins.cpp
+0 −2		test/unittests/test_int128.cpp
+0 −2		test/unittests/test_intx_api.cpp
+1 −1		.cirrus.yml
+5 −0		.github/actions/run-in-docker-action/action.yml
+9 −9		.github/workflows/ci.yml
+5 −0		CHANGELOG.md
+16 −7		CMakeLists.txt
+4 −3		ci/ci.sh
+20 −15		configure.ac
+2 −2		src/ecmult_const_impl.h
+108 −13		src/ecmult_gen.h
+2 −2		src/ecmult_gen_compute_table.h
+79 −55		src/ecmult_gen_compute_table_impl.h
+261 −51		src/ecmult_gen_impl.h
+6 −6		src/ecmult_impl.h
+49 −28		src/precompute_ecmult_gen.c
+1,767 −9,734		src/precomputed_ecmult_gen.c
+2 −2		src/precomputed_ecmult_gen.h
+4 −4		src/scalar.h
+29 −25		src/scalar_4x64_impl.h
+7 −6		src/scalar_8x32_impl.h
+19 −12		src/scalar_low_impl.h
+35 −13		src/tests.c
+1 −1		src/tests_exhaustive.c
+16 −1		src/util.h
+1 −1		CMakeLists.txt
+25 −0		snappy-internal.h
+220 −27		snappy.cc
+33 −10		snappy.h
+38 −18		snappy_benchmark.cc
+18 −14		snappy_compress_fuzzer.cc