Merge Lean's source

config/Config-images.in

@@ -16,6 +16,7 @@ menu "Target Images"
 			prompt "Compression"
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
+			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ipq40xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips

package/kernel/mac80211/broadcom.mk

@@ -449,7 +449,7 @@ define KernelPackage/brcmfmac/config
 
 	config BRCMFMAC_SDIO
 		bool "Enable SDIO bus interface support"
-		default y if TARGET_brcm2708
+		default y if TARGET_bcm27xx
 		default y if TARGET_sunxi
 		default n
 		help

package/lean/UnblockNeteaseMusic/Makefile

@@ -1,24 +1,21 @@
 #
-# Copyright (C) 2015-2016 OpenWrt.org
+# Copyright (C) 2015-2020 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v3.
 #
-# licheng
-# www.maxlicheng.com
-# 2019-07-28
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
 PKG_VERSION:=0.23.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=MIT
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/nondanee/UnblockNeteaseMusic.git
-PKG_SOURCE_VERSION:=1251b9d96826ce5bb63131d0f18696253ec02127
+PKG_SOURCE_VERSION:=586d043806ed8885319d9fcb4806cd05dfa71f09
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/server.lua

@@ -4,7 +4,7 @@
 local m, sec, o
 local shadowsocksr = "shadowsocksr"
 local uci = luci.model.uci.cursor()
-local ipkg = require("luci.model.ipkg")
+
 
 m = Map(shadowsocksr, translate("ShadowSocksR Server"))
 

package/lean/luci-app-unblockmusic/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-unblockmusic
 PKG_VERSION:=2.3.1
-PKG_RELEASE:=11
+PKG_RELEASE:=12
 
 PKG_LICENSE:=Apache-2.0
 

package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua

@@ -62,7 +62,7 @@ o.inputtitle = translate("更新核心版本")
 o.description = string.format(translate("目前运行主程序版本") ..  "<strong><font color=\"green\">: %s </font></strong>", ver)
 o.inputstyle = "reload"
 o.write = function()
-	luci.sys.exec("/usr/share/UnblockNeteaseMusic/update_core.sh 2>&1")
+	luci.sys.exec("/usr/share/UnblockNeteaseMusic/update_core.sh luci_update 2>&1")
   luci.http.redirect(luci.dispatcher.build_url("admin", "services", "unblockmusic"))
 end
 

package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/logcheck.sh

@@ -6,10 +6,8 @@ log_file="/tmp/unblockmusic.log"
 while true
 do
 	sleep 10s
-	icount=`busybox ps -w | grep UnblockNeteaseMusic/app.js |grep -v grep| wc -l`
-	if [ $icount -ne 1 ] ;then 
-		/etc/init.d/unblockmusic restart 
-	fi
+	icount=`busybox ps -w | grep UnblockNeteaseMusic/app.js |grep -v grep`
+	[ -z "$icount" ] && /etc/init.d/unblockmusic restart 
 	(( log_size = "$(ls -l "${log_file}" | awk -F ' ' '{print $5}')" / "1024" ))
 	(( "${log_size}" >= "${log_max_size}" )) && echo "" > /tmp/unblockmusic.log
 	sleep 10m

package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh

@@ -24,6 +24,7 @@ function check_latest_version(){
 		else
 			echo -e "\nLocal version: $(cat /usr/share/UnblockNeteaseMusic/local_ver 2>/dev/null), cloud version: ${latest_ver}." >>/tmp/unblockmusic_update.log
 			echo -e "You're already using the latest version." >>/tmp/unblockmusic_update.log
+			[ "${luci_update}" == "n" ] && /etc/init.d/unblockmusic restart
 			exit 3
 		fi
 	fi
@@ -47,14 +48,14 @@ function update_core(){
 		echo -e "Failed to download core." >>/tmp/unblockmusic_update.log
 		exit 1
 	else
-		[ "${luci_update}" == "y" ] && touch "/usr/share/unblockneteasemusic/update_successfully"
 		echo -e "${latest_ver}" > /usr/share/UnblockNeteaseMusic/local_ver
-		/etc/init.d/unblockmusic restart
+		cat /usr/share/UnblockNeteaseMusic/package-lock.json | grep version |awk -F ':' '{print $2}' | cut -c3-8 > /usr/share/UnblockNeteaseMusic/core_ver
 	fi
 
 	echo -e "Succeeded in updating core." >/tmp/unblockmusic_update.log
 	echo -e "Local version: $(cat /usr/share/UnblockNeteaseMusic/local_ver 2>/dev/null), cloud version: ${latest_ver}.\n" >>/tmp/unblockmusic_update.log
-	cat /usr/share/UnblockNeteaseMusic/package-lock.json | grep version |awk -F ':' '{print $2}' | cut -c3-8 > /usr/share/UnblockNeteaseMusic/core_ver
+	
+	/etc/init.d/unblockmusic restart
 }
 
 function main(){
@@ -62,4 +63,7 @@ function main(){
 	check_latest_version
 }
 
+  luci_update="n"
+	[ "$1" == "luci_update" ] && luci_update="y"
 	main
+	

package/utils/xfsprogs/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfsprogs
 PKG_CPE_ID:=cpe:/a:sgi:xfsprogs
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_VERSION:=4.11.0
 PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs
 PKG_HASH:=c3a6d87b564d7738243c507df82276bed982265e345363a95f2c764e8a5f5bb2

package/utils/xfsprogs/patches/130-db-malloc-Use-posix_memalign-instead-of-deprecated-v.patch

@@ -12,8 +12,6 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
  db/malloc.c | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/db/malloc.c b/db/malloc.c
-index 77b3e022..38fe0b05 100644
 --- a/db/malloc.c
 +++ b/db/malloc.c
 @@ -56,8 +56,7 @@ xmalloc(
@@ -26,6 +24,3 @@ index 77b3e022..38fe0b05 100644
  		return ptr;
  	badmalloc();
  	/* NOTREACHED */
--- 
-2.17.1
-

package/utils/xfsprogs/patches/140-copy-file-range.patch

@@ -0,0 +1,48 @@
+From 8041435de7ed028a27ecca64302945ad455c69a6 Mon Sep 17 00:00:00 2001
+From: "Darrick J. Wong" <darrick.wong@oracle.com>
+Date: Mon, 5 Feb 2018 14:38:02 -0600
+Subject: [PATCH] xfs_io: fix copy_file_range symbol name collision
+
+glibc 2.27 has a copy_file_range wrapper, so we need to change our
+internal function out of the way to avoid compiler warnings.
+
+Reported-by: fredrik@crux.nu
+Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
+Reviewed-by: Eric Sandeen <sandeen@redhat.com>
+Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
+---
+ io/copy_file_range.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+--- a/io/copy_file_range.c
++++ b/io/copy_file_range.c
+@@ -42,13 +42,18 @@ copy_range_help(void)
+ "));
+ }
+ 
++/*
++ * Issue a raw copy_file_range syscall; for our test program we don't want the
++ * glibc buffered copy fallback.
++ */
+ static loff_t
+-copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
++copy_file_range_cmd(int fd, loff_t *src, loff_t *dst, size_t len)
+ {
+ 	loff_t ret;
+ 
+ 	do {
+-		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0);
++		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst,
++				len, 0);
+ 		if (ret == -1) {
+ 			perror("copy_range");
+ 			return errno;
+@@ -130,7 +135,7 @@ copy_range_f(int argc, char **argv)
+ 		copy_dst_truncate();
+ 	}
+ 
+-	ret = copy_file_range(fd, &src, &dst, len);
++	ret = copy_file_range_cmd(fd, &src, &dst, len);
+ 	close(fd);
+ 	return ret;
+ }

target/linux/bcm27xx/image/gen_rpi_sdcard_img.sh

@@ -24,6 +24,3 @@ ROOTFSSIZE="$(($4 / 512))"
 
 dd bs=512 if="$BOOTFS" of="$OUTPUT" seek="$BOOTOFFSET" conv=notrunc
 dd bs=512 if="$ROOTFS" of="$OUTPUT" seek="$ROOTFSOFFSET" conv=notrunc
-
-
-