From a999af1ec8972db1186a5cf2f659f942a18ef7cf Mon Sep 17 00:00:00 2001 From: bobo liu <7552030+fakeboboliu@users.noreply.github.com> Date: Tue, 9 Mar 2021 23:13:48 +0800 Subject: [PATCH 01/13] luci-app-frpc: add config field of user Signed-off-by: Tianling Shen --- package/lean/luci-app-frpc/Makefile | 2 +- .../luasrc/model/cbi/frp/frp.lua | 4 + package/lean/luci-app-frpc/po/zh-cn/frp.po | 546 +++++++++--------- .../lean/luci-app-frpc/root/etc/config/frp | 1 + .../lean/luci-app-frpc/root/etc/init.d/frp | 4 +- 5 files changed, 285 insertions(+), 272 deletions(-) diff --git a/package/lean/luci-app-frpc/Makefile b/package/lean/luci-app-frpc/Makefile index eb1a01eb09..28a304430d 100644 --- a/package/lean/luci-app-frpc/Makefile +++ b/package/lean/luci-app-frpc/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI for FRPC LUCI_DEPENDS:=+wget-ssl +frpc LUCI_PKGARCH:=all -PKG_VERSION:=1.2 +PKG_VERSION:=1.3 PKG_RELEASE:=1 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua index 531dd84f6c..34fc151fbb 100644 --- a/package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua +++ b/package/lean/luci-app-frpc/luasrc/model/cbi/frp/frp.lua @@ -26,6 +26,10 @@ e=t:taboption("base",Value, "token", translate("Token"), translate("Time duratio e.optional=false e.password=true e.rmempty=false +e=t:taboption("base",Value, "user", translate("User"), translate("Commonly used to distinguish you with other clients.")) +e.optional=true +e.default = "" +e.rmempty=false e=t:taboption("base",Value, "vhost_http_port", translate("Vhost HTTP Port")) e.datatype = "port" e.rmempty=false diff --git a/package/lean/luci-app-frpc/po/zh-cn/frp.po b/package/lean/luci-app-frpc/po/zh-cn/frp.po index 17f775a70a..44e60c8c44 100644 --- a/package/lean/luci-app-frpc/po/zh-cn/frp.po +++ b/package/lean/luci-app-frpc/po/zh-cn/frp.po @@ -1,270 +1,276 @@ -msgid "" -msgstr "Content-Type: text/plain; charset=UTF-8" - - -msgid "Frp Setting" -msgstr "Frp 内网穿透" - -msgid "Frp Status" -msgstr "Frp状态" - -msgid "The Frp service is not running." -msgstr "Frp服务未运行" - -msgid "The Frp service is running." -msgstr "Frp服务正在运行" - -msgid "Frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet." -msgstr "Frp 是一个可用于内网穿透的高性能的反向代理应用。" - -msgid "Global Setting" -msgstr "全局设置" - -msgid "Basic Settings" -msgstr "基本设置" - -msgid "Other Settings" -msgstr "其他设置" - -msgid "Client Log" -msgstr "日志" - -msgid "Enabled" -msgstr "启用" - -msgid "Server" -msgstr "服务器" - -msgid "Port" -msgstr "端口" - -msgid "Token" -msgstr "令牌" - -msgid "Time duration between server of frpc and frps mustn't exceed 15 minutes." -msgstr "frpc服务器与frps之间的时间间隔不得超过15分钟" - -msgid "Vhost HTTP Port" -msgstr "HTTP穿透服务端口" - -msgid "Vhost HTTPS Port" -msgstr "HTTPS穿透服务端口" - -msgid "Exit program when first login failed" -msgstr "初始登录失败即退出程序" - -msgid "TCP Stream Multiplexing" -msgstr "TCP端口复用" - -msgid "decide if exit program when first login failed, otherwise continuous relogin to frps." -msgstr "第一次登录失败就退出程序，否则将持续尝试登陆 Frp 服务器。" - -msgid "Default is Ture. This feature in frps.ini and frpc.ini must be same." -msgstr "该功能默认启用，该配置项在服务端和客户端必须保持一致。" - -msgid "Protocol Type" -msgstr "协议类型" - -msgid "Frp support kcp protocol since v0.12.0" -msgstr "从 v0.12.0 版本开始，底层通信协议支持选择 kcp 协议加速。" - -msgid "TCP Protocol" -msgstr "TCP协议" - -msgid "KCP Protocol" -msgstr "KCP协议" - -msgid "Connect frps by HTTP PROXY" -msgstr "通过代理连接 frps" - -msgid "frpc can connect frps using HTTP PROXY" -msgstr "frpc 支持通过 HTTP PROXY 和 frps 进行通信" - -msgid "HTTP PROXY" -msgstr "HTTP代理" - -msgid "Enable Connection Pool" -msgstr "启用连接池功能" - -msgid "This feature is fit for a large number of short connections." -msgstr "适合有大量短连接请求时开启" - -msgid "Connection Pool" -msgstr "指定预创建连接的数量" - -msgid "Connections will be established in advance." -msgstr "frpc 会预先和服务端建立起指定数量的连接。" - -msgid "Service registration interval" -msgstr "服务注册间隔" - -msgid "0 means disable this feature, unit: min" -msgstr "0表示禁用定时注册功能，单位：分钟" - -msgid "Log Level" -msgstr "日志记录等级" - -msgid "Trace" -msgstr "追踪" - -msgid "Debug" -msgstr "调试" - -msgid "Info" -msgstr "信息" - -msgid "Warning" -msgstr "警告" - -msgid "Error" -msgstr "错误" - -msgid "Log Keepd Max Days" -msgstr "日志记录天数" - -msgid "Services List" -msgstr "服务列表" - -msgid "Service Remark Name" -msgstr "服务备注名" - -msgid "Domain/Subdomain" -msgstr "域名/子域名" - -msgid "Remote Port" -msgstr "远程主机端口" - -msgid "Local Host Address" -msgstr "内网主机地址" - -msgid "Local Host Port" -msgstr "内网主机端口" - -msgid "Use Encryption" -msgstr "开启数据加密" - -msgid "Use Compression" -msgstr "使用压缩" - -msgid "Enable State" -msgstr "开启状态" - -msgid "Frp Domain Config" -msgstr "Frp域名配置" - -msgid "Config Frp Protocol" -msgstr "配置 Frp 协议参数" - -msgid "Disable" -msgstr "关闭" - -msgid "Frp Protocol Type" -msgstr "Frp 协议类型" - -msgid "Domain Type" -msgstr "域名类型" - -msgid "Custom Domains" -msgstr "自定义域名" - -msgid "SubDomain" -msgstr "子域名" - -msgid "Both the above two Domain types" -msgstr "同时使用2种域名" - -msgid "If SubDomain is used, Custom Domains couldn't be subdomain or wildcard domain of the maindomain(subdomain_host)." -msgstr "如果服务端配置了主域名(subdomain_host)，则自定义域名不能是属于主域名(subdomain_host) 的子域名或者泛域名。" - -msgid "subdomain_host must be configured in server: frps in advance." -msgstr "使用子域名时，必须预先在服务端配置主域名(subdomain_host)参数。" - -msgid "STCP Role" -msgstr "SFTP服务类型" - -msgid "Use Plugin" -msgstr "使用插件" - -msgid "If plugin is defined, local_ip and local_port is useless, plugin will handle connections got from frps." -msgstr "使用插件使用插件模式时，本地 IP 地址和端口无需配置，插件将会处理来自服务端的链接请求。" - -msgid "STCP Screct Key" -msgstr "SFTP密钥" - -msgid "STCP Server Name" -msgstr "SFTP服务名称" - -msgid "Enable URL routing" -msgstr "启用 URL 路由" - -msgid "Frp support forward http requests to different backward web services by url routing." -msgstr "Frp支持通过url路由将http请求转发到不同的反向web服务。" - -msgid "Choose Plugin" -msgstr "选择插件" - -msgid "Proxy Authentication" -msgstr "代理认证" - -msgid "Other PCs could access the Internet through frpc's network by using http_proxy plugin." -msgstr "http proxy 插件，可以使其他机器通过 frpc 的网络访问互联网；开启身份验证之后需要用户名、密码才能连接到 HTTP 代理。" - -msgid "HTTP Proxy UserName" -msgstr "HTTP 代理用户名" - -msgid "HTTP Proxy Password" -msgstr "HTTP 代理密码" - -msgid "Plugin Unix Sock Path" -msgstr "Unix Sock 插件路径" - -msgid "Password protecting your web service" -msgstr "密码保护您的web服务" - -msgid "HTTP UserName" -msgstr "HTTP 用户名" - -msgid "HTTP PassWord" -msgstr "HTTP 密码" - -msgid "Rewriting the Host Header" -msgstr "修改 Host Header" - -msgid "Frp can rewrite http requests with a modified Host header." -msgstr "Frp可以用修改后的主机头重写http请求。" - -msgid "Proxy-Protocol Version" -msgstr "Proxy-Protocol 版本" - -msgid "Encrypted the communication between frpc and frps, will effectively prevent the traffic intercepted." -msgstr "将 frpc 与 frps 之间的通信内容加密传输，将会有效防止流量被拦截。" - -msgid "The contents will be compressed to speed up the traffic forwarding speed, but this will consume some additional cpu resources." -msgstr "对传输内容进行压缩，加快流量转发速度，但是会额外消耗一些 cpu 资源。" - -msgid "Http username and password are safety certification for http protocol." -msgstr "Http用户名和密码是Http协议的安全认证。" - -msgid "Proxy Protocol to send user's real IP to local services." -msgstr "将用户的真实IP发送到本地服务的代理协议。" - -msgid "STCP Server Name is Service Remark Name of STCP Server" -msgstr "STCP服务器别名" - -msgid "Please ensure the remark name is unique." -msgstr "确保备注名唯一" - -msgid "Plugin_Local_Addr" -msgstr "插件本地地址（格式 IP:Port）" - -msgid "plugin_crt_path" -msgstr "插件证书路径" - -msgid "plugin_key_path" -msgstr "插件私钥路径" - -msgid "plugin_host_header_rewrite" -msgstr "插件 Host Header 重写" - -msgid "plugin_header_X-From-Where" -msgstr "插件X-From-Where请求头" +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + + +msgid "Frp Setting" +msgstr "Frp 内网穿透" + +msgid "Frp Status" +msgstr "Frp状态" + +msgid "The Frp service is not running." +msgstr "Frp服务未运行" + +msgid "The Frp service is running." +msgstr "Frp服务正在运行" + +msgid "Frp is a fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet." +msgstr "Frp 是一个可用于内网穿透的高性能的反向代理应用。" + +msgid "Global Setting" +msgstr "全局设置" + +msgid "Basic Settings" +msgstr "基本设置" + +msgid "Other Settings" +msgstr "其他设置" + +msgid "Client Log" +msgstr "日志" + +msgid "Enabled" +msgstr "启用" + +msgid "Server" +msgstr "服务器" + +msgid "Port" +msgstr "端口" + +msgid "Token" +msgstr "令牌" + +msgid "User" +msgstr "用户名" + +msgid "Commonly used to distinguish you with other clients." +msgstr "通常用于区分你与其他客户端" + +msgid "Time duration between server of frpc and frps mustn't exceed 15 minutes." +msgstr "frpc服务器与frps之间的时间间隔不得超过15分钟" + +msgid "Vhost HTTP Port" +msgstr "HTTP穿透服务端口" + +msgid "Vhost HTTPS Port" +msgstr "HTTPS穿透服务端口" + +msgid "Exit program when first login failed" +msgstr "初始登录失败即退出程序" + +msgid "TCP Stream Multiplexing" +msgstr "TCP端口复用" + +msgid "decide if exit program when first login failed, otherwise continuous relogin to frps." +msgstr "第一次登录失败就退出程序，否则将持续尝试登陆 Frp 服务器。" + +msgid "Default is Ture. This feature in frps.ini and frpc.ini must be same." +msgstr "该功能默认启用，该配置项在服务端和客户端必须保持一致。" + +msgid "Protocol Type" +msgstr "协议类型" + +msgid "Frp support kcp protocol since v0.12.0" +msgstr "从 v0.12.0 版本开始，底层通信协议支持选择 kcp 协议加速。" + +msgid "TCP Protocol" +msgstr "TCP协议" + +msgid "KCP Protocol" +msgstr "KCP协议" + +msgid "Connect frps by HTTP PROXY" +msgstr "通过代理连接 frps" + +msgid "frpc can connect frps using HTTP PROXY" +msgstr "frpc 支持通过 HTTP PROXY 和 frps 进行通信" + +msgid "HTTP PROXY" +msgstr "HTTP代理" + +msgid "Enable Connection Pool" +msgstr "启用连接池功能" + +msgid "This feature is fit for a large number of short connections." +msgstr "适合有大量短连接请求时开启" + +msgid "Connection Pool" +msgstr "指定预创建连接的数量" + +msgid "Connections will be established in advance." +msgstr "frpc 会预先和服务端建立起指定数量的连接。" + +msgid "Service registration interval" +msgstr "服务注册间隔" + +msgid "0 means disable this feature, unit: min" +msgstr "0表示禁用定时注册功能，单位：分钟" + +msgid "Log Level" +msgstr "日志记录等级" + +msgid "Trace" +msgstr "追踪" + +msgid "Debug" +msgstr "调试" + +msgid "Info" +msgstr "信息" + +msgid "Warning" +msgstr "警告" + +msgid "Error" +msgstr "错误" + +msgid "Log Keepd Max Days" +msgstr "日志记录天数" + +msgid "Services List" +msgstr "服务列表" + +msgid "Service Remark Name" +msgstr "服务备注名" + +msgid "Domain/Subdomain" +msgstr "域名/子域名" + +msgid "Remote Port" +msgstr "远程主机端口" + +msgid "Local Host Address" +msgstr "内网主机地址" + +msgid "Local Host Port" +msgstr "内网主机端口" + +msgid "Use Encryption" +msgstr "开启数据加密" + +msgid "Use Compression" +msgstr "使用压缩" + +msgid "Enable State" +msgstr "开启状态" + +msgid "Frp Domain Config" +msgstr "Frp域名配置" + +msgid "Config Frp Protocol" +msgstr "配置 Frp 协议参数" + +msgid "Disable" +msgstr "关闭" + +msgid "Frp Protocol Type" +msgstr "Frp 协议类型" + +msgid "Domain Type" +msgstr "域名类型" + +msgid "Custom Domains" +msgstr "自定义域名" + +msgid "SubDomain" +msgstr "子域名" + +msgid "Both the above two Domain types" +msgstr "同时使用2种域名" + +msgid "If SubDomain is used, Custom Domains couldn't be subdomain or wildcard domain of the maindomain(subdomain_host)." +msgstr "如果服务端配置了主域名(subdomain_host)，则自定义域名不能是属于主域名(subdomain_host) 的子域名或者泛域名。" + +msgid "subdomain_host must be configured in server: frps in advance." +msgstr "使用子域名时，必须预先在服务端配置主域名(subdomain_host)参数。" + +msgid "STCP Role" +msgstr "SFTP服务类型" + +msgid "Use Plugin" +msgstr "使用插件" + +msgid "If plugin is defined, local_ip and local_port is useless, plugin will handle connections got from frps." +msgstr "使用插件使用插件模式时，本地 IP 地址和端口无需配置，插件将会处理来自服务端的链接请求。" + +msgid "STCP Screct Key" +msgstr "SFTP密钥" + +msgid "STCP Server Name" +msgstr "SFTP服务名称" + +msgid "Enable URL routing" +msgstr "启用 URL 路由" + +msgid "Frp support forward http requests to different backward web services by url routing." +msgstr "Frp支持通过url路由将http请求转发到不同的反向web服务。" + +msgid "Choose Plugin" +msgstr "选择插件" + +msgid "Proxy Authentication" +msgstr "代理认证" + +msgid "Other PCs could access the Internet through frpc's network by using http_proxy plugin." +msgstr "http proxy 插件，可以使其他机器通过 frpc 的网络访问互联网；开启身份验证之后需要用户名、密码才能连接到 HTTP 代理。" + +msgid "HTTP Proxy UserName" +msgstr "HTTP 代理用户名" + +msgid "HTTP Proxy Password" +msgstr "HTTP 代理密码" + +msgid "Plugin Unix Sock Path" +msgstr "Unix Sock 插件路径" + +msgid "Password protecting your web service" +msgstr "密码保护您的web服务" + +msgid "HTTP UserName" +msgstr "HTTP 用户名" + +msgid "HTTP PassWord" +msgstr "HTTP 密码" + +msgid "Rewriting the Host Header" +msgstr "修改 Host Header" + +msgid "Frp can rewrite http requests with a modified Host header." +msgstr "Frp可以用修改后的主机头重写http请求。" + +msgid "Proxy-Protocol Version" +msgstr "Proxy-Protocol 版本" + +msgid "Encrypted the communication between frpc and frps, will effectively prevent the traffic intercepted." +msgstr "将 frpc 与 frps 之间的通信内容加密传输，将会有效防止流量被拦截。" + +msgid "The contents will be compressed to speed up the traffic forwarding speed, but this will consume some additional cpu resources." +msgstr "对传输内容进行压缩，加快流量转发速度，但是会额外消耗一些 cpu 资源。" + +msgid "Http username and password are safety certification for http protocol." +msgstr "Http用户名和密码是Http协议的安全认证。" + +msgid "Proxy Protocol to send user's real IP to local services." +msgstr "将用户的真实IP发送到本地服务的代理协议。" + +msgid "STCP Server Name is Service Remark Name of STCP Server" +msgstr "STCP服务器别名" + +msgid "Please ensure the remark name is unique." +msgstr "确保备注名唯一" + +msgid "Plugin_Local_Addr" +msgstr "插件本地地址（格式 IP:Port）" + +msgid "plugin_crt_path" +msgstr "插件证书路径" + +msgid "plugin_key_path" +msgstr "插件私钥路径" + +msgid "plugin_host_header_rewrite" +msgstr "插件 Host Header 重写" + +msgid "plugin_header_X-From-Where" +msgstr "插件X-From-Where请求头" diff --git a/package/lean/luci-app-frpc/root/etc/config/frp b/package/lean/luci-app-frpc/root/etc/config/frp index 736e571f92..8b1f67bbb9 100644 --- a/package/lean/luci-app-frpc/root/etc/config/frp +++ b/package/lean/luci-app-frpc/root/etc/config/frp @@ -14,3 +14,4 @@ config frp 'common' option log_level 'info' option enable_http_proxy '0' option protocol 'tcp' + option user '' diff --git a/package/lean/luci-app-frpc/root/etc/init.d/frp b/package/lean/luci-app-frpc/root/etc/init.d/frp index 7423ec3b92..49cfb762f2 100755 --- a/package/lean/luci-app-frpc/root/etc/init.d/frp +++ b/package/lean/luci-app-frpc/root/etc/init.d/frp @@ -171,7 +171,7 @@ boot() { start() { config_load "frp" - local enabled server_addr server_port time privilege_token tcp_mux enable_cpool + local enabled server_addr server_port time privilege_token tcp_mux user enable_cpool local pool_count log_level log_max_days login_fail_exit http_proxy protocol config_get_bool enabled common enabled 1 @@ -181,6 +181,7 @@ start() { config_get server_addr common server_addr config_get server_port common server_port config_get token common token + config_get user common user config_get enable_cpool common enable_cpool config_get pool_count common pool_count config_get log_level common log_level @@ -201,6 +202,7 @@ start() { echo "server_addr=${server_addr}" >>$tmpconf echo "server_port=${server_port}" >>$tmpconf echo "token=${token}" >>$tmpconf + [ -n "$user" ] && echo "user=$user" >>$tmpconf echo "log_level=${log_level}" >>$tmpconf echo "log_max_days=${log_max_days}" >>$tmpconf echo "protocol=${protocol}" >>$tmpconf From be7048c3730a8423c8961221f8f65b7a0b6e0abd Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 10 Mar 2021 17:15:56 +0800 Subject: [PATCH 02/13] shadowsocksr-libev: rewrite Makefile Signed-off-by: Tianling Shen --- package/lean/shadowsocksr-libev/Makefile | 86 +++++++----------------- 1 file changed, 24 insertions(+), 62 deletions(-) diff --git a/package/lean/shadowsocksr-libev/Makefile b/package/lean/shadowsocksr-libev/Makefile index 7f140d6d49..9b72b56b96 100644 --- a/package/lean/shadowsocksr-libev/Makefile +++ b/package/lean/shadowsocksr-libev/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocksr-libev PKG_VERSION:=2.5.6 -PKG_RELEASE:=6 +PKG_RELEASE:=7 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/shadowsocksrr/shadowsocksr-libev @@ -28,39 +28,29 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -define Package/shadowsocksr-libev/template - SECTION:=net - CATEGORY:=Network - SUBMENU:=Web Servers/Proxies - TITLE:=shadowsocksr-libev - URL:=https://github.com/shadowsocksrr/shadowsocksr-libev - DEPENDS:=+libev +libsodium +libopenssl +libpthread +libpcre +libudns +zlib +define Package/shadowsocksr-libev/Default + define Package/shadowsocksr-libev-ssr-$(1) + SECTION:=net + CATEGORY:=Network + SUBMENU:=Web Servers/Proxies + TITLE:=shadowsocksr-libev ssr-$(1) + URL:=https://github.com/shadowsocksrr/shadowsocksr-libev + DEPENDS:=+libev +libsodium +libopenssl +libpthread +libpcre +libudns +zlib + endef + + define Package/shadowsocksr-libev-ssr-$(1)/install + $$(INSTALL_DIR) $$(1)/usr/bin + $$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/ss-$(1) $$(1)/usr/bin/ssr-$(1) + endef endef -define Package/shadowsocksr-libev-ssr-check - $(call Package/shadowsocksr-libev/template,$(1)) - TITLE+= ssr-check -endef - -define Package/shadowsocksr-libev-ssr-local - $(call Package/shadowsocksr-libev/template,$(1)) - TITLE+= ssr-local -endef - -define Package/shadowsocksr-libev-ssr-nat - $(call Package/shadowsocksr-libev/template,$(1)) - TITLE+= ssr-nat -endef - -define Package/shadowsocksr-libev-ssr-redir - $(call Package/shadowsocksr-libev/template,$(1)) - TITLE+= ssr-redir -endef - -define Package/shadowsocksr-libev-ssr-server - $(call Package/shadowsocksr-libev/template,$(1)) - TITLE+= ssr-server +SHADOWSOCKSR_COMPONENTS:=check local nat redir server +define shadowsocksr-libev/templates + $(foreach component,$(SHADOWSOCKSR_COMPONENTS), + $(call Package/shadowsocksr-libev/Default,$(component)) + ) endef +$(eval $(call shadowsocksr-libev/templates)) CONFIGURE_ARGS += \ --disable-documentation \ @@ -71,34 +61,6 @@ CONFIGURE_ARGS += \ TARGET_CFLAGS += -flto TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed -define Package/shadowsocksr-libev/install/template - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ss-$(2) $(1)/usr/bin/ssr-$(2) -endef - -define Package/shadowsocksr-libev-ssr-check/install - $(call Package/shadowsocksr-libev/install/template,$(1),check) -endef - -define Package/shadowsocksr-libev-ssr-local/install - $(call Package/shadowsocksr-libev/install/template,$(1),local) - $(LN) ssr-local $(1)/usr/bin/ssr-tunnel -endef - -define Package/shadowsocksr-libev-ssr-nat/install - $(call Package/shadowsocksr-libev/install/template,$(1),nat) -endef - -define Package/shadowsocksr-libev-ssr-redir/install - $(call Package/shadowsocksr-libev/install/template,$(1),redir) -endef - -define Package/shadowsocksr-libev-ssr-server/install - $(call Package/shadowsocksr-libev/install/template,$(1),server) -endef - -$(eval $(call BuildPackage,shadowsocksr-libev-ssr-check)) -$(eval $(call BuildPackage,shadowsocksr-libev-ssr-local)) -$(eval $(call BuildPackage,shadowsocksr-libev-ssr-nat)) -$(eval $(call BuildPackage,shadowsocksr-libev-ssr-redir)) -$(eval $(call BuildPackage,shadowsocksr-libev-ssr-server)) +$(foreach component,$(SHADOWSOCKSR_COMPONENTS), \ + $(eval $(call BuildPackage,shadowsocksr-libev-ssr-$(component))) \ +) From ed07042b970fc1b6fec5247e90ccbaa848edc8a7 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 10 Mar 2021 23:02:05 +0800 Subject: [PATCH 03/13] shadowsocks-rust: add new package shadowsocks-rust is shadowsocks written in rust, with high performance for AES AEAD ciphers (while much lower for non-ones). However with the lack of rust toolchain, by now we can only download pre-compiled binaries for quick setup and this Makefile needs to be rewritten when rust toolchain is up. Signed-off-by: Tianling Shen --- package/ctcgfw/shadowsocks-rust/Makefile | 112 +++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 package/ctcgfw/shadowsocks-rust/Makefile diff --git a/package/ctcgfw/shadowsocks-rust/Makefile b/package/ctcgfw/shadowsocks-rust/Makefile new file mode 100644 index 0000000000..fe85283cd7 --- /dev/null +++ b/package/ctcgfw/shadowsocks-rust/Makefile @@ -0,0 +1,112 @@ +# +# Copyright (C) 2017-2020 Yousong Zhou +# +# Copyright (C) 2021 ImmortalWrt +# +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=shadowsocks-rust +PKG_VERSION:=1.9.2 +PKG_RELEASE:=1 + +PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION) +PKG_SOURCE_BODY:=unknown-linux-musl +PKG_SOURCE_FOOTER:=tar.xz +PKG_SOURCE_URL:=https://github.com/shell-script/openwrt-shadowsocks-rust/releases/download/v$(PKG_VERSION)/ + +ifeq ($(ARCH),aarch64) + PKG_SOURCE:=$(PKG_SOURCE_HEADER).aarch64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) + PKG_HASH:=318e0538386e52025448e7dc1e67b71bd399981e386ba0a54802ff3c13b25016 +else ifeq ($(ARCH),arm) + # Referred to golang/golang-values.mk + ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) + ifeq ($(ARM_CPU_FEATURES),) + PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabi.$(PKG_SOURCE_FOOTER) + PKG_HASH:=38d15003799d91ebecb89be61eccb1f3b31ca4e11d6d5ecfcbd367e10cc42319 + else ifneq ($(filter $(ARM_CPU_FEATURES),vfp vfpv2),) + PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER) + PKG_HASH:=e31bfbba903ac171b133b897b2a0e183833002b141db74b95d94873d32c07d49 + else + PKG_SOURCE:=$(PKG_SOURCE_HEADER).armv7-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER) + PKG_HASH:=e1ed14d86b4e7f6b88da3ff5b99431a707eb7a23f0e063ada86e85e7e84a8ec1 + endif +else ifeq ($(ARCH),i386) + ifeq ($(CONFIG_TARGET_x86_geode)$(CONFIG_TARGET_x86_legacy),y) + PKG_SOURCE:=$(PKG_SOURCE_HEADER).i586-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) + PKG_HASH:=f08f6ab355495f5553e388b347f7bf70502ae3f53f3979267fcfe1dd6a7a565f + else + PKG_SOURCE:=$(PKG_SOURCE_HEADER).i686-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) + PKG_HASH:=a5021533dad53a877d6265677dea6f5a6f500f135d47327c98beeb85642180ce + endif +else ifeq ($(ARCH),mips) + PKG_SOURCE:=$(PKG_SOURCE_HEADER).mips-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) + PKG_HASH:=f76de3d0c4b2e3703faabfb730d817b5b5610ec3701827282c18ca44c84f6a28 +else ifeq ($(ARCH),mipsel) + PKG_SOURCE:=$(PKG_SOURCE_HEADER).mipsel-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) + PKG_HASH:=953d2feb430906edcb5ed6994510b3bded141ae8abb3b77dd6bfc80aac8740d1 +else ifeq ($(ARCH),x86_64) + PKG_SOURCE:=$(PKG_SOURCE_HEADER).x86_64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) + PKG_HASH:=adc68983961209cdf3c7a465911bdfabc52e7e08132a6dbcd0db77eaa924ec3f +# Set the default value to make OpenWrt Package Checker happy +else + PKG_SOURCE:=dummy + PKG_HASH:=dummy +endif + +PKG_MAINTAINER:=Tianling Shen +PKG_LICENSE:=MIT +PKG_LICENSE_FILES:=LICENSE + +include $(INCLUDE_DIR)/package.mk + +TAR_CMD:=$(HOST_TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + +define Package/shadowsocks-rust/Default + PKG_CONFIG_DEPENDS+=CONFIG_SHADOWSOCKS_RUST_$(1)_COMPRESS_UPX + + define Package/shadowsocks-rust-$(1) + SECTION:=net + CATEGORY:=Network + SUBMENU:=Web Servers/Proxies + TITLE:=shadowsocks-rust $(1) + URL:=https://github.com/shadowsocks/shadowsocks-rust + DEPENDS:=@(aarch64||arm||i386||mips||mipsel||x86_64) @USE_MUSL + endef + + define Package/shadowsocks-rust-$(1)/config + config SHADOWSOCKS_RUST_$(1)_COMPRESS_UPX + bool "Compress $(1) with UPX" + default y + endef + + define Package/shadowsocks-rust-$(1)/install + $$(INSTALL_DIR) $$(1)/usr/bin + $$(INSTALL_BIN) $$(PKG_BUILD_DIR)/$(1) $$(1)/usr/bin + endef +endef + +PKG_CONFIG_DEPENDS:= +SHADOWSOCKS_COMPONENTS:=sslocal ssmanager ssserver ssurl +define shadowsocks-rust/templates + $(foreach component,$(SHADOWSOCKS_COMPONENTS), + $(call Package/shadowsocks-rust/Default,$(component)) + ) +endef +$(eval $(call shadowsocks-rust/templates)) + +define Build/Compile +$(foreach component,$(SHADOWSOCKS_COMPONENTS), + ifneq ($(CONFIG_SHADOWSOCKS_RUST_$(component)_COMPRESS_UPX),) + $(STAGING_DIR_HOST)/bin/upx --lzma --best $(PKG_BUILD_DIR)/$(component) + endif +) +endef + +$(foreach component,$(SHADOWSOCKS_COMPONENTS), \ + $(eval $(call BuildPackage,shadowsocks-rust-$(component))) \ +) From 806c61ab1491790f3b54c3966f3bde97c26a9f9b Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sun, 7 Mar 2021 18:09:32 -1000 Subject: [PATCH 04/13] include: store ABIVersion in Packages index With the existence of ABI versions there is no clean way to determine the package name without an attached ABI version. The Packages index is stored on device to know what packages are installed. The ABIVersion was recently removed in c921650382 "build: drop ABI version from metadata", while ABI versions still exists. This becomes a problem if a user tries to export installed packages via `ubus call rpcd-sys packagelist` which would return package names including the ABI version. Trying to find these packages in a later release with changes ABI version is impossible. This commits adds the `ABIVersion` field again. Knowing both the combined (SourceName + ABIVersion) and the `ABIVersion` it is possible to calculate the package `SourceName` without storing it in the on-device package list. Signed-off-by: Paul Spooren --- include/package-ipkg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index 5e51b301e1..c2017cd220 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -184,6 +184,7 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) )$$(call addfield,Section,$(SECTION) )$$(call addfield,Require-User,$(USERID) )$$(call addfield,SourceDateEpoch,$(PKG_SOURCE_DATE_EPOCH) +)$$(if $$(ABIV_$(1)),ABIVersion: $$(ABIV_$(1)) )$(if $(PKG_CPE_ID),CPE-ID: $(PKG_CPE_ID) )$(if $(filter hold,$(PKG_FLAGS)),Status: unknown hold not-installed )$(if $(filter essential,$(PKG_FLAGS)),Essential: yes From 3946f8d6375ab62b8f0e2b7b62901e6b71f9cb56 Mon Sep 17 00:00:00 2001 From: Hans Dedecker Date: Wed, 10 Mar 2021 20:48:02 +0100 Subject: [PATCH 05/13] glibc: update to latest 2.33 commit (BZ #27462, BZ #27318, BZ #27389) a151f2e05a nscd: Fix double free in netgroupcache [BZ #27462] ee9f98d9ca x86: Set minimum x86-64 level marker [BZ #27318] 3e880d7337 nss: Re-enable NSS module loading after chroot [BZ #27389] 71b2463f61 x86: Add CPU-specific diagnostics to ld.so --list-diagnostics a1eb3915e7 x86: Automate generation of PREFERRED_FEATURE_INDEX_1 bitfield 33dc1dd602 ld.so: Implement the --list-diagnostics option 8d4241b897 string: Work around GCC PR 98512 in rawmemchr 6efa2d44c8 S390: Add new hwcap values. Signed-off-by: Hans Dedecker --- toolchain/glibc/common.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk index 40a1781412..ea521490f5 100644 --- a/toolchain/glibc/common.mk +++ b/toolchain/glibc/common.mk @@ -12,8 +12,8 @@ PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=c5e354589729c0ca63899923f18783fa6803462d -PKG_MIRROR_HASH:=f6f691f1d0f8789f2f143d9e0e785e96dc44cbf7b07bb41aff792f327a5dcb97 +PKG_SOURCE_VERSION:=a151f2e05a64727c552a297d129b8ef242ffb3b6 +PKG_MIRROR_HASH:=63802bbcbb851d08ea8e609edd2d3fc0828102c07da9cdd3639e16d07883ebae PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz From 99a9f78ee39779a490e64b8b8f41af4a0772b39d Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 11 Mar 2021 14:57:01 +0800 Subject: [PATCH 06/13] treewide: adjust tencent mirror Signed-off-by: Tianling Shen --- package/ctcgfw/node-request/Makefile | 2 +- package/lean/default-settings/files/zzz-default-settings | 2 +- package/libs/openssl/Makefile | 4 ++-- scripts/download.pl | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/ctcgfw/node-request/Makefile b/package/ctcgfw/node-request/Makefile index 0a29930001..5906f80dfc 100644 --- a/package/ctcgfw/node-request/Makefile +++ b/package/ctcgfw/node-request/Makefile @@ -10,7 +10,7 @@ PKG_VERSION:=2.88.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NPM_NAME)-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=https://mirrors.cloud.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ +PKG_SOURCE_URL:=https://mirrors.tencent.com/npm/$(PKG_NPM_NAME)/-/ \ https://registry.npm.taobao.org/$(PKG_NPM_NAME)/-/ \ https://registry.npmjs.org/$(PKG_NPM_NAME)/-/ PKG_HASH:=e86dae884084b90a300096972f5954c815ebe5877c590df7fd170e8b71724242 diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings index 6c38bef5bc..69387d3a4c 100755 --- a/package/lean/default-settings/files/zzz-default-settings +++ b/package/lean/default-settings/files/zzz-default-settings @@ -29,7 +29,7 @@ sed -i 's/services/nas/g' /usr/lib/lua/luci/view/minidlna_status.htm ln -sf /sbin/ip /usr/bin/ip -sed -i 's#https://downloads.openwrt.org#https://mirrors.cloud.tencent.com/lede#g' /etc/opkg/distfeeds.conf +sed -i 's#https://downloads.openwrt.org#https://mirrors.tencent.com/lede#g' /etc/opkg/distfeeds.conf sed -i '/openwrt_luci/ { s/snapshots/releases\/18.06.9/g; }' /etc/opkg/distfeeds.conf sed -i "s/# //g" /etc/opkg/distfeeds.conf diff --git a/package/libs/openssl/Makefile b/package/libs/openssl/Makefile index daafe5222d..ea6b459740 100644 --- a/package/libs/openssl/Makefile +++ b/package/libs/openssl/Makefile @@ -19,8 +19,8 @@ PKG_BUILD_PARALLEL:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ - https://mirrors.cloud.tencent.com/openssl/source/ \ - https://mirrors.cloud.tencent.com/openssl/source/old/$(PKG_BASE)/ \ + https://mirrors.tencent.com/openssl/source/ \ + https://mirrors.tencent.com/openssl/source/old/$(PKG_BASE)/ \ https://www.openssl.org/source/ \ https://www.openssl.org/source/old/$(PKG_BASE)/ \ https://ftp.fi.muni.cz/pub/openssl/source/ \ diff --git a/scripts/download.pl b/scripts/download.pl index 59d29f19d3..bcbc562c56 100755 --- a/scripts/download.pl +++ b/scripts/download.pl @@ -201,7 +201,7 @@ foreach my $mirror (@ARGV) { push @mirrors, "https://mirror.leaseweb.com/debian/$1"; push @mirrors, "https://mirror.netcologne.de/debian/$1"; } elsif ($mirror =~ /^\@APACHE\/(.+)$/) { - push @mirrors, "https://mirrors.cloud.tencent.com/apache/$1"; + push @mirrors, "https://mirrors.tencent.com/apache/$1"; push @mirrors, "https://mirrors.aliyun.com/apache/$1"; push @mirrors, "https://mirrors.tuna.tsinghua.edu.cn/apache/$1"; push @mirrors, "https://mirrors.ustc.edu.cn/apache/$1"; @@ -219,12 +219,13 @@ foreach my $mirror (@ARGV) { my $i = 0; # replace the 2nd '/' with '@' for jsDelivr mirror push @mirrors, "https://cdn.jsdelivr.net/gh/". $dir =~ s{\/}{++$i == 2 ? '@' : $&}ger; + push @mirrors, "https://raw.sevencdn.com/$dir"; # give github a few more tries (different mirrors) for (1 .. 5) { push @mirrors, "https://raw.githubusercontent.com/$dir"; } } elsif ($mirror =~ /^\@GNU\/(.+)$/) { - push @mirrors, "https://mirrors.cloud.tencent.com/gnu/$1"; + push @mirrors, "https://mirrors.tencent.com/gnu/$1"; push @mirrors, "https://mirrors.tuna.tsinghua.edu.cn/gnu/$1"; push @mirrors, "https://mirrors.cqu.edu.cn/gnu/$1"; push @mirrors, "https://mirrors.ustc.edu.cn/gnu/$1"; From f3686b9af13d9493028a3a57248b6435bb529dff Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 11 Mar 2021 16:46:23 +0800 Subject: [PATCH 07/13] qt5: Update to 5.15.2 Removed upstreamed patches. Signed-off-by: Tianling Shen --- package/lean/qt5/Makefile | 17 +++++++++-------- ...resolving-for-OPENSSL_NO_NEXPROTONEG.patch | 19 ------------------- 2 files changed, 9 insertions(+), 27 deletions(-) delete mode 100644 package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch diff --git a/package/lean/qt5/Makefile b/package/lean/qt5/Makefile index 77571ee58e..ee3794ffb9 100644 --- a/package/lean/qt5/Makefile +++ b/package/lean/qt5/Makefile @@ -10,19 +10,19 @@ include $(TOPDIR)/rules.mk -QT5_VERSION_MAJOR_MINOR:=5.13 +QT5_VERSION_MAJOR_MINOR:=5.15 QT5_VERSION_PATCH:=2 PKG_NAME:=qt5 PKG_VERSION:=$(QT5_VERSION_MAJOR_MINOR)$(if $(QT5_VERSION_PATCH),.$(QT5_VERSION_PATCH)) -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).tar.xz -PKG_SOURCE_URL:=https://mirrors.cloud.tencent.com/qt/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \ +PKG_SOURCE_URL:=https://mirrors.tencent.com/qt/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \ https://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \ https://mirrors.ustc.edu.cn/qtproject/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ \ http://download.qt-project.org/archive/qt/$(QT5_VERSION_MAJOR_MINOR)/$(PKG_VERSION)/single/ -PKG_HASH:=55e8273536be41f4f63064a79e552a22133848bb419400b6fa8e9fc0dc05de08 +PKG_HASH:=3a530d1b243b5dec00bc54937455471aaa3e56849d2593edb8ded07228202240 PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION) @@ -66,7 +66,7 @@ endef define Package/qt5-sql $(call Package/qt5/Default) TITLE+=sql - DEPENDS+=+qt5-core + DEPENDS+=+qt5-core +libsqlite3 endef define Package/qt5-xml @@ -90,6 +90,8 @@ CONFIGURE_ARGS = \ -system-pcre \ -system-zlib \ -openssl-runtime \ + -sql-sqlite \ + -sqlite \ -no-cups \ -no-freetype \ -no-harfbuzz \ @@ -116,9 +118,7 @@ CONFIGURE_ARGS = \ -no-sql-oci \ -no-sql-odbc \ -no-sql-psql \ - -no-sql-sqlite \ -no-sql-sqlite2 \ - -no-sqlite \ -no-sql-tds \ -no-strip \ -no-xcb \ @@ -186,8 +186,9 @@ define Package/qt5-network/install endef define Package/qt5-sql/install - $(INSTALL_DIR) $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/Qt/plugins/sqldrivers $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Sql.so* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/qtbase/plugins/sqldrivers/*.so $(1)/usr/lib/Qt/plugins/sqldrivers/ endef define Package/qt5-xml/install diff --git a/package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch b/package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch deleted file mode 100644 index 4056d2885d..0000000000 --- a/package/lean/qt5/patches/001-fix-symbol-resolving-for-OPENSSL_NO_NEXPROTONEG.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-10-25 15:16:48.000000000 +0800 -+++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp 2020-02-06 23:29:33.072453568 +0800 -@@ -1376,12 +1376,12 @@ - RESOLVEFUNC(SSL_select_next_proto) - RESOLVEFUNC(SSL_CTX_set_next_proto_select_cb) - RESOLVEFUNC(SSL_get0_next_proto_negotiated) --#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... - #if OPENSSL_VERSION_NUMBER >= 0x10002000L -- RESOLVEFUNC(SSL_set_alpn_protos) -- RESOLVEFUNC(SSL_CTX_set_alpn_select_cb) -- RESOLVEFUNC(SSL_get0_alpn_selected) -+ RESOLVEFUNC(SSL_set_alpn_protos) -+ RESOLVEFUNC(SSL_CTX_set_alpn_select_cb) -+ RESOLVEFUNC(SSL_get0_alpn_selected) - #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ... -+#endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ... - #if QT_CONFIG(dtls) - RESOLVEFUNC(SSL_CTX_set_cookie_generate_cb) - RESOLVEFUNC(SSL_CTX_set_cookie_verify_cb) From 4698803206233813fe26357cddb39dff647ff8c5 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 11 Mar 2021 16:47:55 +0800 Subject: [PATCH 08/13] qBittorrent-Enhanced-Edition: Update to 4.3.3.10 Signed-off-by: Tianling Shen --- package/lean/qBittorrent-Enhanced-Edition/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/lean/qBittorrent-Enhanced-Edition/Makefile b/package/lean/qBittorrent-Enhanced-Edition/Makefile index f30a5bd21b..0b6d355ea6 100644 --- a/package/lean/qBittorrent-Enhanced-Edition/Makefile +++ b/package/lean/qBittorrent-Enhanced-Edition/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qBittorrent-Enhanced-Edition -PKG_VERSION:=4.3.2.10 +PKG_VERSION:=4.3.3.10 PKG_RELEASE=1 -PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/c0re100/qBittorrent-Enhanced-Edition/tar.gz/release-$(PKG_VERSION)? -PKG_HASH:=204da95489e6e6959561ea43fb1e16fe562d217932ae3b63a172db389f0c102e +PKG_HASH:=a06540fdc41eff122e210c09c746daaeaddee69811bea4ec33ad6ddd4f4b7a17 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION) From 3c618696950b87d384ac3d0880144b47e0aa3504 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 11 Mar 2021 17:52:53 +0800 Subject: [PATCH 09/13] shadowsocks-rust: fix hash key for aarch64 binary Let's "thank" GitHub CDN. Signed-off-by: Tianling Shen --- package/ctcgfw/shadowsocks-rust/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ctcgfw/shadowsocks-rust/Makefile b/package/ctcgfw/shadowsocks-rust/Makefile index fe85283cd7..99bc17da15 100644 --- a/package/ctcgfw/shadowsocks-rust/Makefile +++ b/package/ctcgfw/shadowsocks-rust/Makefile @@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocks-rust PKG_VERSION:=1.9.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_HEADER:=shadowsocks-v$(PKG_VERSION) PKG_SOURCE_BODY:=unknown-linux-musl @@ -21,7 +21,7 @@ PKG_SOURCE_URL:=https://github.com/shell-script/openwrt-shadowsocks-rust/release ifeq ($(ARCH),aarch64) PKG_SOURCE:=$(PKG_SOURCE_HEADER).aarch64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER) - PKG_HASH:=318e0538386e52025448e7dc1e67b71bd399981e386ba0a54802ff3c13b25016 + PKG_HASH:=8e461614154d0d395f4e704ea170a6dac67401d92fe75e57e59ee33370bf1db6 else ifeq ($(ARCH),arm) # Referred to golang/golang-values.mk ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) From 109c08604d404083385d029dd993fd69fa2d557f Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Thu, 11 Mar 2021 00:22:12 +0000 Subject: [PATCH 10/13] opkg: update to git HEAD d71856a pkg: pass-through ABIVersion to status file Signed-off-by: Daniel Golle --- package/system/opkg/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index ffcb15a369..b739650261 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -14,9 +14,9 @@ PKG_FLAGS:=essential PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://git.openwrt.org/project/opkg-lede.git -PKG_SOURCE_DATE:=2020-12-24 -PKG_SOURCE_VERSION:=9bbc7eae91edc3dbb020e2a50d51d9a3fbbf31ca -PKG_MIRROR_HASH:=baa32d1b381d0eb2e224f4742974581c6705c13814662442ebd1288a91c2d577 +PKG_SOURCE_DATE:=2021-03-11 +PKG_SOURCE_VERSION:=d71856a4f137dc9fb890c5e777790e2c51fde921 +PKG_MIRROR_HASH:=4da8ef070474dbc3854435838fbec585d1bdf74f7c99a2fb27203798b7f93c19 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 54e9e5a6c12c7868017ff8319a05c2213b825ea1 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Wed, 10 Mar 2021 00:01:32 +0800 Subject: [PATCH 11/13] luci-theme-argonv3: update to 1.7.2 --- package/ctcgfw/luci-theme-argonv3/Makefile | 4 +- .../htdocs/luci-static/argon/css/cascade.css | 3 + .../htdocs/luci-static/argon/js/script.js | 2 +- .../luci-static/argon/less/cascade.less | 3 + .../luasrc/view/themes/argon/sysauth.htm | 63 +++++++++++-------- 5 files changed, 47 insertions(+), 28 deletions(-) diff --git a/package/ctcgfw/luci-theme-argonv3/Makefile b/package/ctcgfw/luci-theme-argonv3/Makefile index ffa9bd10be..1533ac997c 100644 --- a/package/ctcgfw/luci-theme-argonv3/Makefile +++ b/package/ctcgfw/luci-theme-argonv3/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:= -PKG_VERSION:=1.7.1 -PKG_RELEASE:=20210215 +PKG_VERSION:=1.7.2 +PKG_RELEASE:=20210309 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css index 0ae7a4266f..ec12c7cd42 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/css/cascade.css @@ -2731,6 +2731,9 @@ input[name="nslookup"] { .node-network-diagnostics input { margin: 0.25rem !important; } +.node-network-wireless .cbi-button-add { + margin-left: 0; +} /* fix nlbw/display*/ #detail-bubble.in { z-index: 500; diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js index a627f4e743..33478216bb 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/js/script.js @@ -240,7 +240,7 @@ $(".cbi-section-table-titles, .cbi-section-table-descr, .cbi-section-descr").each(function () { var that = $(this); if (that.text().trim() == "") { - that.css("display", "none"); + that.css("padding", "0px"); } }); diff --git a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less index 330049272e..6d77ffd9ae 100644 --- a/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less +++ b/package/ctcgfw/luci-theme-argonv3/htdocs/luci-static/argon/less/cascade.less @@ -3388,6 +3388,9 @@ input[name="nslookup"] { margin: 0.25rem !important; } +.node-network-wireless .cbi-button-add{ + margin-left: 0; +} diff --git a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm index e194b3c2b9..f526fb8d2e 100644 --- a/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm +++ b/package/ctcgfw/luci-theme-argonv3/luasrc/view/themes/argon/sysauth.htm @@ -27,7 +27,8 @@ local boardinfo = util.ubus("system", "board") local fs = require "nixio.fs" local nutil = require "nixio.util" - + local uci = require 'luci.model.uci'.cursor() + local theme_dir = media .. "/background/" function glob(...) local iter, code, msg = fs.glob(...) if iter then @@ -41,30 +42,42 @@ return str:match(".+%.(%w+)$") end - local bgcount = 0 - local currentBg = {} - local bgs,attr = {} - local theme_dir = media .. "/background/" - for i, f in ipairs(glob("/www" .. theme_dir .. "*")) do - attr = fs.stat(f) - if attr then - local ext = getExtension(fs.basename(f)) - if ext == "jpg" or ext == "png" or ext == "gif" or ext == "mp4" then - local bg = {} - bg.type = ext - bg.url = theme_dir .. fs.basename(f) - table.insert(bgs,bg) - bgcount = bgcount + 1 + function fetchMedia(path) + local bgArr = {} + local numBg = 0 + for i, f in ipairs(glob(path)) do + attr = fs.stat(f) + if attr then + local ext = getExtension(fs.basename(f)) + if ext == "jpg" or ext == "png" or ext == "gif" or ext == "mp4" then + local bg = {} + bg.type = ext + bg.url = theme_dir .. fs.basename(f) + table.insert(bgArr,bg) + numBg = numBg + 1 + end end end + return bgArr,numBg end - if bgcount > 0 then - currentBg = bgs[math.random(1,bgcount)] - end + local bgcount = 0 + local currentBg = {} + local bgs = {} + local theme_dir = media .. "/background/" + local bing_background = fs.access('/etc/config/argon') and uci:get_first('argon', 'global', 'bing_background') or 0 + bgs,bgcount=fetchMedia("/www" .. theme_dir .. "*") %>