Просмотр исходного кода

naiveproxy: Update to 95.0.4638.54-3

Removed upstreamed patch.

Signed-off-by: Tianling Shen <[email protected]>
Tianling Shen 4 лет назад
Родитель
Сommit
398205c3bf

+ 2 - 2
naiveproxy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=naiveproxy
-PKG_VERSION:=95.0.4638.54-2
+PKG_VERSION:=95.0.4638.54-3
 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:=2d94b7ccf8f33787ee06ee4a291d3c3823803ca7be96628031f804f43504b85d
+PKG_HASH:=2489bffda3e0a993cf7e4e8dd6bb5d99e5793c49251ee7dad8612214a3badd03
 
 PKG_LICENSE:=BSD 3-Clause
 PKG_LICENSE_FILES:=LICENSE

+ 0 - 40
naiveproxy/patches/001-Remove-concurrency-limit.patch

@@ -1,40 +0,0 @@
-From f1a49736010170a70123db07ca41256ba92c0002 Mon Sep 17 00:00:00 2001
-From: klzgrad <[email protected]>
-Date: Sat, 3 Oct 2020 08:54:59 +0800
-Subject: [PATCH] Remove concurrency limit
-
----
- src/net/tools/naive/naive_proxy.cc     | 3 +--
- src/net/tools/naive/naive_proxy_bin.cc | 2 +-
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
---- a/src/net/tools/naive/naive_proxy.cc
-+++ b/src/net/tools/naive/naive_proxy.cc
-@@ -5,7 +5,6 @@
- 
- #include "net/tools/naive/naive_proxy.h"
- 
--#include <algorithm>
- #include <utility>
- 
- #include "base/bind.h"
-@@ -39,7 +38,7 @@ NaiveProxy::NaiveProxy(std::unique_ptr<S
-       protocol_(protocol),
-       listen_user_(listen_user),
-       listen_pass_(listen_pass),
--      concurrency_(std::min(4, std::max(1, concurrency))),
-+      concurrency_(concurrency),
-       resolver_(resolver),
-       session_(session),
-       net_log_(
---- a/src/net/tools/naive/naive_proxy_bin.cc
-+++ b/src/net/tools/naive/naive_proxy_bin.cc
-@@ -296,7 +296,7 @@ bool ParseCommandLine(const CommandLine&
- 
-   if (!cmdline.concurrency.empty()) {
-     if (!base::StringToInt(cmdline.concurrency, &params->concurrency) ||
--        params->concurrency < 1 || params->concurrency > 4) {
-+        params->concurrency < 1) {
-       std::cerr << "Invalid concurrency" << std::endl;
-       return false;
-     }

+ 1 - 0
naiveproxy/src/init_env.sh

@@ -46,6 +46,7 @@ use_sysroot=false
 
 use_allocator=\"none\"
 use_allocator_shim=false
+use_partition_alloc=false
 
 fatal_linker_warnings=false
 treat_warnings_as_errors=false