Merge tag '3006.102.2_2'

3006.102.2_2
gnuton · Nov 17, 2024 · c38541f · c38541f
2 parents 20ba60f + 03da482
commit c38541f
Show file tree

Hide file tree

Showing 222 changed files with 6,297 additions and 6,012 deletions.
diff --git a/Changelog-3006.txt b/Changelog-3006.txt
@@ -1,14 +1,52 @@
 Asuswrt-Merlin 3006.xxx Changelog
 =================================
 
+
 3006.102.1_1-gnuton1 (xx-xxxx-2024)
   - NEW: Added support for GT-BE98.
   - FIXED: DNSDirector and Tor pages would fail to properly load
            in some environment.
 
-3006.102.xx (xx-xxx-xxxx)
+3006.102.2_2 (17-Nov-2024)
+  - FIXED: Security issues in AiCloud (backports from Asus)
+
+3006.102.2 (3-Nov-2024)
+  - NEW: Added support for RT-BE88U (based on GPL 3.0.0.6.102_33921)
+  - NEW: Added support for RT-BE86U (based on GPL 3.0.0.6.102_36216)
+  - NEW: Added mDNS support to the router's local name resolution
+         (nss).
+  - UPDATED: OpenVPN to 2.6.12.
+  - CHANGED: Support importing Wireguard config files that
+             contain multiple AllowedIPs, Address or DNS
+             declarations.
+  - CHANGED: Re-added firmware version display on Sysinfo page
+             (as you can't copy the version string from the
+             header banner, this one can be).
+  - CHANGED: VPN killswitch will now only be active if the
+             VPN client itself is enabled.  If you stop/start
+             the client yourself over SSH, you need to also
+             update the enabled/disabled nvram setting.
+  - CHANGED: Display public IP address for Wireguard clients.
+  - FIXED: Generated web certificate wasn't using the FQDN
+           for Namecheap DDNS users.
   - FIXED: DNSDirector and Tor pages would fail to properly load
            in some environment.
+  - FIXED: CVE-2024-2511, CVE-2024-4741, CVE-2024-5535 &
+           Implicit rejection for RSA PKCS#1 in openssl
+           (backport from Ubuntu by RSDNTWK)
+  - FIXED: UPnP options were missing on WAN page for models
+           with multiservice WAN support.
+  - FIXED: Guest Network table would still be shown on the
+           DNSDIrector page if DNSDirector isn't enabled.
+  - FIXED: VPN Fusion-related popup showing when editing
+           an existing DHCP reservation - removed.
+  - FIXED: 320 MHz chanspec would show as 160 on the Wifi
+           icon status.
+  - FIXED: Wifi icon status not properly shown on quad-band
+           Wifi 7 models.
+  - FIXED: DNS over TLS broken if IoT Guest Network (or other
+           Guest Network sharing existing VLAN) is disabled.
+           (patch from Asus)
 
 3006.102.1 (28-Jun-2024)
 

diff --git a/Changelog-NG.txt b/Changelog-NG.txt
diff --git a/README-merlin.txt b/README-merlin.txt
@@ -61,6 +61,8 @@ Fully supported devices:
 3006.102.x:
  * RT-BE96U 
  * GT-BE98_PRO
+ * RT-BE88U
+ * RT-BE86U
 
 No longer supported:
  * RT-N16

diff --git a/release/src-rt-5.04behnd.4916/kernel/linux-4.19/config_base.6a.6813 b/release/src-rt-5.04behnd.4916/kernel/linux-4.19/config_base.6a.6813
@@ -4646,6 +4646,10 @@ CONFIG_BCM_IN_KERNEL=y
 # Asuswrt-merlin configuration
 #
 
+# NFS
+# CONFIG_NFS_FS is not set
+# CONFIG_NFSD is not set
+
 # CIFS
 CONFIG_DNS_RESOLVER=m
 CONFIG_CIFS=m

diff --git a/release/src-rt/target.mak b/release/src-rt/target.mak
@@ -378,4 +378,40 @@ export GT-BE98 += BUILD_NAME="GT-BE98" EXT_PHY="BCM84880" NVSIZE="192" DHDAP=y D
 		MTLANCFG=y CAPTIVE_PORTAL=y CP_FREEWIFI=y WPA3_ENTERPRISE=y \
 		EXTRA_KERNEL_CONFIGS="BCM_JUMBO_FRAME=y BCM_MAX_MTU_SIZE=10240 CONFIG_BCM_IGNORE_BRIDGE_MTU=y" MAX_VPNF=4 \
 		WTFAST_V2=y AMAS_OB_DISABLE_DSAP=y USB_WAN_BACKUP=y AUTO_WANPORT=y \
+
+export RT-BE88U := $(HND-96813_BASE)
+export RT-BE88U += BUILD_NAME="RT-BE88U" EXT_PHY="BCM84880" NVSIZE="192" DHDAP=y REPEATER=y IPV6SUPP=y HTTPS=y ARM=y AUTODICT=y \
+		BBEXTRAS=y USBEXTRAS=y EBTABLES=y MEDIASRV=y MODEM=y PARENTAL2=y ACCEL_PPTPD=y PRINTER=y WEBDAV=y SMARTSYNCBASE=y \
+		USB="USB" APP="network" PROXYSTA=y DNSMQ=y BCMWL6=y BCMWL6A=y DISK_MONITOR=y OPTIMIZE_XBOX=y ODMPID=y BCMSMP=y \
+		XHCI=y DUALWAN=y NEW_USER_LOW_RSSI=y OPENVPN=y TIMEMACHINE=y MDNS=y VPNC=y JFFS2LOG=y BWDPI=y LINUX_MTD="64" \
+		DEBUGFS=y SSH=y EMAIL=y FRS_FEEDBACK=n SYSSTATE=y STAINFO=y CLOUDCHECK=n NATNL_AICLOUD=y REBOOT_SCHEDULE=y \
+		MULTICASTIPTV=y QUAGGA=y BCM_MUMIMO=y LAN50="all" ATCOVER=y GETREALIP=y CFEZ=y ETLAN_LED=y TFAT=y NTFS="tuxera" \
+		HFS="tuxera" NEWSSID_REV4=y NEW_APP_ARM=y NETOOL=y TRACEROUTE=y FORCE_AUTO_UPGRADE=n ALEXA=y SW_HW_AUTH=y \
+		HD_SPINDOWN=y BCMEVENTD=y LETSENCRYPT=y VPN_FUSION=y JFFS_NVRAM=y NVRAM_ENCRYPT=y NATNL_AIHOME=y BCM_CEVENTD=y \
+		UTF8_SSID=y AMAS=y DBLOG=y ETHOBD=y CFGSYNC_LOCSYNC=y CONNDIAG=y NFCM=n DNSQUERY_INTERCEPT=y IPSEC=STRONGSWAN \
+		IPSEC_SRVCLI_ONLY=SRV DWB=y OPEN_NAT=y AMASDB=n CRASHLOG=y BW160M=y BRCM_HOSTAPD=y UUPLUGIN=y IPERF3=y INFO_EXAP=y \
+		BCN_RPT=y BTM_11V=y INTERNETCTRL=y ASD=y AHS=n FRS_LIVE_UPDATE=n ASUSCTRL=y CAPTCHA=y OUTFOX=y GAME_MODE=y \
+		AMAS_ETHDETECT=y INSTANT_GUARD=y AVBLCHAN=y FRONTHAUL_DWB=y BCM_CLED=y BONDING=y BONDING_WAN=y ACL96=y LACP=y \
+		OWE_TRANS=y EXTEND_LIMIT=y GOOGLE_ASST=y IPV6S46=y OCNVC=y DSLITE=y LED_BTN=y WIREGUARD=y BCMBSD_V2=y \
+		SW_CTRL_ALLLED=y COMFW=y WIFI7=y PC_SCHED_V3=y MULTISERVICE_WAN=y MTLANCFG=y CAPTIVE_PORTAL=y CP_FREEWIFI=y \
+		WPA3_ENTERPRISE=y USB_WAN_BACKUP=y SFPP=y SFPP_LED=y WIFI7_NO_6G=y AMAS_OB_DISABLE_DSAP=y WTFAST_V2=n REVERTFW=y MLO=y \
+		DIS_MLO_QIS=y AUTO_WANPORT=y \
+		NFS=n SNMPD=y TOR=y UPNPIGD2=y NANO=y NTPD=y DNSPRIVACY=y IPSET=y VPN_FUSION_MERLIN=y
+
+export RT-BE86U := $(HND-96813_BASE)
+export RT-BE86U += BUILD_NAME="RT-BE86U" EXT_PHY="BCM84880" NVSIZE="192" DHDAP=y HND_WL=y REPEATER=y IPV6SUPP=y HTTPS=y ARM=y \
+		AUTODICT=y BBEXTRAS=y USBEXTRAS=y EBTABLES=y MEDIASRV=y MODEM=y PARENTAL2=y ACCEL_PPTPD=y PRINTER=y WEBDAV=y \
+		SMARTSYNCBASE=y USB="USB" APP="network" PROXYSTA=y DNSMQ=y BCMWL6=y BCMWL6A=y DISK_MONITOR=y OPTIMIZE_XBOX=y ODMPID=y \
+		BCMSMP=y XHCI=y DUALWAN=y NEW_USER_LOW_RSSI=y OPENVPN=y TIMEMACHINE=y MDNS=y VPNC=y JFFS2LOG=y BWDPI=y LINUX_MTD="64" \
+		DEBUGFS=y SSH=y EMAIL=y FRS_FEEDBACK=n SYSSTATE=y STAINFO=y CLOUDCHECK=n NATNL_AICLOUD=y REBOOT_SCHEDULE=y \
+		MULTICASTIPTV=y QUAGGA=y BCM_MUMIMO=y LAN50="all" ATCOVER=y GETREALIP=y CFEZ=y TFAT=y NTFS="tuxera" HFS="tuxera" \
+		NEWSSID_REV4=y LAN4WAN_LED=y NEW_APP_ARM=y NETOOL=y TRACEROUTE=y FORCE_AUTO_UPGRADE=n ALEXA=y SW_HW_AUTH=y HD_SPINDOWN=y \
+		BCMEVENTD=y LETSENCRYPT=y VPN_FUSION=y JFFS_NVRAM=y NVRAM_ENCRYPT=y NATNL_AIHOME=y BCM_CEVENTD=y UTF8_SSID=y AMAS=y \
+		DBLOG=y ETHOBD=y CFGSYNC_LOCSYNC=y CONNDIAG=y NFCM=n DNSQUERY_INTERCEPT=y IPSEC=STRONGSWAN IPSEC_SRVCLI_ONLY=SRV DWB=y \
+		FRONTHAUL_DWB=y OPEN_NAT=y AMASDB=n CRASHLOG=y BW160M=y BRCM_HOSTAPD=y UUPLUGIN=y IPERF3=y INFO_EXAP=y BCN_RPT=y \
+		BTM_11V=y INTERNETCTRL=y ASD=y AHS=n FRS_LIVE_UPDATE=n ASUSCTRL=y CAPTCHA=y OUTFOX=y GAME_MODE=y AMAS_ETHDETECT=y \
+		INSTANT_GUARD=y AVBLCHAN=y BONDING=y BONDING_WAN=n ACL96=y LACP=y OWE_TRANS=y EXTEND_LIMIT=y GOOGLE_ASST=y IPV6S46=y \
+		OCNVC=y DSLITE=y LED_BTN=y WIREGUARD=y BCMBSD_V2=y SW_CTRL_ALLLED=y COMFW=y WIFI7=y PC_SCHED_V3=y \
+		MULTISERVICE_WAN=y MTLANCFG=y CAPTIVE_PORTAL=y CP_FREEWIFI=y WPA3_ENTERPRISE=y USB_WAN_BACKUP=y WIFI7_NO_6G=y \
+		AMAS_OB_DISABLE_DSAP=y AUTO_WANPORT=y \
 		NFS=n SNMPD=y TOR=y UPNPIGD2=y NANO=y NTPD=y DNSPRIVACY=y IPSET=y VPN_FUSION_MERLIN=y
diff --git a/release/src-rt/version.conf b/release/src-rt/version.conf
@@ -3,8 +3,8 @@ FS_VER=0.6
 KERNEL_VER_AM=$(subst .,,$(KERNEL_VER))
 FS_VER_AM=$(subst .,,$(FS_VER))
 
-SERIALNO=102.1
-EXTENDNO=0
+SERIALNO=102.2
+EXTENDNO=2
 
 ifeq ($(ROG_UI),y)
 EXTENDNO:=$(EXTENDNO)_rog

diff --git a/release/src/router/APP-IPK/AiCloud-tmp/CONTROL/control-aicloud b/release/src/router/APP-IPK/AiCloud-tmp/CONTROL/control-aicloud
@@ -2,7 +2,7 @@ Package: aicloud
 Architecture: arm
 Priority: optional
 Section: net
-Version: 2.0.2.32
+Version: 2.0.2.38
 Maintainer: ASUS
 Source: http://nw-dlcdnet.asus.com/asusware/arm/stable
 URL: https://192.168.1.1:443

diff --git a/release/src/router/Makefile b/release/src/router/Makefile
@@ -7339,6 +7339,7 @@ libcap-ng/configure:
 	CFLAGS="-O3 -Wall $(EXTRACFLAGS)" $(CONFIGURE) --enable-shared \
 		--prefix=/usr \
 		--bindir=/usr/sbin \
+		--without-python --without-python3 \
 		--libdir=/usr/lib
 	touch $@
 

diff --git a/release/src/router/hnd_extra/Makefile b/release/src/router/hnd_extra/Makefile
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm63xx_cons.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm63xx_cons.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm63xx_flash.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm63xx_flash.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm63xx_gpio.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm63xx_gpio.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm63xx_led.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm63xx_led.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm963xx_timer.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm963xx_timer.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_arm64_setup.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_arm64_setup.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_arm_cpuidle.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_arm_cpuidle.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_arm_irq.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_arm_irq.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_bpm.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_bpm.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_dt.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_dt.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_enet.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_enet.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_legacy_io_map.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_legacy_io_map.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_misc_hw_init_impl6.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_misc_hw_init_impl6.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_thermal.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_thermal.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_usb.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcm_usb.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcmmcast.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcmmcast.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcmpdc.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcmpdc.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcmspu.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcmspu.o
diff --git a/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcmvlan.o b/release/src/router/hnd_extra/prebuilt/RT-AC86U/bcmvlan.o