From b7be5fd5fa8b81906d70335ca6d7d55d9f16e951 Mon Sep 17 00:00:00 2001
From: Hugo Yuan <429632952@163.com>
Date: Sat, 9 May 2020 15:05:25 +0800
Subject: [PATCH 1/3] UnblockNeteaseMusic: bump to 0.25.0 (#4570)

---
 package/lean/UnblockNeteaseMusic/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile
index 5b4685dcac..f575b2c27c 100644
--- a/package/lean/UnblockNeteaseMusic/Makefile
+++ b/package/lean/UnblockNeteaseMusic/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
-PKG_VERSION:=0.24.1
+PKG_VERSION:=0.25.0
 PKG_RELEASE:=4
 
 PKG_LICENSE:=MIT
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git
-PKG_SOURCE_VERSION:=9c9582401e999e1876c4baa204d35284a3d32bec
+PKG_SOURCE_VERSION:=17cddd06278d0915697b3a342a182ed5e240200d
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz

From 7c2d28fbae3c0e3ba59cb880332c49d699ddc36c Mon Sep 17 00:00:00 2001
From: manyeechen <36399844+manyeechen@users.noreply.github.com>
Date: Sat, 9 May 2020 15:05:39 +0800
Subject: [PATCH 2/3] =?UTF-8?q?npc=EF=BC=9Abump=20version=20to=200.26.7=20?=
 =?UTF-8?q?(#4569)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add:
api /client/list 添加获取服务端连接host和连接类型 #483
添加自定义客户端断开时间 #485
fix:
web手机浏览输入框或者按钮被遮挡问题，感谢 @kekxv
android客户端无法粘贴的问题 #479
p2p 由于上个版本的一些改动造成无法使用的问题 #515
---
 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 e311a246d4..c73f01dc4f 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.6
+PKG_VERSION:=0.26.7
 PKG_RELEASE:=2
 
 ifeq ($(ARCH),mipsel)

From 9c732c877d02d5d1f63fcf0b286012a22d65ca11 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sat, 9 May 2020 15:05:57 +0800
Subject: [PATCH 3/3] ipq40xx: adjust switch configuration for netgear ex61x0v2
 (#4550)

---
 target/linux/ipq40xx/base-files/etc/board.d/02_network | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index a6436ae048..bc9b834a2e 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -31,12 +31,11 @@ ipq40xx_setup_interfaces()
 			"0t@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"
 		;;
 	compex,wpj428)
-		ucidef_set_interface_lan "eth0 eth1"
+		ucidef_add_switch "switch0" \
+			"0t@eth0" "4:lan" "5:lan"
 		;;
 	engenius,eap1300|\
 	meraki,mr33|\
-	netgear,ex6100v2|\
-	netgear,ex6150v2|\
 	zyxel,wre6606)
 		ucidef_set_interface_lan "eth0"
 		;;
@@ -52,6 +51,11 @@ ipq40xx_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0t@eth0" "3:lan:2" "4:lan:1" "5:wan"
 		;;
+	netgear,ex6100v2|\
+	netgear,ex6150v2)
+		ucidef_add_switch "switch0" \
+			"0u@eth0" "4:lan"
+		;;
 	p2w,r619ac|\
 	p2w,r619ac-128m|\
 	zyxel,nbg6617)