* add a tcpdump option to resolve IPs in adblock reporting,
  set 'adb_represolve' accordingly (disabled by default). If enabled
  tcpdump will perform a reverse DNS (PTR) lookup for each IP address
* add 'stalkerware' source (provided by @astryzia)
* update readme

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

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 0b609eb3)

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 616d867e)

The package needs libseccomp, which does not currently support arc.
In order to avoid a circular dependency, we must avoid arc here as well.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry picked from commit 048e1d2d)

crun is the prefered container run-time of podman, it's faster than
runc and has a much lower memory footprint.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 01d1a496)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Fixes: #15870

 - Updated log_dest to syslogs
 - Limit logs to error, warn, notice
 - Enabled per listener config
 - Enabled Localhost connection with anonymous connections
 - External connection is expected over WS with login credentials

This fixes support for x86, auc now selects the right combined image
depending on the system being booted in EFI mode or not.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 1204cb82)

Signed-off-by: Niels Widger <niels@qacafe.com>

cache-domains: Fixed missing wildcard entries

The fix requires the use of the generated dnsmasq `lancache.conf` file.
So I moved configuration of the hosts directory out of the UCI and into
the generated dnsmasq configuration file to simplify the script.

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>

[21.02] nextdns: Update to version 1.33.11

Signed-off-by: Olivier Poitrey <rs@nextdns.io>

* fix a possible race condition during boot
* use the new "device" syntax in the network wizard

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

[21.02] openvpn: update to 2.5.3

Remove upstreamed patch and fix test.sh script.

Signed-off-by: Magnus Kroken <mkroken@gmail.com>

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 7436d944)

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 89a6254b)

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit c6f8536e)

If pppoe is used for wan access. script set 'eth1' as interface for curl
call. The correct interface is however 'pppoe-wan'.

The script uses 'network_get_physdev' function to get real device for
bind_network but this is wrong. We need instead the l3_device of the the
logical interface.

In case if we don't use pppoe connection - 'l3_device' is equal to real device.

This was reported by the github user `welderpb` with P/R:
 https://github.com/openwrt/packages/pull/14431



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

Signed-off-by: Wenli Looi <wlooi@ucalgary.ca>
(cherry picked from commit 9e2aad3f)

Signed-off-by: Wenli Looi <wlooi@ucalgary.ca>
(cherry picked from commit 93344aaf)

[21.02] icu: bump to 69.1

ICU 69 updates to CLDR 39 locale data with many additions and corrections. ICU 69 also includes significant improvements for measurement unit formatting and number formatting in general, as well as many other bug fixes and enhancements.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

[21.02] chrony: fix uci NTP access configuration

The chrony interface hotplug script reuses the handle_allow function
from the init script to allow NTP access on interfaces specified in uci.
The function requires /lib/functions/network.sh. Include the file in the
hotplug script to make the function work as expected.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>

[21.02] node: bump to 14.17.1

[openwrt-21.02] yq: Update to 4.9.6

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit 2b52fb62)

This should prevent some resolving issues by other router app.

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
(cherry picked from commit 1d1eca32)

* update to 4.13.9

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 2057fc9e)

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 6c6b74b8)

Dropped patches:
  0004-Replace-EVP_CIPHER_CTX_cleanup-with-EVP_CIPHER_CTX_r.patch
  0005-Switch-get_-Update-APIs-to-get0.patch

Reworked patches:
  0001-Add-new-ASN1_STRING_get0_data-API.patch
  0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch
These 2 require that we keep only the CUSTOMIZATIONS stuff for now. Maybe
later we can drop this.

Ran 'make package/python-cryptography/refresh'.

Added patch:
  0004-disable-rust.patch
upstream did a sloppy job with the CRYPTOGRAPHY_DONT_BUILD_RUST logic; we
need to patch it, to make sure the setuptools-rust isn't installed.
We may need to carry this patch in our tree for a bit longer than upstream,
because in newer versions, CRYPTOGRAPHY_DONT_BUILD_RUST logic gets removed.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 01d1b458)
Signed-off-by: Jeffery To <jeffery.to@gmail.com>

Notable Changes:
deps: update ICU to 69.1 (Michaël Zasso)
errors: align source-map stacks with spec (Benjamin Coe)

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

* fix issue with nginx search pattern reported in forum support thread

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

Update nano editor version to 5.8.

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

Using strcmp() to compare a version string doesn't work well.
Use verrevcmp() function from opkg instead.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 794cf3ac,
as it was previously skipped also switch PKG_REVISION back to manual
to keep it in sync with master branch)

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 24a8f5874155398df8e64b29897a511d5d603e03)

No longer fail in case a package is part of multiple lists (which may
happen temporarily in case it becomes 'nonshared').
Bump version to prepare for sync accross branches.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 9150e827)

 * don't segfault if server reply is incomplete
 * always request 'generic' image on x86/generic and x86/64
 * make SNAPSHOT branches sticky, eg. stay on 21.02-SNAPSHOT and do
   not 'upgrade' to 21.02.0-rc2.
 * output requested server URL when debugging

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 02bc1fc9)