From 169e9538912a2ef396843cc08bac4147afbe9598 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 25 Oct 2021 18:05:09 +0800
Subject: [PATCH] update-10.25
---
bpytop/Makefile | 5 ++-
bpytop/patches/010-remove-tzset.patch | 32 +++++++++++++++++++
brook/Makefile | 2 +-
hysteria/Makefile | 2 +-
luci-app-easymesh/Makefile | 2 +-
luci-app-passwall/Makefile | 4 +--
.../model/cbi/passwall/client/other.lua | 19 +++++------
.../root/usr/share/passwall/0_default_config | 2 +-
.../root/usr/bin/serverchan/api/ipv4.list | 1 -
luci-app-store/Makefile | 2 +-
luci-app-store/luasrc/controller/store.lua | 6 ++--
naiveproxy/Makefile | 4 +--
naiveproxy/src/init_env.sh | 5 +++
trojan-go/Makefile | 2 +-
v2ray-core/Makefile | 4 +--
v2ray-plugin/Makefile | 2 +-
xray-core/Makefile | 2 +-
xray-plugin/Makefile | 2 +-
18 files changed, 68 insertions(+), 30 deletions(-)
create mode 100644 bpytop/patches/010-remove-tzset.patch
diff --git a/bpytop/Makefile b/bpytop/Makefile
index 524b401be..d354a397f 100644
--- a/bpytop/Makefile
+++ b/bpytop/Makefile
@@ -34,9 +34,8 @@ endef
define Py3Package/bpytop/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/bpytop $(1)/usr/bin/
-
- $(INSTALL_DIR) $(1)/usr/share
- $(CP) $(PKG_BUILD_DIR)/themes $(1)/usr/share/bpytop
+ $(INSTALL_DIR) $(1)/usr/share/bpytop
+ $(CP) $(PKG_BUILD_DIR)/themes $(1)/usr/share/bpytop/
endef
$(eval $(call Py3Package,bpytop))
diff --git a/bpytop/patches/010-remove-tzset.patch b/bpytop/patches/010-remove-tzset.patch
new file mode 100644
index 000000000..4bca531f3
--- /dev/null
+++ b/bpytop/patches/010-remove-tzset.patch
@@ -0,0 +1,32 @@
+--- a/bpytop.py
++++ b/bpytop.py
+@@ -19,7 +19,7 @@
+
+ import os, sys, io, threading, signal, re, subprocess, logging, logging.handlers, argparse
+ import urllib.request
+-from time import time, sleep, strftime, tzset
++from time import time, sleep, strftime
+ from datetime import timedelta
+ from _thread import interrupt_main
+ from collections import defaultdict
+@@ -38,6 +38,11 @@ except Exception as e: errors.append(f'{e}')
+ try: import psutil # type: ignore
+ except Exception as e: errors.append(f'{e}')
+
++try:
++ from time import tzset
++except ImportError:
++ tzset = None
++
+ SELF_START = time()
+
+ SYSTEM: str
+@@ -1706,7 +1711,7 @@ class Box:
+ if not "cpu" in cls.boxes or not cls.clock_on: return
+ cls.c_counter += 1
+ if cls.c_counter > 3600 / (Config.update_ms / 1000):
+- tzset()
++ if tzset: tzset()
+ cls.c_counter = 0
+ out: str = ""
+ if force: pass
diff --git a/brook/Makefile b/brook/Makefile
index 141ddc6c4..534d05048 100644
--- a/brook/Makefile
+++ b/brook/Makefile
@@ -55,7 +55,7 @@ define Package/brook/config
config BROOK_COMPRESS_UPX
bool "Compress executable files with UPX"
- depends on @!mips64
+ depends on !mips64
default y
endef
diff --git a/hysteria/Makefile b/hysteria/Makefile
index a94ce90b0..b43a0c60b 100644
--- a/hysteria/Makefile
+++ b/hysteria/Makefile
@@ -50,7 +50,7 @@ config HYSTERIA_COMPRESS_GOPROXY
config HYSTERIA_COMPRESS_UPX
bool "Compress executable files with UPX"
- depends on @!mips64
+ depends on !mips64
default y
endmenu
diff --git a/luci-app-easymesh/Makefile b/luci-app-easymesh/Makefile
index 34c138d80..941678f4e 100755
--- a/luci-app-easymesh/Makefile
+++ b/luci-app-easymesh/Makefile
@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for easymesh
-LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +dawn -wpad -wpad-basic-wolfssl -wpad-openssl +wpad-mesh-openssl +dawn
+LUCI_DEPENDS:= +kmod-cfg80211 +batctl-default +kmod-batman-adv +wpad-mesh-openssl +dawn
PKG_VERSION:=1.9
include $(TOPDIR)/feeds/luci/luci.mk
diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile
index d0178ad71..af2cea929 100644
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
-PKG_VERSION:=4.40
+PKG_VERSION:=4.41
PKG_RELEASE:=1
#20211021
@@ -83,7 +83,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
bool "Include NaiveProxy"
- depends on !(arc||armeb||mips||mips64||powerpc)
+ depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc)
default n
config PACKAGE_$(PKG_NAME)_INCLUDE_PDNSD
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
index 9c3283a23..5a817fbe6 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/other.lua
@@ -92,21 +92,22 @@ if os.execute("lsmod | grep -i REDIRECT >/dev/null") == 0 and os.execute("lsmod
o:value("redirect", "REDIRECT")
o:value("tproxy", "TPROXY")
o:depends("ipv6_tproxy", false)
- function o.formvalue(self, section)
- local ipv6_tproxy = ListValue.formvalue(o_ipv6_tproxy, section)
- if ipv6_tproxy == "1" then
- return "tproxy"
- end
- return ListValue.formvalue(self, section)
+
+ o = s:option(ListValue, "_tcp_proxy_way", translate("TCP Proxy Way"))
+ o.default = "tproxy"
+ o:value("tproxy", "TPROXY")
+ o:depends("ipv6_tproxy", true)
+ o.write = function(self, section, value)
+ return self.map:set(section, "tcp_proxy_way", value)
end
---- IPv6 TProxy
- o_ipv6_tproxy = s:option(Flag, "ipv6_tproxy", translate("IPv6 TProxy"),
+ o = s:option(Flag, "ipv6_tproxy", translate("IPv6 TProxy"),
"" .. translate(
"Experimental feature. Make sure that your node supports IPv6.") ..
"")
- o_ipv6_tproxy.default = 0
- o_ipv6_tproxy.rmempty = false
+ o.default = 0
+ o.rmempty = false
end
--[[
diff --git a/luci-app-passwall/root/usr/share/passwall/0_default_config b/luci-app-passwall/root/usr/share/passwall/0_default_config
index ae38e75bc..aad1466ff 100644
--- a/luci-app-passwall/root/usr/share/passwall/0_default_config
+++ b/luci-app-passwall/root/usr/share/passwall/0_default_config
@@ -29,7 +29,7 @@ config global_forwarding
option process '0'
option tcp_no_redir_ports 'disable'
option udp_no_redir_ports '80,443'
- option tcp_redir_ports '22,25,53,143,465,587,993,995,80,443'
+ option tcp_redir_ports '22,25,53,143,465,587,853,993,995,80,443'
option udp_redir_ports '1:65535'
option accept_icmp '0'
option tcp_proxy_way 'redirect'
diff --git a/luci-app-serverchan/root/usr/bin/serverchan/api/ipv4.list b/luci-app-serverchan/root/usr/bin/serverchan/api/ipv4.list
index 72081532b..158e57250 100644
--- a/luci-app-serverchan/root/usr/bin/serverchan/api/ipv4.list
+++ b/luci-app-serverchan/root/usr/bin/serverchan/api/ipv4.list
@@ -1,5 +1,4 @@
www.cip.cc
-ipv4.ddnspod.com
ifcfg.cn
speed.neu.edu.cn/getIP.php
ddns.oray.com/checkip
diff --git a/luci-app-store/Makefile b/luci-app-store/Makefile
index e4fa46a35..a61bc2735 100644
--- a/luci-app-store/Makefile
+++ b/luci-app-store/Makefile
@@ -10,7 +10,7 @@ LUCI_DESCRIPTION:=luci-app-store is a ipk store developed by LinkEase team
LUCI_DEPENDS:=+curl
LUCI_PKGARCH:=all
PKG_VERSION:=0.1.0
-PKG_RELEASE:=7
+PKG_RELEASE:=8
PKG_MAINTAINER:=jjm2473
LUCI_BUILD_DEPENDS:=app-store-ui/host
diff --git a/luci-app-store/luasrc/controller/store.lua b/luci-app-store/luasrc/controller/store.lua
index 11548367c..1b1784753 100644
--- a/luci-app-store/luasrc/controller/store.lua
+++ b/luci-app-store/luasrc/controller/store.lua
@@ -129,8 +129,10 @@ function store_action(param)
local meta = json_parse(fs.readfile(metadir .. "/" .. pkg))
local metapkg = metapkgpre .. meta.name
local status = ipkg.status(metapkg)
- meta.time = tonumber(status[metapkg]["Installed-Time"])
- data[#data+1] = meta
+ if next(status) ~= nil then
+ meta.time = tonumber(status[metapkg]["Installed-Time"])
+ data[#data+1] = meta
+ end
end
end
end
diff --git a/naiveproxy/Makefile b/naiveproxy/Makefile
index fc45a1478..ce460785c 100644
--- a/naiveproxy/Makefile
+++ b/naiveproxy/Makefile
@@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=naiveproxy
-PKG_VERSION:=95.0.4638.54-1
+PKG_VERSION:=95.0.4638.54-2
PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -42,7 +42,7 @@ define Package/naiveproxy
SUBMENU:=Web Servers/Proxies
URL:=https://github.com/klzgrad/naiveproxy
TITLE:=Make a fortune quietly
- DEPENDS:=@!(arc||armeb||mips||mips64||powerpc) +libatomic
+ DEPENDS:=@!(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc) +libatomic
endef
define Package/naiveproxy/description
diff --git a/naiveproxy/src/init_env.sh b/naiveproxy/src/init_env.sh
index b41d1bafd..7cca0db92 100755
--- a/naiveproxy/src/init_env.sh
+++ b/naiveproxy/src/init_env.sh
@@ -83,6 +83,11 @@ case "${target_arch}" in
else
naive_flags+=" arm_float_abi=\"soft\" arm_use_neon=false"
fi
+ case "${cpu_type}" in
+ "arm1176jzf-s"|"arm926ej-s"|"mpcore"|"xscale")
+ naive_flags+=" arm_use_thumb=false"
+ ;;
+ esac
;;
"mipsel"|"mips64el")
naive_flags+=" use_gold=false use_thin_lto=false use_lld=false chrome_pgo_phase=0 mips_arch_variant=\"r2\""
diff --git a/trojan-go/Makefile b/trojan-go/Makefile
index 4e2d30b6e..1f52770ed 100644
--- a/trojan-go/Makefile
+++ b/trojan-go/Makefile
@@ -53,7 +53,7 @@ config TROJAN_GO_COMPRESS_GOPROXY
config TROJAN_GO_COMPRESS_UPX
bool "Compress executable files with UPX"
- depends on @!mips64
+ depends on !mips64
default y
endmenu
diff --git a/v2ray-core/Makefile b/v2ray-core/Makefile
index a81dc879f..f925a459b 100644
--- a/v2ray-core/Makefile
+++ b/v2ray-core/Makefile
@@ -104,7 +104,7 @@ config V2RAY_CORE_COMPRESS_GOPROXY
config V2RAY_CORE_COMPRESS_UPX
bool "Compress executable files with UPX"
- depends on @!mips64
+ depends on !mips64
default y
endmenu
endef
@@ -119,7 +119,7 @@ config V2RAY_CTL_COMPRESS_GOPROXY
config V2RAY_CTL_COMPRESS_UPX
bool "Compress executable files with UPX"
- depends on @!mips64
+ depends on !mips64
default y
endmenu
endef
diff --git a/v2ray-plugin/Makefile b/v2ray-plugin/Makefile
index 2b1c89ea4..8d0263741 100644
--- a/v2ray-plugin/Makefile
+++ b/v2ray-plugin/Makefile
@@ -42,7 +42,7 @@ config $(PKG_NAME)_INCLUDE_GOPROXY
config $(PKG_NAME)_COMPRESS_UPX
bool "Compress executable files with UPX"
- depends on @!mips64
+ depends on !mips64
default y
endef
diff --git a/xray-core/Makefile b/xray-core/Makefile
index 23599eb5e..a9b013994 100644
--- a/xray-core/Makefile
+++ b/xray-core/Makefile
@@ -94,7 +94,7 @@ config XRAY_CORE_COMPRESS_GOPROXY
config XRAY_CORE_COMPRESS_UPX
bool "Compress executable files with UPX"
- depends on @!mips64
+ depends on !mips64
default y
endmenu
endef
diff --git a/xray-plugin/Makefile b/xray-plugin/Makefile
index 28a8dcaf9..128c2fc9e 100644
--- a/xray-plugin/Makefile
+++ b/xray-plugin/Makefile
@@ -46,7 +46,7 @@ config XRAY_PLUGIN_COMPRESS_GOPROXY
config XRAY_PLUGIN_COMPRESS_UPX
bool "Compress executable files with UPX"
- depends on @!mips64
+ depends on !mips64
default y
endef