Merge pull request #20034 from peter-stadler/openwrt-21.02

django: bump version 3.2.16

samba4: support both user map and valid users on same time

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit e04e523a01f5144a60541e6468a9f4451f26c8ab)

django: bump version 3.2.16

fix CVE-2022-41323

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>

Merge pull request #19997 from TDT-AG/pr/owrt-21.02-fix-libqmi-build

libqmi: fix build regressions

libqmi: bump to 1.30.8

Signed-off-by: Maxim Anisimov <maxim.anisimov.ua@gmail.com>
(cherry picked from commit 0b0d8163d53efdfd6abd7d9cbb57a770273c5319)

libqmi: bump to 1.30.6

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
(cherry picked from commit 45e8d072ee2d52b5d8f0b053d706ce6a2ae06aae)
(cherry picked from commit b8a8dd53c7996f289aefbcd4fb0d4747f7f8bb48)

libqmi: polish Makefile

PKG_VERSION replaced by PKG_SOURCE_VERSION.
Simplify for collection selection.
Removed unneeded python3/host dep.

Signed-off-by: Maxim Anisimov <maxim.anisimov.ua@gmail.com>
(cherry picked from commit ff5837ee8f483bb425d33b18c1185586507d495c)
(cherry picked from commit 94b824423bc0f668a2f607497d26cc00f47e521e)

libqmi: switch to meson build tools

Using https://gitlab.freedesktop.org/mobile-broadband/libqmi.git to download the source code.
Enabled lto and additional gcc flags for perfomance and less size.
Added support for selecting qmi message collection.
Selected basic qmi message collection by default (modemmanager requires it).
Modified to use meson as upstream has abandoned autotools.
Removed BUILD_PARALLEL options. These are default with ninja/meson.

Signed-off-by: Maxim Anisimov <maxim.anisimov.ua@gmail.com>
(cherry picked from commit f7cbd445408756b7a44764080063a9a4158988ed)
(cherry picked from commit 1683d7c96373948d4c25266f9aaedcf85f13695e)

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Update meson include dir for branch openwrt-21.02.

Revert "libqmi: bump to 1.30.8"

The libqmi version 1.30.8 uses meson. In order to cherry-pick the
last changes cleanly, this commit must first be reverted.

This reverts commit 0cccbcb0c76f2d2fe74fc0acae02c69aee0d8c52.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

lighttpd: lighttpd.conf vars, comments, guidance

lighttpd.conf variables, documentation comments, configuration guidance

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

lighttpd: print stderr trace if validation fails

lighttpd.init validate_conf(): print stderr trace if validation fails

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

v2raya: backports upstream fixes and add 3 new options

It may take a long time waiting for a new tag, so backport these
important bug fixes for now.

While at it, added 3 new options provided by upstream, and deprecated
the usage of `$(AUTORELEASE)`.

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

xray-core: Update to 1.6.5

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b3e453f33517747ef9fb48536cced4e42f7abc99)
[updated geodata, based on 664ecae4e63799]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

yq: Update to 4.30.5

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

uwsgi: bump version and use less workarounds

* adopt pypi name and line numbers in patches
* remove custom tar command and patch for using python3 (changed upstream)

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
(cherry picked from commit 545629e38601846b4b79bc3ac932355f0621d750)

librespeed-go: add new package

Go backend for LibreSpeed.

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

libmbim: switch to meson build tools

Using https://gitlab.freedesktop.org/mobile-broadband/libmbim.git to download the source code.
Enabled lto and additional gcc flags for perfomance and less size.
Modified to use meson as upstream has abandoned autotools.
Removed BUILD_PARALLEL options. These are default with ninja/meson.

Signed-off-by: Maxim Anisimov <maxim.anisimov.ua@gmail.com>
(cherry picked from commit fea19c23994dcc84332dfaeb9d585df46a847b10)

sqlite3: Update to 3.40.0

1. Added a new option for SQLITE3_COLUMN_METADATA.
2. Minor cleanup Makefile and fixed 2 typo errors.

Fixes: CVE-2022-35737
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit a4a0f0793bf7016d813b67a413ee4010917270c0)

sqlite: update to v3.37 (2021-11-27)

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

sqlite3: add option for batch-atomic write support

This allows to build SQLite with support for the batch-atomic write
optimization. It makes use of atomic write support provided by the
underlying file system. Currently, this is only supported on F2FS. It
it does not work with overlayfs.

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

libmbim: fix hash for 1.26.4 tarball

This corrects the hash by using sha256sum for downloaded tarball from
freedesktop. After that, package libmbim was successfully compiled.

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

xtables-addons: update to 3.21

updated to kernel 5.10.121+ changes

Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com>
(cherry picked from commit 69e4ed4b6f2e0fe33367ea13871d5ac227aaf922)

xtables-addons: update to 3.20

866bc7f Xtables-addons 3.20
aa70669 doc: move changelog to rST
d7de2a9 doc: remove old changelog entries
d7e49a8 build: bump supported kernel version to 5.17
966fa43 extensions: replace PDE_DATA

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

audit: remove host build

The audit package in the packages feed share the same sources as the
libaudit package in the base repo.  libaudit performs a host build, used
only by libsemanage in base.

There is no package depending on 'audit/host', so we can remove it to
avoid possible confusion.

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

audit: avoid interferece with base libaudit build

Both audit in the packages feed and libaudito from the base repo use the
same sources.

Have 'audit' use a different build directory than 'libaudit' package to
avoid interference between them.

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

libmbim: bump to 1.26.4

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
(cherry picked from commit 1d2ef5abbbdff8528ec225d4bc499643bc29ea12)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[only version bump]

unbound: update to 1.17.0

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
(cherry picked from commit 6bc0293a73f5a1d86a951ebd4c00cbc7b09e4529)
(cherry picked from commit 0de8e969e30db87d4af6bc2a67c59c0d8ed2378f)

unbound: update to version 1.16.3

Changelog: https://www.nlnetlabs.nl/projects/unbound/download/#unbound-1-16-3
- Fixes: CVE-2022-3204

Refreshed one patch

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

unbound: update to 1.16.2, fix CVE-2022-30698, CVE-2022-30699

Maintainer: @EricLuehrsen
Compile tested: x86/64
Run tested: x86/64
Description: Update to 1.16.2, fix CVE-2022-30698 and CVE-2022-30699.

Signed-off-by: Pascal Ernster <git@hardfalcon.net>
(cherry picked from commit 2179432991fd69ba790225c7959b080986ce363d)
(cherry picked from commit eaefde9a4a6aa649df6ea2152b09d641eca007c3)

unbound: update to 1.16.1

Maintainer: @EricLuehrsen
Compile tested: realtek/rtl838x, x86/64
Run tested: realtek/rtl838x, x86/64
Description: Update to 1.16.1

Signed-off-by: Pascal Ernster <git@hardfalcon.net>
(cherry picked from commit e702a6605805b1160341bfc949ec1de4687af06d)
(cherry picked from commit 2e878763dfb54ae9daba068a441e47c6b954d774)

ooniprobe: Update to 3.16.5

Fix build with Go 1.19.

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

librespeed-cli: rename binary to librespeed-cli

upstream names the binary librespeed-cli and this avoids a conflict with
python3-speedtest-cli

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

rclone: Update to 1.60.1

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

xray-core: Update to 1.6.4

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

librespeed-cli: add package

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

nextdns: initialize nextdns from /etc/uci-defaults

Signed-off-by: Marc Benoit <marcb62185@gmail.com>
(cherry picked from commit e54247a6fa9c03f286d38460c425d6dbd622b657)

nextdns: Update to version 1.38.0

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

nano: update to 7.0

Update nano to version 7.0.

Add a patch to fix the plus variant.
Upstream discussion and patch in
https://savannah.gnu.org/bugs/?63372

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

ariang: update to 1.3.2

Signed-off-by: van waholtz <brvphoenix@gmail.com>
(cherry picked from commit 99315b516f5cfcb6825ca4afdfd5ee14799ee370)

ariang: update to 1.2.4

Changelog: https://github.com/mayswind/AriaNg/releases

Signed-off-by: Van Waholtz <vanwaholtz@gmail.com>
(cherry picked from commit aee5b7db55c3eb7a84b4fc9e90994a1fdef8cd41)

ariang: update to 1.2.3

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

ariang: update to 1.2.2

Signed-off-by: Van Waholtz <vanwaholtz@gmail.com>
(cherry picked from commit ae09a31ffed9e2b5fa72b075d30455916eb82157)

ariang: update to 1.2.1

Use original main repo's releases instead

Signed-off-by: Van Waholtz <vanwaholtz@gmail.com>
(cherry picked from commit 3bcab30f2051720049d8c7605cc4288204bea472)

yq: Update to 4.30.4

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

Merge pull request #19914 from mhei/21.02-php8-update-8.0.25

[21.02] php8: update to 8.0.25

Merge pull request #19913 from mhei/21.02-php7-update-7.4.33

[21.02] php7: update to 7.4.33

Merge pull request #19648 from nemesisdesign/openwrt-21.02

[21.02] Backport fixes for modem-manager and its dependencies

php7: update to 7.4.33

This fixes:
    - CVE-2022-31630
    - CVE-2022-37454

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

php8: update to 8.0.25

This fixes:
    - CVE-2022-31630
    - CVE-2022-37454

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

zerotier: update to 1.10.2

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

zerotier: update to 1.10.1

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

zerotier: update to 1.8.9

Replace patch with Makefile options
to disable Rust components that
cannot be build with OpenWrt.

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

zerotier: fix segfault on ARM platforms

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

zerotier: update to 1.8.8

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

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>

yq: Update to 4.30.2

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

yq: Update to 4.30.1

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

treewide: fix procd service inactive

Exit directly will result procd service inactive and uci
configuration changes are no longer monitored.

Reported-by: Lvc Revincx <revincx233@gmail.com>
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit b1651c5d5444b990b58180a26d6e76779cbb88a9)

v2raya: Update to 1.5.9.1698.1

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

v2raya: Update to 1.5.8.1

1. Switched to use prebuilt web files to get rid of massive Node.js.
2. Increased nofile limitation to avoid "too many open files" error.

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

v2rayA: Update to 1.5.7

- Removed an upstreamed patch
- Move logs to /var/log in accordance with FHS 3.0

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

v2raya: fix panic in go 1.18

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

v2rayA: Update to 1.5.6.2

Manually added new env variable `XDG_DATA_HOME` which won't be passed
by procd by default.

Removed upstreamed patch.

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

v2raya: init: convert arguments into env variables

Suggested by upstream, to provide forward compatibility.

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

v2rayA: Update to 1.5.5

Breaking changes:
The database has been replaced with boltdb to try to solve the problem
of database corruption.

Note that the data will not be migrated, but the previous data will be
retained. If you need the previous data, just downgrade v2rayA (v1.5.4).

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

v2raya: Update to 1.5.4

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

v2raya: Update to 1.5.3

- Added missing conffiles
- Refreshed init srcipt to adapt the new arguments
- Renamed package name to lowercase (suggestion from upstream)
- Updated dependencies and license

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

v2rayA: Update to 1.5.2

Refreshed init script to adapt new arguments accepted by the program.

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

v2rayA: add new package

v2rayA is a Linux web GUI client of Project V which supports V2Ray,
Xray, Shadowsocks, ShadowsocksR, Trojan and Pingtunnel.

Wiki: https://github.com/v2rayA/v2rayA/wiki

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

xray-core: Update to 1.6.3

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 4194268e3f4c931e122dd66ca6196f6262f35c78)
[Update geodata to latest version, based on e5c3c3409]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

xray-core: Update to 1.6.2

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

xray-core: Update to 1.6.1

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

xray-core: Update to 1.6.0

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit a0126b15c58f7527ed21dbcb659d51072ad1f5fc)
[Update geodata to latest version, based on f8c25627ebe1d9]
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 05d1265cb7efc186ecc6b44232c6a4aca0ba0392)

xray-core: Update to 1.5.10

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

syncthing: Update to 1.19.2

Includes patch based on upstream change[1] to fix compilation with Go
1.18.

Fixes https://github.com/openwrt/packages/issues/18267.

[1]: https://github.com/syncthing/syncthing/commit/e30898ddb3e51225d4bda8661a1510c5cc9afe08

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

golang: update to version 1.18.8

Fixes following CVEs:
- CVE-2022-32189 (version 1.18.5 [1]]
- CVE-2022-27664 (version 1.18.6 [2])
- CVE-2022-32190 (version 1.18.6 [2])
- CVE-2022-2879 (version 1.18.7 [3])
- CVE-2022-2880 (version 1.18.7 [3])
- CVE-2022-41715 (version 1.18.7 [3])
- CVE-2022-41716 (version 1.18.8 [4])

and refreshed patch

[1] https://groups.google.com/g/golang-announce/c/YqYYG87xB10
[2] https://groups.google.com/g/golang-announce/c/x49AQzIVX-s
[3] https://groups.google.com/g/golang-announce/c/xtuG5faxtaU
[4] https://groups.google.com/g/golang-announce/c/mbHY1UY3BaM

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

ffmpeg: libffmpeg-full package should provide libffmpeg package, too

The previous solution overwrote the provide from ``define
Package/libffmpeg/Default``, but that's not what was wanted.
Thus libffmpeg-full should provide three packages libffmpeg,
libffmpeg-mini and libffmpeg-audio-dec

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

golang: Update to 1.18.4

Includes fixes for:

* CVE-2022-1705: net/http: improper sanitization of Transfer-Encoding
  header
* CVE-2022-1962: go/parser: stack exhaustion in all Parse* functions
* CVE-2022-28131: encoding/xml: stack exhaustion in Decoder.Skip
* CVE-2022-30630: io/fs: stack exhaustion in Glob
* CVE-2022-30631: compress/gzip: stack exhaustion in Reader.Read
* CVE-2022-30632: path/filepath: stack exhaustion in Glob
* CVE-2022-30633: encoding/xml: stack exhaustion in Unmarshal
* CVE-2022-30635: encoding/gob: stack exhaustion in Decoder.Decode
* CVE-2022-32148: net/http/httputil: NewSingleHostReverseProxy - omit
  X-Forwarded-For not working

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

golang: Update to 1.18.3

Includes fix for CVE-2022-30634 (crypto/rand: Read hangs when passed
buffer larger than 1<<32 - 1).

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

golang: Update to 1.18.2

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

golang: Update to 1.18.1

Includes fixes for:
* CVE-2022-24675 - encoding/pem: stack overflow
* CVE-2022-28327 - crypto/elliptic: generic P-256 panic when scalar has
  too many leading zeroes

This also adds -buildvcs=false to omit VCS information in Go programs.

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

golang: Update to 1.18, update patch

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

golang: update to version 1.17.13

Fixes:
CVE-2022-32189

Release notes:
https://groups.google.com/g/golang-announce/c/YqYYG87xB10?pli=1

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

tailscale: update to version 1.24.2

Signed-off-by: Magnus Kessler <Magnus.Kessler@gmx.net>
(cherry picked from commit b557e9f0d14e59435506fae0a31dfc908175dde4)

tailscale: update to 1.18.2

Signed-off-by: Wes Morgan <git@wesmorgan.me>
(cherry picked from commit efb908b032995d80edfeea500691a1e8a616166b)

pulseadio: fix conffiles for pulseadio-daemon-avahi package

Fixes: 60ac7dd751240fa096a85794023b18f26a8317da ("pulseaudio: simplify
and rework Makefile")

Reported-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 7ae66ec7cac3cbfc94fc30149418698f15406543)

pulseaudio: change homepage URLs to freedesktop.org

The previous used domain http(s)://pulseaudio.org redirects to
https://www.freedesktop.org/wiki/Software/PulseAudio/

This change enforces to use HTTPS everywhere for homepage URLs

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

pulseaudio: use AUTORELEASE variable

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

pulseaudio: daemons should conflict to each other

It should not be possible to install pulseaudio-daemon and
pulseadio-daemon-avahi at the same time as they have the same files.
Let's avoid that situation by adding conflict.

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

pulseaudio: simplify and rework Makefile

There were two conffiles sections and both of them were same, but for
different variants. We can have just one conffile section and use it also
for the other variant.

The same applies for the install section for different variants.
- We have two install sections, but we call the first one with the same
  files and then add something more for the second variant.

- While at it to make it easier, let's change those three rows for
  copying packages into the single one to make sure that I did not miss
anything. Also, we create a directory first and then move files.

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

mpd: depend the full variant on pulseaudio instead of pulseaudio-daemon

The full variant of mpd depends on pulseaudio-daemon, so it was not
possible to use the other pulseaudio variant with avahi.

Both pulseaudio daemons provides package pulseaudio, so users can choose
which variant suits them best.
Let's change the dependency to pulseaudio.

Fixes: #19187
Fixes: 2ed62adc5914 ("mpd: enable pulseaudio in full package")
Signed-off-by: Szabolcs Hubai <szab.hu@gmail.com>
(cherry picked from commit abe35e89f60efb99dee76c53a1ebdc2bd48f73a1)

rclone: Update to 1.60.0

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

yq: Update to 4.29.2

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

zabbix: add variants for SSL support
opkg does not offer ssl varients:
zabbix-agentd
zabbix-sender
zabbix-get
zabbix-proxy
zabbix-server

resolve this by adding ssl varients.

Signed-off-by: Scott Roberts <ttocsr@gmail.com>
(cherry picked from commit cd48d03f01917af2fd525955b6fd8b8498ad3d6f)
(cherry picked from commit e0502e477c88f5430ea6277780354a2cdda2ebee)

coova-chili: fix compilation with kernel 5.10

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

ptunnel-ng: fix compilation with kernel 5.15

Some header change requires to include musl's headers first.

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

libpfring: update to 8.0.0

Fixes compilation with kernel 5.15

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

coova-chilli: update to 1.6

Remove usptreamed patches.

Switch to AUTORELEASE for simplicity.

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

xtables-addons: update to 3.19

Fixes compilation with kernel 5.15.

Fixed changed binary name.

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

ffmpeg: add conflicts and provides

Motivation of this change is that full variants provides the mini
variant and as well audio-dec package, thus you can not install both as
it fails with the following output:

Collected errors:
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavcodec.so.58
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavcodec.so.58.91.100
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavdevice.so.58
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavdevice.so.58.10.100
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavformat.so.58
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavformat.so.58.45.100
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavutil.so.56
But that file is already provided by package  * libffmpeg-full
 * check_data_file_clashes: Package libffmpeg-audio-dec wants to install file /usr/lib/libavutil.so.56.51.100
But that file is already provided by package  * libffmpeg-full
 * opkg_install_cmd: Cannot install package libffmpeg-audio-dec.

Let's change it to:
Installing libffmpeg-audio-dec (4.3.4-1) to root...
Collected errors:
 * check_conflicts_for: The following packages conflict with libffmpeg-audio-dec:
 * check_conflicts_for:         libffmpeg-full *
 * opkg_install_cmd: Cannot install package libffmpeg-audio-dec.

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