From ce2305a0211e82432166f259c1b65c8806180bfd Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Mon, 6 May 2024 08:38:05 +0000 Subject: [PATCH] Upgrade some dependencies to their latest version. --- .gitmodules | 3 +++ app-shared/flutter-desktop-embedding | 2 +- env/output.mk | 4 ++-- env/target-win.mk | 4 ++-- min-cairo/libpng | 2 +- min-krypton/vpn-libraries | 2 +- min-pcre2/pcre2 | 2 +- min-v8/_/base | 1 + min-v8/base | 1 + min-v8/target-win.mk | 4 ++-- min-v8/target.mk | 1 + min-v8/trace_event | 2 +- min-v8/{extra => }/vista.hpp | 0 min-webrtc/libsrtp | 2 +- min-webrtc/webrtc | 2 +- min-wireshark/libgcrypt | 2 +- min-wireshark/libgpg-error | 2 +- min-zlib/googletest | 2 +- min-zlib/libz | 2 +- modules | 2 ++ p2p/asio.mk | 1 + p2p/boost | 2 +- p2p/boringtun | 2 +- p2p/c-ares | 2 +- p2p/challenge-bypass-ristretto-ffi | 2 +- p2p/ctre | 2 +- p2p/curl | 2 +- p2p/expected | 2 +- p2p/extra/sockets.h | 1 - p2p/intx | 2 +- p2p/lwip | 2 +- p2p/lz4 | 2 +- p2p/pugixml | 2 +- p2p/secp256k1 | 2 +- p2p/snappy | 2 +- p2p/source/connection.hpp | 2 -- p2p/tap-windows6 | 2 +- p2p/target.mk | 10 ++++++++-- srv-worker/capnproto | 2 +- srv-worker/workerd | 2 +- vpn-shared/libevent | 2 +- vpn-shared/libmaxminddb | 2 +- vpn-shared/libssh | 2 +- vpn-shared/tor | 2 +- 44 files changed, 54 insertions(+), 42 deletions(-) create mode 120000 min-v8/_/base create mode 160000 min-v8/base rename min-v8/{extra => }/vista.hpp (100%) diff --git a/.gitmodules b/.gitmodules index 677e34e25..b80b4c2dc 100644 --- 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 index 6c66ad23e..eb3964990 160000 --- a/app-shared/flutter-desktop-embedding +++ b/app-shared/flutter-desktop-embedding @@ -1 +1 @@ -Subproject commit 6c66ad23ee79749f30a8eece542cf54eaf157ed8 +Subproject commit eb3964990cf19629c89ff8cb4a37640c7b3d5601 diff --git a/env/output.mk b/env/output.mk index 13cf56412..c98f98878 100644 --- 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 index c3440107e..ccb3062bd 100644 --- 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 index c22ef3b2e..f1848a3b5 160000 --- a/min-cairo/libpng +++ b/min-cairo/libpng @@ -1 +1 @@ -Subproject commit c22ef3b2e342bdfe3140b7e94879996d0e18c95b +Subproject commit f1848a3b560ddcad065242268433af475948461e diff --git a/min-krypton/vpn-libraries b/min-krypton/vpn-libraries index 59c659095..9d7d4af15 160000 --- a/min-krypton/vpn-libraries +++ b/min-krypton/vpn-libraries @@ -1 +1 @@ -Subproject commit 59c659095b7e64b6e5f8f3455ab88e4be7be46f3 +Subproject commit 9d7d4af1506c1fe1936499d09c746aef2007f5d7 diff --git a/min-pcre2/pcre2 b/min-pcre2/pcre2 index 4a6a8b056..5634d0b6b 160000 --- a/min-pcre2/pcre2 +++ b/min-pcre2/pcre2 @@ -1 +1 @@ -Subproject commit 4a6a8b056f39079d5e958eac84c2ad173f4680bc +Subproject commit 5634d0b6b56793f5215d8d348aedffb510c51cc6 diff --git a/min-v8/_/base b/min-v8/_/base new file mode 120000 index 000000000..24312d19b --- /dev/null +++ b/min-v8/_/base @@ -0,0 +1 @@ +../base \ No newline at end of file diff --git a/min-v8/base b/min-v8/base new file mode 160000 index 000000000..6ca251cee --- /dev/null +++ b/min-v8/base @@ -0,0 +1 @@ +Subproject commit 6ca251cee4cf82f5c33461837005539eeaf684da diff --git a/min-v8/target-win.mk b/min-v8/target-win.mk index 5986fec65..853833bda 100644 --- 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 index 5e6964fc9..eef1e4db8 100644 --- 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 index 29ac73db5..35f06510a 160000 --- a/min-v8/trace_event +++ b/min-v8/trace_event @@ -1 +1 @@ -Subproject commit 29ac73db520575590c3aceb0a6f1f58dda8934f6 +Subproject commit 35f06510a6a088054ba3417b0f9f7ee4a120db55 diff --git a/min-v8/extra/vista.hpp b/min-v8/vista.hpp similarity index 100% rename from min-v8/extra/vista.hpp rename to min-v8/vista.hpp diff --git a/min-webrtc/libsrtp b/min-webrtc/libsrtp index 17b2d544e..7a7e64c8b 160000 --- a/min-webrtc/libsrtp +++ b/min-webrtc/libsrtp @@ -1 +1 @@ -Subproject commit 17b2d544ecf4f5d4d338baa41aa7e60eaa6c3e98 +Subproject commit 7a7e64c8b5a632f55929cb3bb7d3e6fb48c3205a diff --git a/min-webrtc/webrtc b/min-webrtc/webrtc index c8068f68f..a513e8b66 160000 --- a/min-webrtc/webrtc +++ b/min-webrtc/webrtc @@ -1 +1 @@ -Subproject commit c8068f68f2de58e61b67c5b37c7a621642daf134 +Subproject commit a513e8b66b8fb430f84df245a2d04cb998082445 diff --git a/min-wireshark/libgcrypt b/min-wireshark/libgcrypt index ccfa9f2c1..47f2cb8f6 160000 --- a/min-wireshark/libgcrypt +++ b/min-wireshark/libgcrypt @@ -1 +1 @@ -Subproject commit ccfa9f2c1427b40483984198c3df41f8057f69f8 +Subproject commit 47f2cb8f6f35cf962158d9cffc79c23fab163585 diff --git a/min-wireshark/libgpg-error b/min-wireshark/libgpg-error index 220a427b4..a5f0e0b2f 160000 --- a/min-wireshark/libgpg-error +++ b/min-wireshark/libgpg-error @@ -1 +1 @@ -Subproject commit 220a427b4f997ef6af1b2d4e82ef1dc96e0cd6ff +Subproject commit a5f0e0b2f7897fc6ef1ab847146e16ef64d1d4a7 diff --git a/min-zlib/googletest b/min-zlib/googletest index 0570e2d93..2d16ed055 160000 --- a/min-zlib/googletest +++ b/min-zlib/googletest @@ -1 +1 @@ -Subproject commit 0570e2d930a185bbc375be70d9ad96836b955a4f +Subproject commit 2d16ed055d09c3689d44b272adc097393de948a0 diff --git a/min-zlib/libz b/min-zlib/libz index 2d44c51ad..7d77fb7fd 160000 --- a/min-zlib/libz +++ b/min-zlib/libz @@ -1 +1 @@ -Subproject commit 2d44c51ada6d325b85b53427b02dabf44648bca4 +Subproject commit 7d77fb7fd66d8a5640618ad32c71fdeb7d3e02df diff --git a/modules b/modules index 695539e35..ac184bf7f 100755 --- 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 index a3c37f667..060f8352f 100644 --- 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 index ad09f667e..ab7968a0b 160000 --- a/p2p/boost +++ b/p2p/boost @@ -1 +1 @@ -Subproject commit ad09f667e61e18f5c31590941e748ac38e5a81bf +Subproject commit ab7968a0bbcf574a7859240d1d8443f58ed6f6cf diff --git a/p2p/boringtun b/p2p/boringtun index b3c4a1b49..f672bb6c1 160000 --- a/p2p/boringtun +++ b/p2p/boringtun @@ -1 +1 @@ -Subproject commit b3c4a1b49be29d91030fa1ead543440b0889225e +Subproject commit f672bb6c1e1e371240a8d151f15854687eb740bb diff --git a/p2p/c-ares b/p2p/c-ares index d32231304..6bad5a4ba 160000 --- a/p2p/c-ares +++ b/p2p/c-ares @@ -1 +1 @@ -Subproject commit d322313040f9b7815b16bea1115474471f3f8a28 +Subproject commit 6bad5a4ba306f7e3702feeb8d6c10e38969f80b6 diff --git a/p2p/challenge-bypass-ristretto-ffi b/p2p/challenge-bypass-ristretto-ffi index 419995e4a..3e22c067e 160000 --- a/p2p/challenge-bypass-ristretto-ffi +++ b/p2p/challenge-bypass-ristretto-ffi @@ -1 +1 @@ -Subproject commit 419995e4a873c294f1eaefca276f8ad25328e89f +Subproject commit 3e22c067e9e4135e5b8bbec7a611ae0e2545648b diff --git a/p2p/ctre b/p2p/ctre index 972588658..02b4165c0 160000 --- a/p2p/ctre +++ b/p2p/ctre @@ -1 +1 @@ -Subproject commit 9725886582a928491a086bba1c07909b2e583157 +Subproject commit 02b4165c024cad597335f9b742ed0186ca7ee212 diff --git a/p2p/curl b/p2p/curl index ab173d144..3a082cd3c 160000 --- a/p2p/curl +++ b/p2p/curl @@ -1 +1 @@ -Subproject commit ab173d14437b4eea67bea139a5c28645d6b2ae88 +Subproject commit 3a082cd3c55790870a8025856c42587a06cd295e diff --git a/p2p/expected b/p2p/expected index b74fecd44..3f0ca7b19 160000 --- a/p2p/expected +++ b/p2p/expected @@ -1 +1 @@ -Subproject commit b74fecd4448a1a5549402d17ddc51e39faa5020c +Subproject commit 3f0ca7b19253129700a073abfa6d8638d9f7c80c diff --git a/p2p/extra/sockets.h b/p2p/extra/sockets.h index cef465749..d81a40228 100644 --- a/p2p/extra/sockets.h +++ b/p2p/extra/sockets.h @@ -6,7 +6,6 @@ #include 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 index f3b775faa..8296dd711 160000 --- a/p2p/intx +++ b/p2p/intx @@ -1 +1 @@ -Subproject commit f3b775faa76e64ee76e0c8c4fde4bf7386845402 +Subproject commit 8296dd711603056cd16412b68da6f9ab26dd59c0 diff --git a/p2p/lwip b/p2p/lwip index 3fe8d2fc4..1cc1536e6 160000 --- a/p2p/lwip +++ b/p2p/lwip @@ -1 +1 @@ -Subproject commit 3fe8d2fc43a9b69f7ed28c63d44a7744f9c0def9 +Subproject commit 1cc1536e6a7117e23ebaf5546405a843a3e558ae diff --git a/p2p/lz4 b/p2p/lz4 index ecf92d089..0f57364a1 160000 --- a/p2p/lz4 +++ b/p2p/lz4 @@ -1 +1 @@ -Subproject commit ecf92d0897587c0f641df9db83c910fd236cb18a +Subproject commit 0f57364a1b2f71cbfda2c4fcd0979eb0c0c1466c diff --git a/p2p/pugixml b/p2p/pugixml index b2b466403..f1d8c51ec 160000 --- a/p2p/pugixml +++ b/p2p/pugixml @@ -1 +1 @@ -Subproject commit b2b466403084667c90a0f0cc4e960405cfc8117a +Subproject commit f1d8c51ec8e05b571d7f420ce5cb1a6708c5e0ed diff --git a/p2p/secp256k1 b/p2p/secp256k1 index 427e86b9e..da515074e 160000 --- a/p2p/secp256k1 +++ b/p2p/secp256k1 @@ -1 +1 @@ -Subproject commit 427e86b9edcaa5cb19e71233ad93c2ec60dff10f +Subproject commit da515074e3ebc8abc85a4fff3a31d7694ecf897b diff --git a/p2p/snappy b/p2p/snappy index 27f34a580..52820ea9c 160000 --- a/p2p/snappy +++ b/p2p/snappy @@ -1 +1 @@ -Subproject commit 27f34a580be4a3becf5f8c0cba13433f53c21337 +Subproject commit 52820ea9c6cb0af6ebe4920f806dbfbb0de9eaab diff --git a/p2p/source/connection.hpp b/p2p/source/connection.hpp index 2bc2f21f6..b57453ab0 100644 --- 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 index dc230ae84..0cad8664c 160000 --- a/p2p/tap-windows6 +++ b/p2p/tap-windows6 @@ -1 +1 @@ -Subproject commit dc230ae845f322f546aa154d67aeb989c6ee2398 +Subproject commit 0cad8664c2a51832df61f2e1853b6da317d1c129 diff --git a/p2p/target.mk b/p2p/target.mk index 692a0c1aa..7730826bd 100644 --- 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 index e7d005e87..08d082653 160000 --- a/srv-worker/capnproto +++ b/srv-worker/capnproto @@ -1 +1 @@ -Subproject commit e7d005e8775ed19212f06ef6df0ea1f27a5ab7e5 +Subproject commit 08d0826533c72ae9d9182cb2dd33d5ccd20e4e46 diff --git a/srv-worker/workerd b/srv-worker/workerd index 4ff491f73..bb8c8cd75 160000 --- a/srv-worker/workerd +++ b/srv-worker/workerd @@ -1 +1 @@ -Subproject commit 4ff491f7374822821b541b0e34c48cef0c2d8a50 +Subproject commit bb8c8cd75e6a85dc88a1905553eb1ce4e1e58576 diff --git a/vpn-shared/libevent b/vpn-shared/libevent index f9134df7d..6bb41ed0b 160000 --- a/vpn-shared/libevent +++ b/vpn-shared/libevent @@ -1 +1 @@ -Subproject commit f9134df7d07a9214d00cb0d18d7fd820fa7eb781 +Subproject commit 6bb41ed0bbac9c27f97e80cfd4e52a9b1d610d38 diff --git a/vpn-shared/libmaxminddb b/vpn-shared/libmaxminddb index c7f2d1dc9..f33d0224c 160000 --- a/vpn-shared/libmaxminddb +++ b/vpn-shared/libmaxminddb @@ -1 +1 @@ -Subproject commit c7f2d1dc9927c719371539c1d75f52028bffcd91 +Subproject commit f33d0224c2177170b46dc05df5f2c7a4f494bb9a diff --git a/vpn-shared/libssh b/vpn-shared/libssh index 6ad455a8a..89c53e196 160000 --- a/vpn-shared/libssh +++ b/vpn-shared/libssh @@ -1 +1 @@ -Subproject commit 6ad455a8acfe6032c2a87cf83f2d20463c30f8af +Subproject commit 89c53e1962bbff7b8866c09895489eaaca736f39 diff --git a/vpn-shared/tor b/vpn-shared/tor index a5d53ce41..7a5d94bcf 160000 --- a/vpn-shared/tor +++ b/vpn-shared/tor @@ -1 +1 @@ -Subproject commit a5d53ce4164bd8a2070435dd7887bdfd0b5480dd +Subproject commit 7a5d94bcf842299534b667433424ac7a1133d371