conmon: update to 2.0.26

Switched to building with meson as it works better in a parallel
context.

Small Makefile adjustments for consistency.

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

cni-plugins: update to version 1.0.1

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

cni-plugins: update to version 1.0.0

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

cni-plugins: depend on kmod-veth

cni-plugins makes use of veth, make sure kernel module is installed.

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

cni-plugins: update to version 0.9.1

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

cni: update to version 1.0.1

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

cni: update to 0.8.1

This is a security release that fixes a single bug:
 - tighten up plugin-finding logic (#811)

Users of libcni are strongly encouraged to update.

Added me to list of maintainers as requested by @dangowrt.

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

libinput: update to version 1.19.2

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

libinput: update to version 1.19.1

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

libinput: package libinput cli applets and quriks

Also package /usr/libexec/libinput/* and /usr/share/lib/input/*.

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

libinput: update to version 1.18.0

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

libinput: update to version 1.17.1

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

libevdev: update to version 1.12.0

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

libextractor: update to version 1.11

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

pyodbc: update to version 4.0.32

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

pyodbc: update hash

This package was updated without a hash change.

Fixes: c1575225807cab ("pyodbc: update to version 4.0.31")
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b783386890ac6d861adc181306c19a9ff2104632)

pyodbc: update to version 4.0.31

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

Werkzeug: update to version 2.0.2

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

Jinja2: update to version 3.0.3

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

click: update to version 8.0.3

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

perl-mail-spamassassin: update to version 3.4.6

Fixes CVE-2020-1946

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

perl-mail-spamassassin: fix compilation without deprecated OpenSSL APIs

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

perl-net-dns: update to version 1.32

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

perl-net-dns: update to version 1.30

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

opentracker: update to git HEAD of 2021-08-23

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

opentracker: update to git HEAD

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

opentracker: update to git HEAD

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

libksba: update to version 1.6.0

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

libksba: update to version 1.5.1

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

libassuan: update to version 2.5.5

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

libgpg-error: patch to fix cross-compile

Paul Blazejowski discovered that the recent update to this package broke
cross-compiling for some OpenWrt platforms. This backports commit 33593864
(March 26, 2021) from the upstream libgpg-error project to fix this
problem.

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

libgpg-error: update to 1.42

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

i2c-tools: update to version 4.3

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

hiredis: update to version 1.0.2

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

hiredis: fix compilation with macOS

uname is used to test the host OS. Override it.

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

gawk: update to version 5.1.1

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

ccid: update to version 1.4.36

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

ccid: fix compilation under macOS

Remove a bad uname check.

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

ccid: update to version 1.4.35

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

ccid: update to version 1.4.34

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

cryptsetup: update to version 2.4.1

Package new experimental SSH token authenticator plugin as new package
'cryptsetup-ssh'.

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

cryptsetup: update to version 2.3.6

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 2bff0b47aa5c878513b8389538bb0d3fab60e1b6)

cryptsetup: update to version 2.3.5

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

opensc: update to version 0.22.0

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

opensc: update to version 0.21.0

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

pcsc-lite: update to version 1.9.4

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

pcsc-lite: update to version 1.9.1

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

postgresql: update to version 13.5

Addresses CVE-2021-3393 and CVE-2021-20229.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

lvm2: update to version 2.03.14

Drop two local patches which were replaced by upstream commits.

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

lvm2: update to version 2.03.13

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

lvm2: add hotplug script to scan and enable PVs on hotplug

Automatically scan and activate physical volumes when added at runtime.

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

lvm2: update to version 2.03.12

Two notable changes are devices file and metadata based autoactivation.

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

lvm2: don't use `-normal` suffix for non-SELinux variants

This was probably a work-around for an issue with dependencies which
was fixed by
https://github.com/openwrt/openwrt/commit/988ed0080284903d1fe4851c5ae8f1238bc61da2

Remove it as all other packages with `-selinux` variants do provide
a non-SELinux-variant without any suffix and that works now, see
procd vs. procd-selinux
busybox vs. busybox-selinux

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

libudev-zero: update to version 1.0.0

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

libudev-zero: update to version 0.5.2

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

libudev-zero: update to version 0.4.8

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

Merge pull request #17113 from paper42/cve-2019-19906-21

[21.02] cyrus-sasl: patch CVE-2019-19906

php8: Clean up and update distributed php.ini for php 8.0.12

Details:
- Cleaned up whitespace and removed comments (refer to official PHP documentation for that)
- Removed directives that no longer exist as of PHP 8.0.12
- Added newly existing directives commented out
- Added '~E_DEPRECATED' to 'error_reporting'

Signed-off-by: Giovanni Giacobbi <giovanni@giacobbi.net>
(cherry picked from commit f54b987c8f1bbc8b908f14d7616dd417d18cc887)
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

cyrus-sasl: patch CVE-2019-19906

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

Merge pull request #17111 from thg2k/pr/21_php74_ini_1

[21.02] php7: Update and clean up distributed php7.ini

dockerd: Update to 20.10.10

Signed-off-by: Ren Zongjia <acooler15@foxmail.com>

docker: Update to 20.10.10

Signed-off-by: Ren Zongjia <acooler15@foxmail.com>

containerd: Update to 1.4.11

Signed-off-by: Ren Zongjia <acooler15@foxmail.com>

runc: Update to 1.0.2

Signed-off-by: Ren Zongjia <acooler15@foxmail.com>

php7: Clean up and update distributed php.ini for php 7.4.25

Details:
- Cleaned up whitespace and removed comments (refer to official PHP documentation for that)
- Removed directives that no longer exist as of PHP 7.4.25
- Added '~E_DEPRECATED' to 'error_reporting'

Directives removed that no longer exist as of PHP 7.4.25:
- zend.ze1_compatibility_mode
- y2k_compliance
- register_globals
- register_long_arrays
- magic_quotes_gpc
- magic_quotes_runtime
- magic_quotes_sybase
- always_populate_raw_post_data

Signed-off-by: Giovanni Giacobbi <giovanni@giacobbi.net>

nano: enable showing line numbers with M-N (Alt-n)

Backport new upstream patch to enable toggling the display of
the line numbers with the shortcut key M-N (Alt-n).

Also the cmdline option "-l" works.

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

Merge pull request #17099 from mhei/php7-pecl-updates

[21.02] Pull latest php7 pecl package updates from master

nano: enable line numbers (from cmdline)

Enable showing line numbers, which makes it easier to find
the correct place in long files. Due to the "tiny" build,
the functionality is only available from cmdline with "-l"
option.
For example:  nano -l /etc/banner

Key shortcut M-n is disabled due to "tiny".
See https://savannah.gnu.org/bugs/?61441 for explanation.

Also
* remove without-slang config option, deprecated in Dec 2020
* adopt AUTORELEASE

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

mosquitto: bump to 2.0.13

Security and bugfix releases.

Changelogs:
https://mosquitto.org/blog/2021/10/version-2-0-13-released/
https://mosquitto.org/blog/2021/08/version-2-0-12-released/

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

php7-pecl-redis: update to 5.3.4

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

php7-pecl-imagick: update to 3.5.1

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

php7-pecl-http: update to version 3.2.4

This is the latest version, which still has support for PHP 7.x.

It's an intermediate step in the transition to PHP 8.x.

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

Merge pull request #17052 from mhei/21.01-php8-icu-compat

[21.02] php8: Support for icu 70.1

Merge pull request #17053 from mhei/21.01-php7-icu-compat

[21.02] php7: Support for icu 70.1

xray-core: remove dead jail files

It never works... And Xray-core needs root access to work.

Bump geodata to latest version while at it.

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

afuse: Add new package

This commit add new package afuse into packages feed.

afuse is an automounting file system implemented in user-space using
FUSE. It implements the most basic functionality that can be expected by
an automounter; that is it manages a directory of virtual directories.
If one of these virtual directories is accessed and is not already
automounted, afuse will attempt to mount a filesystem onto that
directory. If the mount succeeds the requested access proceeds as
normal, otherwise it will fail with an error.

Signed-off-by: Michal Hrusecky <michal@hrusecky.net>
(cherry picked from commit 3d0f73ea676b7e1e0bb1184f9f1e0d1b7f18a3fe)

Merge pull request #17017 from miska/mariadb-21.02

mariadb: Update to version 10.4.21

php7: Support for icu 70.1

This PR prepares PHP for a few minor changes that cause PHP builds to fail when using --enable-intl with ICU 70.1.

Change UBool to bool for equality operators in ICU >= 70.1

https://github.com/php/php-src/pull/7596

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit bc13112a7c180dfad51db065c74438017fc8a8c7)

php8: Support for icu 70.1

This PR prepares PHP for a few minor changes that cause PHP builds to fail when using --enable-intl with ICU 70.1.

Change UBool to bool for equality operators in ICU >= 70.1

https://github.com/php/php-src/pull/7596

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 4da149b68a10e121eb0ef5c19d2d18020828ec24)

tvheadend: add patch to update hdhomerun

Tarball with libhdhomerun_20171221 [1] was removed from upstream repository
and as it can not be found.

[1] http://download.silicondust.com/hdhomerun/libhdhomerun_20171221.tgz

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

rclone-ng: initial package

Signed-off-by: Elon Huang <elonh@immortalwrt.org>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 9b7e817f93720dbfb3e02229d9ad6e2f3fbd8f43)

rclone-webui-react: initial package

Signed-off-by: Elon Huang <elonh@immortalwrt.org>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 5204e148b337cc835a96999a9921046cb07289c5)

rclone: add test script

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

rclone: fix logic err in service file

- Corrected `enable` detection.
- Granted config/log write permission for `rclone` user.

Fixes: d51823988847fc ("rclone: initial package")
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 00747f7b97e68df3a475601606e7e403551d36d8)

rclone: initial package

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

yq: Update to 4.14.1

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

mariadb: Update to version 10.4.21

Update to the latest stable version. Also contains minor Makefile
polishing - better source RL and correctly formatted license.

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>

lighttpd: update to lighttpd 1.4.61 release hash

also remove patches incorporated upstream into lighttpd 1.4.61

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
(cherry picked from commit 9786df13a82e58e36d4730e209ea6849fa27a113)

lighttpd: update to lighttpd 1.4.60 release hash

also remove patches incorporated upstream into lighttpd 1.4.60

Signed-off-by: Glenn Strauss <gstrauss@gluelogic.com>
(cherry picked from commit 07446a73cabefb9f0afeb3c2fcf3d4159be68191)

bind: Bump to 9.17.19

The following CVE updates are included:

* CVE-2021-25219: The "lame-ttl" option is now forcibly set to 0. This
  effectively disables the lame server cache, as it could previously be
  abused by an attacker to significantly degrade resolver performance.

* CVE-2021-25218: An assertion failure occurred when named attempted
  to send a UDP packet that exceeded the MTU size, if Response Rate
  Limiting (RRL) was enabled.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Noah Meyerhans <frodo@morgul.net>
(cherry-picked from commit c2de702cbdb0034a84550589195fe95df25572b9)

nginx: fix compilation with BUILD_NLS

Requires nls.mk because of libxml2.

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

generate-ipv6-address: fix PIC compilation

This is a single C file. Don't bother using the Makefile.

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

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

[21.02] php8: update to 8.0.12

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

[21.02] php7: update to 7.4.25

php7: update to 7.4.25

This fixes:
    - CVE-2021-21703

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

php8: update to 8.0.12

This fixes:
    - CVE-2021-21703

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

dawn: set symm_enc default to 0

User mpeleshenko reported that symm encryption breaks hearing map.
Set the default to 0.

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

mariadb: update to 10.4.18

Remove uClibc depends. It's gone now.

Remove CMAKE_INSTALL to avoid installing to InstallDev.

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

python-websockets: new package

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

atlas-probe: allow parallel build

Set PKG_BUILD_PARALLEL:=1

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