tvheadend: disable uriparser

This avoids to add liburiparser as dependency.

Package tvheadend is missing dependencies for the following libraries:
liburiparser.so.1

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 0449c109e78d4e5b998fc26415ecaa5bb5c274c3)

python3: Update to 3.9.10, refresh patches

Signed-off-by: Jeffery To <jeffery.to@gmail.com>

wg-installer: remove unused dependency

Remove the dependency "coreutils-realpath" from
wg-installer-server-hotplug-olsrd.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit fab86eb626b677f8329482f427c6837e59fe4597)

wg-installer: create wireguard key if it does not exist

Check if the key exists which is given by
    option wg_key '/etc/wgserver/wg.key'

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 324fa79d7c8a90e899a81bbb3ae0c5a5a602f88e)

wg-installer: install cronjob

Install a cronjob that removes unused wireguard interfaces every 10
minutes.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 432a965689f09c6bb86cd24753f79d739b9bcf46)

wg-installer: check if a key is already inserted

Check if a peer is already existing with a given public key. Introduce a
response code for signaling why the server rejected the request.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit da48bc3792705b12fc104459ed9f5f1b73544d17)

wg-installer: rework code

Use shellcheck to rework the code. Use "export" to return variables from
a function call. Further, fix typos.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 69c81790d1045e064cd9c643a1643a0f919f448d)

wg-installer: cosmetic changes

Use "ip addr" instead of "ip addres" or "ip a".

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 38a9a3e0dc9713af7509e455ca9a71567d80323f)

cryptsetup: update to version 2.4.3

Fixes: CVE-2021-4122
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit a2427edf76fffd294fbcc70f94c7d59d420d07b4)

git: update to version 2.34.1

- Refreshed patches

- Release notes 2.34.0:
https://github.com/git/git/blob/2ae0a9cb8298185a94e5998086f380a355dd8907/Documentation/RelNotes/2.34.0.txt

- Release notes 2.34.1:
https://github.com/git/git/blob/2ae0a9cb8298185a94e5998086f380a355dd8907/Documentation/RelNotes/2.34.1.txt

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 042bf16072627d763ba22a4d80c03cb32406a936)

crowdsec: update from upstream latest release 1.2.3

update from latest upstream release 1.2.3
updated copyright

(cherry picked from commit de41b63ca45be91273e0ea97213b2a6a29ba2a9a)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>

smcroute: update to 2.5.5

Signed-off-by: Moritz Warning <moritzwarning@web.de>

smcroute: update to 2.5.4

Signed-off-by: Moritz Warning <moritzwarning@web.de>

Merge pull request #17619 from erdoukki/21.02-2to3

[21.02] 2to3: add package host tool

wg-installer: switch to ubus call for olsrd hotplug

Use ubus ipc calls to add and remove interfaces.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit b89eb0115fc21183175af68c0a8807b25bd71c99)

wg-installer: rework iproute2 commands

- Use ip address add instead of ip a a
- Directly add broadcast address

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit fea27cec05c0d76d3bb6aad1b4bfd53270c1c263)

2to3: add package host tool

2to3 is a Python program that reads Python 2.x source code and applies a
  series of fixers to transform it into valid Python 3.x code. The standard
  library contains a rich set of fixers that will handle almost all code. 2to3
  supporting library lib2to3 is, however, a flexible and generic library, so it
  is possible to write your own fixers for 2to3. lib2to3 could also be adapted
  to custom applications in which Python code needs to be edited automatically.

This tool is necessary for fail2ban package because of issue
  https://github.com/openwrt/packages/issues/17311
  https://github.com/openwrt/packages/pull/17341

Simple 2to3.py script from Debian, thanks to Matthias Klose <doko@ubuntu.com>
From: https://salsa.debian.org/cpython-team/python3-defaults

(cherry picked from commit 2f91e1c9c5876bcdac4630fdc0e417903d8f9eb9)
Co-authored-by: Jeffery To <jeffery.to@gmail.com>
Signed-off-by: Kerma Gérald <gandalf@gk2.net>

CI: fix runtime testing for non master branch

The runtime testing always ran on master branch aka snapshots since the
branch wasn't passed over to the container execution!

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

i2pd: Update to 2.40.0 and update package sources

* Updating i2pd package to 2.40.0
* Rewrite Makefile
* Remove usage of PKG_INSTALL (package's make install)
* Rewrite init.rc configuration and script
* Remove '--service' option from init, which only sets datadir to /var/lib/i2pd
* Use '--datadir' option in init, otherwise datadir changing via uci is not works
* Update patch for i2pd.conf

Signed-off-by: R4SAS I2P <r4sas@i2pmail.org>
(cherry picked from commit ac27fffff9159be7b0b6529797ca45d7dc4136c0)

i2pd: remove unneeded functions.sh

its included via rc.common, see
https://openwrt.org/docs/guide-developer/config-scripting

Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
(cherry picked from commit 266deb586686bfdd5e95c451284541a06c3d5d25)

i2pd: Update to 2.38.0

Remove USE_AVX and USE_AESNI make options as it is correclty handled by
internal code.

Signed-off-by: R4SAS I2P <r4sas@i2pmail.org>
(cherry picked from commit 1025dd7c76706a4130a636b61eb112052617c082)

i2pd: update to 2.36

remove AVX patches as upstream has integrated and closed
all AVX issues

compiled on :  x86-64, i386 generic
tested on : x86-64 VM, i386 VM

Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
(cherry picked from commit fc7d710e626f73029597d1f6811d0bd26d587c4d)

mariadb: Add sudo dependency

During update we use sudo to start an instance. It probably could be
workarounded, but given the MariaDB size, dependency on sudo shouldn't
be an issue.

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
(cherry picked from commit 0ffec9bd4bf91118d33203d93d53b316b43115ce)

mariadb: Check and fix datadir owner issues during upgrade

If you are migrating to MariaDB package, you might have old datadir
stored somewhere using different setup with different users. If you
trust us enough to enable autoupgrade, you probably trust us enough to
chown your datadir as well. This can prevent some potential issues.

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
(cherry picked from commit b41525cef4171c7f3200afc41dca5e3837cbd2ec)

Merge pull request #17603 from BKPepe/mariadb-bump

mariadb: update to version 10.4.22

mariadb: update to version 10.4.22

Fixes: CVE-2021-35604
Removed two patches:
130-c11_atomics.patch - included in upstream now [1]
140-mips-connect-unaligned.patch - included in upstream, too. [2]

[1] https://github.com/MariaDB/server/commit/f502ccbcb5dfce29067434885a23db8d1bd5f134#diff-6ef8fc82162068daeab927be94e246b202eb39323a102273b9448219da24172f
[2] https://github.com/MariaDB/server/commit/a33c1082dab7ab4b08acf957d6364be95e4c6a9f#diff-821e2c7a49184a660339b094f437fcd1e9aea997a86391467a657088234ebca0

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

mg: bump to 7.0

This is mg as it appears in OpenBSD 7.0.

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

zerotier: add configuration reload trigger

Ensure that the zerotier service is automatically restarted when the uci
configuration is modified.

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

netdata: Update init script to use -D rather than -nd

The current init script is using the deprecated -nd flag. This updates netdata to be started with -D.

Signed-off-by: James White <james@jmwhite.co.uk>
(cherry picked from commit cf9d5a887031f245fbae6f8bcd3366078996f123)

atlas-probe: update to version 2.4.1

Removed patches:
001-fix-stime-glibc-remove.patch - it is included in upstream
003-Fix-compilation-with-gcc11.patch - no longer necessary

Updated patches:
002-Avoid-problems-with-64-bit-time_t.patch

Refreshed patches:
004-Comment-out-librt-testing.patch

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit cf65ca2db009cc69aa4eedea7116727704c84c48)

atlas-sw-probe: update to version 5040

Update copyright

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit ec767eb499dfa9269cf0f454b6f6446bf4235340)

crowdsec-firewall-bouncer: update to 0.0.21

Update crowdsec-firewall-bouncer to latest upstream release version 0.0.21

Makefile rework
- use tagged version for download

Fixes
- set API_KEY in firewall bouncer config file

(cherry picked from commit b4f48b5c23d0b5d2ab9de2041edbf69a8f6ca013)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>

crowdsec: update to 1.2.2

Update crowdsec to latest upstream release version 1.2.2

Makefile rework
- use tagged version for download

(cherry picked from commit 2a34e4987bbd60091150de1886017426f10634ab)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>

apache: fixup apxs

apxs is used to get information about the apache installation when
building external modules. Currently there are issues:

1.

./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET
apache2
apxs:Error: ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/bin/apr-1-config not found!.

This error is fixed by sed script #2.

2.

./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET
cannot open ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/share/apache2/build/config_vars.mk: No such file or directory at ./staging_dir/target-mips_24kc_musl/usr/bin/apxs line 213.

This error is fixed by sed scipt #1.

Both sed scripts taken from buildroot (see [1]).

[1] https://github.com/buildroot/buildroot/blob/master/package/apache/apache.mk

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit 83d1cdaf3f1392a67aaa9d10f544680805229019)

apache: security bump to 2.4.51

Fixes (see [1] for details):

  CVE-2021-33193
  CVE-2021-41524
  CVE-2021-41773
  CVE-2021-42013

[1] https://httpd.apache.org/security/vulnerabilities_24.html

Patch 020-openssl-deprecated.patch refreshed.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit da4b1ca8d65b788d85489cd3ca83d91b0fd72f0f)

wg-installer: fix shell typo

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 53503c4a3a6660a67e88a37876a87e9b824ee03c)

wg-installer: allow defining link costs for hotplugs

Add options to set link costs in mesh routing daemons.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit ee879d37479cf66f8caf8d4354a0aeae3764f0a8)

wg-installer: private key as parameter

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 6a59d41fbf4ea61b1ee8b6e2ccc47d9a10529b0e)

wg-installer: generate new keys for every connection

Generate new keys on every new connection.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 8ab044712abb7e1a319099a419b1265ea04fb53c)

golang: Update to 1.17.6

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 45208db29bd22238d355f4f8fdcc02fd2045c78a)

wg-installer: fix using symlinks for conf files

It is useful to symlink babeld and olsrd to /tmp/ if we frequently
write to those config files.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 5e8301d7dc154b27b03dc2c24c111e41bb897293)

fail2ban: fix 2to3 error

Issue: 2to3 support has been removed in setuptools since version 58.0.0.

Fix: openwrt/packages#17311

Requirements: 2to3/host openwrt/packages#17429

Add upstream patch: https://github.com/fail2ban/fail2ban/commit/196c55e93103d1e56d1336f27a5f2591b4e54fef

To install/build for python3 from source, it is necessary to convert to py3
codebase before setup (invoke 2to3 or ./fail2ban-2to3 firstly).
> ./fail2ban-2to3
> python3 setup.py build

(cherry picked from commit ad0e1a1c3ce871da079779bf9ac706859445f3c5)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>

wg-installer: fix cleanup script

The wrong function was called.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit e6afcf8f3c5ef428a954bda0f391f7b691d0de9f)

haveged: update to 1.9.17

Update havged to version 1.9.17.

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

wg-installer: fix get_usage function

The get_usage function always returns 0. The shell syntax was wrong.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit f7cb8b20e118834f9a6c5be298737829f90ea68b)

wg-installer: delete old interfaces

Add "wg_check_interfaces" and specify a timeout in the config file.
This allows to delete not used wireguard-interfaces automatically.

For example a cronjob can be installed that calls:
  . /usr/share/wginstaller/wg_functions.sh && wg_check_interfaces

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 36dc9b3f797dd04d075d9b6c36fece68d03470fe)

wg-installer: fix dependencies

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 62cc627aba9b9aa1ac7b54ac5471b6f97e3f4ba3)

wg-installer: fix typo in cleanup function

The delete variable was misspelled leading to devices always being
removed although they had connected neighbors.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 0e416dadd1281878388445007e45df741c387335)

wg-installer: fix ipv4 meshing via olsr

The ipv4 address space was not allowed.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 4302bfd3c8b710411bc8572ad218f4b17dfb0c67)

wg-installer: add link-local to client interface

Wireguard has no link-local address on an interface automatically.
Add a link-local to the interface. The server has fe80::1/64 and
the client fe80::2/64.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 625f3c830207317dac1be06d6e1f196a9d92479c)

wg-installer: add cleanup script

Add script to cleanup unused wireguard interfaces.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 714b51c6309e4abc7c000bb9250119104fc2757a)

wg-installer: add ipv4 support

Add base_v4prefix to allow ipv4 mesh connections.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 98d8680a8c26adfba431da008c9a76ff85786390)

getdns: remove maintainer

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>
(cherry picked from commit 4a241581ab1cbd6679ca64c401e8cc0c00b88c45)

getdns: bump to 1.7.0

Remove obsolete patches.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
(cherry picked from commit 0261cd097226b7b8aca0c3053b69763ea4b4815c)

Merge pull request #17504 from jefferyto/radicale2-2.1.12-openwrt-21.02

[openwrt-21.02] radicale2: Update to 2.1.12

Merge pull request #17503 from jefferyto/radicale-1.1.7-openwrt-21.02

[openwrt-21.02] radicale: Update to 1.1.7

wg-installer: add hotplug script for olsr

Add hotplug-olsrd to automatically mesh with olsrd via new wireguard
links.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit d35c22951bfabb9b34133471fe1e389909d2007b)

radicale2: Update to 2.1.12

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit b37f409146d3e5e70dec5a2bb347c6b01e90aa05)

radicale: Update to 1.1.7

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 8d0018f54953e4821312e8ca2a0dc562bb7c087c)

inadyn: update to 2.9.1

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit b434cd71b950185cbf57308466eb0e3473ba484e)

Merge pull request #17447 from jefferyto/golang-1.17.5-openwrt-21.02

[openwrt-21.02] golang: Update to 1.17.5, add patch

mwan3: fix mwan3 flush conntrack table call

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

golang: Update to 1.17.5, add patch

Includes fixes for:
* CVE-2021-44716: unbounded growth of HTTP/2 header canonicalization
  cache
* CVE-2021-44717: syscall.ForkExec error can close file descriptor 0

Added patches:
* 001-cmd-link-use-gold-on-ARM-ARM64-only-if-gold-is-available.patch:
  https://github.com/golang/go/pull/49748 backported for Go 1.17,
  this removes the requirement for the gold linker when building Go
  programs that use Go plugins on arm/arm64

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit eac2e91a285e9df119ce1aac0f4fe340cc54a6e4)

adguardhome: update to 0.107.0

Full changelog available at: https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.0

packr has been removed from build dependencies, per
https://github.com/AdguardTeam/AdGuardHome/commit/c6888326b034daea9e69de5ee0a8f37aede45892#diff-2873f79a86c0d8b3335cd7731b0ecf7dd4301eb19a82ef7a1cba7589b5252261L2

Also added the ability to configure working directory location and moved
the directory to /var. On most setups this should not change anything,
as /var is symlinked to /tmp. The move mostly benefits setups where /var
is configured to be persistent.

The working directory is used by AdGuard to store persistent data like
query logs, filter lists, etc.

Data stored in this directory can get really huge, as such allowing
this directory to be moved elsewhere (ie. an USB drive) is very
beneficial.

Fixes: #17437
Co-authored-by: Dobroslaw Kijowski <dobo90@gmail.com>
Co-authored-by: Jeffery To <jeffery.to@gmail.com>
Signed-off-by: Hiếu Lê <leorize+oss@disroot.org>
(cherry picked from commit f44603a131ef54bbfb2836ef942d0276da427881)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[Added fixes in the commit message]

Merge pull request #17439 from 1715173329/xr-2102

[openwrt-21.02] xray-core: Update to 1.5.2

Merge pull request #17438 from 1715173329/yq21

[openwrt-21.02] yq: Update to 4.16.2

xray-core: Update to 1.5.2

Removed upstreamed patches.

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

xray-core: Update to 1.5.1

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

yq: Update to 4.16.2

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

adblock: 4.1.3-4

* fix backup dir creation in raw mode

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

python-lxml: update to version 4.6.5

Fixes: CVE-2021-43818
  https://nvd.nist.gov/vuln/detail/CVE-2021-43818

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

Merge pull request #17405 from mhei/21.02-php8-update

[21.02] php8: update to 8.0.14

php8: update to 8.0.14

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Merge pull request #17400 from jefferyto/remove-commodo-openwrt-21.02

[openwrt-21.02] python-packages/seafile: Remove commodo as maintainer

seafile: remove myself as maintainer of these packages

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

python-packages: remove myself as maintainer

There's been a bit of overlapping opinions on some of these packages.
The best thing to do here is to reduce ownership and relinquish my
control.

This patch does that.

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

crowdsec-firewall-bouncer: update to 0.0.18

Update to upstream release 0.0.18

(cherry picked from commit 515f8489cc77bfbd0e9925599713a3f4843e6e3a)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>

Merge pull request #17356 from mhei/21.02-php7-update

[21.02] php7: update to 7.4.27

php7: update to 7.4.27

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

nano: update to version 6.0

Update nano editor to version 6.0

Version 6.0 enable toggling the display of the line numbers with
the shortcut key M-N (Alt-n). Also the cmdline option "-l" works.
Remove earlier patch regarding that.

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

libqmi: fix missing CONFIG_ prefix

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

ldns: update to 1.8.1

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
(cherry picked from commit 7594e8581a200f6fd20fcba29672af54c4591111)

unbound: update to 1.14.0

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>

htop: update to 3.1.2-1

Build-tested: x86/64
Run-tested: bcm2711/RPi4B

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit 3b041e3b458889d7dbef72e1d49b102f193bf5c7)

htop: explicitly disable some build options

Since 3.1.0 delayacct option is enabled if the needed dependencies
are detected, it was previously disabled.
Sensors also check for dependency so we need to explicitly
disable it when not enabled.

Fixes 5f916720551ad5ea5ac86cf5e122fc2c0c34cc15

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 253e3f558c9d5d6ee43a7e870ef60f8a1c0c80c7)

htop: update to 3.1.0

Update htop to versio 3.1.0

* Adjust Makefile configuration options to update
* Avoid libcap dependency
* Backport post-release fix for old automake

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

Merge pull request #17299 from nxhack/2102_node_14182

[21.02] node: bump to 14.18.2

node: bump to 14.18.2

Update to v14.18.2

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

Merge pull request #17270 from BKPepe/update-python3

python3: update to version 3.9.9

hwdata: update to version 0.354

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 20a759a6ddf9f24ee1ca5128a10cfd95eabad771)

python-babel: update to version 2.9.1

Changelog:
https://github.com/python-babel/babel/releases/tag/v2.9.1

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit e2932db1ce45e1882b6935694a46c3a3b7e8536f)

python-babel: update to version 2.9.0

Update copyright

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit a31dc44d2dd8cae498135b2994a7a117bc4c6e2d)

knot: update to 3.1.4

Signed-off-by: Jan Hák <jan.hak@nic.cz>
(cherry picked from commit 60a80b31fbf3585d52b64ab0b9bf5a4aa844a032)

gnutls: don't run aclocal --install

Remove the --install parameter when running aclocal.  The --install
argument is used to copy third-party files to the first -I directory.
gnutls has -I m4 first, which would copy files to its local build
directory.  However, openwrt prepends the staging dir m4 directory,
causing aclocal --install to copy an old definition of
ax_code_coverage.m4 into the staging dir.

If strace is built after gnutls, compilation will fail:

    Makefile:9303: *** missing separator.  Stop.

The version of ax_code_coverage.m4 that gets installed does not define
@CODE_COVERAGE_RULES@.

Removing the --install parameter in gnutls solves the issue.

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

bind: bump to 9.17.20

Signed-off-by: Noah Meyerhans <frodo@morgul.net>
(cherry picked from commit 249079187dd6a3a21ec62b275782d13f546b5e26)

knot-resolver: update to version 5.4.3

Release notes:
https://www.knot-resolver.cz/2021-12-01-knot-resolver-5.4.3.html

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 10ab2306702c5292f98a43cf5a1dfc0b7ab99c27)

yq: Update to 4.16.1

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

python3: update to version 3.9.9

- Updated setuptools and pip
- Refreshed patches

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

msmtp: update to version 1.8.1.9

Changelog:
https://marlam.de/msmtp/news/msmtp-1-8-19/

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 173faad3340772e1b2194c618fb8c1f13f81b9a9)

Merge pull request #17259 from rs/nextdns-1.37.7-openwrt-21.02

[21.02] nextdns: Update to version 1.37.7