From b204e113e12d68d79d09ef28052ecb90c0658461 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 7 May 2024 01:45:59 -0700 Subject: [PATCH] Upgrade most dependencies to their latest version. --- .gitmodules | 3 +++ app-shared/flutter-desktop-embedding | 2 +- env/output.mk | 13 ++++++++----- env/setup-ndk.sh | 2 +- env/target-apl.mk | 3 --- env/target-win.mk | 4 ++-- gui-orchid/ios/Podfile.lock | 2 +- gui-orchid/macos/Podfile.lock | 2 +- min-cairo/libpng | 2 +- min-cairo/libpng.mk | 1 + 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 .../include/perfetto/tracing/event_context.h | 0 .../perfetto/include/perfetto/tracing/track.h | 0 .../include/perfetto/tracing/track_event_args.h | 0 min-webrtc/libsrtp | 2 +- min-webrtc/target.mk | 4 +++- min-webrtc/webrtc | 2 +- min-wireshark/target.mk | 6 ++++++ min-zlib/googletest | 2 +- min-zlib/libz | 2 +- modules | 5 ++++- p2p/asio.mk | 2 ++ 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 | 2 +- p2p/intx | 2 +- p2p/lwip | 2 +- p2p/lz4 | 2 +- p2p/openvpn3.mk | 14 ++------------ p2p/ovpncli.mm | 1 - p2p/pugixml | 2 +- p2p/secp256k1 | 2 +- p2p/snappy | 2 +- p2p/source/connection.hpp | 2 -- p2p/source/integer.hpp | 5 +++-- p2p/tap-windows6 | 2 +- p2p/target.mk | 13 +++++++++++-- srv-daemon/source/server.cpp | 2 +- srv-worker/capnproto | 2 +- srv-worker/workerd | 2 +- vpn-shared/libevent | 2 +- vpn-shared/libmaxminddb | 2 +- vpn-shared/libssh | 2 +- vpn-shared/tor | 2 +- 56 files changed, 84 insertions(+), 67 deletions(-) create mode 120000 min-v8/_/base create mode 160000 min-v8/base rename min-v8/{extra => }/vista.hpp (100%) create mode 100644 min-webrtc/extra/third_party/perfetto/include/perfetto/tracing/event_context.h create mode 100644 min-webrtc/extra/third_party/perfetto/include/perfetto/tracing/track.h create mode 100644 min-webrtc/extra/third_party/perfetto/include/perfetto/tracing/track_event_args.h delete mode 120000 p2p/ovpncli.mm 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..5bbd01c49 100644 --- a/env/output.mk +++ b/env/output.mk @@ -63,7 +63,7 @@ $(output)/%.mm.o: $$(specific) $$(folder).mm $$(code) $(specific) @mkdir -p $(dir $@) @echo [CC] $(target)/$(arch) $< - $(call compile,cxx,objective-c++,-std=gnu++17 -fobjc-arc) + $(call compile,cxx,objective-c++,-std=gnu++20 -fobjc-arc) $(output)/%.cc.o: $$(specific) $$(folder).cc $$(code) $(specific) @@ -77,6 +77,9 @@ $(output)/%.c++.o: $$(specific) $$(folder).c++ $$(code) @echo [CC] $(target)/$(arch) $< $(call compile,cxx,c++,-std=c++20) +# XXX: -std=c++2b is currently blocked on an incompatibility with libwebrtc +# https://issues.webrtc.org/issues/339074792 + $(output)/%.cpp.o: $$(specific) $$(folder).cpp $$(code) $(specific) @mkdir -p $(dir $@) @@ -84,11 +87,11 @@ ifeq ($(filter notidy,$(debug)),) @if [[ $< =~ $(filter) && ! $< =~ .*/(base58|lwip|monitor)\.cpp ]]; then \ echo [CT] $(target)/$(arch) $<; \ $(tidy) $< --quiet --warnings-as-errors='*' --header-filter='$(filter)' --config='{Checks: "$(checks)", CheckOptions: [$(foreach v,$(filter checks/%,$(.VARIABLES)),{key: "$(patsubst checks/%,%,$(v))", value: $($(v))}$(comma) )]}' -- \ - $(wordlist 2,$(words $(cxx)),$(cxx)) $(more/$(arch)) -std=c++2b -Wconversion -Wno-sign-conversion $(flags) $(xflags); \ + $(wordlist 2,$(words $(cxx)),$(cxx)) $(more/$(arch)) -std=c++20 -Wconversion -Wno-sign-conversion $(flags) $(xflags); \ fi endif @echo [CC] $(target)/$(arch) $< - $(call compile,cxx,c++,-std=c++2b) + $(call compile,cxx,c++,-std=c++20) $(output)/%.rc.o: $$(specific) $$(folder).rc $$(code) $(specific) @@ -111,11 +114,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 $@) $(a_$(notdir $(patsubst %/configure.ac,%,$<))) $(output)/%/Makefile: $$(specific) $$(folder)/configure $(sysroot) $$(call head,$$(folder)) $(output)/$$(arch)/usr/bin/pkg-config $(specific) diff --git a/env/setup-ndk.sh b/env/setup-ndk.sh index 70f571e7f..1fd7e9bee 100755 --- a/env/setup-ndk.sh +++ b/env/setup-ndk.sh @@ -1,4 +1,4 @@ #!/bin/bash set -e set -o pipefail -echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.2.11394342" "platforms;android-33" >/dev/null +echo y | "${ANDROID_HOME}"/cmdline-tools/latest/bin/sdkmanager "build-tools;29.0.2" "ndk;26.3.11579264" "platforms;android-33" >/dev/null diff --git a/env/target-apl.mk b/env/target-apl.mk index eeac8ecba..ef06781c1 100644 --- a/env/target-apl.mk +++ b/env/target-apl.mk @@ -59,9 +59,6 @@ more += -fno-strict-return include $(pwd)/kit-android.mk cxx += -stdlib=libc++ -xflags += -nostdinc++ -xflags += -isystem $(toolchain)/usr/include/c++/v1 - # the r22 NDK prefers its own copy of ld wflags += -fuse-ld=/usr/bin/ld 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/gui-orchid/ios/Podfile.lock b/gui-orchid/ios/Podfile.lock index b28794384..28c4da638 100644 --- a/gui-orchid/ios/Podfile.lock +++ b/gui-orchid/ios/Podfile.lock @@ -143,4 +143,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 21e78760fee629465f00ee6e1b0ca78764f69ff7 -COCOAPODS: 1.11.3 +COCOAPODS: 1.15.2 diff --git a/gui-orchid/macos/Podfile.lock b/gui-orchid/macos/Podfile.lock index 803877b5b..14f277bb7 100644 --- a/gui-orchid/macos/Podfile.lock +++ b/gui-orchid/macos/Podfile.lock @@ -65,4 +65,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: ce32ab99a0089086c289cf0789c8382f403ce92b -COCOAPODS: 1.11.3 +COCOAPODS: 1.15.2 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-cairo/libpng.mk b/min-cairo/libpng.mk index 5d764aba2..30d393fac 100644 --- a/min-cairo/libpng.mk +++ b/min-cairo/libpng.mk @@ -11,6 +11,7 @@ # XXX: this relied on pre-_.a behavior of archive +a_libpng += --maintainer p_libpng := -I$(CURDIR)/$(pwd)/zlb/libz l_libpng := -L@/$(pwd)/zlb 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/extra/third_party/perfetto/include/perfetto/tracing/event_context.h b/min-webrtc/extra/third_party/perfetto/include/perfetto/tracing/event_context.h new file mode 100644 index 000000000..e69de29bb diff --git a/min-webrtc/extra/third_party/perfetto/include/perfetto/tracing/track.h b/min-webrtc/extra/third_party/perfetto/include/perfetto/tracing/track.h new file mode 100644 index 000000000..e69de29bb diff --git a/min-webrtc/extra/third_party/perfetto/include/perfetto/tracing/track_event_args.h b/min-webrtc/extra/third_party/perfetto/include/perfetto/tracing/track_event_args.h new file mode 100644 index 000000000..e69de29bb 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/target.mk b/min-webrtc/target.mk index f10b39a1f..9e04c6aaf 100644 --- a/min-webrtc/target.mk +++ b/min-webrtc/target.mk @@ -38,6 +38,8 @@ webrtc += $(wildcard $(pwd)/webrtc/api/units/*.cc) webrtc += $(pwd)/webrtc/api/field_trials_registry.cc +webrtc += $(pwd)/webrtc/api/audio/audio_processing_statistics.cc + webrtc += $(pwd)/webrtc/api/audio_codecs/audio_codec_pair_id.cc webrtc += $(pwd)/webrtc/api/audio_codecs/audio_encoder.cc @@ -99,7 +101,6 @@ webrtc += $(filter-out \ webrtc += $(wildcard $(pwd)/webrtc/media/sctp/*.cc) webrtc += $(pwd)/webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_config.cc -webrtc += $(pwd)/webrtc/modules/audio_processing/include/audio_processing_statistics.cc webrtc += $(wildcard $(pwd)/webrtc/modules/congestion_controller/goog_cc/*.cc) webrtc += $(wildcard $(pwd)/webrtc/modules/congestion_controller/rtp/*.cc) @@ -137,6 +138,7 @@ webrtc += $(filter-out \ %/ifaddrs_converter.cc \ %/nat_server.cc \ %/nat_socket_factory.cc \ + %/trace_categories.cc \ ,$(wildcard $(pwd)/webrtc/rtc_base/*.cc)) # XXX: I'd prefer to remove all %/experiments/* diff --git a/min-webrtc/webrtc b/min-webrtc/webrtc index c8068f68f..84e90556a 160000 --- a/min-webrtc/webrtc +++ b/min-webrtc/webrtc @@ -1 +1 @@ -Subproject commit c8068f68f2de58e61b67c5b37c7a621642daf134 +Subproject commit 84e90556aa3dae8fa7e71c1e476efd73b32a9c2e diff --git a/min-wireshark/target.mk b/min-wireshark/target.mk index fff915a0f..3323619a0 100644 --- a/min-wireshark/target.mk +++ b/min-wireshark/target.mk @@ -239,8 +239,14 @@ ifneq ($(filter ios mac,$(target)),) # XXX: rndlinux.c ret = getentropy (buffer, nbytes); (syscall() backup) # error: implicit declaration of function 'getentropy' is invalid in C99 w_libgcrypt += ac_cv_func_getentropy=no +# the README file seems to indicate they don't know how to implement this +w_libgcrypt += ac_cv_sys_symbol_underscore=yes endif +# these symbols conflict with OpenSSL :/ +p_libgcrypt += -Daria_encrypt=gcrypt_aria_encrypt +p_libgcrypt += -Dgf_mul=gcrypt_gf_mul + w_libgcrypt += --with-libgpg-error-prefix=@/usr $(call depend,$(pwd)/libgcrypt/Makefile,@/usr/include/gpg-error.h) $(call depend,$(pwd)/libgcrypt/Makefile,@/usr/lib/libgpg-error.a) 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..1b2859869 100755 --- a/modules +++ b/modules @@ -21,7 +21,10 @@ 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) -# pcre2 is stuck due to https://github.com/PCRE2Project/pcre2/issues/205 +# 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++) +# libgcrypt is stuck on aarch64 Android due to https://dev.gnupg.org/T7111 +# libgpg-error is stuck due to libgcrypt as it breaks the older detection # url is stuck due to https://forums.developer.apple.com/thread/120977 :/ # (I tried to use a local copy of libcxx on Apple, but crashed on iOS 14) diff --git a/p2p/asio.mk b/p2p/asio.mk index a3c37f667..de9f596d5 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 @@ -95,6 +96,7 @@ cflags += -DBOOST_ASIO_DISABLE_CONNECTEX #cflags += -DBOOST_ASIO_NO_DEPRECATED # XXX: this is because I am still using an old version of libc++ +cflags += -DBOOST_ASIO_DISABLE_STD_COROUTINE cflags += -DBOOST_FILESYSTEM_NO_CXX20_ATOMIC_REF cflags += -DBOOST_NO_CXX20_HDR_CONCEPTS 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..14aac0569 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 @@ -57,6 +56,7 @@ struct msghdr { #ifdef __linux__ #include #include +#define TCP_KEEPALIVE 0xFF #ifndef __ANDROID__ #include #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/openvpn3.mk b/p2p/openvpn3.mk index 9a0c8a633..960e9ebd3 100644 --- a/p2p/openvpn3.mk +++ b/p2p/openvpn3.mk @@ -19,16 +19,7 @@ cflags += -DUSE_OPENSSL cflags += -DOPENVPN_FORCE_TUN_NULL cflags += -DUSE_TUN_BUILDER -ifeq (,) -ifeq ($(target),ios) -source += $(pwd)/ovpncli.mm -else -source += $(pwd)/openvpn3/client/ovpncli.cpp -endif -else source += $(wildcard $(pwd)/openvpn3/client/*.cpp) -cflags/$(pwd)/openvpn3/ += -ObjC++ -endif cflags += -I$(pwd)/openvpn3 cflags += -I$(pwd)/openvpn3/client @@ -36,11 +27,10 @@ cflags += -I$(pwd)/openvpn3/client cflags += -DOPENVPN_EXTERNAL_TRANSPORT_FACTORY cflags += -DOPENVPN_EXTERNAL_TUN_FACTORY +# XXX: this is unfortunate +cflags/$(pwd)/ovpncli.mm += -Wno-deprecated-enum-enum-conversion cflags/$(pwd)/openvpn3/ += -Wno-deprecated-enum-enum-conversion -# XXX: https://github.com/OpenVPN/openvpn3/issues/204 -cflags/$(pwd)/openvpn3/client/ovpncli.cpp += -Wno-bitwise-instead-of-logical - ifeq ($(target),win) cflags/$(pwd)/openvpn3/ += -Wno-missing-braces cflags/$(pwd)/openvpn3/ += -Wno-pointer-bool-conversion diff --git a/p2p/ovpncli.mm b/p2p/ovpncli.mm deleted file mode 120000 index c6c0d32ee..000000000 --- a/p2p/ovpncli.mm +++ /dev/null @@ -1 +0,0 @@ -openvpn3/client/ovpncli.cpp \ No newline at end of file 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/source/integer.hpp b/p2p/source/integer.hpp index 7106e1fc3..609b48d1e 100644 --- a/p2p/source/integer.hpp +++ b/p2p/source/integer.hpp @@ -43,7 +43,8 @@ using boost::multiprecision::uint256_t; static const uint128_t Max128((uint256_t(1) << 128) - 1); -inline bool operator ==(const std::from_chars_result &lhs, const std::from_chars_result &rhs) { +// XXX: remove this once I upgrade libc++ +inline bool Compare(const std::from_chars_result &lhs, const std::from_chars_result &rhs) { return lhs.ptr == rhs.ptr && lhs.ec == rhs.ec; } @@ -61,7 +62,7 @@ std::enable_if_t, Type_> To(const std::string_view &va return 16; }()); Type_ number; - orc_assert_((std::from_chars(start, end, number, detected) == std::from_chars_result{end, std::errc()}), value << " is not a number"); + orc_assert_(Compare(std::from_chars(start, end, number, detected), std::from_chars_result{end, std::errc()}), value << " is not a number"); return number; } 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..9b6089f2e 100644 --- a/p2p/target.mk +++ b/p2p/target.mk @@ -46,6 +46,10 @@ $(call depend,$(pwd)/source/version.cpp.o,@/extra/revision.hpp) cflags += -I$(pwd)/expected/include cflags += -I$(pwd)/url/include cflags += -I$(pwd)/url/src + +# XXX: this might be fixed in a later version +cflags/$(pwd)/url/ += -include iterator + source += $(filter-out \ %/filesystem.cpp \ ,$(wildcard \ @@ -73,6 +77,11 @@ endif cflags += -I$(pwd)/lwip/src/include cflags += -DLWIP_ERRNO_STDINCLUDE +cflags += -DLWIP_TCP + +ifeq ($(target),lnx) +cflags += -DTCP_USER_TIMEOUT=18 +endif # Android sockaddr_storage is more indirect @@ -169,9 +178,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-daemon/source/server.cpp b/srv-daemon/source/server.cpp index bae476a1e..b2e1f5a88 100644 --- a/srv-daemon/source/server.cpp +++ b/srv-daemon/source/server.cpp @@ -93,7 +93,7 @@ bool Server::Bill(const Buffer &data, bool force) { return true; const auto amount(cashier_->Bill(data.size())); - const auto floor(cashier_->Bill(1024UZ*128)); + const auto floor(cashier_->Bill(1024ULL*128)); // XXX: c++2b UZ S self; 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