Upgrade most dependencies to their latest version.

.gitmodules

@@ -226,3 +226,6 @@
 [submodule "llvm-project"]
 	path = env/llvm-project
 	url = https://github.com/llvm/llvm-project.git
+[submodule "range-v3"]
+	path = lib-shared/range-v3
+	url = https://github.com/ericniebler/range-v3.git

env/lnx-arch.sh

@@ -11,7 +11,7 @@ pacman -Sy \
     binutils aarch64-linux-gnu-binutils \
     mingw-w64-binutils \
     libc++ libc++abi \
-    python-pip python-setuptools \
+    python-{packaging,pip,setuptools} \
     jdk17-openjdk \
     bison flex gperf \
     gettext groff texinfo \

env/lnx-ubuntu.sh

@@ -14,10 +14,14 @@ apt-get -y install \
     binutils-{x86-64,aarch64}-linux-gnu \
     binutils-mingw-w64-{i686,x86-64} \
     libc++-dev libc++abi-dev \
-    python3-pip python3-setuptools \
+    python3-{packaging,pip,setuptools} \
     openjdk-11-jre-headless \
     bison flex gperf \
     gettext groff texinfo \
     autoconf autoconf-archive automake \
     libtool meson ninja-build pkg-config \
     qemu-system-{x86,arm} \
+
+if dpkg --compare-versions $(meson --version) '<<' "1.2.0"; then
+    pip3 install --upgrade meson
+fi

env/setup-mac.sh

@@ -7,6 +7,7 @@ brew install \
     rpm2cpio zstd \
     binutils \
     mingw-w64 \
+    python-packaging \
     groff \
     autoconf autoconf-archive automake \
     libtool meson \

env/target-ios.mk

@@ -27,7 +27,7 @@ endif
 
 sdk := iphoneos
 runtime := ios
-more := -miphoneos-version-min=11.0
+more := -miphoneos-version-min=12.0
 include $(pwd)/target-apl.mk
 
 support := iPhoneOS

lib-protocol/source/locator.cpp

@@ -40,7 +40,7 @@ Locator::Locator(const std::string &locator) :
     Locator([&]() {
         // XXX: this should obviously take std::string_view
         auto result(skyr::make_url(locator));
-        orc_assert_(result, result.error().message());
+        orc_assert_(result, make_error_code(result.error()).message());
         auto &value(result.value());
         auto scheme(value.protocol());
         orc_assert(!scheme.empty() && scheme[scheme.size() - 1] == ':');

lib-protocol/source/transport.cpp

@@ -190,7 +190,7 @@ class Transport :
         return false; }
     bool transport_has_send_queue() noexcept override {
         return false; }
-    unsigned int transport_send_queue_size() noexcept override {
+    size_t transport_send_queue_size() noexcept override {
         return 0; }
 
     // no one calls this. it has something to do with UWP
@@ -381,8 +381,12 @@ class Middle :
         Log() << "OpenVPN[" << event.name << "]: " << event.info << std::endl;
     }
 
+    void acc_event(const openvpn::ClientAPI::AppCustomControlMessageEvent &event) noexcept override {
+        Log() << "OpenVPN[" << event.protocol << "]: " << event.payload << std::endl;
+    }
+
 
-    bool socket_protect(int socket, std::string remote, bool ipv6) noexcept override {
+    bool socket_protect(openvpn_io::detail::socket_type socket, std::string remote, bool ipv6) noexcept override {
         // we do this by hooking the internal implementation of bind/connect
         return true;
     }

lib-shared/extra/fmt/format_header_only.h

@@ -1 +1,2 @@
 #include <fmt/format.h>
+#include <fmt/ranges.h>

lib-shared/target.mk

@@ -43,22 +43,6 @@ source += $(pwd)/cppcoro/lib/win32.cpp
 endif
 
 
-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 \
-    $(pwd)/url/src/unicode/*.cpp \
-    $(pwd)/url/src/url/*.cpp \
-    $(pwd)/url/src/url/percent_encoding/*.cpp \
-))
-
-
 #source += $(pwd)/boost/libs/regex/src/regex_traits_defaults.cpp
 source += $(wildcard $(pwd)/boost/libs/filesystem/src/*.cpp)
 source += $(wildcard $(pwd)/boost/libs/json/src/*.cpp)
@@ -122,3 +106,4 @@ include $(pwd)/asio.mk
 $(call include,abseil.mk)
 $(call include,secp256k1.mk)
 $(call include,sqlite.mk)
+$(call include,url.mk)

lib-shared/url.mk

@@ -0,0 +1,27 @@
+# Orchid - WebRTC P2P VPN Market (on Ethereum)
+# Copyright (C) 2017-2020  The Orchid Authors
+
+# GNU Affero General Public License, Version 3 {{{ */
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# }}}
+
+
+cflags += -I$(pwd)/expected/include
+cflags += -I$(pwd)/range-v3/include
+
+cflags += -I$(pwd)/url/include
+cflags += -I$(pwd)/url/src
+
+source += $(wildcard $(pwd)/url/src/v1/*/*.cpp)

modules

@@ -21,12 +21,8 @@ head[min-v8/v8]=$(sed -e '/url = "https:\/\/github.com\/v8\/v8\//!d;s/^.*\///;s/
 head[srv-worker/capnproto]=$(sed -e '/url.*"https:\/\/github.com\/capnproto\/capnproto\//!d;s/^.*\///;s/".*//' srv-worker/workerd/WORKSPACE)
 
 # cairo and pixman decided to drop autotools, which is really annoying :/
-# 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)
-head[lib-shared/url]=7c822cb9873b1422e09be5131f30e9d83d487096
+# llvm-project (libcxx/libcxxabi) is stuck due to me being bored of this
+# openvpn3 is stuck due to external transport factory breaking OPENVPN_LOG
 
 git submodule foreach -q 'echo $displaypath' | while read -r sub; do (
     cd "${sub}"