From 2b051ca18808dda0d0dc5f9212514370079fa787 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 7 Nov 2021 09:02:49 +0800
Subject: [PATCH] update-11.07

---
 luci-app-godproxy/rulesupdate.log             | 83 ++++++++++---------
 luci-app-services-wolplus/Makefile            |  5 +-
 .../po/zh-cn/{timewol.po => wolplus.po}       |  0
 shadowsocks-rust/Makefile                     | 29 ++-----
 4 files changed, 54 insertions(+), 63 deletions(-)
 rename luci-app-services-wolplus/po/zh-cn/{timewol.po => wolplus.po} (100%)

diff --git a/luci-app-godproxy/rulesupdate.log b/luci-app-godproxy/rulesupdate.log
index c12c8cd3e..012d34248 100644
--- a/luci-app-godproxy/rulesupdate.log
+++ b/luci-app-godproxy/rulesupdate.log
@@ -1,40 +1,43 @@
-2021-11-05 00:30:37: ------------------- 规则更新 -----------------------
-2021-11-05 00:30:37: ====================================================
-2021-11-05 00:30:37: 开始更新koolproxy的规则，请等待...
-2021-11-05 00:30:37:  ---------------------------------------------------------------------------------------
-2021-11-05 00:30:38: ABP规则的本地版本号： 202111050016
-2021-11-05 00:30:38: ABP规则的在线版本号： 202111050016
-2021-11-05 00:30:38: 检测到 ABP规则本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-05 00:30:39: kpr_our_rule2规则文件下载失败
-2021-11-05 00:30:39: yhosts规则本地版本号： !version: 202110242326
-2021-11-05 00:30:39: yhosts规则在线版本号： #version: 202110242326
-2021-11-05 00:30:39: 检测到 yhosts规则 已更新，现在开始更新...
-2021-11-05 00:30:39: 将临时文件覆盖到原始yhosts文件
-2021-11-05 00:30:39: 远程视频规则md5：
-2021-11-05 00:30:39: 您本地视频规则md5：
-2021-11-05 00:30:39: 检测到 视频规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-05 00:30:39: fanboy规则本地版本号： 202103250121
-2021-11-05 00:30:39: fanboy规则在线版本号：
-2021-11-05 00:30:39: fanboy规则 文件下载失败！
-2021-11-05 00:30:39: antiad规则本地版本号： 20211105024137
-2021-11-05 00:30:39: antiad规则在线版本号： 20211105024137
-2021-11-05 00:30:39: 检测到 antiad规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-05 00:30:39: StevenBlack规则本地版本号： 04 November
-2021-11-05 00:30:39: StevenBlack规则在线版本号： 04 November
-2021-11-05 00:30:39: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊!
-2021-11-05 00:30:39: 跳过优化 fanboy规则。。。。。
-2021-11-05 00:30:39: 跳过优化 ABP规则。。。。。
-2021-11-05 00:30:39: 正在优化 补充规则yhosts。。。。。
-2021-11-05 00:30:40: 跳过优化 补充规则antiad。。。。。
-2021-11-05 00:30:40: 跳过优化 补充规则adwars。。。。。
-2021-11-05 00:30:40: 跳过优化 补充规则ADgkStevenBlack。。。。。
-2021-11-05 00:30:40: 所有规则更新并优化完毕！
-2021-11-05 00:30:40: ====================================================
-2021-11-05 00:30:42: -------------------Yhosts规则 version !version: 202110242326
-2021-11-05 00:30:42: -------------------ABP规则 version 202111050016
-2021-11-05 00:30:42: -------------------Fanboy规则 version 202103250121
-2021-11-05 00:30:42: -------------------Antiad规则 version 20211105024137
-2021-11-05 00:30:42: -------------------静态规则 version 2020-02-27 23:00
-2021-11-05 00:30:42: -------------------乘风视频 version 202105021
-2021-11-05 00:30:42: ------------------- 内置规则更新成功！ -------------------
-2021-11-05 00:30:42: ------------------- 规则更新成功！ -------------------
+2021-11-07 00:34:13: ------------------- 规则更新 -----------------------
+2021-11-07 00:34:13: ====================================================
+2021-11-07 00:34:13: 开始更新koolproxy的规则，请等待...
+2021-11-07 00:34:13:  ---------------------------------------------------------------------------------------
+2021-11-07 00:34:15: ABP规则的本地版本号： 202111050016
+2021-11-07 00:34:15: ABP规则的在线版本号： 202111070026
+2021-11-07 00:34:15: 检测到 ABP规则 已更新，现在开始更新...
+2021-11-07 00:34:15: 将临时的ABP规则文件移动到指定位置
+2021-11-07 00:34:15: kpr_our_rule2规则文件下载失败
+2021-11-07 00:34:15: yhosts规则本地版本号： !version: 202110242326
+2021-11-07 00:34:15: yhosts规则在线版本号： #version: 202110242326
+2021-11-07 00:34:15: 检测到 yhosts规则 已更新，现在开始更新...
+2021-11-07 00:34:15: 将临时文件覆盖到原始yhosts文件
+2021-11-07 00:34:15: 远程视频规则md5：
+2021-11-07 00:34:15: 您本地视频规则md5：48cdd7ed1e121aabf00b0884538e1cfe
+2021-11-07 00:34:15: 检测到新版视频规则.开始更新..........
+2021-11-07 00:34:15: 您下载的视频规则md5：d41d8cd98f00b204e9800998ecf8427e
+2021-11-07 00:34:15: 视频规则md5校验不通过...
+2021-11-07 00:34:15: fanboy规则本地版本号： 202103250121
+2021-11-07 00:34:15: fanboy规则在线版本号：
+2021-11-07 00:34:15: fanboy规则 文件下载失败！
+2021-11-07 00:34:15: antiad规则本地版本号： 20211105024137
+2021-11-07 00:34:15: antiad规则在线版本号： 20211105024137
+2021-11-07 00:34:16: 检测到 antiad规则 本地版本号和在线版本号相同，那还更新个毛啊!
+2021-11-07 00:34:16: StevenBlack规则本地版本号： 04 November
+2021-11-07 00:34:16: StevenBlack规则在线版本号： 04 November
+2021-11-07 00:34:16: 检测到 StevenBlack规则 本地版本号和在线版本号相同，那还更新个毛啊!
+2021-11-07 00:34:16: 跳过优化 fanboy规则。。。。。
+2021-11-07 00:34:16: 正在优化 ABP规则。。。。。
+2021-11-07 00:34:18: 正在优化 补充规则yhosts。。。。。
+2021-11-07 00:34:18: 跳过优化 补充规则antiad。。。。。
+2021-11-07 00:34:18: 跳过优化 补充规则adwars。。。。。
+2021-11-07 00:34:18: 跳过优化 补充规则ADgkStevenBlack。。。。。
+2021-11-07 00:34:18: 所有规则更新并优化完毕！
+2021-11-07 00:34:18: ====================================================
+2021-11-07 00:34:21: -------------------Yhosts规则 version !version: 202110242326
+2021-11-07 00:34:21: -------------------ABP规则 version 202111070026
+2021-11-07 00:34:21: -------------------Fanboy规则 version 202103250121
+2021-11-07 00:34:21: -------------------Antiad规则 version 20211105024137
+2021-11-07 00:34:21: -------------------静态规则 version 2020-02-27 23:00
+2021-11-07 00:34:21: -------------------乘风视频 version 202105021
+2021-11-07 00:34:21: ------------------- 内置规则更新成功！ -------------------
+2021-11-07 00:34:21: ------------------- 规则更新成功！ -------------------
diff --git a/luci-app-services-wolplus/Makefile b/luci-app-services-wolplus/Makefile
index cb8540cd0..4281482f7 100644
--- a/luci-app-services-wolplus/Makefile
+++ b/luci-app-services-wolplus/Makefile
@@ -5,11 +5,12 @@
 
 include $(TOPDIR)/rules.mk
 
-LUCI_TITLE:=LuCI support for wol From sundaqiang
+LUCI_TITLE:=LuCI support for wolplus From sundaqiang
 LUCI_DEPENDS:=+etherwake
 LUCI_PKGARCH:=all
 PKG_VERSION:=1.0
-PKG_RELEASE:=1-20201225
+PKG_RELEASE:=20201225
+PKG_MAINTAINER:=sundaqiang
 
 include $(TOPDIR)/feeds/luci/luci.mk
 
diff --git a/luci-app-services-wolplus/po/zh-cn/timewol.po b/luci-app-services-wolplus/po/zh-cn/wolplus.po
similarity index 100%
rename from luci-app-services-wolplus/po/zh-cn/timewol.po
rename to luci-app-services-wolplus/po/zh-cn/wolplus.po
diff --git a/shadowsocks-rust/Makefile b/shadowsocks-rust/Makefile
index 1d224b89d..375d1f29f 100644
--- a/shadowsocks-rust/Makefile
+++ b/shadowsocks-rust/Makefile
@@ -1,23 +1,18 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
 # Copyright (C) 2017-2020 Yousong Zhou <yszhou4tech@gmail.com>
-#
-# Copyright (C) 2021 ImmortalWrt
-# <https://immortalwrt.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2021 ImmortalWrt.org
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=shadowsocks-rust
-PKG_VERSION:=1.11.2
+PKG_VERSION:=1.12.0
 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)/
+PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-rust/releases/download/v$(PKG_VERSION)/
 
 ifeq ($(ARCH),aarch64)
   PKG_SOURCE:=$(PKG_SOURCE_HEADER).aarch64-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
@@ -28,21 +23,13 @@ else ifeq ($(ARCH),arm)
   ifeq ($(ARM_CPU_FEATURES),)
     PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabi.$(PKG_SOURCE_FOOTER)
     PKG_HASH:=skip
-  else ifneq ($(filter $(ARM_CPU_FEATURES),vfp vfpv2),)
-    PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER)
-    PKG_HASH:=skip
   else
-    PKG_SOURCE:=$(PKG_SOURCE_HEADER).armv7-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER)
+    PKG_SOURCE:=$(PKG_SOURCE_HEADER).arm-$(PKG_SOURCE_BODY)eabihf.$(PKG_SOURCE_FOOTER)
     PKG_HASH:=skip
   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:=skip
-  else
-    PKG_SOURCE:=$(PKG_SOURCE_HEADER).i686-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
-    PKG_HASH:=skip
-  endif
+  PKG_SOURCE:=$(PKG_SOURCE_HEADER).i686-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
+  PKG_HASH:=skip
 else ifeq ($(ARCH),mips)
   PKG_SOURCE:=$(PKG_SOURCE_HEADER).mips-$(PKG_SOURCE_BODY).$(PKG_SOURCE_FOOTER)
   PKG_HASH:=skip
@@ -73,7 +60,7 @@ define Package/shadowsocks-rust/Default
     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
+    DEPENDS:=@USE_MUSL @(aarch64||arm||i386||mips||mipsel||x86_64) @!(TARGET_x86_geode||TARGET_x86_legacy)
   endef
 
   define Package/shadowsocks-rust-$(1)/install