From 95d52b6014681dabf03bdc17a0729f01df9ac0b4 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Tue, 16 Jun 2020 11:56:59 +0800
Subject: [PATCH] luci-app-unblockmusic: fix golang version can't unlock iOS
 newversion issue

---
 package/lean/UnblockNeteaseMusic/Makefile           |  4 ++--
 package/lean/UnblockNeteaseMusicGo/Makefile         |  5 ++---
 .../patches/01-fix-endpoint.patch                   | 13 +++++++++++++
 package/lean/luci-app-unblockmusic/Makefile         |  2 +-
 .../root/etc/init.d/unblockmusic                    |  5 +++--
 5 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch

diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile
index bcd8ef581..ff8e77606 100644
--- a/package/lean/UnblockNeteaseMusic/Makefile
+++ b/package/lean/UnblockNeteaseMusic/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
 PKG_VERSION:=0.25.3
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_LICENSE:=MIT
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git
-PKG_SOURCE_VERSION:=610ff1716aa3698cd2e9391ff808a35a05719586
+PKG_SOURCE_VERSION:=1193e29a2c8f72c738d2988d5cf5afbb2fee7463
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz
diff --git a/package/lean/UnblockNeteaseMusicGo/Makefile b/package/lean/UnblockNeteaseMusicGo/Makefile
index 7f451f146..e86f9711f 100644
--- a/package/lean/UnblockNeteaseMusicGo/Makefile
+++ b/package/lean/UnblockNeteaseMusicGo/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusicGo
 PKG_VERSION:=0.2.0
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/cnsilvan/UnblockNeteaseMusic.git
@@ -43,7 +43,7 @@ define Build/Prepare
 endef
 
 define Build/Configure
-
+  patch -p1 -d $(BUILD_DIR)/$(PKG_NAME) <./patches/01-fix-endpoint.patch
 endef
 
 define Build/Compile
@@ -59,7 +59,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/UnblockNeteaseMusic $(1)/usr/bin/UnblockNeteaseMusic
 	$(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusicGo
 	$(CP) ./files/* $(1)/usr/share/UnblockNeteaseMusicGo/
-	
 endef
 $(eval $(call GoBinPackage,$(PKG_NAME)))
 $(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch b/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch
new file mode 100644
index 000000000..c67f83ef2
--- /dev/null
+++ b/package/lean/UnblockNeteaseMusicGo/patches/01-fix-endpoint.patch
@@ -0,0 +1,13 @@
+diff --git a/processor/processor.go b/processor/processor.go
+index a35f8df..a7e3015 100644
+--- a/processor/processor.go
++++ b/processor/processor.go
+@@ -393,7 +393,7 @@
+ 				//data["url"] = uri.Scheme + "://" + uri.Host + uri.EscapedPath()
+ 				//data["url"] = uri.String()
+ 				if *config.EndPoint {
+-					data["url"] = "http://music.163.com/unblockmusic/" + uri.String()
++					data["url"] = "https://music.163.com/unblockmusic/" + uri.String()
+ 				} else {
+ 					data["url"] = uri.String()
+ 				}
diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile
index 9ef04f6ec..9b7971cd5 100644
--- a/package/lean/luci-app-unblockmusic/Makefile
+++ b/package/lean/luci-app-unblockmusic/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-unblockmusic
 PKG_VERSION:=2.3.5
-PKG_RELEASE:=3
+PKG_RELEASE:=6
 
 PKG_CONFIG_DEPENDS := \
 	CONFIG_UnblockNeteaseMusic_Go \
diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
index b3de31158..102040681 100755
--- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
+++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic
@@ -179,13 +179,14 @@ start()
     else
       sed -i '/item.br < 320000/ { s/item.br < 320000/item.code != 200 || item.freeTrialInfo/g; }'  /usr/share/UnblockNeteaseMusic/src/hook.js
     fi
-    node /usr/share/UnblockNeteaseMusic/app.js -e http://music.163.com -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 &
+    node /usr/share/UnblockNeteaseMusic/app.js -p 5200 $musictype >>/tmp/unblockmusic.log 2>&1 &
     node /usr/share/UnblockNeteaseMusic/app.js -e https://music.163.com -p 5203:5201 $musictype >>/tmp/unblockmusic.log 2>&1 &
     add_cron
     echo "$(date -R) # UnblockNeteaseMusic Nodejs Version (http:5200, https:5201)" >>/tmp/unblockmusic.log  
 	elif [ "$APPTYPE" == "go" ]; then
-    UnblockNeteaseMusic -p 5200 -sp 5201 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 &
+    UnblockNeteaseMusic -p 5200 -sp 5202 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 >>/tmp/unblockmusic.log 2>&1 &
     echo "$(date -R) # UnblockNeteaseMusic Golang Version (http:5200, https:5201)" >>/tmp/unblockmusic.log
+    UnblockNeteaseMusic -p 5203 -sp 5201 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 &
   else
     kill -9 $(busybox ps -w | grep 'sleep 60m' | grep -v grep | awk '{print $1}') >/dev/null 2>&1
     /usr/bin/UnblockNeteaseMusicCloud >/dev/null 2>&1 &