Merge branch 'gnuton-master' into DEV_repeater

.circleci/config.yml

@@ -31,19 +31,10 @@ jobs:
               sed -i "s/EXTENDNO=.*/EXTENDNO=${MINOR_VER}/g" release/src-rt/version.conf
             fi
       - run:
-          name: Generate changelog (only for tags)
+          name: Generate changelog
           command: |
-            REGXP_TO_MATCH=.*gnuton.*
-            if [[ ${CIRCLE_TAG} =~ ${REGXP_TO_MATCH} ]]; then
-              CURRENT_TAG=${CIRCLE_TAG}
-              PREVIOUS_TAG=$(git tag --sort=-version:refname | grep -vE "snapshot|beta|alpha|${CIRCLE_TAG}" | grep ${REGXP_TO_MATCH} | head -n 1)
-              echo "Generating logs between the tags ${PREVIOUS_TAG} and ${CURRENT_TAG}"
-              echo "Changes from the latest stable gnuton build (${PREVIOUS_TAG}):" > "${CHANGELOG_FILE}"
-              git log ${PREVIOUS_TAG}...${CURRENT_TAG} --pretty=format:'* %s' --reverse | grep -vE 'Merge branch|ci:|Bump' >> "${CHANGELOG_FILE}" || echo "WARNING: The Changelog is empty!!"
-              cat "${CHANGELOG_FILE}"
-            else
-              echo "No changelog to generate. Changelog is generated only for tags matching ${REGXP_TO_MATCH}";
-            fi;
+            python tools/get-last-notes.py > "${CHANGELOG_FILE}"
+            cat "${CHANGELOG_FILE}"
       - run:
           name: Build firmware
           shell: /bin/bash
@@ -70,14 +61,17 @@ jobs:
             ls ${PROJECT_DIR}/release/${RELEASE_DIR}/image/
       - run:
           name: Prepare workspace
+          shell: /bin/bash
           command: |
+            export IMAGE_PATH=${PROJECT_DIR}/release/${RELEASE_DIR}/image/
             mkdir -p workspace/release/
             if [[ ${MODEL} == "dsl-ac68u" ]]; then
-              cp ${PROJECT_DIR}/release/${RELEASE_DIR}/image/DSL*DSL*.trx workspace/release/
-              cp ${PROJECT_DIR}/release/${RELEASE_DIR}/image/DSL*DSL*.md5 workspace/release/ || :
+              mv "${IMAGE_PATH}/DSL-AC68U_${CIRCLE_TAG}.trx" "${IMAGE_PATH}/DSL-AC68U_${CIRCLE_TAG}_NO-DSL-FIRMWARE.trx"
+              cp ${IMAGE_PATH}/*.trx workspace/release/
+              cp ${IMAGE_PATH}/DSL*DSL*.md5 workspace/release/ || :
             elif [[ ${MODEL} == "dsl-ax82u" ]]; then
-              cp ${PROJECT_DIR}/release/${RELEASE_DIR}/image/*_cferom_pureubi.w workspace/release
-              cp ${PROJECT_DIR}/release/${RELEASE_DIR}/image/*_cferom_pureubi.md5 workspace/release || :
+              cp ${IMAGE_PATH}/*_cferom_pureubi.w workspace/release
+              cp ${IMAGE_PATH}/*_cferom_pureubi.md5 workspace/release || :
             fi
             cp /tmp/build.log workspace/release/${MODEL}-build.log
             if [ -z "${CIRCLE_TAG}" ]; then
@@ -136,7 +130,7 @@ jobs:
           command: |
             echo "Uploading release..."
             RELEASE_TITLE="Stable: ${CIRCLE_TAG}"
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete -n "${RELEASE_TITLE}" -b "$(cat workspace/release/CHANGELOG)" ${CIRCLE_TAG} workspace/release/
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete -n "${RELEASE_TITLE}" -b "$(cat workspace/release/CHANGELOG | head -n 50)" ${CIRCLE_TAG} workspace/release/
   publish-github-ci-pre-release:
     docker:
       - image: cibuilds/github:latest
@@ -149,7 +143,7 @@ jobs:
           command: |
             echo "Uploading CI pre-release..."
             RELEASE_TITLE="Unstable: ${CIRCLE_TAG}"
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -n "${RELEASE_TITLE}" -b "$(cat workspace/release/CHANGELOG)" -delete -prerelease ${CIRCLE_TAG} workspace/release/
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -n "${RELEASE_TITLE}" -b "$(cat workspace/release/CHANGELOG | head -n 50)" -delete -prerelease ${CIRCLE_TAG} workspace/release/
 
 workflows:
   version: 2.1

Changelog-NG.txt

@@ -1,6 +1,132 @@
 Asuswrt-Merlin 386/NG Changelog
 ===============================
 
+386.03_2-gnuton5 (??-??-????)
+  - FIXED: regression in PPPoA for DSL-AX82U
+
+386.03_2-gnuton4 (30-Set-2021)
+  - ADDED: DNS over TLS support to VDSL WAN page
+
+386.03_2-gnuton2 (18-Set-2021)
+  - CHANGED: Enabled ROG and Open NAT for DSL-AC68U
+
+386.3_2 (6-Aug-2021)
+  - NOTE: closed down the Issue tracker on Github, as 90%
+          of it was people asking for technical support,
+          or failing to use the supplied submission form.
+  - NOTE: From now on DSL-AC68U trx images without DSL modem 
+          firmware will be provided at each release.
+	  Reason: Some ISPs may require older DSL modem fw.
+  - CHANGED: Re-disabled jitterentropy-rngd on non-HND
+             models.  It kept using CPU time every two
+             seconds and had a very marginal impact on
+             the entropy pool (which it never could push
+             above the target threshold of 1024).
+  - CHANGED: Moved the "Redirect Internet traffic" setting on
+             the OpenVPN Client page to the Network Settings
+             section to increase its visibility, as too many
+             users are forgetting to configure it.
+  - CHANGED: Display "Internet traffic not redirected" instead
+             of "Public IP Unknown" on the OpenVPN Client
+             status display when Redirect Internet traffic
+             is set to "No".
+  - FIXED: Only the first OpenVPN client would be used if
+           you had multiple clients connected and the first
+           one had a Redirect Internet set to "No".  Now,
+           setting this to "No" means that client's routing
+           table will no longer get a default gateway
+           configured, allowing traffic to be processed
+           by other RPDB tables if there wasn't a matching
+           route within that client's table.
+  - FIXED: IPV6-compatible DNSFilter servers weren't
+           properly configured in dnsmasq.
+  - FIXED: DNSFilter client rules may get corrupted after a
+           reboot.
+  - FIXED: Cake QoS for DSL-AX82U now works
+  - FIXED: QoS upload classification page now shows upload plot for DSL-AX82U
+  - FIXED: WiFi Insight page under wireless tab has been enabled for DSL-AX82U
+  - FIXED: DNSFilter has been enabled for DSL-AX82U
+
+386.3 (23-July-2021)
+  - NOTE: First time you boot into this version, you need to
+          either shift-reload the main index page, or clear
+          your browser cache.
+
+  - NEW: Introducing VPN Director, which replaces the original
+         policy routing management interface for OpenVPN clients.
+         A bit similar to Asus's own VPN Fusion, OpenVPN routing
+         rules are now managed through a central web interface,
+         and they are stored in JFFS instead of nvram, to allow
+         creating more rules, and free up some nvram for
+         nvram-limited devices such as the RT-AC68U.
+         See the Wiki for more information.
+
+  - NEW: Added QR codes to the networkmap as well as the Guest
+         Network page, to allow easily connecting a mobile
+         device just by scanning the QR code.
+         The generated QR code can also be saved as a file
+         if you'd like to print it.
+
+  - CHANGED: Rewrote OpenVPN routing handling.  The firmware will
+             now handle route creation itself rather than letting
+             the openvpn client create/remove routes.
+             The new implementation brings a few changes:
+
+             - "Force Internet traffic through tunnel" can now
+               be set to "No", "Yes (All)" or "VPN Director".
+             - This setting will now override whatever setting
+               pushed by the server regarding gateway redirection.
+             - The kill switch can now be used in both "Yes" and
+               "VPN Director" routing modes
+             - Manually stopping a client will remove the kill
+               switch.  It will now only be applied at boot time
+               (if client was set to start at boot), or if the
+               tunnel is disconnected through a non-user event
+
+  - CHANGED: Reworked OpenVPN's DNS Exclusive mode implementation
+             and interaction with dnsmasq.
+  - CHANGED: Moved OpenVPN Custom settings content to JFFS, and
+             increased max storage length from around 350 chars
+             to 4095 chars.
+  - CHANGED: Added support for BCM50991 used for the 2.5G
+             interface in newer RT-AX86U revisions.
+  - UPDATED: nano to 5.7.
+  - UPDATED: curl to 7.76.1.
+  - UPDATED: dnsmasq to 2.85-openssl.
+  - UPDATED: openvpn to 2.5.3.
+  - UPDATED: getdns to 1.7.0.
+  - UPDATED: stubby to 0.4.0.
+  - FIXED: Setting an OpenVPN client's DNS mode to Exclusive
+           could fail to work for certain configurations
+  - FIXED: DNS Exclusive redirections applied in Policy mode
+           could be executed in the wrong order if you had
+           overlapping policy rules in two separate clients.
+  - FIXED: Clients connected to Guest Network 1 couldn't be
+           routed through an OpenVPN tunnel.
+  - FIXED: Clients connected to Guest Network 1 would bypass
+           DNSFilter rules.
+  - FIXED: USB disks not properly unmounted on reboot
+           on some router models.
+  - FIXED: Missing error report on OpenVPN client connection
+           failure
+  - FIXED: profile.add getting used even if JFFS scripting
+           was disabled (dave14305)
+  - FIXED: Freedns authentication errors would not
+           properly be reported as errors.
+
+
+386.2_6 (6-June-2021)
+  - NOTE: The IRC channel, #asuswrt, has moved to the
+          Libera IRC network (https://libera.chat/).
+
+  - UPDATED: chart.js to 2.9.4.
+  - UPDATED: tor to 0.4.5.8.
+  - UPDATED: root certificate bundle to June 5th 2021.
+  - FIXED: Fragattack security issues
+  - FIXED: DSL-AX82U: CPU frequency is now visible in tools page
+  - FIXED: DSL-AX82U: Kernel supports cake QoS
+  - NEW: DSL-AX82U: Added IFTT support
+
 386.2_4 (30-Apr-2021)
   - NEW: Added jitterentropy-rngd to non-HND models, in addition
          to HND models.
@@ -12,7 +138,7 @@ Asuswrt-Merlin 386/NG Changelog
   - FIXED: OpenVPN server would flip into an error state (being
            shown as "initializing" on the webui) whenever an
            inbound client failed to connect to it.
-
+  - FIXED: DSL-AX82U: CPU frequency is now visible in tools page
 
 386.2_2 (13-Apr-2021)
   - FIXED: IPv6 pings were blocked if sent below the rate limit

README-merlin.txt

@@ -201,7 +201,7 @@ Website: https://www.asuswrt-merlin.net/
 Github: https://github.com/RMerl
 Email: [email protected]
 Twitter: https://twitter.com/RMerlinDev
-IRC: #asuswrt on Freenode
+IRC: #asuswrt on Libera
 Download: https://www.asuswrt-merlin.net/download
 
 Development news will be posted on Twitter and the support forums.  

release/src-rt-5.02axhnd.675x/bcmdrivers/broadcom/net/wl/impl63/main/components/apps/visualization/installbin/bin/vis-datacollector_saved-4908-arm

@@ -0,0 +1 @@
+vis-datacollector_saved-63178-arm

release/src-rt-5.02axhnd.675x/bcmdrivers/broadcom/net/wl/impl63/main/components/apps/visualization/installbin/bin/vis-dcon_saved-4908-arm

@@ -0,0 +1 @@
+vis-dcon_saved-63178-arm

release/src-rt-5.02axhnd.675x/kernel/linux-4.1/config_base.6a.63178

@@ -2963,3 +2963,17 @@ CONFIG_BCM_COMMON_CLK=y
 CONFIG_BCM_COMMON_CLK_IMPL=1
 # CONFIG_BCM_COMMON_CLK_I2S is not set
 CONFIG_BCM_IN_KERNEL=y
+
+#
+# Asuswrt-merlin configuration
+#
+# Cake Scheduler
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_CLS_MATCHALL=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_IPSET=m

release/src-rt-5.02axhnd.675x/router-sysdep.dsl-ax82u/bshared/README

@@ -0,0 +1,53 @@
+#
+# Broadcom Binary Shared Library functions
+#
+# Copyright 2020 Broadcom
+#
+# This program is the proprietary software of Broadcom and/or
+# its licensors, and may only be used, duplicated, modified or distributed
+# pursuant to the terms and conditions of a separate, written license
+# agreement executed between you and Broadcom (an "Authorized License").
+# Except as set forth in an Authorized License, Broadcom grants no license
+# (express or implied), right to use, or waiver of any kind with respect to
+# the Software, and Broadcom expressly reserves all rights in and to the
+# Software and all intellectual property rights therein.  IF YOU HAVE NO
+# AUTHORIZED LICENSE, THEN YOU HAVE NO RIGHT TO USE THIS SOFTWARE IN ANY
+# WAY, AND SHOULD IMMEDIATELY NOTIFY BROADCOM AND DISCONTINUE ALL USE OF
+# THE SOFTWARE.
+#
+# Except as expressly set forth in the Authorized License,
+#
+# 1. This program, including its structure, sequence and organization,
+# constitutes the valuable trade secrets of Broadcom, and you shall use
+# all reasonable efforts to protect the confidentiality thereof, and to
+# use this information only in connection with your use of Broadcom
+# integrated circuit products.
+#
+# 2. TO THE MAXIMUM EXTENT PERMITTED BY LAW, THE SOFTWARE IS PROVIDED
+# "AS IS" AND WITH ALL FAULTS AND BROADCOM MAKES NO PROMISES,
+# REPRESENTATIONS OR WARRANTIES, EITHER EXPRESS, IMPLIED, STATUTORY, OR
+# OTHERWISE, WITH RESPECT TO THE SOFTWARE.  BROADCOM SPECIFICALLY
+# DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OF TITLE, MERCHANTABILITY,
+# NONINFRINGEMENT, FITNESS FOR A PARTICULAR PURPOSE, LACK OF VIRUSES,
+# ACCURACY OR COMPLETENESS, QUIET ENJOYMENT, QUIET POSSESSION OR
+# CORRESPONDENCE TO DESCRIPTION. YOU ASSUME THE ENTIRE RISK ARISING
+# OUT OF USE OR PERFORMANCE OF THE SOFTWARE.
+#
+# 3. TO THE MAXIMUM EXTENT PERMITTED BY LAW, IN NO EVENT SHALL
+# BROADCOM OR ITS LICENSORS BE LIABLE FOR (i) CONSEQUENTIAL, INCIDENTAL,
+# SPECIAL, INDIRECT, OR EXEMPLARY DAMAGES WHATSOEVER ARISING OUT OF OR
+# IN ANY WAY RELATING TO YOUR USE OF OR INABILITY TO USE THE SOFTWARE EVEN
+# IF BROADCOM HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES; OR (ii)
+# ANY AMOUNT IN EXCESS OF THE AMOUNT ACTUALLY PAID FOR THE SOFTWARE ITSELF
+# OR U.S. $1, WHICHEVER IS GREATER. THESE LIMITATIONS SHALL APPLY
+# NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY LIMITED REMEDY.
+#
+# $Id: README 669425 2016-11-09 12:26:48Z $
+#
+
+This directory contains source files which are used to
+build the shared library 'libbshared.so'.
+
+This shared library contains functions that can be used by
+multiple applications on the Linux Router. The source files
+will not be added to any package only.