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)

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)

utils/findutils: update to 4.8.0

* utils/findutils/Makefile (PKG_VERSION): Update to latest.
(PKG_RELEASE): Reset to 1.
(PKG_HASH): Update.

Signed-off-by: Bernhard Voelker <mail@bernhard-voelker.de>
(cherry picked from commit 3614a520d22f48b753460f5d6ca25e89e5300c21)

static-neighbor-reports: add missing Lua dependency

Add a missing dependency on Lua. Otherwise the script installing the
neighbor report can't be executed in case Lua is not installed on the
system.

Signed-off-by: David Bauer <mail@david-bauer.net>
(cherry picked from commit 83d572af980db83f91851327dc0e0ed07383f5c8)

vim: fix compile with BUILD_NLS

Avoids having to use msgfmt, which happens to be broken with gettext-full.

msgfmt is used for the desktop gvim application, which is not used here.

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

docker,dockerd: Updated to 20.10.3

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

docker,dockerd: Added git-short-commit to verify short commit

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

Merge pull request #14937 from nxhack/2102_add_node-yarn

[21.02] node-yarn: add new package - for building adguardhome

Merge pull request #14935 from G-M0N3Y-2503/dockerd-use-host-dns

dockerd: Added option to configrue docker to use host Dnsmasq for DNS

dockerd: Package release bump

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

dockerd: set docker zone chain defaults to ACCEPT
* Since the docker0 is a private network by default we can be
  more accepting like the LAN is by default

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

dockerd: Added option to set dns servers
* The default server is the default switch so that
  queries will go through the hosts dnsmasq by default

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

Merge pull request #14839 from G-M0N3Y-2503/dockerd-maintainence-backport

dockerd: misc maintainence

Merge pull request #14920 from luizluca/21.02/sane-backends-1.0.32

[21.02] sane backends 1.0.32

adblock: update 4.1.0

* major source changes:
  * split oisd.nl in basic and full variant
  * add swedish regional list
  * made archive categories for shallalist and utcapitole selectable
    via LuCI
  * made all list variants of energized and stevenblack selectable
    via LuCI
* removed dns filereset mode

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

travelmate: update to 2.0.3

* refine the wifi reconfigure logic

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

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

[21.02] vpn-policy-routing: bugfix: netflix user file missing redirect

dockerd: Package release bump

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

dockerd: Added iptables wait to ensure rules are added

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

dockerd: Made blocked_interfaces ip rule REJECT
* Changed from DROP to REJECT to be consistant with other firewall rules

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

dockerd: made registry_mirrors and hosts omittable
* Moved logic out of config writing
* Made default config only specify OpenWrt dictated defaults
  Otherwise, docker defaults can be assumed

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

dockerd: Normalized config quotation marks

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

vpn-policy-routing: bugfix: netflix user file missing redirect

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

sane-backends: update to 1.0.32

Dropped patches:
-102-pixma_Restore_old_behaviour_in_case_XML_support_is_missing.patch (merged)
-101-fix_uclibc_std_rand.patch std::round was unavailable because of a wrong configure
 var from the uClibc days. Fixed upstream with 1647790ae6202bd70b199e2aa44f8eb43e8d3af1

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(cherry picked from commit bf1a138f9276718a76589b3b170648d85bbb8c0b)
(cherry picked from commit 49e75e810585a1e173e74fe3b7154a65835675c7)

libv4l: fix glibc compilation

There was a typo in the linker flags.

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

php7: fix build with QUILT

When building with QUILT, unlike the regular build, Build/Prepare does
not apply the patches.  So when buildconf is called with QUILT on, at
the end of Build/Prepare, it will not have the patched sources, and
build will fail.

To fix the problem, run buildconf in Build/Prepare only when QUILT is
off, and do it in Build/Configure otherwise.

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

php7: fix pecl build with QUILT

Commit d741a64b7 ("lang/php7: Don't run phpize7 with QUILT") changed
pecl.mk to not run phpize7 during Package/prepare if QUILT is set.  The
intention was to allow prepare, refresh and update targets to run
without building dependencies.

As a side-effect, Package/configure and Package/compile fail when QUILT
is defined because they can't find ./configure or a Makefile.  It also
impacts the github tests run with pull requests, because QUILT is
defined there.

To avoid that failure and still keep the prepare, refresh, and update
speedup, call phpize7 before Package/Configure if QUILT is defined.

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