Merge tag '384.17-mainline' into dsl-ac68u-384.17

384.17-mainline

Changelog-NG.txt

@@ -1,6 +1,31 @@
 Asuswrt-Merlin 384/NG Changelog
 ===============================
 
+384.17 (26-Apr-2020)
+  Updating some models (like the RT-AC88U) from stock firmware
+  3.0.0.4.384_81790 and newer will require a factory default reset
+  after flashing Asuswrt-Merlin, due to a change in how Asus
+  stores the admin password starting with 384_81790.
+
+  - NEW: Add Chacha20-poly1305 support to dropbear (themiron)
+  - UPDATED: dnsmasq to 2.81-openssl (themiron)
+  - UPDATED: openvpn to 2.4.9.
+  - UPDATED: curl to 7.69.1.
+  - UPDATED: openssl-1.1 to 1.1.1g (themiron)
+  - UPDATED: nano to 4.9.2.
+  - FIXED: RT-AC88U/RT-AC3100/RT-AC5300 could fail to upgrade
+           from newer stock versions to Asuswrt-Merlin.
+  - FIXED: Various webui issues with sorting DHCP reservations.
+
+
+384.13_8 (26-Apr-2020)
+  This release is only available for the RT-AC87U and RT-AC3200.
+
+  - UPDATED: dnsmasq to 2.81-openssl (themiron)
+  - UPDATED: openvpn to 2.4.9.
+  - UPDATED: openssl-1.1 to 1.1.1g (themiron)
+
+
 384.16 (5-Apr-2020)
   - NEW: Added support for the RT-AX58U and RT-AX3000 (same
          firmware), based on GPL 384_8253 + binary blobs 384_8137.

release/src-rt/target.mak

@@ -30,7 +30,7 @@ export RT-AC68U_BASE := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y U
 			TFAT=y HFS="tuxera" NTFS="tuxera" REPEATER=y DUALWAN=y DNSFILTER=y UPNPIGD2=n \
 			NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y NETOOL=y TRACEROUTE=n
 
-export RT-AC68U := $(RT-AC68U_BASE) FAKEHDR=y FORCE_SN=384 FORCE_EN=20000
+export RT-AC68U := $(RT-AC68U_BASE) FAKEHDR=y FORCE_SN=385 FORCE_EN=20000
 export RT-AC68U += BUILD_NAME="RT-AC68U" NEWSSID_REV2=y DBLOG=y ETHOBD=y DWB=y UUPLUGIN=y BTM_11V=y \
 		BCN_RPT=y INFO_EXAP=y RAST_NONMESH_KVONLY=y IPERF3=y AVBLCHAN=y FILEFLEX=y
 
@@ -60,7 +60,7 @@ export RT-AC87U := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y USBEXT
 # Broadcom HND ARM platform
 #
 export HND-94908_BASE := HND_ROUTER=y PROFILE="94908HND" SW_HW_AUTH=y AMAS=y UTF8_SSID=y ETHOBD=y DWB=y SAMBA3="3.6.x"
-export RT-AC86U := $(HND-94908_BASE) 
+export RT-AC86U := $(HND-94908_BASE) FAKEHDR=y FORCE_SN=385 FORCE_EN=20000
 export RT-AC86U += BUILD_NAME="RT-AC86U" NVSIZE="128" DHDAP=y DPSTA=y LACP=n WTFAST=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 \
@@ -111,20 +111,20 @@ export RT-AC88U_BASE := IPV6SUPP=y HTTPS=y ARM=y BCM57=y AUTODICT=y BBEXTRAS=y U
 		ASPMD=n BCMEVENTD=n WLCLMLOAD=n BCM_MUMIMO=y LAN50=y ATCOVER=y GETREALIP=y DWB=y \
 		NOTIFICATION_CENTER=y NATNL_AICLOUD=y SYSSTATE=y SMARTSYNCBASE=y NATNL_AIHOME=y \
 		NFS=y DNSFILTER=y SNMPD=y TOR=y UPNPIGD2=n NANO=y OPENSSL11=y NTPD=y DNSPRIVACY=y \
-		TRACEROUTE=n
+		TRACEROUTE=n FAKEHDR=y FORCE_SN=385 FORCE_EN=20000
 
 export RT-AC88U := $(RT-AC88U_BASE)
 export RT-AC88U += BUILD_NAME="RT-AC88U" RGMII_BRCM5301X=y SWITCH2="RTL8365MB" BCM_MMC=n BCM_7114=y \
 		ETLAN_LED=y ROMCFE=n NVSIZE="128" DHDAP=y DPSTA=y USB_DEBUG=n BCMFA=n GMAC3=y \
-		LACP=y RESET_SWITCH=n WTFAST=y FORCE_SN="380" FORCE_EN="664" DISABLE_REPEATER_UI=n \
+		LACP=y RESET_SWITCH=n WTFAST=y DISABLE_REPEATER_UI=n \
 		NEWSSID_REV2=y DWB=y ASUSCTRL=y FRS_LIVE_UPDATE=y
 
 export RT-AC3100 := $(RT-AC88U_BASE)
 export RT-AC3100 += BUILD_NAME="RT-AC3100" SWITCH2="" BCM_MMC=n BCM_7114=y ETLAN_LED=y ROMCFE=n \
 		NVSIZE="128" DHDAP=y DPSTA=y BCMFA=n GMAC3=y LACP=y WTFAST=y DWB=y \
-		FORCE_SN="380" FORCE_EN="664" DISABLE_REPEATER_UI=n NEWSSID_REV2=y ASUSCTRL=y FRS_LIVE_UPDATE=y
+		DISABLE_REPEATER_UI=n NEWSSID_REV2=y ASUSCTRL=y FRS_LIVE_UPDATE=y
 
 export RT-AC5300 := $(RT-AC88U_BASE)
 export RT-AC5300 += BUILD_NAME="RT-AC5300" RGMII_BRCM5301X=y SWITCH2="" BCM_MMC=n BCM_7114=y ETLAN_LED=y \
-		NVSIZE="128" DHDAP=y DPSTA=y BCMFA=n GMAC3=y LACP=y WTFAST=y DWB=y FORCE_SN="380" FORCE_EN="630" \
+		NVSIZE="128" DHDAP=y DPSTA=y BCMFA=n GMAC3=y LACP=y WTFAST=y DWB=y \
 		DISABLE_REPEATER_UI=y UUPLUGIN=y

release/src-rt/version.conf

@@ -1,5 +1,5 @@
 KERNEL_VER=3.0
 FS_VER=0.4
-SERIALNO=384.16
+SERIALNO=384.17
 EXTENDNO=0
 RCNO=0