Merge branch 'main9' into main4

vipshmily · Feb 26, 2024 · eff6916 · eff6916
1 parent 1ef3a49
commit eff6916
Show file tree

Hide file tree

Showing 51 changed files with 1,177 additions and 626 deletions.
diff --git a/trunk/configs/templates/NETGEAR-BZV.config b/trunk/configs/templates/NETGEAR-BZV.config
@@ -303,5 +303,4 @@ CONFIG_FIRMWARE_INCLUDE_ALDRIVER=y
 CONFIG_FIRMWARE_INCLUDE_SQM=n
 
 ### wireguard 10k
-CONFIG_FIRMWARE_INCLUDE_WIREGUARD=n
-
+CONFIG_FIRMWARE_INCLUDE_WIREGUARD=n
diff --git a/trunk/configs/templates/PSG1218.config b/trunk/configs/templates/PSG1218.config
@@ -127,7 +127,7 @@ CONFIG_FIRMWARE_INCLUDE_LPRD=n
 CONFIG_FIRMWARE_INCLUDE_U2EC=n
 
 ### Include "tcpdump" utility. ~0.6MB
-CONFIG_FIRMWARE_INCLUDE_TCPDUMP=y
+CONFIG_FIRMWARE_INCLUDE_TCPDUMP=n
 
 ### Include "hdparm" utility (allow set HDD spindown timeout and APM). ~0.1MB
 CONFIG_FIRMWARE_INCLUDE_HDPARM=n
@@ -139,7 +139,7 @@ CONFIG_FIRMWARE_INCLUDE_PARTED=n
 CONFIG_FIRMWARE_INCLUDE_SMBD=n
 
 ### using samba3.6 instead of samba3
-CONFIG_FIRMWARE_INCLUDE_SMBD36=y
+CONFIG_FIRMWARE_INCLUDE_SMBD36=n
 
 ### Include WINS server only. ~0.4MB
 CONFIG_FIRMWARE_INCLUDE_WINS=n
@@ -154,13 +154,13 @@ CONFIG_FIRMWARE_INCLUDE_FTPD=n
 CONFIG_FIRMWARE_INCLUDE_RPL2TP=n
 
 ### Include EAP-TTLS and EAP-PEAP authentication support. openssl ~1.2MB, wpa_supplicant +0.04MB
-CONFIG_FIRMWARE_INCLUDE_EAP_PEAP=y
+CONFIG_FIRMWARE_INCLUDE_EAP_PEAP=n
 
 ### Include HTTPS support. openssl ~1.2MB
 CONFIG_FIRMWARE_INCLUDE_HTTPS=n
 
 ### Include sftp-server. openssl ~1.2MB, sftp-server ~0.06MB
-CONFIG_FIRMWARE_INCLUDE_SFTP=y
+CONFIG_FIRMWARE_INCLUDE_SFTP=n
 
 ### Include dropbear SSH. ~0.3MB
 CONFIG_FIRMWARE_INCLUDE_DROPBEAR=n
@@ -169,7 +169,7 @@ CONFIG_FIRMWARE_INCLUDE_DROPBEAR=n
 CONFIG_FIRMWARE_INCLUDE_DROPBEAR_FAST_CODE=n
 
 ### Include OpenSSH instead of dropbear. openssl ~1.2MB, openssh ~1.0MB
-CONFIG_FIRMWARE_INCLUDE_OPENSSH=y
+CONFIG_FIRMWARE_INCLUDE_OPENSSH=n
 
 ### Include OpenVPN. IPv6 required. openssl ~1.2MB, openvpn ~0.4MB
 CONFIG_FIRMWARE_INCLUDE_OPENVPN=n
@@ -181,7 +181,7 @@ CONFIG_FIRMWARE_INCLUDE_OPENSSL_EC=y
 CONFIG_FIRMWARE_INCLUDE_OPENSSL_EXE=n
 
 ### Include xUPNPd IPTV mediaserver. ~0.3MB
-CONFIG_FIRMWARE_INCLUDE_XUPNPD=y
+CONFIG_FIRMWARE_INCLUDE_XUPNPD=n
 
 ### Include Minidlna UPnP mediaserver. ~1.6MB
 CONFIG_FIRMWARE_INCLUDE_MINIDLNA=n
@@ -190,7 +190,7 @@ CONFIG_FIRMWARE_INCLUDE_MINIDLNA=n
 CONFIG_FIRMWARE_INCLUDE_FIREFLY=n
 
 ### Include ffmpeg 0.11.x instead of 0.6.x for Minidlna and Firefly. ~0.1MB
-CONFIG_FIRMWARE_INCLUDE_FFMPEG_NEW=y
+CONFIG_FIRMWARE_INCLUDE_FFMPEG_NEW=n
 
 ### Include Transmission torrent. openssl ~1.2MB, transmission ~1.5MB
 CONFIG_FIRMWARE_INCLUDE_TRANSMISSION=n
@@ -210,48 +210,92 @@ 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_MINIEAP=n
 
-CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT=y
+CONFIG_FIRMWARE_INCLUDE_NJIT_CLIENT=n
 
-CONFIG_FIRMWARE_INCLUDE_NAPT66=y
+CONFIG_FIRMWARE_INCLUDE_NAPT66=n
 
 CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_SERVER=n
 
 CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_CLIENT=n
 
 CONFIG_FIRMWARE_INCLUDE_SOFTETHERVPN_CMD=n
 
-CONFIG_FIRMWARE_INCLUDE_VLMCSD=y
+CONFIG_FIRMWARE_INCLUDE_VLMCSD=n
 
-CONFIG_FIRMWARE_INCLUDE_TTYD=y
+CONFIG_FIRMWARE_INCLUDE_TTYD=n
 
-CONFIG_FIRMWARE_INCLUDE_LRZSZ=y
+### Include msd_lite, replaces udpxy
+CONFIG_FIRMWARE_INCLUDE_MSD_LITE=y
 
-CONFIG_FIRMWARE_INCLUDE_HTOP=y
+CONFIG_FIRMWARE_INCLUDE_LIBCGROUP=n
 
-CONFIG_FIRMWARE_INCLUDE_NANO=y
+CONFIG_FIRMWARE_INCLUDE_LRZSZ=n
 
-CONFIG_FIRMWARE_INCLUDE_IPERF3=y
+CONFIG_FIRMWARE_INCLUDE_HTOP=n
+
+CONFIG_FIRMWARE_INCLUDE_NANO=n
+
+CONFIG_FIRMWARE_INCLUDE_IPERF3=n
 
 CONFIG_FIRMWARE_INCLUDE_DUMP1090=n
 
 CONFIG_FIRMWARE_INCLUDE_RTL_SDR=n
 
-CONFIG_FIRMWARE_INCLUDE_MTR=y
+CONFIG_FIRMWARE_INCLUDE_MTR=n
 
-CONFIG_FIRMWARE_INCLUDE_SOCAT=y
+CONFIG_FIRMWARE_INCLUDE_SOCAT=n
 
-CONFIG_FIRMWARE_INCLUDE_SRELAY=y
+CONFIG_FIRMWARE_INCLUDE_SRELAY=n
 
 CONFIG_FIRMWARE_INCLUDE_MENTOHUST=n
 
 CONFIG_FIRMWARE_INCLUDE_FRPC=n
 
 CONFIG_FIRMWARE_INCLUDE_FRPS=n
 
-CONFIG_FIRMWARE_INCLUDE_TUNSAFE=n
+CONFIG_FIRMWARE_INCLUDE_REDSOCKS=n
+
+### Include Shadowsocks
+CONFIG_FIRMWARE_INCLUDE_SHADOWSOCKS=n
+
+### Include xray  ~4.5M
+CONFIG_FIRMWARE_INCLUDE_XRAY=n
+
+### Include v2ray
+CONFIG_FIRMWARE_INCLUDE_V2RAY=n
+
+### Include trojan  ~1.2M
+CONFIG_FIRMWARE_INCLUDE_TROJAN=n
+
+### Include simple-obfs
+CONFIG_FIRMWARE_INCLUDE_SSOBFS=n
+
+### Include adbyby plus+
+CONFIG_FIRMWARE_INCLUDE_ADBYBY=y
+
+### DNS Services
+CONFIG_FIRMWARE_INCLUDE_DNSFORWARDER=n
+
+CONFIG_FIRMWARE_INCLUDE_SMARTDNS=y
+
+CONFIG_FIRMWARE_INCLUDE_ADGUARDHOME=n
+
+### zerotier ~1.3M
+CONFIG_FIRMWARE_INCLUDE_ZEROTIER=y
+
+CONFIG_FIRMWARE_INCLUDE_ALIDDNS=n
+
+### ddnsto  ~0.5M
+CONFIG_FIRMWARE_INCLUDE_DDNSTO=n
+
+### ALDRIVER  ~3m
+CONFIG_FIRMWARE_INCLUDE_ALDRIVER=n
+
+CONFIG_FIRMWARE_INCLUDE_SQM=n
 
+### wireguard 10k
 CONFIG_FIRMWARE_INCLUDE_WIREGUARD=n
diff --git a/trunk/libs/libcares/c-ares-1.26.0.tar.gz b/trunk/libs/libcares/c-ares-1.26.0.tar.gz
diff --git a/trunk/libs/libjpeg/Makefile b/trunk/libs/libjpeg/Makefile
@@ -1,5 +1,5 @@
-SRC_NAME=jpeg-9e
-SRC_URL=http://www.ijg.org/files/jpegsrc.v9e.tar.gz
+SRC_NAME=jpeg-9f
+SRC_URL=http://www.ijg.org/files/jpegsrc.v9f.tar.gz
 
 all: download_test extract_test config_test
 	$(MAKE) -j$(HOST_NCPU) -C $(SRC_NAME)

diff --git a/trunk/libs/libjpeg/jpeg-9f.tar.gz b/trunk/libs/libjpeg/jpeg-9f.tar.gz
diff --git a/trunk/libs/libjpeg/jpegsrc.v9e.tar.gz b/trunk/libs/libjpeg/jpegsrc.v9e.tar.gz
diff --git a/trunk/libs/libjson-c/Makefile b/trunk/libs/libjson-c/Makefile
@@ -1,5 +1,5 @@
 SRC_NAME=json-c-json-c-0.17-20230812
-SRC_URL=https://github.com/json-c/json-c/archive/refs/tags/json-c-json-c-0.17-20230812.tar.gz
+SRC_URL=https://codeload.github.com/json-c/json-c/tar.gz/refs/tags/json-c-0.17-20230812
 ARCHIVE_NAME=json-c-json-c-0.17-20230812
 
 all: download_test extract_test config_test

diff --git a/trunk/libs/libsqlite/Makefile b/trunk/libs/libsqlite/Makefile
@@ -1,5 +1,5 @@
-SRC_NAME=sqlite-autoconf-3440200
-SRC_URL=https://www.sqlite.org/2023/$(SRC_NAME).tar.gz
+SRC_NAME=sqlite-autoconf-3450100
+SRC_URL=https://www.sqlite.org/2024/$(SRC_NAME).tar.gz
 
 
 all: download_test extract_test config_test

diff --git a/trunk/libs/libsqlite/sqlite-autoconf-3440200.tar.gz b/trunk/libs/libsqlite/sqlite-autoconf-3440200.tar.gz
diff --git a/trunk/libs/libsqlite/sqlite-autoconf-3450100.tar.gz b/trunk/libs/libsqlite/sqlite-autoconf-3450100.tar.gz
diff --git a/trunk/libs/libusb-1.0/Makefile b/trunk/libs/libusb-1.0/Makefile
@@ -1,8 +1,8 @@
-SRC_NAME=libusb-1.0.26
-SRC_URL=https://github.com/libusb/libusb/releases/download/v1.0.25/$(SRC_NAME).tar.bz2
+SRC_NAME=libusb-1.0.27
+SRC_URL=https://github.com/libusb/libusb/releases/download/v1.0.27/$(SRC_NAME).tar.bz2
 
-#all: download_test extract_test config_test
-all: config_test
+all: download_test extract_test config_test
+#all: config_test
 	$(MAKE) -j$(HOST_NCPU) -C $(SRC_NAME)
 
 download_test:

diff --git a/trunk/libs/libusb-1.0/libusb-1.0.27.tar.bz2 b/trunk/libs/libusb-1.0/libusb-1.0.27.tar.bz2
diff --git a/trunk/libs/libuv/Makefile b/trunk/libs/libuv/Makefile
@@ -1,5 +1,5 @@
-SRC_NAME=libuv-v1.47.0
-SRC_URL=https://dist.libuv.org/dist/v1.47.0/$(SRC_NAME).tar.gz
+SRC_NAME=libuv-v1.48.0
+SRC_URL=https://dist.libuv.org/dist/v1.48.0/$(SRC_NAME).tar.gz
 
 all: download_test extract_test config_test
 	$(MAKE) -j$(HOST_NCPU) -C $(SRC_NAME)

diff --git a/trunk/libs/libuv/libuv-v1.44.2.tar.gz b/trunk/libs/libuv/libuv-v1.44.2.tar.gz
diff --git a/trunk/libs/libuv/libuv-v1.48.0.tar.gz b/trunk/libs/libuv/libuv-v1.48.0.tar.gz
diff --git a/trunk/libs/libxml2/Makefile b/trunk/libs/libxml2/Makefile
@@ -1,5 +1,5 @@
-SRC_NAME=libxml2-v2.12.3
-SRC_URL=https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.12.3/$(SRC_NAME).tar.gz
+SRC_NAME=libxml2-v2.11.7
+SRC_URL=https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.11.7/$(SRC_NAME).tar.gz
 
 all: download_test extract_test config_test
 	$(MAKE) -j$(HOST_NCPU) -C $(SRC_NAME)

diff --git a/trunk/libs/libxml2/libxml2-v2.11.7.tar.gz b/trunk/libs/libxml2/libxml2-v2.11.7.tar.gz
diff --git a/trunk/libs/libz/Makefile b/trunk/libs/libz/Makefile
@@ -1,4 +1,4 @@
-SRC_NAME=zlib-1.3
+SRC_NAME=zlib-1.3.1
 SRC_URL=http://www.zlib.net/$(SRC_NAME).tar.gz
 
 all: download_test extract_test config_test

diff --git a/trunk/libs/libz/zlib-1.2.13.tar.gz b/trunk/libs/libz/zlib-1.2.13.tar.gz
diff --git a/trunk/libs/libz/zlib-1.3.1.tar.gz b/trunk/libs/libz/zlib-1.3.1.tar.gz
diff --git a/trunk/libs/mbedtls/Makefile b/trunk/libs/mbedtls/Makefile
@@ -1,5 +1,5 @@
-SRC_NAME=mbedtls-2.28.6
-SRC_URL=https://github.com/Mbed-TLS/mbedtls/archive/v2.28.6.tar.gz
+SRC_NAME=mbedtls-2.28.7
+SRC_URL=https://github.com/Mbed-TLS/mbedtls/archive/v2.28.7.tar.gz
 
 all: download_test extract_test config_test
 	$(MAKE) -j$(HOST_NCPU) -C $(SRC_NAME)/build

diff --git a/trunk/libs/mbedtls/mbedtls-2.28.7.tar.gz b/trunk/libs/mbedtls/mbedtls-2.28.7.tar.gz
diff --git a/trunk/proprietary/rt_wifi/rtpci/3.0.X.X/mt76x2/include/os/rt_linux.h b/trunk/proprietary/rt_wifi/rtpci/3.0.X.X/mt76x2/include/os/rt_linux.h
@@ -787,15 +787,17 @@ void linux_pci_unmap_single(void *handle, ra_dma_addr_t dma_addr, size_t size, i
 #define PCI_FREE_CONSISTENT(_pci_dev, _size, _virtual_addr, _physical_addr) \
 	pci_free_consistent(_pci_dev, _size, _virtual_addr, _physical_addr)
 
-#ifdef VENDOR_FEATURE2_SUPPORT
-#define DEV_ALLOC_SKB(_pAd, _Pkt, _length)	\
-	_Pkt = dev_alloc_skb(_length);			\
-	if (_Pkt != NULL) {MEM_DBG_PKT_ALLOC_INC(_Pkt);};
-#else
-
-#define DEV_ALLOC_SKB(_pAd, _Pkt, _length)	\
-	_Pkt = dev_alloc_skb(_length);
-#endif /* VENDOR_FEATURE2_SUPPORT */
+#ifndef NET_SKB_PAD
+#define NET_SKB_PAD	32
+#endif
+#define DEV_ALLOC_SKB(_pAd,_Pkt, _length)		\
+	do {\
+		_Pkt = alloc_skb(_length + NET_SKB_PAD, GFP_ATOMIC);		\
+		if (_Pkt != NULL) {							\
+			skb_reserve(_Pkt, NET_SKB_PAD);		\
+			MEM_DBG_PKT_ALLOC_INC(_Pkt);	\
+		};	\
+	} while (0)
 
 /*#define PCI_MAP_SINGLE(_handle, _ptr, _size, _dir) (ULONG)0 */
 /*#define PCI_UNMAP_SINGLE(_handle, _ptr, _size, _dir) */

diff --git a/trunk/tools/mksquashfs_xz/Makefile b/trunk/tools/mksquashfs_xz/Makefile
@@ -1,5 +1,5 @@
 SRC_NAME1=squashfs-4.6.1
-SRC_NAME2=xz-5.4.5
+SRC_NAME2=xz-5.4.6
 SRC_URL2=https://netactuate.dl.sourceforge.net/project/lzmautils/$(SRC_NAME2).tar.xz
 
 all: extract_xz config_xz build_xz build_squashfs

diff --git a/trunk/tools/mksquashfs_xz/xz-5.4.5.tar.xz b/trunk/tools/mksquashfs_xz/xz-5.4.5.tar.xz
diff --git a/trunk/tools/mksquashfs_xz/xz-5.4.6.tar.xz b/trunk/tools/mksquashfs_xz/xz-5.4.6.tar.xz
diff --git a/trunk/user/adguardhome/Makefile b/trunk/user/adguardhome/Makefile
@@ -1,4 +1,4 @@
-VERSION := 0.107.41
+VERSION := 0.107.44
 VERSION_PKG := github.com/AdguardTeam/AdGuardHome/internal/version
 
 SRC_NAME := AdGuardHome-$(VERSION)

diff --git a/trunk/user/aria2/Makefile b/trunk/user/aria2/Makefile
@@ -1,8 +1,8 @@
 SRC_NAME=aria2-1.37.0
-SRC_URL=https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0.tar.xz
+SRC_URL=https://github.com/aria2/aria2/releases/download/release-1.37.0/$(SRC_NAME).tar.xz
 
 SRC_ARIA_NG_NAME=AriaNg-1.3.7-AllInOne
-SRC_ARIA_NG_URL=https://github.com/mayswind/AriaNg/releases/download/1.3.7/AriaNg-1.3.7-AllInOne.zip
+SRC_ARIA_NG_URL=https://github.com/mayswind/AriaNg/releases/download/1.3.7/$(SRC_ARIA_NG_NAME).zip
 
 CFLAGS  += -ffunction-sections -fdata-sections -fvisibility=hidden
 CXXFLAGS += -ffunction-sections -fdata-sections -fvisibility-inlines-hidden

diff --git a/trunk/user/htop/Makefile b/trunk/user/htop/Makefile
@@ -1,5 +1,5 @@
-SRC_NAME = htop-3.2.2
-SRC_URL = https://github.com/htop-dev/htop/releases/download/3.2.2/$(SRC_NAME).tar.xz
+SRC_NAME = htop-3.3.0
+SRC_URL = https://github.com/htop-dev/htop/releases/download/3.3.0/$(SRC_NAME).tar.xz
 THISDIR = $(shell pwd)
 
 all: download_test extract_test config_test
@@ -12,7 +12,7 @@ download_test:
 
 extract_test:
 	( if [ ! -d $(SRC_NAME) ]; then \
-		tar -xf $(SRC_NAME).tar.xz; \
+		tar xf $(SRC_NAME).tar.xz; \
 	fi )
 
 config_test:

diff --git a/trunk/user/htop/htop-3.2.2.tar.xz b/trunk/user/htop/htop-3.2.2.tar.xz
diff --git a/trunk/user/httpd/ralink.c b/trunk/user/httpd/ralink.c
@@ -893,7 +893,7 @@ get_apcli_wds_entry(const char *ifname, RT_802_11_MAC_ENTRY *pme)
 	wrq.u.data.flags = 0;
 
 	if (wl_ioctl(ifname, RTPRIV_IOCTL_GET_MAC_TABLE_STRUCT, &wrq) >= 0 &&
-	    wrq.u.data.length == sizeof(RT_802_11_MAC_ENTRY)) {
+	    wrq.u.data.length == sizeof(RT_802_11_MAC_ENTRY)) { //bug with mt7615 driver
 		return 1;
 	}
 
@@ -1073,7 +1073,7 @@ print_sta_list(webs_t wp, RT_802_11_MAC_TABLE *mp, int num_ss_rx, int ap_idx)
 		bzero(&RxRate, sizeof(RxRate));
 		RxRate.word = mp->Entry[i].LastRxRate;
 
-		ret += websWrite(wp, "%02X:%02X:%02X:%02X:%02X:%02X  %-7s %3s %3d %3s %4s %4s %5dM %5dM %4d %3s %02d:%02d:%02d\n",
+		ret += websWrite(wp, "%02X:%02X:%02X:%02X:%02X:%02X %-7s %3s %3d %3s %4s %4s %5dM %5dM %4d %3s %02d:%02d:%02d\n",
 				mp->Entry[i].Addr[0], mp->Entry[i].Addr[1], mp->Entry[i].Addr[2],
 				mp->Entry[i].Addr[3], mp->Entry[i].Addr[4], mp->Entry[i].Addr[5],
 				GetPhyMode(mp->Entry[i].TxRate.field.MODE),