naiveproxy: bump to 86.0.4240.75-1

package/ctcgfw/naiveproxy/Makefile

@@ -7,12 +7,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
-PKG_VERSION:=85.0.4183.83-4
+PKG_VERSION:=86.0.4240.75-1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/klzgrad/naiveproxy/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=68b3ec22aba04a671ddb14a1f55dc7425c73adf781cbe87a95097c782f269a07
+PKG_HASH:=91f946e137565115649bc5787788a6889d84e0a20e9878553a832b89c0cb161f
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=BSD 3-Clause

package/ctcgfw/naiveproxy/patches/001-Remove-concurrency-limit.patch

@@ -8,8 +8,6 @@ Subject: [PATCH] Remove concurrency limit
  src/net/tools/naive/naive_proxy_bin.cc | 2 +-
  2 files changed, 2 insertions(+), 3 deletions(-)
 
-diff --git a/src/net/tools/naive/naive_proxy.cc b/src/net/tools/naive/naive_proxy.cc
-index b4d5feee6..a38f79124 100644
 --- a/src/net/tools/naive/naive_proxy.cc
 +++ b/src/net/tools/naive/naive_proxy.cc
 @@ -5,7 +5,6 @@
@@ -20,7 +18,7 @@ index b4d5feee6..a38f79124 100644
  #include <utility>
  
  #include "base/bind.h"
-@@ -35,7 +34,7 @@ NaiveProxy::NaiveProxy(std::unique_ptr<ServerSocket> listen_socket,
+@@ -35,7 +34,7 @@ NaiveProxy::NaiveProxy(std::unique_ptr<S
                         const NetworkTrafficAnnotationTag& traffic_annotation)
      : listen_socket_(std::move(listen_socket)),
        protocol_(protocol),
@@ -29,11 +27,9 @@ index b4d5feee6..a38f79124 100644
        resolver_(resolver),
        session_(session),
        net_log_(
-diff --git a/src/net/tools/naive/naive_proxy_bin.cc b/src/net/tools/naive/naive_proxy_bin.cc
-index 4ba08712d..00acd7756 100644
 --- a/src/net/tools/naive/naive_proxy_bin.cc
 +++ b/src/net/tools/naive/naive_proxy_bin.cc
-@@ -289,7 +289,7 @@ bool ParseCommandLine(const CommandLine& cmdline, Params* params) {
+@@ -289,7 +289,7 @@ bool ParseCommandLine(const CommandLine&
  
    if (!cmdline.concurrency.empty()) {
      if (!base::StringToInt(cmdline.concurrency, &params->concurrency) ||

package/ctcgfw/naiveproxy/patches/100-build-add-OpenWrt-staging-libraries.patch

@@ -7,8 +7,6 @@ Subject: [PATCH] build: add OpenWrt staging libraries
  src/build/config/posix/BUILD.gn | 4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/src/build/config/posix/BUILD.gn b/src/build/config/posix/BUILD.gn
-index 9ccb89f27..de9e5501d 100644
 --- a/src/build/config/posix/BUILD.gn
 +++ b/src/build/config/posix/BUILD.gn
 @@ -28,6 +28,9 @@ config("runtime_library") {
@@ -18,7 +16,7 @@ index 9ccb89f27..de9e5501d 100644
 +    sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include" ]
 +    sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include/nss" ]
 +    sysroot_flags += [ "-I" + getenv("OP_STAGING_DIR") + "/usr/include/nspr" ]
-     if (is_linux) {
+     if (is_linux || is_chromeos) {
        # This is here so that all files get recompiled after a sysroot roll and
        # when turning the sysroot on or off. (defines are passed via the command
 @@ -57,6 +60,7 @@ config("runtime_library") {
@@ -29,5 +27,3 @@ index 9ccb89f27..de9e5501d 100644
      ld_paths = exec_script("sysroot_ld_path.py",
                             [
                               rebase_path("//build/linux/sysroot_ld_path.sh",
--- 
-2.17.1

package/ctcgfw/naiveproxy/patches/101-build-drop-useless-deps-simd_asm.patch

@@ -15,18 +15,13 @@ So, let's drop it in global build file.
  src/BUILD.gn | 1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/src/BUILD.gn b/src/BUILD.gn
-index 97494c0a0..daddf5213 100644
 --- a/src/BUILD.gn
 +++ b/src/BUILD.gn
-@@ -746,7 +746,6 @@ group("gn_all") {
+@@ -751,7 +751,6 @@ group("gn_all") {
        if (enable_nacl) {
          deps += [ "//native_client/src/trusted/platform_qualify:vcpuid" ]
        }
 -      deps += [ "//third_party/libjpeg_turbo:simd_asm" ]
      }
-     if (is_linux && current_toolchain == host_toolchain) {
+     if ((is_linux || is_chromeos) && current_toolchain == host_toolchain) {
        deps += [ "//v8:v8_shell" ]
--- 
-2.17.1
-