luci-mod-network: fix disabling 11w MFP for WPA3

Fixes: #5394
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0b49ed45c6e9f4bc10abdcea392125aec3794e58)

luci-app-radicale2: Fix library loading

This fixes the "Authentication / Users" and "Storage" tab of
luci-app-radicale2.

Signed-off-by: Dennis Dast <mail@ddast.de>
(cherry picked from commit 29f78ce73fd35978f34d1aa4d7a7697889298d3e)

rpcd-mod-luci: fix syntax error

Fixes: 45a398e1ed ("rpcd-mod-luci: avoid PTR requests for IPv6 link-local and ULA addrs")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit af4352c07ef33ebb06a0c7f684f3f753b9c23f4f)

rpcd-mod-luci: avoid PTR requests for IPv6 link-local and ULA addrs

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 45a398e1ed86c9706d47ff46be73bdaa303ff661)

rpcd-mod-luci: let IPv4 hostnames take precedence over IPv6 ones

Do not overwrite IPv4-resolved hostnames with IPv6 ones in case both are
available or resolvable.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 93bd93e220714276eff95ea51793bb2f826328e8)

luci-mod-status: fix wrong logic for maclist adding feature

Currently any new entry added to the black/whitelist deletes the
others. Fix this and improve the rule apply by firstly disconnect
the wifi client.

Fixes: #5343
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 085c4a08f5bf50919731304a962cfcd2b592d523)

luci-mod-status: cosmetic fix for isWPSEnabled in wifi status

Drop isWPSEnabled table as it's really not needed and can directly
included in the network table.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 2a97d5533cba419f51da0b550b00a34bc9f50cce)

luci-mod-network: fix option ip6table in network/interfaces

Fix the incorrectly displayed value for the option "ip6table".

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 3ebdf51f9b2e713cd655c0f97f2542c96736cae5)

luci-base: fix off-by-one in cbi_update_table()

Fixes: #5189
Fixes: f919635310 ("luci-base: batch DOM updates to prevent slowdown")
Ref: https://github.com/openwrt/luci/commit/f919635310286b3b905aedb716d707da1ea2c811#commitcomment-53495580
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7d9ab8d4a741cbc97e9553982e9e352b21ddf5f3)

luci-base: batch DOM updates to prevent slowdown

Signed-off-by: Olli Asikainen <olli.asikainen@gmail.com>
(cherry picked from commit f919635310286b3b905aedb716d707da1ea2c811)

luci-mod-network: fix 60GHz radio frequency configuration

Fix incorrect minimum 60GHz frequency value and ensure that a 60GHz band
choice option is available once corresponding channels are found on the
system.

Ref: http://lists.openwrt.org/pipermail/openwrt-devel/2021-July/035810.html
Suggested-by: Alex Henrie <alexhenrie24@gmail.com>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e5626ece12236f6be9dbb6da6eb90fcbb469a1f0)

luci-mod-network: dhcp.js: don't fail on not existing interface

Fixes: #5177
Fixes: 7e56289538 ("luci-mod-network: improve static DHCP lease validation")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f57d20bffffda026ab203d328a859a3f38c0c8d0)

luci-mod-network: fixes to DHCP lease validation

 - validate current form value IP instead of stored uci one
 - ensure to not pass non-string values to the validator
 - remove leftover debug code
 - simplify obtaining formvalues

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9d15a4e70c10a43911c7f9d48240a01c23eb81b6)

luci-mod-network: improve static DHCP lease validation

 - Ensure that MAC addresses are unique within the same pool
 - Ensure that IP addresses are globally unique
 - Ensure that IP addresses are within any DHCP pool range

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 7e562895380d6bbe89ed88fe7576272c078f3b59)

luci-app-fwknopd: trivial typo fix

* fix for #5073

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 07d6ac5995a27fea06dd468f5a8b25b19ccfc8cc)

rpcd-mod-luci: support parsing 11ax HW / HT modes

Add support for parsing 11ax modes returned from UBUS. This is required
so the frontend can display information about supported 11ax operation.

Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit 7b11e848ac48325377712179fb9cf79fffff207d)

luci-mod-network: do not remove enable_vlan from config

There are many switch drivers where VLAN functionality is enabled by default.
In this situation, LuCI cannot be used to disable VLAN functionality,
because removing the line from configuration results in VLAN remaining enabled
by the driver.

When enable_vlan is set to 0 by default
by using functions in board.d,
and an unrelated change is made on the Switch webpage,
then the enable_vlan option gets deleted when changes are saved.

Therefore, the option needs to be preserved, whether set to 0 or 1.

Signed-off-by: Michael Pratt <mcpratt@pm.me>
(cherry picked from commit 51ab737a4ba2b0f2a9d479cf114837c570f8d05c)

Merge pull request #5413 from stangri/21.02-luci-app-advanced-reboot

[21.02] luci-app-advanced-reboot: bugfix for Linksys E4200v2

luci-app-advanced-reboot: bugfix for Linksys E4200v2

* bugfix for Linksys E4200v2
* backport updates from master

Signed-off-by: Stan Grishin <stangri@melmac.net>

treewide: i18n - Backport translations

Backport translations from master.
Sync.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-statistics: Remove erroneous include from default config

Remove the unnecessary Include line from the default config.
It causes error at collectd start, as the directory is missing.
  daemon.err collectd[9722]: configfile: stat (/etc/collectd/conf.d) failed: No such file or directory

Leave the line as a comment/example.

Fixes #5373

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 2c27f5c9417ff5414a2730a9c310b68fdd5f585c)

luci-app-statistics: standardise newline usage

Fix newline usage in a few graph definitions.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 12b13fe89a9d21560303c963123493268a5017c0)

Merge pull request #5392 from ByteAndNibble/openwrt-21.02

[21.02] luci-app-https-dns-proxy: add ControlD as provider

luci-app-https-dns-proxy: add ControlD as provider

Signed-off-by: Aleem Hossain <aleem@tectonic.it>

luci-app-transmission: grant access to group and passwd files

This is required for the user and group ID dropdowns in the
configuration.

Fixes: #4697
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 1d9067b2715eede8c0e6977f9f1cc77037ff2842)

luci-app-dawn: add missing quotation mark

Signed-off-by: Schleifer, Werner <werner.schleifer@gmx.de>
(cherry picked from commit d4ab37d9a03cce11620414b98137d11d889d8720)

luci-mod-network: fix name of network.device.isolate uci option

Fixes: #5383
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e0053fe79d7c2167298907b06f161795f9c38031)

treewide: i18n - Sync, backport translations

Backport translations from master.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-attendedsysupgrade: use correct linter settings

The previous settings would use spaces which messed up things since LuCI
uses tabs everywhere.

Also removed a stray console.log

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 641bfe3967cef3a7f5a2a5c72f138438c395428b)

luci-app-attendedsysupgrade: support revision checks

SNAPSHOTS are not real releases and therefore the app always offers an
upgrade, even if running the latest build. To prevent that all SNAPSHOTS
now check for the running revision and if a newer one is available.

Also do a bunch of refactoring based on JavaScript I learned over the
last week.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit f799d550b6389baee5b388eefe638ba9a690f4c5)

luci-app-yggdrasil: Update to support v0.4.0 config

Signed-off-by: George Iv <zhoreeq@users.noreply.github.com>
(cherry picked from commit 3953b1a5b249b09e566ca1ec4ce2fb4e23cdf69e)

treewide: i18n - Backport translations

Backport translations from master.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-travelmate: EAP-bugfixes

* fix numerous errors in EAP handling
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 9f9247a08c79e2b94deeeb82af086ec5f5c2ebe9)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-firewall: add ipv6 exclusive ICMP types

fixes #5213

Signed-off-by: Paul Dee <systemcrash@users.noreply.github.com>
(cherry picked from commit 19c66ef539da5136bcdb3978e5e8b87c87f8ae21)
Update commit description
Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-mod-network: fix route6 source autocomplete

Fix the wrong value for the "source" option of the "route6" section.

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 8b4015036d6f298cbfe0291ab8fdc23b4133cca7)

luci-theme-openwrt-2020: add css success label

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a655389032b85b12ec56733c455abaac07693f56)

luci-app-wireguard: set allowed_ips option as optional value

Signed-off-by: Keith Irwin <git@ki9.us>
(cherry picked from commit 092109c9056444a4ba691d15031f69403ab2b37c)
fixed commit title
Signed-off-by: Florian Eckert <fe@dev.tdt.de>

treewide: i18n - Backport translations, sync.

Sync translations.
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-app-attendedsysupgrade: use detail not message

The new API unifies all human readable responses in the `detail` field
to follow the newly used framework.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 2a29911121bf72d5d316b2eeae7f184b8ce14482)

luci-app-attendedsysupgrade: use latest.json

The content is the same response as for `/api/latest.json` but
statically hosted by a webserver rather than Python generated.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit a672875402a0802ddcd0e4c8c2d0ac7913dff671)

luci-app-attendedsysupgrade: show position in queue

The server provides a queue_position argument, show it.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 53ff7ca676d10fa253d3ab472b9b5645996527ed)

luci-app-attendedsysupgrade: add timeout and catch

If the upgrade server API does not respond, show an error message.
Fix #5222

While at it, minimal code linting

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit ff24b78c807a52a0f9afb62ba0aba1085d9ad045)

luci-app-travelmate: sync with travelmate 2.0.6

* a few (visual) fixes reported in the forum
* emphasize normal uplinks in blue, vpn uplinks in green
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit f1d1e752b8b08b7803b6c027d9c44dded97d2a4c)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-travelmate: sync with travelmate 2.0.5-3

* adapt the travelmate UI to support the changed 'trm_maxscan' option

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit fd7494ffb19d1c0197ddcb048c381b44cdb205e5)
Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-base: support loopback by widgets.NetworkSelect

Support the "loopback" interface by "widgets.NetworkSelect".
Enable the "loopback" option to include this interface.
Can be used to configure interface binding for services.

Signed-off-by: Vladislav Grigoryev <vg.aetera@gmail.com>
(cherry picked from commit 376af36975579008e3176a860ae032759d27dcbb)

luci-mod-system: hide unsupported option on flash.js

Hide unsupported option when /rom is not used in flash.js

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 82035eec6150fef1319e6fcec324124f82ada754)

luci-mod-system: improve sysupgrade page

- Add missing -k and -u option from sysupgrade page.
- Fix missing check for image verification exit code
- Provide the actual reason of the image verification

Fixes: #4160
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
(cherry picked from commit 0f4f6e89f15aa1dac0bfd676cb8364ef0b6c6e1f)

luci-mod-battstatus: chmod battstatus.js to 644

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 7f5751c16f9c883728ab67cab8b3c717aaf6a590)

luci-mod-battstatus: fix quotation marks

Fixes output on i18n generation:
standard input:56: warning: RegExp literal terminated too early

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 7e1e83fcb8b3e4229dd1bf9218e1b256f81deda6)

luci-app-travelmate: sync with travelmate 2.0.5

* support new features of travelmate 2.0.5
* made the station manager more comfortable
* a few minor bugfixes
* sync translations

Signed-off-by: Dirk Brenken dev@brenken.org
Signed-off-by: Dirk Brenken <dev@brenken.org>

treewide: i18n - Sync and backport translations

Sync translations.
Backport translations from master.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-proto-bonding: bugfix xmit_hash_policy dependencies

Signed-off-by: Helge Mader <ma@dev.tdt.de>
(cherry picked from commit adaf3feb65918bd56ac3a24ac4fc68820f794a6e)

luci-proto-bonding: fix member because of API change

Signed-off-by: Helge Mader <ma@dev.tdt.de>
(cherry picked from commit 64a066c33972ce803b3e78292081285e5013b4aa)

luci-mod-network: fix legacy_rates option dependency

The recently introduced band option support changed the internal frequency
selector choice values, breaking the legacy rates option dependency.

Fixes: #5234
Fixes: 0829d31290 ("luci-mod-network: support newer wireless.wifi-device.band option")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit fd2e755b6f30d80ffdf15536669fdb739212ac96)

Merge pull request #5227 from stangri/21.02-firewall

[21.02] luci-app-firewall: replace hh.mm.ss with hh:mm:ss

luci-app-firewall: replace hh.mm.ss with hh:mm:ss

Signed-off-by: Stan Grishin <stangri@melmac.net>

Merge pull request #5217 from stangri/21.02-luci-app-https-dns-proxy

[21.02] luci-app-https-dns-proxy: update to 2021-07-29-1

luci-app-https-dns-proxy: update to 2021-07-29-1

* add HTTP/2-only supporting providers: Mullvad, Digitale-Gesellschaft, dns.sb and Rubyfish.cn
* switch default provider from Google to Cloudflare
* add IPv6 addresses for bootstrap resolvers for Google DNS
* add secondary bootstrap resolver (Cloudflare's) to all providers with a single bootstrap resolver
* modify model/cbi file to show HTTP/2-only providers (and help texts) on HTTP/2-supporting systems

Signed-off-by: Stan Grishin <stangri@melmac.net>

luci-app-attendedsysupgrade: fix empty array condition

In JavaScript (other than in Python) an empty array is considered `true`
within if statements. Fix this by checking for the array length rather
than its existence.

This fixes the issue of an empty dropdown menu in case the user is
running the latest release.

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 7f5becc69e004f831c9dc09e0859c179b439c7d2)

luci-app-attendedsysupgrade: remove depends uhttpd-mod-ubus

Remove depenedency uhttpd-mod-ubus which is not required.
User may want to work with nginx rather uhttpd.

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
(cherry picked from commit 9866bfe13ce2bed07453cce968f670e00a0d7517)

luci-app-attendedsysupgrade: fix ACL definition

Fix the ACL file which handles the permissions for the LuCI app.

Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 02de3e4a2b08d2fb9d4f08b83a2526337671b6e2)

treewide: i18n - Backport translations

Backport translations from master.
Sync translations.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

luci-mod-system: reload crond upon saving crontab

Fixes: #5184
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8d4ac60f7a02e5c8e3d186f4009b4696b098152d)

luci-app-acl: remove support for plaintext login passwords

Upon reviewing the rpcd session support code, it turns out that account
definitions with plaintext password values are not supported, the password
value is treated as crypt() hash/salt in any case.

Ref: https://github.com/openwrt/luci/issues/5179
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f74b06cb92e403fa281414d5a6bd57228858bfa7)

luci-app-adblock: expose dns instance option

* expose the 'adb_dnsinstance' option to LuCI under
  Advanced DNS Settings (only relevant for dnsmasq)
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>

luci-app-nlbwmon: Add translation context for Download/Upload terms

Added a translation context for the terms 'Download' and 'Upload'
used in this application. The reason is that these terms are
translated differently in Russian depending on the context.

If the terms are used in the sense of an action (download file
or upload file) then the translations should be as follows:
- Download = скачать
- Upload   = загрузить

But if they are used in the context of a traffic counter (like
in this application) the correct translations are:
- Download = скачано
- Upload   = загружено

A translation context has been added to all affected PO files
to avoid breaking existing translations. The Russian translation
in PO file is fixed to comply with the used context.

Signed-off-by: Anton Kikin <a.kikin@tano-systems.com>
(cherry picked from commit fb52e86b54f25e8fb2f46c857af20dd3b4ddb022)

luci-app-sqm: only reload view once sqm enable/start completed

Chain the exec calls to enable and start the SQM service and only reload
the view once these operations are complete and return the entire promise
chain from the handler function to ensure that the busy indicator remains
active throughout the entire duration of the operation.

Also replace exec_direct() with exec() as there is no need to bypass ubus
for the init script calls.

Fixes: e76d9cc767 ("luci-app-sqm: fix JS error if service is disabled")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 005c09a293d1d0f4a5a76e210e0fa23842f13cb3)

luci-app-sqm: fix JS error if service is disabled

* fix a 'resource not found error' if the sqm service has been disabled
  and the dir '/var/run/sqm/available_qdiscs' not exist
* inform the user about this issue and provide a button
  to enable & start the service

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit e76d9cc7673ffbebd8887bcfc14542c1269288e0)

luci-base: do not add validation for named section if readonly is set

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 1a2b7fef6cc181f7f0ff0e1133ad4d8ab03e279c)

luci-base: prevent empty field for adding new named section in JavaScript

Suggested-by: Helge Mader <ma@dev.tdt.de>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 87215e3d1bd2406c4a5ae5088e176fb4aefbe546)

luci-base: change css class btn to cbi-button

The css class btn is only a valid input element on lua rendered pages.
Use instead cbi-button for javascript rendered pages.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 80262bb9a7e63eeee0e1fa5f290b27a569a644bf)

luci-base: use button tag instead of input tag on named section add

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 97e673b72cc96f5f866df7e990a51fa65bff5b5f)

luci-app-acl: unset read and write before acl set

If the setting in the view is set to `denied`, only the read list option
is deleted. This is not correct. The write list option must also be
deleted. To ensure that the correct configuration is saved, the write
and read list options are always deleted beforehand and then rewritten.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit f4e8fcb6b53780bd2d126b22a89c379cd7c071d7)

luci-mod-status: disable "Set static" lease action on readonly view

Fixes: f6b6a12927 ("luci-mod-status: add support for one-click static lease")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit a6d957d6f59329cc16c838afe3c88c6072fad236)

luci-app-acl: ensure to set read/write ACL presets as uci lists

The rpcd daemon expects uci list notation for the login.read and login.write
options, so ensure to set them accordingly when chosing the `full access` or
`readonly` presets while configuring an account.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9922c838cd1abcda60f4e93b89b0c52a101fc667)

luci-base: Fix time display error

Signed-off-by: DeYu Liu <vito_sam@outlook.com>
(cherry picked from commit 0e4b4c5b42f9d8b93a4936c4b2d63f9a90c5a61b)

luci-base: validation: disallow mutlicast MACs by default

Extend the MAC address validator to disallow multicast MAC addresses and
add a new optional validator option to require multicast MACs instead of
unicast ones.

Fixes: #5166
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 00e41c3c4977f75e6ca43429dd4c8c2f5cb22419)

luci-app-openvpn: create base directory if not available

* trivial fix for never ending ticket #3454

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b6f36ca91b74e708cb8866a0299923dab3f5343b)

luci-app-attendedsysupgrade: fix typo

Suggested-by: Jo-Philipp Wich <jo@mein.io>
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit cef330a1c8b59b0b84bb862b8d04b56892be3803)

Revert "luci-mod-network: issue with breakdown of dnsmasq after duplication of static IP was fixed"

This reverts commit 463e910119813aaea0755ff5c16c91ce412a8cbb.

This change causes the entire static lease to get deleted when attempting
to change the MAC address.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 91f46d765b36825fcfe63e2b7d4863de00cdc69d)

luci-mod-network: fix saving bridge VLANs without member ports

Calling `uci.set()` with an empty array yields an invalid argument error,
make sure to pass `null` instead in this case.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f1f566bfe2a6b0960ba95a5ea05ca4353b766867)

luci-mod-network: work around jsmin bug

The jsmin minifier incorrectly transforms the expression `/\*/.test(...)`
into `/\* /.test(...)`, causing the VLAN filter dialog to not recognize
PVID settings in the configuration.

Work around the issue by using an equivalent `\x2a` escape sequence instead.

Ref: https://forum.openwrt.org/t/x/99222/28
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2869c9cf324a9e057567075d4977c7cc40140938)

treewide: fix typo in "Enable VLAN filtering" label

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(backported from commit c48d8f4a2c9a771c8c03a76eb1b554f62d57140b)

luci-mod-status: don't set '-' hostname when creating static lease

Fixes: #5153
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e3357deb7d273b6a982dfaf9800c83eba85fe6b2)

luci-mod-network: enforce IPv4 mode for traceroute call

Recent busybox traceroute applet versions support both IPv4 and IPv6 and
default to IPv6 when running a route trace to an IPv6 enabled target
host. Pass the `-4` flag to enforce IPv4 mode in this case.

Fixes: #5155
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c4f429461545d1401429e7ba133f24a55d1015b6)

luci-mod-network: parse ports without tag/pvid annotation as well

Fixes: 01eac366f6 ("luci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e57f8663afd53cc7421debcd63444e1d136f5dec)

luci-mod-network: fix tagging/pvid state parsing in bridge-vlan ports

The previous code naively looked for a `t` in the entire port spec,
wrongly matching untagged ports having a `t` in their name, such
as `eth0`.

Rework the logic to be more strict when parsing the port member
specification to avoid this issue.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 01eac366f69ba58c090ddc2cb70aeb069adbdd5a)

luci-mod-network: refactor device configuration

Since all netifd device types inherit generic device settings, we can
simplify various aspects of the device configuration ui and drop unused
code while we're at it.

 - Remove setIfActive() helper, superseded by commit
   f3f74bd0fe ("luci-base: form.js: consider aliased options in AbstractValue.remove()")

 - Remove most dependency constraints to make all generic device settings
   available for all device types

 - Add MTU value validation to disallow exceeding parent device MTU for
   VLAN interfaces

 - Dynamically update placeholder values when changing base or parent
   device options

 - Undo VLAN network config hack since all options are available now.
   Reverts commit
   3c6b59504a ("luci-mod-interfaces: simplify configuring MAC address of 802.1q devices")

 - Do not suggest inactive wireless networks as existing device or base
   device choices

 - Disallow specifying names of already existing network devices when
   creating new device settings

 - Fix a number of multicast dependency specifications

 - Drop now unused functions

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit f689d0d208acbf9934da5a2d49c8717c054be585)

luci-mod-network: change port status layout in vlan filter config

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 36350e9867ca9fd2f9b137ed76f0fabe0e57c880)

build: add script to find commits suitable for cherry picking

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0ead87320bade6f924991f4310271582a760edb4)

luci-app-adblock: sync with latest version

* expose new reporting option to LuCI
* sync translations

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit 83778c145281eb128a4acf23defda07003dfdc98)

Merge pull request #5145 from msylgj/patch-2

luci-app-frpc/frps:add service status display

luci-app-frpc/frps:add service status display
reference from luci-app-smartdns
Special thanks to Nick Peng <pymumu@gmail.com>

Signed-off-by: SiYao Mo <msylgj@vip.qq.com>

Merge pull request #5142 from msylgj/patch-2

luci-app-frpc: allow hostname in server address

luci-app-frpc: allow hostname in server address

Sometimes, our frp server cannot use a static ip address.
So perhaps we should allow people to use hostname in server address.

Signed-off-by: SiYao Mo <msylgj@vip.qq.com>

luci-app-nlbwmon: i18n sync translations

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-base: i18n sync translations

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-app-watchcat: i18n sync translations

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-app-banip: i18n sync translations

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

luci-app-adblock: i18n sync translations

Signed-off-by: Florian Eckert <fe@dev.tdt.de>