From ad0a71dadc98318a266a9fd4a97aea319f3543bc Mon Sep 17 00:00:00 2001 From: ElonH Date: Fri, 12 Jun 2020 12:18:15 +0800 Subject: [PATCH 1/3] luci-app-nps: monitor uci configuration changes (#4784) when uci configuration about nps has been changed, service doesn't restart itself --- package/lean/luci-app-nps/root/etc/init.d/nps | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/lean/luci-app-nps/root/etc/init.d/nps b/package/lean/luci-app-nps/root/etc/init.d/nps index 3ea722b618..8773054926 100755 --- a/package/lean/luci-app-nps/root/etc/init.d/nps +++ b/package/lean/luci-app-nps/root/etc/init.d/nps @@ -62,9 +62,7 @@ start_service() { fi } -reload_service() -{ - stop - start +service_triggers() { + procd_add_reload_trigger "nps" } From e7e68c33520e5edc37d5360ee22f34fedae6513a Mon Sep 17 00:00:00 2001 From: ricksuzade-maker <58425544+ricksuzade-maker@users.noreply.github.com> Date: Fri, 12 Jun 2020 12:18:29 +0800 Subject: [PATCH 2/3] Bump wireguard to v1.0.20200611 (#4778) Bump wireguard to the newest version --- package/network/services/wireguard/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index ce91fbe9b5..c796aa82f9 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard -PKG_VERSION:=1.0.20200520 +PKG_VERSION:=1.0.20200611 PKG_RELEASE:=1 PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/ -PKG_HASH:=16e7ae4bef734b243428eea07f3b3c3d4721880c3ea8eb8f98628fd6ae5b77c3 +PKG_HASH:=9b0478c3b1f3a7b488916e632e2fcbb1383bb1a2ef294489858ce2ba1da3246d PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING From 5715e22bbbac051d1ab486a60415d6ef431262b1 Mon Sep 17 00:00:00 2001 From: swxk <61259428+swxk521@users.noreply.github.com> Date: Fri, 12 Jun 2020 12:18:51 +0800 Subject: [PATCH 3/3] Update trojan 1.16.0 (#4772) * Update Makefile * Update Makefile --- 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 432f9246ad..fc8f35e572 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.1 +PKG_VERSION:=1.16.0 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:=0bad2988c60200c15786baf6b9ea42d66ba2109c +PKG_SOURCE_VERSION:=8606b7110fe79f8ab02d60c897f87ffb0a9b23f0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz CMAKE_INSTALL:=1