diff --git a/package/lean/adbyby/Makefile b/package/lean/adbyby/Makefile index 21c782d6b9..831dcb5b68 100644 --- a/package/lean/adbyby/Makefile +++ b/package/lean/adbyby/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=adbyby PKG_VERSION:=2.7 -PKG_RELEASE:=20200310 +PKG_RELEASE:=20200315 include $(INCLUDE_DIR)/package.mk @@ -16,7 +16,7 @@ define Package/$(PKG_NAME) SECTION:=net CATEGORY:=Network TITLE:=Powerful adblock module to block ad. - DEPENDS:=@(x86||x86_64||arm||mipsel||mips||aarch64) + DEPENDS:=@(i386||x86_64||arm||mipsel||mips||aarch64) URL:=http://www.adbyby.com/ endef diff --git a/package/lean/adbyby/files/armv7/adbyby b/package/lean/adbyby/files/armv7/adbyby index fbbf33f778..98dbfbe549 100755 Binary files a/package/lean/adbyby/files/armv7/adbyby and b/package/lean/adbyby/files/armv7/adbyby differ diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index fd8b47eff5..30cd70a33d 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:=166 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 55670e3060..978f941c93 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -197,7 +197,7 @@ start_rules() { if [ $dports == "1" ]; then proxyport=" " else - proxyport="-m multiport --dports 22,53,587,465,995,993,143,80,443" + proxyport="-m multiport --dports 22,53,587,465,995,993,143,80,443,5222" fi /usr/bin/ssr-rules \ -s "$server" \ diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua index 0ea059a5e3..175180516e 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua @@ -46,7 +46,7 @@ log = { streamSettings = { network = server.transport, security = (server.tls == '1') and "tls" or "none", - tlsSettings = {allowInsecure = (server.insecure == "1") and true or false,serverName=server.tls_host,}, + tlsSettings = {allowInsecure = (server.insecure ~= "0") and true or false,serverName=server.tls_host,}, kcpSettings = (server.transport == "kcp") and { mtu = tonumber(server.mtu), tti = tonumber(server.tti), diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 9d68618b59..6179cfb7dc 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -9,7 +9,7 @@ CPU_SUBTYPE:=neon-vfpv4 MAINTAINER:=John Crispin # TODO: drop kmod-usb-dwc3-of-simple when migrating to 4.19 -KERNEL_PATCHVER:=4.19 +KERNEL_PATCHVER:=4.14 KERNELNAME:=zImage Image dtbs