Updating minieap sources to minieap-taiga(From ZenZRyan) Updating mentohust sources Updating suctclient

.github/workflows/CI.yml

@@ -1,8 +1,10 @@
-name: CI
+name: ALL_BUILD
 
 # Controls when the action will run. 
 on: 
   push:
+    branches: 
+      - develop
   pull_request:
   workflow_dispatch:
     inputs:
@@ -17,7 +19,7 @@ on:
 jobs:
   build:
     name: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: ${{ !(github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')) }}
     env:
       build_variant: ${{ matrix.build_variant }}
@@ -36,16 +38,20 @@ jobs:
             targets: "XY-C1 JCG-836PRO JCG-AC860M JCG-Y2 DIR-882 A3004NS MSG1500 WR1200JS MI-R3G NEWIFI3 B70"
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: develop
       - name: Prepare environment
         run: |
           sudo apt update
-          sudo apt install libtool-bin gperf python3-docutils autopoint gettext
+          sudo apt install libtool-bin gperf python3-docutils autopoint gettext help2man
+          sudo apt upgrade
       - name: Run shellcheck
         run: sh ./trunk/tools/shellcheck.sh
       - name: Prepare toolchain
         run: |
           cd toolchain-mipsel
-          sh dl_toolchain.sh
+          ./clean_toolchain
+          ./build_toolchain
       - name: Setup tmate session
         uses: mxschmitt/action-tmate@v3
         if: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.debug_enabled == 'yes' }}

README.md

@@ -9,7 +9,29 @@ Welcome to the rt-n56u project
 This project aims to improve the rt-n56u and other supported devices on the software part, allowing power user to take full control over their hardware.
 This project was created in hope to be useful, but comes without warranty or support. Installing it will probably void your warranty. 
 Contributors of this project are not responsible for what happens next.
-
+***
+# How to build this project? #
+This project uses Github's automatic compilation, you can download the compiled image directly or compile it by yourself.
+### Download compiled image ###
+* Go to Actions (https://github.com/ZenZRyan/rt-n56u/actions)
+* Select the latest workflow
+* Find your target and open it in Artifacts
+* Download image
+### Compile by yourself ###
+* Need Unix-like environmet (Take Ubuntu for example）
+* sudo apt update
+sudo apt install unzip libtool-bin curl cmake gperf gawk flex bison nano xxd \
+	fakeroot kmod cpio git python3-docutils gettext automake autopoint \
+	texinfo build-essential help2man pkg-config zlib1g-dev libgmp3-dev \
+	libmpc-dev libmpfr-dev libncurses5-dev libltdl-dev wget libc-dev-bin
+* git clone https://github.com/ZenZRyan/rt-n56u.git
+* cd /opt/rt-n56u/toolchain-mipsel
+* ./clean_toolchain && ./build_toolchain #(recommendation)
+or ./dl_toolchain.sh
+* cd /opt/rt-n56u/trunk
+* fakeroot ./build_firmware_modify YOUR TARGET
+* Wait for the end, and the image file in the /trunk/image directory
+***
 ### How do I get set up? ###
 
 * [Get the tools to build the system](https://bitbucket.org/padavan/rt-n56u/wiki/EN/HowToMakeFirmware) or [Download pre-built system image](https://bitbucket.org/padavan/rt-n56u/downloads)
@@ -23,97 +45,34 @@ Contributors of this project are not responsible for what happens next.
 
 ***
 
+### What does this fork change? ###
+
+* Updating minieap sources to minieap-taiga(From ZenZRyan) 
+* Updating mentohust sources
+* Updating suctclient
+
+*** 
+
 ### 特别说明 ###
 * 汉化字典来自：https://github.com/gorden5566/padavan
 * 更新日志：https://www.jianshu.com/p/d76a63a12eae
 
 ***
 
-### 固件特点 ###
-- 使用[gorden5566](https://github.com/gorden5566/padavan)的汉化字典
-- aria2前端更换为[AriaNg](https://github.com/mayswind/AriaNg)
-- [curl](https://github.com/curl/curl)可选编译可执行程序 ```CONFIG_FIRMWARE_INCLUDE_CURL```
-- 使用了[PROMETHEUS](http://pm.freize.net/index.html)提供的部分补丁
-- 使用了[Linaro1985/padavan-ng](https://gitlab.com/padavan-ng/padavan-ng)的部分软件包
-- 可选以下插件：
->- [scutclient](https://github.com/hanwckf/scutclient) ```CONFIG_FIRMWARE_INCLUDE_SCUTCLIENT```
->- [gdut-drcom](https://github.com/chenhaowen01/gdut-drcom) ```CONFIG_FIRMWARE_INCLUDE_GDUT_DRCOM```
->- [dogcom](https://github.com/hanwckf/dogcom) ```CONFIG_FIRMWARE_INCLUDE_DOGCOM```
->- [minieap](https://github.com/hanwckf/minieap) ```CONFIG_FIRMWARE_INCLUDE_MINIEAP```
->- [njit-client](https://github.com/hanwckf/njit8021xclient) ```CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT```
->- [napt66](https://github.com/mzweilin/napt66) ```CONFIG_FIRMWARE_INCLUDE_NAPT66```
->- [softether-vpnserver](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable) ```CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_SERVER```
->- [softether-vpnclient](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable) ```CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_CLIENT```
->- [softether-vpncmd](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable) ```CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_CMD```
->- [vlmcsd](https://github.com/hanwckf/vlmcsd) ```CONFIG_FIRMWARE_INCLUDE_VLMCSD```
->- [ttyd](https://github.com/tsl0922/ttyd) ```CONFIG_FIRMWARE_INCLUDE_TTYD```
->- [lrzsz](https://ohse.de/uwe/software/lrzsz.html) ```CONFIG_FIRMWARE_INCLUDE_LRZSZ```
->- [htop](https://hisham.hm/htop/releases/) ```CONFIG_FIRMWARE_INCLUDE_HTOP```
->- [nano](https://www.nano-editor.org/dist/) ```CONFIG_FIRMWARE_INCLUDE_NANO```
->- [iperf3](https://github.com/esnet/iperf) ```CONFIG_FIRMWARE_INCLUDE_IPERF3```
->- [dump1090](https://github.com/hanwckf/dump1090) ```CONFIG_FIRMWARE_INCLUDE_DUMP1090```
->- [rtl-sdr](https://github.com/osmocom/rtl-sdr) ```CONFIG_FIRMWARE_INCLUDE_RTL_SDR```
->- [samba3.6](https://gitlab.com/padavan-ng/padavan-ng/tree/master/trunk/user/samba36) ```CONFIG_FIRMWARE_INCLUDE_SMBD36```
->- [mtr](https://github.com/traviscross/mtr) ```CONFIG_FIRMWARE_INCLUDE_MTR```
->- [socat](http://www.dest-unreach.org/socat) ```CONFIG_FIRMWARE_INCLUDE_SOCAT```
->- [srelay](https://socks-relay.sourceforge.io) ```CONFIG_FIRMWARE_INCLUDE_SRELAY```
->- [3proxy](https://github.com/z3APA3A/3proxy) ```CONFIG_FIRMWARE_INCLUDE_3PROXY```
->- [mentohust](https://github.com/hanwckf/mentohust-1) ```CONFIG_FIRMWARE_INCLUDE_MENTOHUST```
->- [frpc](https://github.com/fatedier/frp) ```CONFIG_FIRMWARE_INCLUDE_FRPC```
->- [frps](https://github.com/fatedier/frp) ```CONFIG_FIRMWARE_INCLUDE_FRPS```
->- [tunsafe](https://github.com/TunSafe/TunSafe) ```CONFIG_FIRMWARE_INCLUDE_TUNSAFE```
->- [wireguard-go](https://git.zx2c4.com/wireguard-go/) ```CONFIG_FIRMWARE_INCLUDE_WIREGUARD```
->- [smartdns](https://github.com/pymumu/smartdns) ```CONFIG_FIRMWARE_INCLUDE_SMARTDNS```
-
-- 已适配除官方适配外的以下机型
->- PSG1208
->- PSG1218
->- 5K-W20 (USB)
->- OYE-001 (USB)
->- NEWIFI-MINI (USB)
->- MI-MINI (USB)
->- MI-3 (USB)
->- MI-3C
->- MI-4
->- MI-R3G (USB)
->- MI-R4A
->- MI-R3P (USB)
->- HC5661A
->- HC5761A (USB)
->- HC5861B
->- 360P2 (USB)
->- MI-NANO
->- MZ-R13
->- MZ-R13P
->- RT-AC1200GU (USB)
->- XY-C1 (USB)
->- WR1200JS (USB)
->- NEWIFI3 (USB)
->- B70 (USB)
->- A3004NS (USB)
->- K2P
->- K2P-USB (USB)
->- JCG-836PRO (USB)
->- JCG-AC860M (USB)
->- DIR-882 (USB)
->- DIR-878
->- MR2600 (USB)
->- WDR7300
->- RM2100
->- CR660x (CR6606, CR6608, CR6609)
->- R2100
->- JCG-Y2 (USB)
->- E8820V2 (USB)
->- ZTE_E8820S (USB)
->- MSG1500 (USB)
->- R6220 (USB)
->- NETGEAR-CHJ (R6260, R6350, R6850, WAC124)
->- NETGEAR-BZV (R6800, R6700-v2, R7200, Nighthawk AC2400)
+### 这个分支更新了什么？ ###
+* 更新minieap的软件源，采用来自ZenZRyan的minieap-taiga
+* 更新mentohust版本至最新版本（同步原作者）
+* 更新suctclient版本至最新版本（同步原作者）
 
 ***
-
-### 编译说明 ###
-
+# 编译说明 #
+* 本仓库采用Github的自动编译流程，你可以下载自动编译的固件或者自行手动编译
+### 自动编译 ###
+* 打开本仓库上方的Actions选项卡(https://github.com/ZenZRyan/rt-n56u/actions)
+* 在Workflow工作流中找到一个最新的工作流
+* 进入工作流之后，在下方的Artifacts中下载编译好的固件包
+* 找到你的设备所支持的固件，刷入即可
+### 手动编译 ###
 * 安装依赖包
 
 ```shell
@@ -200,6 +159,87 @@ fakeroot ./build_firmware_modify PSG1218
 
 ***
 
+### 固件特点 ###
+- 使用[gorden5566](https://github.com/gorden5566/padavan)的汉化字典
+- aria2前端更换为[AriaNg](https://github.com/mayswind/AriaNg)
+- [curl](https://github.com/curl/curl)可选编译可执行程序 ```CONFIG_FIRMWARE_INCLUDE_CURL```
+- 使用了[PROMETHEUS](http://pm.freize.net/index.html)提供的部分补丁
+- 使用了[Linaro1985/padavan-ng](https://gitlab.com/padavan-ng/padavan-ng)的部分软件包
+- 可选以下插件：
+>- [scutclient](https://github.com/hanwckf/scutclient) ```CONFIG_FIRMWARE_INCLUDE_SCUTCLIENT```
+>- [gdut-drcom](https://github.com/chenhaowen01/gdut-drcom) ```CONFIG_FIRMWARE_INCLUDE_GDUT_DRCOM```
+>- [dogcom](https://github.com/hanwckf/dogcom) ```CONFIG_FIRMWARE_INCLUDE_DOGCOM```
+>- [minieap](https://github.com/ZenZRyan/minieap-taiga) ```CONFIG_FIRMWARE_INCLUDE_MINIEAP```
+>- [njit-client](https://github.com/hanwckf/njit8021xclient) ```CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT```
+>- [napt66](https://github.com/mzweilin/napt66) ```CONFIG_FIRMWARE_INCLUDE_NAPT66```
+>- [softether-vpnserver](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable) ```CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_SERVER```
+>- [softether-vpnclient](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable) ```CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_CLIENT```
+>- [softether-vpncmd](https://github.com/SoftEtherVPN/SoftEtherVPN_Stable) ```CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_CMD```
+>- [vlmcsd](https://github.com/hanwckf/vlmcsd) ```CONFIG_FIRMWARE_INCLUDE_VLMCSD```
+>- [ttyd](https://github.com/tsl0922/ttyd) ```CONFIG_FIRMWARE_INCLUDE_TTYD```
+>- [lrzsz](https://ohse.de/uwe/software/lrzsz.html) ```CONFIG_FIRMWARE_INCLUDE_LRZSZ```
+>- [htop](https://hisham.hm/htop/releases/) ```CONFIG_FIRMWARE_INCLUDE_HTOP```
+>- [nano](https://www.nano-editor.org/dist/) ```CONFIG_FIRMWARE_INCLUDE_NANO```
+>- [iperf3](https://github.com/esnet/iperf) ```CONFIG_FIRMWARE_INCLUDE_IPERF3```
+>- [dump1090](https://github.com/hanwckf/dump1090) ```CONFIG_FIRMWARE_INCLUDE_DUMP1090```
+>- [rtl-sdr](https://github.com/osmocom/rtl-sdr) ```CONFIG_FIRMWARE_INCLUDE_RTL_SDR```
+>- [samba3.6](https://gitlab.com/padavan-ng/padavan-ng/tree/master/trunk/user/samba36) ```CONFIG_FIRMWARE_INCLUDE_SMBD36```
+>- [mtr](https://github.com/traviscross/mtr) ```CONFIG_FIRMWARE_INCLUDE_MTR```
+>- [socat](http://www.dest-unreach.org/socat) ```CONFIG_FIRMWARE_INCLUDE_SOCAT```
+>- [srelay](https://socks-relay.sourceforge.io) ```CONFIG_FIRMWARE_INCLUDE_SRELAY```
+>- [3proxy](https://github.com/z3APA3A/3proxy) ```CONFIG_FIRMWARE_INCLUDE_3PROXY```
+>- [mentohust](https://github.com/hanwckf/mentohust-1) ```CONFIG_FIRMWARE_INCLUDE_MENTOHUST```
+>- [frpc](https://github.com/fatedier/frp) ```CONFIG_FIRMWARE_INCLUDE_FRPC```
+>- [frps](https://github.com/fatedier/frp) ```CONFIG_FIRMWARE_INCLUDE_FRPS```
+>- [tunsafe](https://github.com/TunSafe/TunSafe) ```CONFIG_FIRMWARE_INCLUDE_TUNSAFE```
+>- [wireguard-go](https://git.zx2c4.com/wireguard-go/) ```CONFIG_FIRMWARE_INCLUDE_WIREGUARD```
+>- [smartdns](https://github.com/pymumu/smartdns) ```CONFIG_FIRMWARE_INCLUDE_SMARTDNS```
+
+- 已适配除官方适配外的以下机型
+>- PSG1208
+>- PSG1218
+>- 5K-W20 (USB)
+>- OYE-001 (USB)
+>- NEWIFI-MINI (USB)
+>- MI-MINI (USB)
+>- MI-3 (USB)
+>- MI-3C
+>- MI-4
+>- MI-R3G (USB)
+>- MI-R4A
+>- MI-R3P (USB)
+>- HC5661A
+>- HC5761A (USB)
+>- HC5861B
+>- 360P2 (USB)
+>- MI-NANO
+>- MZ-R13
+>- MZ-R13P
+>- RT-AC1200GU (USB)
+>- XY-C1 (USB)
+>- WR1200JS (USB)
+>- NEWIFI3 (USB)
+>- B70 (USB)
+>- A3004NS (USB)
+>- K2P
+>- K2P-USB (USB)
+>- JCG-836PRO (USB)
+>- JCG-AC860M (USB)
+>- DIR-882 (USB)
+>- DIR-878
+>- MR2600 (USB)
+>- WDR7300
+>- RM2100
+>- CR660x (CR6606, CR6608, CR6609)
+>- R2100
+>- JCG-Y2 (USB)
+>- E8820V2 (USB)
+>- ZTE_E8820S (USB)
+>- MSG1500 (USB)
+>- R6220 (USB)
+>- NETGEAR-CHJ (R6260, R6350, R6850, WAC124)
+>- NETGEAR-BZV (R6800, R6700-v2, R7200, Nighthawk AC2400)
+
 ### 请参阅 ###
 - https://www.jianshu.com/p/cb51fb0fb2ac
 - https://www.jianshu.com/p/6b8403cdea46

toolchain-mipsel/dl_toolchain.sh

@@ -2,7 +2,7 @@
 
 DIR="toolchain-3.4.x"
 DL_NAME="mipsel-linux-uclibc.tar.xz"
-DL_URL="https://github.com/hanwckf/padavan-toolchain/releases/download/v1.1/$DL_NAME"
+DL_URL="https://github.com/ZenZRyan/rt-n56u/releases/download/toolchain/$DL_NAME"
 
 if [ -d $DIR ]; then
 	echo "$DIR exists!"

trunk/configs/templates/360P2.config

@@ -206,7 +206,7 @@ CONFIG_FIRMWARE_INCLUDE_DOGCOM=y
 
 CONFIG_FIRMWARE_INCLUDE_MINIEAP=y
 
-CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT=y
+CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT=n
 
 CONFIG_FIRMWARE_INCLUDE_NAPT66=y
 
@@ -224,9 +224,9 @@ CONFIG_FIRMWARE_INCLUDE_LRZSZ=y
 
 CONFIG_FIRMWARE_INCLUDE_HTOP=y
 
-CONFIG_FIRMWARE_INCLUDE_NANO=y
+CONFIG_FIRMWARE_INCLUDE_NANO=n
 
-CONFIG_FIRMWARE_INCLUDE_IPERF3=y
+CONFIG_FIRMWARE_INCLUDE_IPERF3=n
 
 CONFIG_FIRMWARE_INCLUDE_DUMP1090=n
 
@@ -238,7 +238,7 @@ CONFIG_FIRMWARE_INCLUDE_SOCAT=y
 
 CONFIG_FIRMWARE_INCLUDE_SRELAY=y
 
-CONFIG_FIRMWARE_INCLUDE_MENTOHUST=n
+CONFIG_FIRMWARE_INCLUDE_MENTOHUST=y
 
 CONFIG_FIRMWARE_INCLUDE_FRPC=n
 

trunk/configs/templates/HC5761A.config

@@ -196,17 +196,17 @@ CONFIG_FIRMWARE_INCLUDE_ARIA=y
 ### Include Aria2 WEB control. ~0.7MB
 CONFIG_FIRMWARE_INCLUDE_ARIA_WEB_CONTROL=y
 
-CONFIG_FIRMWARE_INCLUDE_CURL=y
+CONFIG_FIRMWARE_INCLUDE_CURL=n
 
 CONFIG_FIRMWARE_INCLUDE_SCUTCLIENT=n
 
 CONFIG_FIRMWARE_INCLUDE_GDUT_DRCOM=n
 
-CONFIG_FIRMWARE_INCLUDE_DOGCOM=y
+CONFIG_FIRMWARE_INCLUDE_DOGCOM=n
 
 CONFIG_FIRMWARE_INCLUDE_MINIEAP=y
 
-CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT=y
+CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT=n
 
 CONFIG_FIRMWARE_INCLUDE_NAPT66=y
 
@@ -224,9 +224,9 @@ CONFIG_FIRMWARE_INCLUDE_LRZSZ=y
 
 CONFIG_FIRMWARE_INCLUDE_HTOP=y
 
-CONFIG_FIRMWARE_INCLUDE_NANO=y
+CONFIG_FIRMWARE_INCLUDE_NANO=n
 
-CONFIG_FIRMWARE_INCLUDE_IPERF3=y
+CONFIG_FIRMWARE_INCLUDE_IPERF3=n
 
 CONFIG_FIRMWARE_INCLUDE_DUMP1090=n
 
@@ -238,7 +238,7 @@ CONFIG_FIRMWARE_INCLUDE_SOCAT=y
 
 CONFIG_FIRMWARE_INCLUDE_SRELAY=y
 
-CONFIG_FIRMWARE_INCLUDE_MENTOHUST=n
+CONFIG_FIRMWARE_INCLUDE_MENTOHUST=y
 
 CONFIG_FIRMWARE_INCLUDE_FRPC=n