From ffa1a3a364135f14124bc044e0fbbeb3ed9f9ae6 Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Wed, 19 Feb 2020 14:44:31 +0800 Subject: [PATCH 1/4] luci-app-cifsd: load modules on boot --- package/lean/luci-app-cifsd/Makefile | 2 +- package/lean/luci-app-cifsd/root/etc/modules.d/ksmbd | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 package/lean/luci-app-cifsd/root/etc/modules.d/ksmbd diff --git a/package/lean/luci-app-cifsd/Makefile b/package/lean/luci-app-cifsd/Makefile index 119ed542e6..26347d6ca4 100644 --- a/package/lean/luci-app-cifsd/Makefile +++ b/package/lean/luci-app-cifsd/Makefile @@ -7,7 +7,7 @@ LUCI_DEPENDS:=+ksmbd-server LUCI_PKGARCH:=all PKG_NAME:=luci-app-cifsd PKG_VERSION:=1 -PKG_RELEASE:=6 +PKG_RELEASE:=7 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-cifsd/root/etc/modules.d/ksmbd b/package/lean/luci-app-cifsd/root/etc/modules.d/ksmbd new file mode 100644 index 0000000000..f32d1bb856 --- /dev/null +++ b/package/lean/luci-app-cifsd/root/etc/modules.d/ksmbd @@ -0,0 +1 @@ +ksmbd \ No newline at end of file From d99da91bbee95f85a610a89aded9bfd4a4990c85 Mon Sep 17 00:00:00 2001 From: ElonH Date: Wed, 19 Feb 2020 14:53:31 +0800 Subject: [PATCH 2/4] upx: fix dependence (#3188) missing ucl library dependence reduce error probability on parallel build --- tools/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/Makefile b/tools/Makefile index 8f30c125ea..eccfbe9fe7 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -43,6 +43,7 @@ tools-$(CONFIG_TARGET_apm821xx)$(CONFIG_TARGET_gemini) += genext2fs tools-$(CONFIG_TARGET_tegra) += cbootimage cbootimage-configs # builddir dependencies +$(curdir)/upx/compile := $(curdir)/ucl/compile $(curdir)/bison/compile := $(curdir)/flex/compile $(curdir)/flex/compile := $(curdir)/libtool/compile $(curdir)/libtool/compile := $(curdir)/m4/compile $(curdir)/autoconf/compile $(curdir)/automake/compile $(curdir)/missing-macros/compile From 6d579bcf33bbed3d06de12d552c0694f89fa2fe1 Mon Sep 17 00:00:00 2001 From: manyeechen <36399844+manyeechen@users.noreply.github.com> Date: Wed, 19 Feb 2020 14:53:46 +0800 Subject: [PATCH 3/4] frpc: bump version to v0.31.2 (#3191) Fix not release port when client start proxy error. --- package/lean/frpc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/frpc/Makefile b/package/lean/frpc/Makefile index 262cb72f25..e746daa7b0 100644 --- a/package/lean/frpc/Makefile +++ b/package/lean/frpc/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=frpc -PKG_VERSION:=0.31.1 +PKG_VERSION:=0.31.2 PKG_RELEASE:=1 ifeq ($(ARCH),mipsel) From a18e7218b4664f880250e592a38c9d4dda4d513d Mon Sep 17 00:00:00 2001 From: manyeechen <36399844+manyeechen@users.noreply.github.com> Date: Wed, 19 Feb 2020 14:54:03 +0800 Subject: [PATCH 4/4] npc: bump version to v0.26.3 (#3190) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix: mux 无锁队列同时进行pop可能导致死循环的问题 mux buffer pool 同一对象可能放入两次的问题 socks5 tcp连接未及时断开问题 udp 穿透逻辑不完善 change: 文件记录改为临时文件写入完毕后替换，避免文件被截断照成数据丢失 #412 service初始化失败后继续运行，但无法提供相关功能 #407 --- package/lean/npc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/lean/npc/Makefile b/package/lean/npc/Makefile index cf68297153..e7625263c0 100644 --- a/package/lean/npc/Makefile +++ b/package/lean/npc/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=npc -PKG_VERSION:=0.26.2 +PKG_VERSION:=0.26.3 PKG_RELEASE:=1 ifeq ($(ARCH),mipsel)