netatalk: update to version 3.1.13

Please update to this latest release as soon as possible as this
releases fixes the following major security issues: CVE-2021-31439,
CVE-2022-23121, CVE-2022-23122, CVE-2022-23123, CVE-2022-23124,
CVE-2022-23125 and CVE-2022-0194.

Local patch '010-gcc10.patch' has been applied upstream and was hence
removed.

For a summary of news and a detailed list of changes see the
ReleaseNotes[1].

[1]: https://netatalk.sourceforge.io/3.1/ReleaseNotes3.1.13.html
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

Merge pull request #18125 from 1715173329/x2

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

Merge pull request #18124 from 1715173329/y2

[openwrt-21.02] yq: Update to 4.23.1

Merge pull request #18123 from jefferyto/python-3.9.11-openwrt-21.02

[openwrt-21.02] python3: Update to 3.9.11, refresh patches

xray-core: Update to 1.5.4

Updated geodata to latest version while at it.

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

yq: Update to 4.23.1

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

python3: Update to 3.9.11, refresh patches

Includes fixes for:
* Windows builds updated to bzip2 1.0.8 to mitigate CVE-2016-3189 and
  CVE-2019-12900
* CVE-2022-26488: Escalation of privilege via Windows Installer

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

usteer: add package

This commits adds the new usteer package to the packages feed.

usteer is a daemon for steering wireless clients across frequency
bands as well as between multiple access points on a network.

Signed-off-by: David Bauer <mail@david-bauer.net>

zerotier: update to 1.8.6

* remove upstreamed gcc10 and cerrno patches
* disable SSO and OIDC as it needs Rust/Cargo support

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

zerotier: update to 1.8.4

Also remove patch to fix uClibc-ng,
since it is not in openwrt anymore.

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

zerotier: update to 1.8.3

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

zerotier: update to 1.8.2

Update und switch back to release source package.

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

zerotier: update to 1.8.1

Release notes:

1.8.0
 - Upgrade json.hpp dependency to version 3.10.2
 - Check if DNS servers need to be applied on macOS
 - Set MAC address before bringing up Linux TAP link
 - Stop binding to temporary IPv6 addresses
 - Fix for mistakenly using v6 source addresses for v4 routes on some platforms
 - Fix for MacOS MTU capping issue on feth devices
 - Implement a workaround for one potential source of a "coma" bug, which can occur if buggy NATs/routers stop allowing the service to communicate on a given port. ZeroTier now reassigns a new secondary port if it's offline for a while unless a secondary port is manually specified in local.conf. Working around crummy buggy routers is an ongoing effort.
 - A completely rewritten desktop UI for Mac and Windows!

1.8.1
 - Fix an issue that could cause clobbering of MacOS IP route settings on restart.
 - Added additional hardening against address impersonation on networks (also in 1.6.6).
 - MacOS IPv6 no longer binds to temporary addresses as these can cause interruptions if they expire.
 - Remove support for REALLY ancient 1.1.6 or earlier network controllers.
 - Fix numerous UI issues from 1.8.0 (never fully released).

Changed to git as source and added $(AUTORELEASE)

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>

zerotier: add respawn procd param

Signed-off-by: Chao Liu <git@expiron.dev>

zerotier: add option to copy config

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

zerotier: fix cross compile in macOS

zerotier's Makefile use `uname` to detect target when cross compile
uname should always be 'linux'

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>

Merge pull request #18103 from BKPepe/21.02-haproxy

haproxy: update to version 2.2.22

haproxy: update to version 2.2.22

Fixes:
CVE-2022-0711

Changelog:
https://git.haproxy.org/?p=haproxy-2.2.git;a=blob;f=CHANGELOG;h=bfc5d6495e39ace56581663ce820e6909039a286;hb=bfc5d6495e39ace56581663ce820e6909039a286

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

tree: bump to 2.0.2

Update to latest upstream release.

Build system: x86_64
Build-tested: bcm2711/RPi4B
Run-tested: bcm2711/RPi4B

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

curl: Fix compiling curl wolfSSL IPv6 disabled

Fixes #18082

Signed-off-by: Chris Osgood <chris_github@functionalfuture.com>
(cherry picked from commit 4eb08bacf309d336f03ad001194b9c8c1847ac2b)

bind: bump to 9.18.1

Fixes multiple security issues:

 * CVE-2022-0667 -- An assertion could occur in resume_dslookup() if the
                    fetch had been shut down earlier
 * CVE-2022-0635 -- Lookups involving a DNAME could trigger an INSIST when
                    "synth-from-dnssec" was enabled
 * CVE-2022-0396 -- A synchronous call to closehandle_cb() caused
                    isc__nm_process_sock_buffer() to be called recursively,
                    which in turn left TCP connections hanging in the CLOSE_WAIT
                    state blocking indefinitely when out-of-order processing was
                    disabled.
 * CVE-2021-25220 -- The rules for acceptance of records into the cache
                     have been tightened to prevent the possibility of
                     poisoning if forwarders send records outside the
                     configured bailiwick

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

libnetfilter-log: update to 1.0.2

Remove all patches as they have been upstreamed.

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

Merge pull request #18083 from mhei/21.02-libxml2-update

libxml2: update to 2.9.13

libxml2: update to 2.9.13

This fixes CVE-2022-23308.

Also switch to GNOME as download source and xz tarball.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 81fd836f97aee93c8cfcb4ebbf901c2a99c3525c)

auc: don't segfault on invalid URL

Show error message instead of segfaulting in case of an invalid URL
being read from UCI config.

Fixes: #17971
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit c0d2c82528e19a304164dade96e9b019114b8fb0)

auc: fall back to 'sdcard' image

Fallback to use 'sdcard' image in case there is neither 'sysupgrade'
nor 'combined' image available.
This allows using 'auc' on targets where 'sdcard' image is also used
for sysupgrade (such as some mvebu-based devices with eMMC).

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

auc: accept both 'y' and 'Y' as confirmation from user

Accept both 'y' and 'Y' as positive confirmation when asking the user
if auc should proceed with requesting and installing an upgrade.

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

auc: add '-n' parameter for dry-run

Add option to allow only requesting an image but not actually download
or sysupgrade anything.

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

attendedsysupgrade-common: update to 2021

* Use SPDX
* Use CA (ucert) public key
* Update repo link
* Update maintainer email
* Format description

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit a54b9570ad6abc0b3e1079e881d1dbe9a475e33d)
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

Merge pull request #18010 from stangri/openwrt-21.02-curl

[21.02] curl: update to 7.82.0

Merge pull request #18037 from M95D/openwrt-21.02

tvheadend: bind to LAN IP by default

yq: Update to 4.22.1

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

yq: Update to 4.21.1

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

syslog-ng: update to version 3.36.1

- Bump version in config file

Release notes:
https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-3.36.1

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

tvheadend: bind to LAN IP by default

If config parameter is not set, tvheadend will bind to LAN IP address by default.
Fixes issue #16500 without requiring user modifications to config file. It's also more secure if firewall becomes disabled.

Signed-off-by: Marius Dinu <m95d+git@psihoexpert.ro>
(cherry picked from commit 95cbfe893b259433ec06f5a22bac7c047d1db517)

dockerd: fix compilation with glibc

Signed-off-by: Liang Yang <ggg17226@gmail.com>

docker: fix compilation with glibc

Signed-off-by: Liang Yang <ggg17226@gmail.com>

yggdrasil: bump to 0.4.3

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

i2pd: Update package

* Update to 2.41.0
* Added use AUTORELEASE

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

i2pd: add service reload support

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

coova-chilli: remove kmod dep on binary package

There is no reason for the kmod to depend on the binary package
itself, neither for building nor for installing.

That dependency prevents phase1 from building the kmod even though
support is enabled in the binary.

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
(cherry picked from commit 385923321bf0625b28b62f9e2538b2a3377c74bb)

cache-domains: Fixed hotplug script not running

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

Merge pull request #18019 from rs/nextdns-1.37.10-openwrt-21.02

[21.02] nextdns: Update to version 1.37.10

Merge pull request #18012 from jefferyto/golang-1.17.8-openwrt-21.02

[openwrt-21.02] golang: Update to 1.17.8

nextdns: Update to version 1.37.10

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

golang: Update to 1.17.8

Includes fix for CVE-2022-24921 (regexp: stack overflow (process exit)
handling deeply nested regexp).

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

curl: update to 7.82.0

* changelog: https://curl.se/changes.html#7_82_0

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

python-twisted: Update to 22.2.0

Includes fix for CVE-2022-21716 (The Twisted SSH client and server
implementation naively accepted an infinite amount of data for the
peer's SSH version identifier.)

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

python-twisted: Update to 22.1.0, refresh patches

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

mdnsresponder: Fix nullpointer dereference while parsing interface list

This patch was backported from https://github.com/IETF-Hackathon/mDNSResponder/commit/1fb07b9524b4afed3a826c087db4dc48a7bfdb8

(cherry picked from commit a4b33ab169a3ca60cd12c2eb5155e899779d3570)
Signed-off-by: Maarten Aertsen <spam-github@rtsn.nl>

Merge pull request #17986 from CyberMind-FR/crowdsec-firewall-bouncer-remove-crowdsec-depency

[21.02] crowdsec-firewall-bouncer: remove crowdsec package dependency

crowdsec-firewall-bouncer: remove crowdsec package dependency

Remove un-necessary crowdsec package dependency, to be able to use
crowdsec-firewall-bouncer independently from crowdsec local installation.
(with remote API)

Fix issue: https://github.com/openwrt/packages/issues/17406

Description:
  using crowdsec-firewall-bouncer on many OpenWRT devices connected
  with my domain LAPI server (which collect many crowdsec machines,
  mostly nginx), it works great. Actually, crowdsec package is not
  mandatory for that usage, it would be great if it was not a dependency.

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

kcptun: bump to v20210922

Signed-off-by: Chao Liu <git@expiron.dev>

samplicator: fix Wformat warning

Wrong type.

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

ocserv: updated to 1.1.6

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>

openconnect: updated to 8.20

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>

yq: Update to 4.20.2

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

MarkupSafe: update to version 2.1.0

Changelog:
https://markupsafe.palletsprojects.com/en/2.1.x/changes/#version-2-1-0

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

domoticz: update to 2021.1

Remove outdated patches.

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

minizip: update to 3.0.2

Add back compat header as domoticz really wants it.

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

minizip: update to 3.0.1

Switch to AUTORELEASE for simplicity.

Switch to building with Ninja for faster compilation.

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

minizip: update to 3.0.0

Switch to new upstream and switch package name.

Further disable features to avoid extra dependencies.

Build with PIC to avoid build failures with mips16.

Remove no longer needed patch. Upstream fixed it differently.

Use AUTORELEASE for simplicity.

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

expat: import patches for CVEs

* import patches for CVEs from alpine 3.13

CVE-2021-45960, CVE-2021-46143, CVE-2022-22822, CVE-2022-23852, CVE-2022-23990
CVE-2022-25235, CVE-2022-25236, CVE-2022-25313, CVE-2022-25314, CVE-2022-25315

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>

nfdump: update to 1.6.23

Signed-off-by: W. Michael Petullo <mike@flyn.org>
(cherry picked from commit a64e94bd462bc8d68a36b9a545b24852b294ec0e)

htpdate: drop freebsd.org from default server list

The FreeBSD project stopped publishing HTTP date headers and seeks to
limit further resource taxing by distributed htpdate clients using the
www.freebsd.org host as default time source.

Fixes: #17924
Reported-by: Allan Jude <allanjude@freebsd.org>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit e8713180026e0cf1c9d1421e3b664fee3fa4df12)

nano: update to 6.2

Update nano to 6.2.
Remove inactive second maintainer.

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

unbound: update to version 1.15.0

Refresh patch

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

yq: Update to 4.20.1

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

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

[21.02] php8: update to 8.0.16

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

[21.02] php7: update to 7.4.28

pcapplusplus: Add new package

PcapPlusPlus is a multiplatform C++ library for capturing, parsing and
crafting of network packets. It is designed to be efficient, powerful
and easy to use. It provides C++ wrappers for the most popular packet
processing engines such as libpcap, WinPcap, DPDK and PF_RING.

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

Merge pull request #17895 from jefferyto/slide-switch-0.9.7-openwrt-21.02

[openwrt-21.02] slide-switch: Update to 0.9.7

vnstat2: update to version 2.9

Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit 948f0d29ccd825f5370d87549f8977b851db756e)

vnstat2: add hotplug script for adding interfaces

If an interface doesn't exist yet when vnStat is started, it won't be
monitored, as only existing interfaces can be added to the database via
the vnstat command.

This adds a hotplug script which adds any configured interfaces to the
vnStat database when it goes up.

Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit f9ea8142601cee5542f9ba0f4e5a24e53ab59a6d)

vnstat2: fix all interfaces being monitored when none are configured

By default, vnstatd adds all available interfaces on startup when its
database is empty. The --noadd option prevents this, but it breaks
import of legacy databases, and causes vnstatd to exit immediately
after startup, which breaks reloading.

This changes the init script to add the --noadd option when no legacy
databases need to be imported, and patches vnstatd to keep running
even when no interfaces are configured.

Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit ecae7dedde0ccd2a636e93620ced41bca807d405)

vnstat2: update to version 2.8

Signed-off-by: Jan Hoffmann <jan@3e8.eu>
(cherry picked from commit 73fff7a4ed0687996cc43d7ad4878161b5bd21e5)

php7: update to 7.4.28

This fixes:
    - CVE-2021-21708

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

php8: update to 8.0.16

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

slide-switch: Update to 0.9.7

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

Merge pull request #17866 from neheb/1

[21.02] ksmbd: update to 3.44

golang: Update to 1.17.7, refresh patch

This includes fixes for:

* CVE-2022-23772: math/big: Rat.SetString may consume large amount of
  RAM and crash

* CVE-2022-23806: crypto/elliptic: IsOnCurve returns true for invalid
  field elements

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

tvheadend: fix first-run

The first-run command should create a new tvheadend configuration including an admin account with no name and no password, but it aborts (-A) too early without saving the files. I reported the bug here: https://tvheadend.org/issues/6140
This workaround fixes the problem by removing the tvheadend -A switch and replacing it with a 10s delay and a kill signal. That should be enough even for slow routers to generate and save the configuration. It is meant to be a temporary fix until tvheadend bug is resolved.

Signed-off-by: Marius Dinu <m95d+git@psihoexpert.ro>

ksmbd-tools: update to 3.4.4

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

ksmbd-tools: Fix ksmbd service is semi-killed at system startup

The configuration for the ksmbd service is auto-generated when
the OpenWRT configuration changes, and also during startup,
hence ksmbd.init has to reload the kernel module. It does that by
calling kill_server, which does not perform cleanup. This results
in ksmbd being killed but not restarted properly during boot.
This patch resolves the issue by using stop_service, which performs
proper cleanup.

https://forum.openwrt.org/t/ksmbd-samba3-4-alternative-ex-cifsd-smbd-package-support-thread/51695/68

Signed-off-by: Georgi Valkov <gvalkov@abv.bg>
(cherry picked from commit 4af04cdc05af1e78dab310550fae5bae21d51c8c)

ksmbd: update to 3.4.4

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

ksmbd: update to 3.4.2

Signed-off-by: Marcos Del Sol Vives <marcos@orca.pet>
(cherry picked from commit 2b48a6952a4d3283164b2e4df1bdfdc7e4c32fde)

ksmbd: update to 3.4.1

Add AUTORELEASE as 19.07 compatibility is not needed.

Add dependency hacks and add comments.

Add upstream patch to get rid of FS_POSIX_ACL requirement.

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

dockerd: Update to 20.10.12

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

docker: Update to 20.10.12

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

yq: Update to 4.19.1

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

dtc: drop package

It has been imported as core package into OpenWrt repository. Its fdtget
is required by sysupgrade on U-Boot devices so it couldn't live in an
extra feed.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit c8d4c89daae4c406f3744ca52c7451fe07c9a59e)

knot: update to 3.1.6

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

knot: update to 3.1.5

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

nano: update to 6.1

Update nano to version 6.1.

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

xray-core: Update to 1.5.3

Removed outdated `alterId` in sample config.

Updated geodata to latest version while at it.

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

ruby: update to 3.0.3

* fixes CVE-2021-41817, CVE-2021-41816 and CVE-2021-41819

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
(cherry picked from commit 51cf0dc2cc4b159bc80b70c90ed1c1abe1f59936)

Merge pull request #17812 from stangri/openwrt-21.02

[21.02] https-dns-proxy: init script refactoring

https-dns-proxy: init script refactoring

* consolidate dnsmasq config manipulation into one function
* more elegant code for PROCD data processing (Thanks @jow-!)

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

slide-switch: Update to 0.9.6

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

ffmpeg: update to version 4.3.3

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