Merge pull request #53 from coolsnowwolf/master

20200518更新

README.md

@@ -65,6 +65,13 @@ make -j$(($(nproc) + 1)) V=s
 3.想学习OpenWrt开发，但是摸不着门道？自学没毅力？基础太差？怕太难学不会？跟着佐大学OpenWrt开发入门培训班助你能学有所成
 报名地址：[点击报名](http://forgotfun.org/2018/04/openwrt-training-2018.html "报名")
 
+## 软路由介绍
+友情推荐不恰饭：如果你在寻找一个低功耗小体积性能不错的 x86/x64 路由器，我个人建议可以考虑 
+小马v1 的铝合金版本 (N3710 4千兆)：[页面介绍](https://item.taobao.com/item.htm?spm=a230r.1.14.20.144c763fRkK0VZ&id=561126544764 " 小马v1 的铝合金版本")
+
+![xm1](doc/xm5.jpg)
+![xm2](doc/xm6.jpg)
+
 ## Donate
 
 如果你觉得此项目对你有帮助，可以捐助我们，以鼓励项目能持续发展，更加完善

package/devel/gdb/patches/130-musl_signal_fix.patch

@@ -0,0 +1,20 @@
+diff -Naur a/gdb/nat/aarch64-sve-linux-ptrace.h b/gdb/nat/aarch64-sve-linux-ptrace.h
+--- a/gdb/nat/aarch64-sve-linux-ptrace.h	2018-09-05 15:27:13.000000000 +0800
++++ b/gdb/nat/aarch64-sve-linux-ptrace.h	2020-05-17 11:18:55.994338014 +0800
+@@ -20,15 +20,11 @@
+ #ifndef AARCH64_SVE_LINUX_PTRACE_H
+ #define AARCH64_SVE_LINUX_PTRACE_H
+
+-#include <asm/sigcontext.h>
++#include <signal.h>
+ #include <sys/utsname.h>
+ #include <sys/ptrace.h>
+ #include <asm/ptrace.h>
+
+-#ifndef SVE_SIG_ZREGS_SIZE
+-#include "aarch64-sve-linux-sigcontext.h"
+-#endif
+-
+ /* Indicates whether a SVE ptrace header is followed by SVE registers or a
+    fpsimd structure.  */
+

package/network/services/ppp/files/ppp.sh

@@ -234,7 +234,7 @@ proto_pppoe_setup() {
 #By 蝈蝈：并发拨号同步的前期准备
 	syncppp_option=""
 	[ "$(uci get syncdial.config.enabled)" == "1" ] && {
-		ppp_if_cnt=$(cat /etc/config/network | grep -c "proto 'pppoe'")
+		ppp_if_cnt=$(cat /etc/config/network | grep -E -c "proto\s+?'pppoe'")
 		syncppp_option="syncppp $ppp_if_cnt"
 		shellsync $ppp_if_cnt 10
 	}

package/network/utils/wireguard-tools/Makefile

@@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wireguard-tools
 
-PKG_VERSION:=1.0.20200510
+PKG_VERSION:=1.0.20200513
 PKG_RELEASE:=1
 
 PKG_SOURCE:=wireguard-tools-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-tools/snapshot/
-PKG_HASH:=cd526c7ea177e59ae4c0ebc4f3cc360b8524881b090d043426bdf7e3c85ac8e7
+PKG_HASH:=e73409a9fb8c90506db241d1e1a4e7372a60dbfa400e37f4ab2fd70a92ba495f
 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYING