nnn: update to version 3.6

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

syslog-ng: update to version 3.31.2

Bump config file

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

gitlab-runner: update to version 13.10.0

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

gitlab-runner: update to 13.9.0

Remove no MIPS depends as it supports MIPS now.

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

gnutls: update to version 3.7.1

Fixes
CVE-2021-20231
CVE-2021-20232

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

libmariadb: add dependency on libcurl

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 5b2d35a8d005faa5c2ea6fd457fcb57141463eeb)

libqmi: bump to 1.28.2

Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
(cherry picked from commit 570ff69ec63c737cd0f6049e476042df423fa65e)

libqrtr-glib: add libqrtr-glib

Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
(cherry picked from commit cfe24305de3d00916fd7deac8a93fb719cdd4df4)

libqmi: bump to 1.28.0

Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
(cherry picked from commit c9709a3c82b963e2b882b3a0c2c44bd7e9f8ae23)

modemmanager: bump to 1.16.2

Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
(cherry picked from commit 02d8bbcfe0a76a375657ce4042586d09c94ea03a)

modemmanager: bump to version 1.16.0

Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
(cherry picked from commit 54a9b58ffd549bc271881a81a773be4e5c1a62d5)

banip: update to 0.7.5-4

* fix another IPv4/IPv6 related iptables chain creation problem
* fix counter during ipset creation
* fix regex for debug counters
* fix ipset housekeeping for local sources

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

https-dns-proxy: bugfix: correct PROCD firewall object

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

adblock: update 4.1.0-3

* add a restrictive "jail mode only" variant, just point your
  jail directory to your primary dns directory
* update readme

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

Merge pull request #15220 from stangri/21.02-https-dns-proxy

[21.02] https-dns-proxy: support for additional Force DNS ports

Merge pull request #15227 from cotequeiroz/pic_quote-21.02

[21.02] Cherry-picks from PRs dealing with $(FPIC) quoting

nss: fix compilation with QUILT

Commit 657574f45 disabled building the host nsinstall program when using
QUILT.  However, the host nsinstall is needed to compile the package,
breaking compilation with QUILT.

Move the native compile to Build/Configure, which will not be called for
prepare, refresh, or update targets, but will be called before
Build/Compile.

nss does not have a configure script, so Build/Configure/Default is not
being called.

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

nss: quote $(FPIC), as it may have multiple flags

FPIC may be defined with more than one flag.  In that case, it becomes
necessary to use it inside QUOTES in a shell context.

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

treewide: fix places where $(FPIC) is unquoted

Fixes part of issue #14921.

When $(FPIC) gets added to TARGET_CFLAGS (for instance), we can
count on $(TARGET_CFLAGS) in turn being quoted when it gets
expanded.  But there are a few places where $(FPIC) gets
expanded directly into environment variables passed on the
command line, such as when setting lt_cv_* variables as in this
case.

It's wrong to assume that the expansion of $(FPIC) won't require
quoting (such as it containing spaces) if it has multiple compiler
flags.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 0d5c6769f15f15ce950d2b41dce3341b5c160c36)

Merge pull request #15158 from TDT-AG/pr/20210218-openwrt-21.02-watchcat

watchcat: update to support procd

https-dns-proxy: support for additional Force DNS ports

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

tinc: new maintainer

Signed-off-by: Erwan MAS <erwan@mas.nom.fr>

tinc: fix missing HASH

Signed-off-by: Erwan MAS <erwan@mas.nom.fr>

tinc: Bump to version 1.1 commit 3ee0d5dd

Signed-off-by: Erwan MAS <erwan@mas.nom.fr>

Merge pull request #15164 from gladiac1337/haproxy-2.2.11-21.02

[openwrt-21.02] haproxy: Update HAProxy to v2.2.11

banip: update 0.7.5-3

* fix iptables/chain creation in setups without IPv6 support

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

haproxy: Update HAProxy to v2.2.11

- Update haproxy download URL and hash

Signed-off-by: Christian Lachner <gladiac@gmail.com>

tmate: add new package

Tmate is a fork of tmux. It provides an instant pairing solution.
For more details, see https://tmate.io.

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

msgpack-c: add new package

This is needed by tmate.

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

watchcat: update to support procd

Signed-off-by: Nicholas Smith <nicholas@nbembedded.com>
(cherry picked from commit 399279b363b23a541753e69a89c2a68b4e04a3fe)

auc: bump to version 0.1.6

Fixes running on release branches.

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

auc: sync with development branch

 * update to new server API
 * include version_code in request
 * include versions of selected packages in request
 * add SHA256 verification via busybox sha256sum
 * sort attributes in policies alphabetically
 * move all API-specific string constants to precompiler macros
 * set correct MIME type for JSON post request (application/json)
 * output string error message if something goes wrong
 * auto-generate version string

(cherry squashed from commit 85ba80592ba67d4b47d914416ecec1f764dbc64b,
commit 985b0f8f637eb2d5a4ad21d90d288f13c4109313 and
commit fb26b424e8efbc47f768d41b671702e420ce3c59)
Signed-off-by: Daniel Golle <daniel@makrotopia.org>

tor: update to version 0.4.5.7

Fixes CVE-2021-28089 and CVE-2021-28090

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>

mwan3: add connecting and disconnecting event to mwan3track

If the interface goes into failure state (is disconnecting)
then with this change one hotplug.d event is generated.

The same is true for the recovery state (is connecting), when the interface
comes back from a failure state.

In both cases, a hotplug.d event for the iface is triggered. Once
with the $ACTION=disconnecting and once for the $ACTION=connecting.

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

banip: update to 0.7.5-2

* refine the new dns resolving process
* add a caching mechanism for the resolved IPs, the detached name
  lookup takes place only during 'restart' or 'reload' action, 'start'
  and 'refresh' actions are using an auto-generated backup instead.
* update the readme

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

lang/lua-libmodbus: bump to 0.7 release

Includes fixes for OpenWrt's Lnum patched lua.
Release notes at: https://github.com/etactica/lua-libmodbus/blob/v0.7/changelog

Signed-off-by: Karl Palsson <karlp@etactica.com>

net/mosquitto: Update to 2.0.9

This is a bugfix release, with minor security fixes for outgoing bridge
connections and the client library.

Full details here: https://mosquitto.org/blog/2021/03/version-2-0-9-released/

Signed-off-by: Karl Palsson <karlp@etactica.com>

gerbera: update to 1.7.0

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 be54cf98eb73f355d0e74ea1f7626bd07544805c)

libnpupnp: update to 4.1.1

Switch to AUTORELEASE for simplicity.

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

pugixml: update to 1.11.4

Switch to AUTORELEASE for simplicity.

Switch to ninja for faster compilation.

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

taglib: update to 1.12-beta-2

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 c94614841fa3e90a47fff97ccfef979ff0836991)

libmatroska: update to 1.6.3

Switch to AUTORELEASE for simplicity.

Switch to ninja for faster compilation.

Remove LTO as it's broken on this package.

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

libebml: update to 1.4.2

Switch to AUTORELEASE for simplicity.

Switch to ninja for faster compilation.

Remove LTO as it's broken on this package.

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

Merge pull request #15123 from 1715173329/21.02-xray-update

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

xray-core: Update to 1.4.0

- Re-assigned myself as the maintainer
- Updated geodata to latest version

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(backported from a28580a53087935677452be866bce66da055dc89)

Merge pull request #15085 from cotequeiroz/pigeonhole-21.02

[21.02] pigeonhole: cherry-pick bumps to 0.5.14 from master

banip: bump to 0.7.5

* black- and whitelist now supporting domain names as well - the
corresponding IPs (IPv4 & IPv6) will be resolved in a detached
background process and added to the IPsets

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

Merge pull request #15113 from G-M0N3Y-2503/docker-20.10.5

docker,dockerd: Updated to 20.10.5

docker,dockerd: Updated to 20.10.5

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

haproxy: Update HAProxy to v2.2.10

- Update haproxy download URL and hash

Signed-off-by: Christian Lachner <gladiac@gmail.com>

ksmbd-tools: update to 3.3.7

Major change are:

ksmbd.control -s terminate ksmbd.mountd as well as kernel server.
Update configuration.txt and README.
Turn off smb2 leases by default again.

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

ksmbd: update to 3.3.7

Major change are:

Fix an issue that directories appear as files when using windows
backup.
Fix xfstests generic/241 failure on life test.
Update ksmbd shutdown and debug print on/off using ksmbd.control in
cifsd.rst.

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

ksmbd-tools: update to 3.3.6

Major changes are:

Add missing g_rwlock_init() for rpc_samr and rpc_lsaprc.
Fix potential potential null pointer dereferencing error.
Fix memleak.

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

ksmbd-tools: update to 3.3.5

Major changes for version 3.3.5 are:
- Rename "streams" parameter to "vfs objects = streams_xattr".
- Enable smb2 leases by default.
- Ignore ksmbd.subauth creation failure.
- Fix bugs that related to guest ok = yes.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
(cherry picked from commit 58f91090f598892d12f435e02e09f3b37fd059d3)

ksmbd: update to 3.3.6

Major changes are:

Fix kernel oops from fuse+ntfs driver.
Fix the issue of change the directory to the file using Nautilus
client.
Fix ksmbd build break with the latest linux-5.12-rc1.
Fix potential memleak and use after free.
Fix use after free from KASAN(racy issue)

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

ksmbd: update to 3.3.5

Major changes for version 3.3.5 are:
- Add support for version 4 dos attribute structure of samba.
- Implement maximal allowed desired access.
- Fix several error handling.
- Fix a few smbtorture failures.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
(cherry picked from commit 71aef26ecb99f2cb086e74ecfd08cdd5b8244535)

syncthing: update to 1.14.0

https://github.com/syncthing/syncthing/releases/tag/v1.14.0

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

pigeonhole: bump to 0.5.14

ChangeLog:
 - IMAP FILTER command: cmd-filter-sieve - Do not allow NIL as script
   name argument.

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

pigeonhole: update to 0.5.13

Switch to AUTORELEASE for simplicity.

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

adblock: small update

* add adguard_tracking source (list with cname trackers)
* optimize/sort output of active sources in status
* optimize log output in EMails

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

Merge pull request #15064 from mhei/21.02-php8

[21.02] php8: backport fixes and update from master

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

[21.02] php7: update to 7.4.16

Merge pull request #15053 from stangri/21.02-vpn-policy-routing

[21.02] vpn-policy-routing: better processing of custom user files

php8: update to 8.0.3

Also update opcache compile fix patch.

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

php8: fix pecl build with QUILT

This is d4979cff0 ported to php8.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit db3389edc285d4ba7a23a2bd212d8af5db596dd4)

php8: fix build with QUILT

This is d4979cff0 ported to php8.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 8c6d7dc37c139178a60197834bbab20df265dc33)

Merge pull request #15051 from stangri/21.02-simple-adblock

[21.02] simple-adblock: update to 1.8.5-1

vpn-policy-routing: better processing of custom user files

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

simple-adblock: update to 1.8.5-1

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

php7: update to 7.4.16

Also refresh patch.

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

i2pd: fix startup

i2pd reports:
missing/unreadable config file: /etc/i2pd/i2pd.conf

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

python-aiohttp: update to version 3.7.4

Note:
Fixes CVE-2021-21330
Add new required dependecy python3-typing-extensions

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

python-typing-extensions: add new package

Note:
Dependency for python3-aiohttp

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

hs20: fix linking with full language support enabled

After d18692c, we need to include nls.mk to setup correct
environment variables so that linking succeeds.

Reported-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 3b177a9d6056af61ec7bf5db81382003965767d4)

aria2: fix linking with full language support enabled

After d18692c, we need to include nls.mk to setup correct
environment variables so that linking succeeds.

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

reptyr: do not build on mips64

mips of any kind is not supported.

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

nano: update to 5.6.1

Update nano editor to version 5.6.1

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

Merge pull request #14993 from 1715173329/2102-newyq

[openwrt-21.02] yq: Update to 4.6.1

Merge pull request #14995 from 1715173329/2102-xr-go1.16

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

Merge pull request #14908 from jefferyto/python-3.9.2-openwrt-21.02

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

python3: Update to 3.9.2, refresh patches

Includes fixes for:
* CVE-2021-3177 - ctypes: Buffer overflow in PyCArg_repr
* CVE-2021-23336 - urllib parse_qsl(): Web cache poisoning - semicolon
  as a query args separator

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

xray-core: Update to 1.3.1

- updated geodata to latest version
- updated project url

Fixes: #14972
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(backported from 264ce0d0eeda2f99722de9e9e41039b1016fd8b4)

yq: Update to 4.6.1

Fixed performance issue.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(backported from 32515ced93d5dbf99588b1714b70bc4cf3e8af57)

Merge pull request #14990 from G-M0N3Y-2503/dockerd-20.10.4

docker,dockerd,runc: Docker 20.10.4 Update

Merge pull request #14989 from stangri/21.02-vpn-policy-routing

[21.02] vpn-policy-routing: update to 0.3.2-18

knot-resolver: update to version 5.3.0

Changes:
- remove arch limit
- add libnghttpd2 dependency

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

docker,dockerd: Updated to 20.10.4

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

runc: Updated to 1.0.0-rc93

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

Merge pull request #14976 from G-M0N3Y-2503/dockerd-ipv6-config-bridge

dockerd: ipv6 bridge config

syncthing: update to 1.13.1

Also start using $(AUTORELEASE)

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

CI: fix handling of release branches

The "changed package" logic triggers all packages changed since
`origin/master` while for releases branches all changes since e.g.
`origin/openwrt-21.02` should be considered.

First figure out the active branch, then find changed packages.

Signed-off-by: Paul Spooren <mail@aparcar.org>

vpn-policy-routing: update to 0.3.2-18

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

mwan3: disable DNS lookups for ping checks

By default, ping does a reverse DNS of the IP that you are pinging.
When you have a network issue (such as when a link has just gone down
and you haven't yet marked it down), this lookup can cause failures on
tests for links that are still good.

This option only works for iputils ping.
For busybox the option is not evaluated, but it is accepted without
throwing an error.

Fixes: #14968
Fixes: #14924
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Suggested-by: David Lang <david@lang.hm>
(cherry picked from commit 7cfb282432dad52aca0c2c578b43a99da4f8522a)

dockerd: package release bump

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

dockerd: Added options to setup a dualstack default bridge
* Added IPv6 Support

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

CI: enhance package detection logic

Signed-off-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com>
(cherry picked from commit a2b08b5cbfb655d853a92f845d7e93e6b4031456)

Merge pull request #14946 from G-M0N3Y-2503/docker-20.10.3

docker,dockerd: Updated to 20.10.3

Merge pull request #14963 from EricLuehrsen/unbound_1131_2102

[openwrt-21.02] unbound: update to 1.13.1

unbound: update to 1.13.1

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

safe-search: fix typos in package scripting

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 8d09fc0cfbe126ce3e7123d011c9597e1fae795c)