Merge remote-tracking branch 'upstream/mainline' into dsl-ac68u-384.17

Changelog-NG.txt

@@ -1,6 +1,18 @@
 Asuswrt-Merlin 384/NG Changelog
 ===============================
 
+384.17 (xx-xxx-xxxx)
+  - 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.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,7 +111,7 @@ 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 \

release/src-rt/version.conf

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