syncthing: update to 1.22.1

Signed-off-by: Van Waholtz <brvphoenix@gmail.com>
(cherry picked from commit 4d5c427922fa59e078bbd5f3f55346e569de49a2)

syncthing: update to 1.20.1

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

syncthing: add stdiscosrv and strelaysrv

Signed-off-by: Van Waholtz <brvphoenix@gmail.com>
(cherry picked from commit 9d17ba1a9387efdc08e236d4eaa937eb103472f4)

tvheadend: update to git master 2022-11-20

- EPG database switched from v2 to v3. This commit updates OpenWrt init script to use the new database file.
- EPG database symlink created by OpenWrt config option is overwritten with a real file by tvheadend.
  The latest tvheadend commit included here fixes that.

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

knot: update to version 3.2.3

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

cloudflared: Update to 2022.11.0

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

Merge pull request #19957 from stangri/openwrt-22.03-https-dns-proxy

[22.03] https-dns-proxy: update Makefile package descrition

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)

unbound: update to 1.17.0

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

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)

gg: Update to 0.2.15

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

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)

https-dns-proxy: update Makefile package descrition

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

xray-core: Update to 1.6.4

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

nextdns: Update to version 1.38.0

Signed-off-by: Olivier Poitrey <rs@nextdns.io>
(cherry picked from commit 1acf423ef5891eb88c8e2bbdf8dad7896b8db398)

Merge pull request #19901 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: update to 1.9.3-1

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)

bcp38: migrate to nftables

Signed-off-by: Stefan Brusch <ne20002@gmx.ch>
(cherry picked from commit 471ffdd98c3a543e4935c3e76ac19301ac16c52d)

yq: Update to 4.30.4

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

frp: update to 0.45.0

Signed-off-by: van waholtz <brvphoenix@gmail.com>

ariang: update to 1.3.2

Signed-off-by: van waholtz <brvphoenix@gmail.com>

Revert "openthread-br: new package"

The PR to add openthread-br in master isn't merged yet, as it has draft
status. This was merged prematurely. Revert.

This reverts commit 27dd30aadb0b9ae1b7e710e0ea479f6fbe142918.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

simple-adblock: update to 1.9.3-1

* introduce the new curl_max_file_size option
* prevent warnings/errors to be displayed each time the load_environment
  is invoked
* better organize dl_command appendixes
* implement support for downloading/using external dnsmasq config file
* refactor adb_check and adb_allow for better readability
* update default values for some options in the uci_load_validate call
* update reload trigger to include curl options

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

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)

rsync: update to 3.2.7

Bump to latest upstream release.

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit de85ed88a70968acfd9bf47a2ea5d86d14fc0ae0)

rsync: incorporate upstream fixes

Upstream is requesting that packagers cherry-pick two commits to fix the
current release.[1]

1. https://www.mail-archive.com/rsync@lists.samba.org/msg33576.html

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit deddf26cc286240e83b1ad43811ab1bc30bc73bf)

rsync: bump to 3.2.6

Bump to latest upstream release.

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 454bbae88863e9507f1a2207147639155e3f52b5)

zerotier: update to 1.10.2

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

irqbalance: update to 1.9.2

Update irqbalance to version 1.9.2.

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

gg: Update to 0.2.14

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

v2ray-geodata: Update to latest version

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

xray-core: Update to 1.6.3

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

openthread-br: new package

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit ff49c0c02b290a3939b8a7f25fd58c160a904dbb)

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)

Merge pull request #19871 from blocktrron/qcsuper-2203

qcsuper: add package with dependencies

qcsuper: add package

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

python-pycrate: add package

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

python-crcmod: add package

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

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)

Merge pull request #19861 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: update to 1.9.2-4

simple-adblock: update to 1.9.2-4

* update default config file to list options alphabetically
* rearrange some of the init script code to support transition
  of WebUI to javascript
* rename wan6_trigger to procd_trigger_wan6 for readability

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

xray-core: Update to 1.6.2

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

Merge pull request #19835 from mhei/22.03-php8-update-to-8.1.12

[22.03] php8: update to 8.1.12

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)

hub-ctrl: trim trailing spaces

Found with modified Kconfiglib.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit 9579da76ecbb10c611f18e1dca9c4110ca60bb63)

announce: trim trailing spaces

Found with modified Kconfiglib.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit d6b78a0a2bab396c070bc8809c610c4fb25d6fc0)

knot: update to version 3.2.2

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

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)

luaexpat: trim trailing spaces

Found with modified Kconfiglib.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit b051bbcad8c21b0de77657923b9bb9b81030af36)

squid: trim trailing space

Found with modified Kconfiglib.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit d3ef994b3515637e5cc6c6f5a4058c893121811f)

mini_snmpd: trim trailing spaces

Found with modified Kconfiglib.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit 3d98f91fe2b5daa2c5a4c0b7270dc937389ed9df)

lynx: trim trailing space

Found with modified Kconfiglib.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit 1ba153246b1fab19ac43591666b8d773a41a66d9)

librespeed-cli: add package

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

zoneinfo: updated to the latest release

Updated zoneinfo-all meta-package to fix warnings on build
Removed zoneinfo-simple from dependencies of zoneinfo-all as its contents are included in other packages.

Signed-off-by: Vladimir Ulrich <admin@evl.su>
(cherry picked from commit 1d88250815b5efe623bb01a591c4ca651c8f5600)

zoneinfo: updated to the latest release

Signed-off-by: Vladimir Ulrich <admin@evl.su>
(cherry picked from commit 5a9e8698c94fcfa14ab6a0c314881eb4be1d47c7)

zoneinfo: updated to the latest release

Signed-off-by: Vladimir Ulrich <admin@evl.su>
(cherry picked from commit 8d693a79bedd8a4bf00c2e14f43b0c95ec950155)

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)

Merge pull request #19793 from stangri/openwrt-22.03-curl-7.86.0

[22.03] curl: update to 7.86.0

Merge pull request #19710 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: rename wan6_trigger option

Merge pull request #19708 from stangri/openwrt-22.03-https-dns-proxy

[22.03] https-dns-proxy: rename options

php8: update to 8.1.12

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

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

cloudflared: Update to 2022.10.3

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

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)

curl: bugfix: building as selected package doesn't break build

* Reported-by: Chen Minqiang <ptpt52@gmail.com>
* details [here](https://github.com/openwrt/packages/commit/88009b2d5e394c1822ec55734b63b434981a2a9d#commitcomment-88604318)

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

curl: update to 7.86.0

* update to 7.86.0: https://curl.se/changes.html#7_86_0
* remove 300-curl-wolfssl.m4-error-out-if-wolfSSL-is-not-usable.patch as
  it was fixed upstream: https://github.com/curl/curl/pull/9682
* update configure options for OpenSSL as --without-ssl is breaking build
* remove --without-libidn configure arg as it's no longer recognized

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

python3-pytz: bump to version 2022.5

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

curl: include nls.mk

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

dnsproxy: Update to 0.46.2

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

v2ray-geodata: Update to latest version

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

xray-core: Update to 1.6.1

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

xray-core: remove orphan xray-geodata definition

Fixes: 975153f93da132 ("v2ray-geodata: split from xray-geodata")
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 8e2e11aa2d0c7bb2da3c41c9d97421d975a196ef)

node: bump to v16.18.0

Update to v16.18.0

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry picked from commit 5851aa8062f5b8a239e241410c144764b8eb1d88)

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)

bandwidthd: fix time_t problem
Fixes issue #19510 with the change in time_t with musl 1.2

Signed-off-by: Jean-Michel Lacroix <lacroix@lepine-lacroix.info>
(cherry picked from commit 61d1a86)

atlas-probe: fix SIGSEGV error on 32bit system

Changes to time_t cause SIGSEGV error on 32bit system and cause ripe
atlas malfunction. (registration successful but no traffic)
Also introduce minor patch to fix some compilation warning.

While at it move PKG_RELEASE to AUTORELEASE macro.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
(cherry picked from commit 14c5dfe4c10f6550b7c4aab4419e0f64ef1abda4)

samplicator: update to latest master commit 2021-10-11

The newest master branch has important fixes. However, no new release is
published [0]. Switch to git and update to latest master commit.
This introduces new version scheme by using YYYY-MM-DD of the commit.

In addition, add necessary "PKG_FIXUP" and "PKG_REMOVE_FILES" to allow
compile the new version. Also add enable "PKG_BUILD_PARALLEL".

Further, use a pidfile and remove outdated patches.

https://github.com/sleinen/samplicator/issues/73

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

libwebsockets: fix recursive dependency

While running `make menuconfig`, it was discovered then there is a
recursive dependency like this:
tmp/.config-package.in:59138:error: recursive dependency detected!
tmp/.config-package.in:59138: symbol PACKAGE_libwebsockets-openssl is selected by PACKAGE_libwebsockets-mbedtls
tmp/.config-package.in:59122: symbol PACKAGE_libwebsockets-mbedtls depends on PACKAGE_libwebsockets-openssl

It is not possible with the recently added conflicts that two packages
(OpenSSL and full variant, which uses OpenSSL as well), which are almost the same
provides the same named package libwebsockets as their conflict - Mbed
TLS.

Fixes: 676c5c72b5eeb583da2603e399fac085fa442c59 ("libwebsockets: OpenSSL
and mbedTLS variants should conflict")

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

simple-adblock: rename wan6_trigger option

* rename wan6_trigger to procd_trigger_wan6
* reorder options in default config alphabetically

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

https-dns-proxy: rename options

* rename wan6_trigger to procd_trigger_wan6
* rename update_dnsmasq_config to dnsmasq_config_update
* add the uci-defaults file to run sed on config file
* update Makefile to include uci-defaults file

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

libwebsockets: OpenSSL and mbedTLS variants should conflict

They provide the same files, but they don't conflict to each other, this
means that users can install them side by side.

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

libwebsockets: full variant provides OpenSSL

For some time, it is not possible to install ttyd and mosquitto-ssl at the
same time, so let's solve it that libwebsockets-full provides
libwebsockets-openssl. This allows to install ttyd and mosquitto at
the same time.

Also, we need to add conflict, because we should not have installed
libwebsockets-openssl and libwebsockets-full at the same time as they
provides the same files.

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

lighttpd: backport patch to fix dummy Sec-WebSocket-Key

It was requested in https://gitlab.nic.cz/turris/os/packages/-/issues/873

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

Merge pull request #19700 from stangri/openwrt-22.03-https-dns-proxy

[22.03] https-dns-proxy: add version information to binary

Merge pull request #19697 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: service_triggers improvements

mariadb: Drop unused rundir fix socket dir perms

We had been creating "rundir" but it was never used, probably leftover
from some removed function. At the same time, we were setting quite
strict rights to the socket directory (while comments sugested
otherwise).

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

https-dns-proxy: add version information to binary

* add patches/020-cmakelists-add-version.patch (thanks @baranyaib90)
  to add version information to the binary and fix https://github.com/aarond10/https_dns_proxy/issues/149
* modify Makefile to add version information for the binary
* rename patches/010-fix-cmakelists.patch for better readability
* revert back to service restart in WAN/WAN6 trigger
* update test.sh to test both init script and binary versions

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

simple-adblock: service_triggers improvements

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

Merge pull request #19692 from stangri/openwrt-22.03-https-dns-proxy

[22.03] https-dns-proxy: bugfix: restore empty server; misc improvements

adblock: update 4.1.5-4

* fixed broken oisd regex

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

softflowd: use %lld for time_t always

Add upstreamed patch to fix segmentation fault reported in [1].

[1] https://github.com/openwrt/packages/issues/19655

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit 7d019635b1490248e0efc487b3723a4cd07b39d7)

mariadb: Update to the latest version 10.6.10

Keeping the major version, bumping just a minor version. It includes
various bug fixes and security fixes. For details, see:

https://mariadb.com/kb/en/mariadb-10610-release-notes/
https://mariadb.com/kb/en/mariadb-1069-release-notes/
https://mariadb.com/kb/en/mariadb-1068-release-notes/
https://mariadb.com/kb/en/mariadb-1067-release-notes/
https://mariadb.com/kb/en/mariadb-1066-release-notes/
https://mariadb.com/kb/en/mariadb-1065-release-notes/

Following two patches dropped as the issues were fixed in upstream.

* 130-c11_atomics.patch
* 140-mips-connect-unaligned.patch

The rest of the patches were refreshed.

Don't need to disable cassandra and tokudb anymore as they were dropped
from upstream tarball.

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

https-dns-proxy: bugfix: restore empty server; misc improvements

* bugfix: properly restore empty server config for dnsmasq (to
  address issue brought up in https://github.com/stangri/source.openwrt.melmac.net/pull/162)
* better handling of non-existant wan/wan6 interface for triggers
* add resolver url to ubus data for future-proofing WebUI js move

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

adblock: update 4.1.5-3

* fixed search regression in DNS report
* removed last shallalist pointers in the init help

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

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)