luci-mod-system: Fix cron log level settings in 23.05

Busybox crond only uses level 5, 7 and 8. (And 7 and 8 only differ
on one error regarding finding a crontab without user.)

For simplicity, just provide 5 and 7 as alternatives in LuCI.
Add "Disabled" with value 9 as a choice for cron log level.

9 actually exceeds the highest built-in value 8, but can be
used to quieten the logging in cases where there are e.g. cron
jobs running each minute, which would create log spam.

Show level 7 as the default and as the first offered choice.

Add missing semicolons to the file.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 1e7ce8de990e0bcb36b77bdb846b644aa1724568)
(cherry picked from commit ef167782ffc6b700f133557a9196ac846edb3399)
[also modernize system log size placeholder value]

Merge pull request #7456 from stangri/23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: catch up to snapshots version

luci-app-adblock-fast: catch up to snapshots version

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

luci-proto-wireguard: fixed incorrect peer detection for ipv6 and default port

Fixed incorrect peer detection if IP v6 is used and no port for peer is defined.

Signed-off-by: Tom Haley <this_username_has_been_taken2@proton.me>
(cherry picked from commit 461d632d5c57bb179f2dae0b164b2d7d99d7432c)

luci-proto-wireguard: fixed incorrect peer detection if port is not set

Fixed incorrect peer detection if port is not set (default port is used)

Signed-off-by: Tom Haley <this_username_has_been_taken2@proton.me>
(cherry picked from commit 27ecfdaafe344a79ed32a5b5dc1fddf8f811f91d)

luci-proto-wireguard: fixed a vulnerability in the checkPeerHost method

shellquote method is introduced so an injected code cannot be executed by the popen command.

Signed-off-by: Tom Haley <this_username_has_been_taken2@proton.me>
(cherry picked from commit 101ea169c6af90c0aeaff6655b906b6d40155924)

luci-proto-wireguard: Fix incorrect peer detection for IP v6

This commit fixes incorrect peer detection when using IP v6 by deleting all the square the square brackets from the wgHost variable.

Signed-off-by: Tom Haley <this_username_has_been_taken2@proton.me>
(cherry picked from commit 5c97a89684cbc9eb6cf891f44cfd7f89237c52d4)

docs: amend links for real this time

Closes #7449

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit e76155d09484602e2b02e84bb8ffafa4848798f0)

docs: amend links

Closes #7449

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 1ee9d0c8fa432485d2611895c0d99edff26d5e81)

luci-app-attendedsysupgrade: Fix logic error in EFI image selection

If a non-EFI image comes first in the list of images, it would have
been selected even on an EFI system.

Signed-off-by: Jakob Haufe <sur5r@sur5r.net>
(cherry picked from commit cb45737d1bf6f89017e2ab557144c524aea2e57e)

treewide: Backport translations

Backport translations from master.
Sync.

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

luci-app-wifischedule: Correct dependencies

As the app is now javascript-based, depend on luci-base
instead of luci-compat.

(modified from 3e7fe9f07 and 019e29f20)

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

luci-app-openvpn: Handle missing openvpn config file.

With this change if the specified config file (from UCI) doesn't exist,
it won't error out. instead it treats it as an empty file.
Previously, when clicking edit on the custom_config option in the UI, it
will show an error because the file doesn't exist there by default. As a
result, a user can't easily add (paste) a config file content.

Signed-off-by: Milad Mohtashamirad <milad.mohtashamirad@morsemicro.com>
(cherry picked from commit a30ae19006cad444e18b10a5e42a35436a59133e)

luci-mod-status: NOTRACK action for nftables rule rendering

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 63b7e637c94a57973cf889b699be42198af19d49)

luci-app-statistics: fix prepare values from list vlaues

If UCI store values as a list instead of an option, conversation for the
collectd configuration is not work correctly. This is due to the use of
a DynamicList type element in the UI (for example, for the RRATimespans
field). For this function argument val receives as array instead of a
string, so no additional conversion is required.

Signed-off-by: Aleksey Kolosov <softovick@gmail.com>

luci-mod-network: fix DHCP ip constraint (masks generate "bad address")

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit bbc4a909255c34630f7710aff636c519a12318bd)

luci-app-adblock: sync with adblock-4.2.3-1

* add new tld option

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

luci-app-libreswan: small refactor

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit a4a5cf6af7035a21abc98959747f157a0b453fb5)

luci-app-libreswan: prevent proposals and tunnels overwriting each other

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 2bf802d844a1eb3f75db6aff26786749df5b2c95)

luci-app-libreswan: upgrade uci-defaults for ucitrack handling to use json

Conversion of the 'uci-defaults' script for ucitrack handling to the new
json processing.

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

luci-app-libreswan: Add LuCI for Libreswan

LuCI Support for IPSec VPN (Libreswan)

Signed-off-by: Jaymin Patel <jem.patel@gmail.com>
[fix '15h' label typo]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9f652445355258497fd7f8c7f06dd75f58cd64ce)

luci-proto-openconnect: convert helper to ucode

set also dep to luci-base

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 32249963f1290142fffadc426b08a6712900e12b)

luci-proto-openfortivpn: convert helper to ucode

set also dep to luci-base

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit d304024f3eb45bd18b10eb4c3e14d9bfd5e7035c)

luci-proto-openconnect: updated SSL VPN option list and update sha1 hash wording

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
(cherry picked from commit c27c0b2505dc4cde9ab1b5de97eabbc6b3c79c71)

luci-proto-openconnect: use the uri configuration option

This enables more advanced configuration by allowing complex URIs, including
user groups and hidden directories (camouflage). It further simplifies the configuration
by eliminating the port and usergroup parameters.

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
(cherry picked from commit 03d6dec7d25cb87981b4beffe3a1d18d4cc8854c)

luci-proto-openconnect: register as simply openconnect

This is no longer a client implementing CISCO anyconnect. Many other
protocols are present.

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>
(cherry picked from commit 46a2acac92adff44eedf8bd33820c8c30e50b64d)

luci-proto-openconnect: add missing license information

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

luci-proto-openconnect: add option for array ssl vpn

Signed-off-by: Tinko Liu <24890691+TinkoLiu@users.noreply.github.com>
(cherry picked from commit 4b31ffa09b49b6f236607cd0d4c9a8aaa58866c9)

luci-app-ddns: excise luci-lua-runtime depends

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 8efe23f3be44a28b872f2cb78b5bac5c8ff7e0a3)

applications: replace +luci-mod-admin-full with +luci-base

The apps don't need for the admin full.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
(cherry picked from commit 2edb20189a4bf54e55625a6f88cb475c11e77df6)

luci-app-p910nd: excise luci-compat

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit b4a07a23c1bd22ed85ed4680d373344bd0daf80b)

luci-app-ddns: Convert to JS

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 22fcc720ec5d2ad1426509136447172281d345a0)

luci-proto-vxlan: fix format in i18n strings

follow-up to 9ebffc1ecdb8871dea7d35eb8eb10dde688baf5d

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 42e2e404cfd974a257fe697b424b94abaad09170)

treewide: Backport i18n translations

Backport translations from master. Sync.

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

luci-app-wifischedule: really delete lua component

Closes #7390

follow-up for 7327da234957da04285dd39cdb5df1af27a5c8f9 cherry-pick

Signed-off-by: Paul Donald <newtwen+github@gmail.com>

luci-base: fix documented path

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 8f7f14208a4b694d24ab8faf0a759b8dd8d35ff9)

luci-app-wifischedule: tighten acl perms

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 0691504ef0df09c64ae74b744f4912a095d6d14e)

luci-app-wifischedule: Convert to JS

Signed-off-by: Ramon Van Gorkom <Ramon00c00@gmail.com>
(cherry picked from commit 9ddbc1155566a3d0ebc4aef5a2b46b89b075b14e)

luci-proto-vxlan: fix tos write and load handlers

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 1de73e16f525a5edc80954afda50db88b3cf96da)

Revert "luci-app-opkg: fix passing wrong option on opkg update/install"

This reverts commit b93fdef9692166396c880a3a8cecde603b932544.

Due to cache problem it's better to revert this minor fixup than adding
a fixup on top of it. For OPKG it doesn't cause any problem as the extra
unsupported options is just ignored.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

luci-app-opkg: add PROVIDES luci-app-package-manager

To ease image generation with a package list from 24.xx
or main/master snapshot, add a PROVIDES statement to support
also the package's newer name luci-app-package-manager.

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

luci-app-opkg: fix passing wrong option on opkg update/install

Fix passing wrong option on opkg update/install. While starting to
introduce support for APK in the opkg module, it was notice that
--force-removal-of-dependent-packages was always passed even with update
and install command.

This was probably a leftover/oversight of old one. To fix this, limit
this option only on remove and also update the acl.d to support single
call to update or install.

Fixes: 9b25031cb29b ("luci-app-opkg: rework backend operations")
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 3a8e9baf32242f30cf65791b61c460413bd115ce)

luci-app-statistics: render all graphs on refresh if no summary

Previously, if there would usually be a summary page for the data
but this was not happening because there was only a single instance
(e.g. a single wifi interface), the refresh would mistakenly
request the summary rather than the existing data.

i.e. graphs would mysteriously disappear on refresh.

Signed-off-by: James Haggerty <james.haggerty@morsemicro.com>
(cherry picked from commit 4d75286519015f19e3878008b21fb7342ca5fae3)

luci-proto-vxlan: introduce peers tab and additional vxlan settings

Added ip-bridge dep for bridge command to manage FDB entries.

Reference:
https://events.static.linuxfound.org/sites/events/files/slides/2013-linuxcon.pdf

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit ba530891d56ff89db799d5ccb87333dadfabf88e)

luci-proto-wireguard: make peer entries sortable

Closes #7354

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit f1b302d49bce91b0e25814af08c63681cf2744a5)

luci-proto-wireguard: fixed bug with incorrect peer name detection

Fixed bug with incorrect peer name detection on `Status -> WireGuard`
page when more than one peer with the same public key exist:
1. Peers are now tested not only by public key, but also by
enabled/disabled status, peer host (both IP and FQDN are supported)
and port.
2. Added required `resolveip` dependency.

Closes #7342

Signed-off-by: @this-username-has-been-taken
Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 7acea818735a9c5e8577d6b57f359996956f15e4)

luci-proto-wireguard: follow-up fix for status overview

follow-up to 7acea818735a9c5e8577d6b57f359996956f15e4

Closes #7347

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 760ac165fa76952161e82bd825d9c757a10e0436)

luci-proto-wireguard: disable peers from the tab

It's clumsy to enable/disable peers from the modal, save some clicks

Signed-off-by: Bryan Roessler <bryanroessler@gmail.com>
(cherry picked from commit 071fc1bc92980454b6701d9394711b9d758f332a)

luci-proto-wireguard: adapt to use uqr

If for some reason luci-lib-uqr is absent, the GUI shows that the proto
handler needs installing (since it now has a dep which is missing).

Suitable action is to install the lib or remove/install wireguard again.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 74f366a1e54f54079fde6e4906e7307f199127e5)

luci-lib-uqr: introduce JS library

Initial idea by Christian Marangi <ansuelsmth@gmail.com>

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit b2e7441a60e9d0fa9bda8a95fac61958a14cef85)

treewide: Backport translations - sync

Backport translations from master and sync.

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

Merge pull request #7317 from stangri/openwrt-23.05-luci-app-advanced-reboot

[23.05] luci-app-advanced-reboot: update to 1.0.1-15

luci-app-lldpd: Fix mysterious Command failed: Unknown error

Executing the following command:

ubus call luci.lldpd getStatus

always returned 'Command failed: Unknown error', but the underlying

lldpcli -f json0 show *

worked fine. Fixed with a chained ?.read?

Tested on 23.05.3

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit c40253ada3d3e0257e1e3796aeab5ad46bc02f5b)

luci-app-adblock: sync with adblock-4.2.2-6

* adjust changed sources field in the online status

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

treewide: Backport and sync translations

Backport translations from master.
Sync.

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

luci-app-advanced-reboot: update to 1.0.1-15

Update to the most recent version, this update includes:
* copyright & license updates
* better package definitions in Makefile
* better presence in make menuconfig
* better version/release information compatible with both opkg/apk
* updated link to upstream code
* updated README link wording
* add support for Linksys MX4200v1
* add support for Linksys MX4200v2
* add support for Linksys MX4300
* add support for Linksys WHW03
* add support for Linksys EA6350v4

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit a917ad6c31f70fadc093d215bdef2b14e940e129)

luci-app-advanced-reboot: update to 1.0.1-13

* update copyright
* update license
* split version string into PKG_VERSION and PKG_RELEASE for APK compatibility
* update upstream URL link
* add menuconfig title/version info
* update README
* add support for:
  * Linksys MX4200v1 (Thanks @innovara)
  * Linksys MX4200v2 (Thanks @innovara)
  * Linksys MX4300 (Thanks @PIPIPIG233666)

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit b884bf4f47e5bea487a2f0962976bd373ffa727f)

luci-app-advanced-reboot: add support for Linksys WHW03 V1

Signed-off-by: Rodrigo Balerdi <lanchon@gmail.com>
(cherry picked from commit 8875f414f939a64cbe3f718f1ac36fb9427f576f)

luci-app-rp-pppoe-server: convert to JS

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 3aa60877ea4bc47b86c3ee11448db7503a20ae01)

luci-mod-network: split interface name and protocol validation

The previous implementation of binding the protocol validation to the
name validation caused problems when creating a new interface where an
already existing interface had the new one's protocol as its name, as the
protocol would be used when validating if an interface of that name already
existed.

Consider the following case:
1. Interface 'gre' with protocol PPPoE is created
2. Interface 'foo' with protocol GRE tunnel over IPv4 (which resolves to
   'gre') tries to be created

Creating interface 'foo' would error out during protocol validation as
'gre' would be passed to the name validation, which in turn would check if
an interface with name 'gre' already exists, which it does.

Instead of reusing the validation logic, simply trigger the name
validation manually as the protocol changes to properly pass the name of
the interface instead of the protocol. This also gives the benefit of
keeping all error states related to the name contained in the appropriate
UI element.

Fixes #7146

Tested-by: Tiago Gaspar <tiagogaspar8@gmail.com>
Signed-off-by: Daniel Nilsson <dannil+github@protonmail.com>
(cherry picked from commit 300961bb1ba7d71b50288b97c0fdeae0c71253e7)

luci-mod-dashboard: Minor repairs

Strength gauge is now displayed. Appended dBm measurement also.

Corrected some labels.

Closes #6147

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 723eb386340c8da681aa2c5fb60101690b3231fc)

Merge pull request #7293 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: better description/link for force_dns

luci-app-https-dns-proxy: better description/link for force_dns

* better description/link for force_dns in WebUI

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit c70ec6f8c7e2fbf6c66697117914313289f0a14f)

luci-mod-network: change to non-breaking space character

Closes #7252

Thanks to @efahl

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit a2c21a62c9cd10b61baa48f4881cd8794930e4ff)

luci-base: expunge correct transport cookies on logout

Closes #7269

Thanks to @mikma

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 8449716ceb0641c3f76f103fa52b8529013f2581)

treewide: Backport and sync translations

Sync translations.
Backport translations.

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

luci-app-lldpd: Create from Tano Systems

This is a copy of https://github.com/tano-systems/luci-app-tn-lldpd, which is licensed under the MIT License.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Rename luci-app-tn-lldpd to luci-app-lldpd

The original version of Tanosystem has a naming scheme which does not correspond to the standard naming scheme in OpenWrt LuCi. Therefore the renaming.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Fix bug not getting the current lldpd status

Specifying the arguments in the wrong order can (and has in my tests) resulted in errors. So you can see in the man page that flags like -f come first and then the command.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Disable option to enable SNMP agent

SNMP agent support is not enabled by default in lldpd. This can (and has in my tests) cause LLDP to stop working. See comment in source code.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Add option to disable sending sensitive information

Added an option that sets the "-k" flag, which results in less sensitive information being sent. See man pages and description in source code.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Add license information to Makefile

All of Tano Systems source code for the app is licensed under the MIT License. This has now been indicated accordingly in the Makefile.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Remove old footer from Tano Systems

The app from Tano Systems appears to include a footer. Since most LuCi apps do not, I have removed it.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Bug fix caused that the management IP address could not be set.

The TanoWrt fork calls the option to set the management IP addresses "lldp_sys_mgmt_ip". However, in OpenWrt it is called "lldp_mgmt_ip".

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Improve style

Remove double space

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Adding the Lua dependency

The rpcd script used by the Luci app is written in Lua. Therefore, runtime dependencies for Lua must exist when using the Luci app.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Remove old files

Since the app is called luci-app-lldpd and not luci-app-tn-lldpd, the files for the TanoWrt app are no longer necessary.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: RPCd backend change from Lua to ucode

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Update filter matrix

The old filter matrix was based on the man pages, but the selected value in the range 1-20 was also assigned to the configuration and thus lldpd was configured incorrectly. lldpd expects a value in the range 0-19. The webapp matrix has now been changed so that the values 0-19 also appear there.
This leads to a unification of configuration and webapp.

Signed-off-by: Marek Küthe <m.k@mk16.de>
luci-app-lldpd: Add location parameter

Signed-off-by: Marek Küthe <m.k@mk16.de>
(cherry picked from commit 49207b47ca048fdb9262b89c0683829f8e75972c)

luci-app-lldpd: Fixes

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit fe54b3e4f0739bd18f046d91ec69916f0935dc06)

luci-app-lldpd: Fixes and additions

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit d3953006c2fe54806db97dbbadc2163847cd1dbf)

luci-app-lldpd: retain empty settings for advertisements flags

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit f79634dc3e18671b3a2fd992d67d0c68fadd84dc)

luci-app-lldpd: helpers for location data in lldpd

They should help with handling coordinate, address and ELIN formats.

It disassembles any lldp_location and fills corresponding fields. The
address fields used are globally common and include those used in Cisco
products. (lldpd has more address properties available)

Changes made to any field trigger write_lldp_location to compose a new
string saved to lldp_location.

The user can override everything by entering a raw config string (in
case an address type field is not available). The last field changed,
wins.

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 40afc3149da61ed05f0958a8ad3b482b3e5b6f83)

luci-app-lldpd: reveal SNMP agentX socket

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit b3d0ac820ed1a32da6f918d1f41c6d7a2959fdd4)

luci-app-lldpd: rebase i18n

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

treewide: Backport i18n translations

Backport from master. Sync.

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

luci-app-usteer: Fix translation

Fix translation by renaming po/template --> po/templates
Backport current translations.

(Fixes 77bd97af cherry-pick of 0b2aad03 by applying also
the directory name fix from d41e972b)

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

luci-app-usteer: Fix neighbor spelling in option

Fix option name max_neighbour_reports --> max_neighbor_reports

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(adapted from 067f1c5 in master)

luci-app-natmap: change bind port data type from port to portrange

Signed-off-by: Ray Wang <r@hev.cc>
(cherry picked from commit ca57a08eb9176f51a978cb2adbaa96b6c5dcb470)

Merge pull request #7239 from stangri/openwrt-23.05-pbr

[23.05] luci-app-pbr: cherry-pick commits from snapshots to update to 1.1.6-20

luci-app-pbr: sync with 1.1.6-20 principal package

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit fc9f85ffb4568fdbd2162467db4e8603acfcfa96)

luci-app-pbr: sync with principal package

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 73109ae7df7d9ee544e0b7296a756b79db51d950)

luci-app-pbr: sync with principal package

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit fa71bb482534f0243d43fa3407480d82d1bd0a39)

luci-app-pbr: prepare migration to APK

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 6d2c56fe9096df96e0d1277b05d6e84a52b2b592)

luci-app-pbr: update to 1.1.4-5

* sync with the principal package
* add the status include file

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit e55d184e9f9e14f60d0229687c0c4676ae4201c2)

treewide: Backport i18n translations and sync

Backport translations from master.
Sync.

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

luci-app-adblock: sync with adblock-4.2.1

* added full 1Hosts support

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

luci-app-adblock: sync with adblock-4.2.0

* add hagezi support

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

Merge pull request #7230 from stangri/openwrt-23.05-luci-app-adblock-fast

[23.05] luci-app-adblock-fast: sync with 1.1.2-3 principal package

luci-app-adblock-fast: sync with 1.1.2-3 principal package

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit bd7bee7731a45ee72960562546cc713a03fbfc92)

Merge pull request #7226 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: Mullvad URL update

rpcd-mod-luci: strip colon from dnsmasq duid

Dnsmasq DHCPv6 use colons in the generated duid present in the lease file. Strip the colon as this is not supported by the OpenWrt config and follow the same way odhcpd use to display duid.

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

luci-app-https-dns-proxy: Mullvad URL update

Signed-off-by: Hector Fernandez <hector.fernandez.carmona@gmail.com>
(cherry picked from commit d5f80ac6e8669d3c52d92e9b33ebd4cb6627a41e)

luci-base: dispatcher.uc: skip login nodes when resolving w/ active session

When resolving eligible child nodes during evaluation of the "firstchild"
dispatch action, do not consider nodes allowing a login as allowed when
there already is an established session.

This fixes cases where restricted sessions are redirected to nodes they
have insufficent ACLs for, just because those nodes allow logins.

Fixes: #7218
Ref: https://forum.openwrt.org/t/x/174687
Suggested-by: @mikma
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 65b8002adbf8219b5dad37637756fa8fcae871a6)

luci-mod-status: log viewers - change focus() to scrollIntoView()

scrollIntoView() is more universally supported and standards tracked.

Closes #7186

Updates 9370bdddaede2feeb581193158d83f5062d5a318

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 7893f2d08aaa1a0419ede1a695a25781f60e6ba6)

luci-theme-openwrt: convert Lua templates to ucode

Convert the theme's Lua templates to ucode to avoid the implicit dependency
on the luci-lua-runtime package.

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

Merge pull request #7216 from stangri/openwrt-23.05-luci-app-https-dns-proxy

[23.05] luci-app-https-dns-proxy: bugfix: OpenDNS family filter URL update

luci-app-https-dns-proxy: bugfix: OpenDNS family filter URL update

* bugfix: update OpenDNS family filter URL
* update copyright/license
* update PKG_RELEASE to avoid double `r` on snapshots
* add LUCI_URL to upstream repository
* update README URL to upstream documentation
* update pkg.URL property to allow linking to a specific version of README
* remove duplicates of pkg object from overview.js/status include js files

Signed-off-by: Stan Grishin <stangri@melmac.ca>
(cherry picked from commit 9c836d14734f069421a459a63436d07cc91dd760)

luci-app-banip: optimized external file loading

* optimize loading of external config/feed files

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

luci-mod-network: made expandAndFormatMAC return arrays

instead of returning a space separated string

follow-up to 5ab0cb1f15bcb31015ae8345d302c6d023ba51e2

Closes #7209

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 84ffb655b0764d949c7bd4fd5f9502c314b77c58)

luci-mod-network: Correctly assign dnsmasq instance: name not number

Closes #7199

Signed-off-by: Paul Donald <newtwen+github@gmail.com>
(cherry picked from commit 5ab0cb1f15bcb31015ae8345d302c6d023ba51e2)

treewide: Backport and sync i18n translations

Backport translations from master.
Sync.

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

treewide: Backport translations

Backport translations and sync.

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

luci-app-keepalived: Fix option for script falls
Signed-off-by: Kotyara <lokotyara@gmail.com>

treewide: Backport and sync i18n translations

Backport translations from master.
Sync.

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

luci-app-banip: sync with forthcoming banIP 1.0

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

luci-app-banip: responsive design fixes

fix responsive design, esp. on mobile devices

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

luci-app-banip: sync with 0.9.6-2

small fixes & improvements

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

luci-app-opkg: populate alternative package size if needed

Populate the raw size value with the alternative size if the package
size is unavailable.

Fixes: #7139
Fixes: 63e5d38db0 ("luci-app-opkg: fix sorting by size column")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 2d2e5c0689b3483b22d033af1da9d33afeedf33e)