From 1f040092ce71910c67262701cfae52f8cf42dd74 Mon Sep 17 00:00:00 2001 From: lean Date: Wed, 25 Mar 2020 22:23:34 +0800 Subject: [PATCH 1/5] procd: update to latest git HEAD --- package/system/procd/Makefile | 2 +- package/system/procd/files/procd.sh | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 7516089352..9f71f6bb49 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git diff --git a/package/system/procd/files/procd.sh b/package/system/procd/files/procd.sh index 7031763844..17dc14ad3b 100644 --- a/package/system/procd/files/procd.sh +++ b/package/system/procd/files/procd.sh @@ -48,15 +48,6 @@ _PROCD_SERVICE= procd_lock() { local basescript=$(readlink "$initscript") local service_name="$(basename ${basescript:-$initscript})" - - flock -n 1000 &> /dev/null - if [ "$?" != "0" ]; then - exec 1000>"$IPKG_INSTROOT/var/lock/procd_${service_name}.lock" - flock 1000 - if [ "$?" != "0" ]; then - logger "warning: procd flock for $service_name failed" - fi - fi } _procd_call() { From 2998f9a2287df630db8290690442d01e843fa9d3 Mon Sep 17 00:00:00 2001 From: lean Date: Wed, 25 Mar 2020 23:33:19 +0800 Subject: [PATCH 2/5] target:remove luci-proto-relay --- include/target.mk | 2 +- package/lean/luci-app-ssr-plus/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/target.mk b/include/target.mk index b748010c2f..06536fcb41 100644 --- a/include/target.mk +++ b/include/target.mk @@ -15,7 +15,7 @@ DEVICE_TYPE?=router # Default packages - the really basic set DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd urandom-seed urngd \ block-mount coremark kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw wget libustream-openssl ca-certificates \ -default-settings luci luci-proto-relay luci-app-ddns luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ +default-settings luci-app-ddns luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \ luci-app-filetransfer luci-app-vsftpd luci-app-ssr-plus luci-app-unblockmusic \ luci-app-arpbind luci-app-vlmcsd luci-app-wol luci-app-ramfree \ luci-app-sfe luci-app-flowoffload luci-app-nlbwmon luci-app-accesscontrol luci-app-cpufreq \ diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 95318b081b..7f2cb95626 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=174 -PKG_RELEASE:=7 +PKG_RELEASE:=8 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -41,7 +41,7 @@ define Package/$(PKG_NAME) TITLE:=SS/SSR/V2Ray/Trojan LuCI interface PKGARCH:=all DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +pdnsd-alt +wget +lua +libuci-lua \ - +microsocks +dns2socks +shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs +tcpping +proxychains-ng \ + +microsocks +dns2socks +shadowsocks-libev-ss-local +shadowsocksr-libev-ssr-local +shadowsocks-libev-ss-redir +simple-obfs +tcpping \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_plugin:v2ray-plugin \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \ From 1a6c52cc066f9ece6a26c654e08f894970ea8ed1 Mon Sep 17 00:00:00 2001 From: lean Date: Wed, 25 Mar 2020 23:34:22 +0800 Subject: [PATCH 3/5] trojan: bump to 1.15.1 --- package/lean/trojan/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/trojan/Makefile b/package/lean/trojan/Makefile index fce0eeaadc..432f9246ad 100644 --- a/package/lean/trojan/Makefile +++ b/package/lean/trojan/Makefile @@ -7,13 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=trojan -PKG_VERSION:=1.15.0 +PKG_VERSION:=1.15.1 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/trojan-gfw/trojan.git PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=26637b32213fbd508c85d7f8fbfcf593f8330ae3 +PKG_SOURCE_VERSION:=0bad2988c60200c15786baf6b9ea42d66ba2109c PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1 From a0174a6584aa06e372941780343b5b074b3225b9 Mon Sep 17 00:00:00 2001 From: Mattraks <16359027+Mattraks@users.noreply.github.com> Date: Thu, 26 Mar 2020 00:38:57 +0800 Subject: [PATCH 4/5] luci-app-ssr-plus:Fix update.lua (#4018) --- package/lean/luci-app-ssr-plus/Makefile | 3 +++ .../luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 7f2cb95626..4be156283c 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -68,6 +68,9 @@ define Package/$(PKG_NAME)/conffiles endef define Package/$(PKG_NAME)/install + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) ./root/etc/china_ssr.txt $(1)/etc/china_ssr.txt + $(INSTALL_DIR) $(1)/etc/config $(INSTALL_CONF) ./root/etc/config/shadowsocksr $(1)/etc/config/shadowsocksr $(INSTALL_DATA) ./root/etc/config/*.list $(1)/etc/config/ diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua index de0ab7b19f..a7c6394f76 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/update.lua @@ -15,7 +15,7 @@ local log = function(...) end log('正在更新【GFW列表】数据库') -refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'gfwlist_url', 'https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt') .. ' > /tmp//tmp/gfw.b64' +refresh_cmd = "wget-ssl --no-check-certificate -O- " .. uci:get_first('shadowsocksr', 'global', 'gfwlist_url', 'https://cdn.jsdelivr.net/gh/gfwlist/gfwlist/gfwlist.txt') .. " > /tmp/gfw.b64" sret = luci.sys.call(refresh_cmd .. " 2>/dev/null") if sret == 0 then luci.sys.call("/usr/bin/ssr-gfw") From f907738f7c44d497f044e40e512d127b2de87b9e Mon Sep 17 00:00:00 2001 From: Xiaofu Date: Thu, 26 Mar 2020 00:39:09 +0800 Subject: [PATCH 5/5] luci-app-adbyby_plus: bugfix (#4020) --- package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby index 704e00df71..4c79b4710f 100755 --- a/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby +++ b/package/lean/luci-app-adbyby-plus/root/etc/init.d/adbyby @@ -65,7 +65,7 @@ ip_rule() ipset -N adbyby_esc hash:ip $ipt_n -A ADBYBY -m set --match-set adbyby_esc dst -j RETURN - local icount=$(uci show unblockmusic | grep 'filter_mode' | wc -l) + local icount=$(uci show adbyby | grep 'filter_mode' | wc -l) let icount=icount-1 for i in $(seq 0 $icount) do @@ -92,7 +92,7 @@ ip_rule() $ipt_n -A ADBYBY -m set ! --match-set adbyby_wan dst -j RETURN ;; 2) - $ipt_n -I ADBYBY -j RETURN + $ipt_n -A ADBYBY -j RETURN ;; esac