rust: Use make's jobserver when building packages

This allows cargo to use make's jobserver when building packages, by
marking the cargo command as recursive (with the + prefix[1]) and
setting MAKEFLAGS.

This also:

* Give cargo/x.py the build directory instead of having to change the
  current directory (and opening subshells)

* Set PKG_BUILD_PARALLEL/HOST_BUILD_PARALLEL for Rust packages to enable
  the use of make's jobserver

[1]: https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 0dfc1b508d5e5b361978ef9783cb63775176c305)
[omit changes to arp-whisper and procs]
Signed-off-by: Jeffery To <jeffery.to@gmail.com>

rust: Consolidate cargo environment variables

This consolidates all environment variables for cargo into:

* CARGO_HOST_CONFIG_VARS / CARGO_PKG_CONFIG_VARS

  These contain all cargo-specific environment variables, i.e. without
  "common" variables like CC.

* CARGO_HOST_VARS / CARGO_PKG_VARS (renamed from CARGO_VARS)

  These contain all environment variables to be passed to cargo.

This also:

* Set the CARGO_BUILD_TARGET environment variable instead of using the
  --target command-line option

* Update Python include files to use CARGO_HOST_CONFIG_VARS /
  CARGO_PKG_CONFIG_VARS

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

rust: Move CARGO_HOME to $(DL_DIR)/cargo

As CARGO_HOME mainly functions as a download and source cache[1], moving
it into $(DL_DIR) allows it to persist and be reused between different
buildroots/sdks (when DL_DIR is set to a custom/external location).

[1]: https://doc.rust-lang.org/cargo/guide/cargo-home.html

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

rust: Move cargo config options into environment variables

This also:

* Modify the "release" profile in place of adding the "stripped" profile

  Only the profile for target is modified; there are no file size
  constraints for host.

* For host, build with the "release" profile

* For target, build with either the "dev" or "release" profile based on
  CONFIG_DEBUG

There is no environment variable to specify the "strip" option, but
enabling this option is not necessary as the build system will already
strip binaries based on CONFIG_NO_STRIP / CONFIG_USE_STRIP /
CONFIG_USE_SSTRIP.

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

rust: Install to $(STAGING_DIR)/host

This allows rustc/cargo/etc to be called without having to set PATH, as
$(STAGING_DIR)/host/bin is already in PATH.

This also fixes CARGO_HOME not being set during Host/Configure and
Host/Compile.

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

rust: Improve Host/Install speed

* Compress dist archives with gzip instead of xz; gzip is faster to
  compress and decompress

* Use a for loop instead of calling find to extract archives

* Use libdeflate's gzip to decompress instead of gzip

* Limit search for install scripts to top level of extracted archives

This also runs the install scripts with bash instead of sh, in
accordance with the shebang lines inside the scripts.

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

rust: Cache bootstrap downloads to $(DL_DIR)/rustc

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

rust: Add RUST_HOST_FEATURES for host builds

Features to be enabled for host may not be the same as those for target.

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

rust: Use build host Python

The build system already requires Python to be installed.

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

v2ray-geodata: add package v2ray-geosite-ir

"Iran Hosted Domains" is a comprehensive list of Iranian domains and services that are hosted within the country.

Signed-off-by: Kaveh Dadgar <Kavehdadgar666@protonmail.com>
(cherry picked from commit b1fc3754b3969edc9dca2f1fd5129edbd0a76517)

cloudreve: Update to 3.8.3

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

dnsproxy: Update to 0.56.0

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

dnsproxy: Update to 0.55.0

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

v2ray-core: Update to 5.8.0

Removed upstreamed patches.

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

curl: Update to version 8.4.0

For detailed changes, see https://curl.se/changes.html#8_4_0
Switching to tar.bz2 for the time being as tar.xz is not yet available.
Fixes CVE-2023-38546 and CVE-2023-38545.

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
(cherry picked from d353218c320073bf6c2b48f4b9eeab5d4aeeed1c)

python3: Update to 3.11.6, refresh patches

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

Merge pull request #22346 from douglarek/sb

[openwrt-23.05] sing-box: update to v1.5.2

Merge pull request #22293 from jefferyto/python-charset-normalizer-3.3.0-openwrt-23.05

[openwrt-23.05] python-charset-normalizer: Update to 3.3.0

sing-box: update to v1.5.2

* Enable `with_ech` and `with_dhcp`, just like upstream
* See changelog: https://github.com/SagerNet/sing-box/releases/tag/v1.5.2

Signed-off-by: Leo Douglas <douglarek@gmail.com>
sing-box: ShadowsocksR is marked as deprecated since v1.5.0

Signed-off-by: Leo Douglas <douglarek@gmail.com>
sing-box: remove dhcp by default

Signed-off-by: Leo Douglas <douglarek@gmail.com>
(cherry picked from commit bf7ce353b8af9a36411525306abcde23e860e76d)

nextdns: Update to version 1.41.0

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

net-snmp: move to PCRE2 library

Add upstream patch adding support for pcre2 and update dependency to
require libpcre2 instead of libpcre.

--with-pcre2-8 is now needed to exclude support for pcre and only
require pcre2 as net-snmp still use and try to use pcre by default.

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

Merge pull request #22326 from jefferyto/python-twisted-23.8.0-openwrt-23.05

[openwrt-23.05] python-twisted: Update to 23.8.0, rework patches

libvpx: update to 1.13.1

v1.13.0

This release includes more Neon and AVX2 optimizations, adds a new codec
control to set per frame QP, upgrades GoogleTest to v1.12.1, and includes
numerous bug fixes.

v1.13.1

This release contains two security related fixes. One each for VP8 and VP9.

- https://crbug.com/1486441 (CVE-2023-5217)
- Fix bug with smaller width bigger size (CVE-2023-44488)

Fixes #22318

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

exim: update to version 4.96.1

This is a security release.

JH/01 Bug 2999: Fix a possible OOB write in the external authenticator, which
      could be triggered by externally-supplied input.  Found by Trend Micro.
      CVE-2023-42115

JH/02 Bug 3000: Fix a possible OOB write in the SPA authenticator, which could
      be triggered by externally-controlled input.  Found by Trend Micro.
      CVE-2023-42116

JH/03 Bug 3001: Fix a possible OOB read in the SPA authenticator, which could
      be triggered by externally-controlled input.  Found by Trend Micro.
      CVE-2023-42114

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

golang: Update to 1.21.2

Includes fix for CVE-2023-39323 (cmd/go: line directives allows
arbitrary execution during build).

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

python3: avoid unnecessary rebuilds

Move the order in which BuildPackage is called, so that the libpython
package is built ahead of the module packages, to avoid forcing a
clean-build of the package when 'make package/python3/compile' is called
a second time without changes.

The library must be built first, so that when the buildsystem checks for
ABI version changes using libpython3.version, its timestamp should be
older than the dependent package's STAMP_PREPARED file.

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

openssh: bump to 9.5p1

Changelog: https://www.openssh.com/txt/release-9.5

Build system: x86/64
Build-tested: x86/64/AMD Cezanne
Run-tested: x86/64/AMD Cezanne

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

tor-fw-helper: remove it

This package does not receive any update since 2015. [1]
It seems unmaintained and most likely not used at all.

[1] https://gitweb.torproject.org/tor-fw-helper.git/

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

python-twisted: Update to 23.8.0, rework patches

The package changed to the hatchling build backend.

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

crowdsec-firewall-bouncer: new upstream release version 0.0.28

Signed-off-by: S. Brusch <ne20002@gmx.ch>
Maintainer: Kerma Gérald <gandalf@gk2.net>
Run tested: mediatek/filogic, BPI-R3, Openwrt 23.05.0-rc3

Description: Update crowdsec-firewall-bouncer to latest upstream release version 0.0.28
(cherry picked from commit 401d2428ac24abcd90dcaa7bf5bc32ef33e6769b)

Merge pull request #22312 from stangri/openwrt-23.05-adblock-fast

[23.05] adblock-fast: bugfix: properly identify hosts-files

banip: release 0.9.1-1

* drop packets silently on input and forwardwan chains or actively reject the traffic, set 'ban_blocktype' accordingly
* optimized banIP boot/reload handling
* removed pppoe quirk in device detection
* small fixes and optimizations

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

yq: Update to 4.35.2

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

adblock-fast: bugfix: properly identify hosts-files

* escape dots in grep command to properly identify hosts files

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

atftp: move to PCRE2

Move atftp to PCRE2 as PCRE is flagged as EOL and won't receive security
updates anymore.

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

atftp: bump to release 0.8.0

Bump to release 0.8.0. Autorecong is now needed to correctly compile the
package.

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

ffmpeg: Add avi muxer

Otherwise one cannot produce *.avi containers needed for some H.264
camera codecs.

Signed-off-by: Jan Kratochvil <jan@jankratochvil.net>
(cherry picked from commit 62f01d7b36ca621f3b9e2e01c78a64e897dbf4e8)

wget: Update to 1.21.4

Removed upstreamed patches and unneeded autoreconf.

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

syslog-ng: update to version 4.4.0

- Release notes:
https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-4.4.0

- Bump version in config file

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

python-cffi: Update to 1.16.0

This includes a patch to unpin the version of setuptools required for
build; the required version is newer than the version bundled with
Python 3.11. This patch should not be necessary when Python 3.12 is
available.

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

python-packaging: Update to 23.2

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

python-bcrypt: Update to 4.0.1, add myself as maintainer

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

python-pyopenssl: Update to 23.2.0

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

python-charset-normalizer: Update to 3.3.0

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

Merge pull request #22287 from stangri/openwrt-23.05-adblock-fast

[23.05] adblock-fast: update to 1.0.0-5

adblock-fast: update to 1.0.0-5

* improve processing of dnsmasq config files
* do not run sed/show error if allow_filter is empty

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

Merge pull request #22269 from stangri/openwrt-23.05-adblock-fast

[23.05] adblock-fast: update to 1.0.0-5

libwebp: bump to version 1.3.2

From https://github.com/webmproject/libwebp/releases/tag/v1.3.2

- 9/13/2023: version 1.3.2
  This is a binary compatible release.
  * security fix for lossless decoder (chromium: #1479274, CVE-2023-4863)

Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
(cherry picked from commit 90c6cb239002b1581b249ed19c3d7475fa78e5f1)

prometheus-node-exporter-lua: drop bmx6 package

In the OpenWrt routing feed, package bmx6 and luci-app-bmx6 were removed because the LuCI app was vulnerable to several CVEs, as found by dependabot. It has been reporting it for a few months and has even created an issue. These two packages are not maintained in OpenWrt as well in upstream.

Users should switch to the bmx7 package.

Fixes: 9fb9d9343ea27d6dbb5008ece10c0c843dd2c781 ("bmx6: drop package") in the routing feed
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 9c2bf859005ada11c17835f74826b356cdb0fb7b)

cloudflared: Update to 2023.7.3

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

adguardhome: update quic-go to v0.37.6

* quic-go v0.36.x cannot be compiled with Go 1.21. Update that
  AdGuardHome dependency to latest one from v0.37 series.
* It fixes following compilation error:
  go-mod-cache/github.com/quic-go/quic-go@v0.36.2/internal/qtls/go121.go:5:13: cannot use "The version of quic-go you're using can't be built on Go 1.21 yet. For more details, please see https://github.
  com/quic-go/quic-go/wiki/quic-go-and-Go-versions." (untyped string constant "The version of quic-go you're using can't be built on Go 1.21 yet.

Signed-off-by: Dobroslaw Kijowski <dobo90@gmail.com>
(cherry picked from commit 11230bb580443efd14a3c3bb4aa193c0476e4a7d)

python-typing-extensions: Update to 4.8.0

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

python-trove-classifiers: Update to 2023.9.19

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

python-setuptools: Update to 68.2.2

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

python-cryptography: Update to 41.0.4

This includes a patch to update the version of ouroboros (Rust crate)
used, to fix RUSTSEC-2023-0042[1]. Upstream has switch from ouroboros to
self_cell so this patch should only be necessary for cryptography 41.

[1]: https://rustsec.org/advisories/RUSTSEC-2023-0042.html

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

python: Add environment variables to build Rust extensions

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

python-setuptools-rust: Add new host-only package

From the README:

setuptools-rust is a plugin for setuptools to build Rust Python
extensions implemented with PyO3 or rust-cpython.

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

python-semantic-version: Add new host-only package

From the README:

This small python library provides a few tools to handle SemVer in
Python. It follows strictly the 2.0.0 version of the SemVer scheme.

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

exim: apply hotfix for some ZDI reported vulnerabilities

Apply preliminary hotfix for some (three?) of the 0-day
vulnerabilities reported by ZDI.

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

adblock-fast: update to 1.0.0-5

* improve processing of dnsmasq config files
* do not run sed/show error if allow_filter is empty

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

v2raya: remove go version hack

This hack was added for Go 1.20 as it did not take minor version.
Now we have Go 1.21, this hack can go away.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>

Merge pull request #22242 from stangri/openwrt-23.05-adblock-fast

[23.05] adblock-fast: better error reporting when nothing to do

v2ray-core: backport upstream Go 1.21 updates

Fix build for Go 1.21.

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

frp: update to 0.51.3

Includes some bug fixes and adds support for GO 1.21.

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

frp: update to 0.51.0

XTCP is incompatible with previous versions since 0.49.0.

Changelog:
https://github.com/fatedier/frp/releases/tag/v0.49.0
https://github.com/fatedier/frp/releases/tag/v0.50.0
https://github.com/fatedier/frp/releases/tag/v0.51.0

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

kismet: drop the package

This package is no longer maintained in OpenWrt even though it is maintained by upstream.
The last update was done in August 2016 and because we have 2023, drop this package
without replacement.

If anyone from the community wants to step in and retake the maintainership together with the update,
feel free to do it.

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

adblock-fast: better error reporting when nothing to do

* also nicer file type output in high verbosity

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

adguardhome: update to v0.107.36

* Full changelog available at:
  * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.34
  * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.35
  * https://github.com/AdguardTeam/AdGuardHome/releases/tag/v0.107.36

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[ Reword commit message ]
Signed-off-by: Dobroslaw Kijowski <dobo90@gmail.com>
(cherry picked from commit d4fa3d0a1aa242c0aed5a5292335fe9d9ac42a31)

syncthing: update to 1.24.0

This package can be built with Go 1.21 and QUIC can be enabled.

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

syncthing: disable quic to support GO 1.21

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

syncthing: update to 1.23.7

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

tailscale: Update to 1.50.0

Signed-off-by: Zephyr Lykos <git@mochaa.ws>
(cherry picked from commit eeb1e0f057ea9463a99aa3f49cbd64ce69906713)

tailscale: update to version 1.48.2

Release notes:
https://github.com/tailscale/tailscale/releases/tag/v1.48.2

Signed-off-by: Tyler Young <git@yfh.addy.io>
(cherry picked from commit 992807ca35ce3a8ef3dae8f71d9b1e6dbe724e22)

tailscale: enable autodect of fw type

Signed-off-by: Tyler Young <git@yfh.addy.io>
(cherry picked from commit 40d5ba9378127a852b0b4735b02798be17e2e12c)

tailscale: Update to 1.48.1

Signed-off-by: Zephyr Lykos <git@mochaa.ws>
(cherry picked from commit a9373d6dd1782807dafbad2bf6a2c8f30b252638)

tailscale: Update to 1.48.0

Everything is working on pure upstream code.
Patching is not longer needed.

Added entire /etc/tailscale/ directory to conffiles for persistent ssh
host key & https certificate across sysupgrades.

Signed-off-by: Zephyr Lykos <git@mochaa.ws>
(cherry picked from commit 750faf5942088c430732533e162ea5d91b17579a)

dnscrypt-proxy2: update to version 2.1.5

Fixes compilation with Go 1.21+.

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

apache: move to PCRE2

Move apache to PCRE2 now that PCRE is flagged EOL and won't receive any
security update.

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

apache: bump to release 2.4.57

Bump apache to release 2.4.57 and refresh patch automatically.

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

Merge pull request #22222 from stangri/openwrt-23.05-adblock-fast

[23.05] adblock-fast: bugfix: better detect ABP lists

python3-networkx: Update to 3.1, rename source package

This renames the source package to python-networkx to match other Python
packages.

This also updates the list of dependencies.

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

python-bidict: Update to 0.22.1

The package no longer has a build dependency on setuptools-scm.

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

golang: Update to 1.21.1

Includes fixes for:

* CVE-2023-39318: html/template: improper handling of HTML-like comments
  within script contexts

* CVE-2023-39319: html/template: improper handling of special tags
  within script contexts

* CVE-2023-39320: cmd/go: go.mod toolchain directive allows arbitrary
  execution

* CVE-2023-39321 and CVE-2023-39322: crypto/tls: panic when processing
  partial post-handshake message in QUICConn.HandleData

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

golang: Update to 1.21.0, remove patch

Upstream has updated the Go compiler to not use gold when building for
arm, and is waiting for a fix to binutils (released in 2.41) before
doing the same for aarch64.[1]

Based on the above, it does not appear that
https://github.com/golang/go/pull/49748 will be merged. This removes the
patch from that pull request.

[1]: https://github.com/golang/go/issues/22040

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

btrfs-progs: update to version 6.5.1

Release notes:
https://github.com/kdave/btrfs-progs/releases/tag/v6.5.1

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

openvswitch: disable groff manpage check

The openvswitch build trips over a number of warnings during the
manpage-check step if groff 1.23 is installed on the build host,
resulting in a failed build.

As this check is optional, and we don't even install the manpages, simply
override the groff configure check to never detect groff.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit db34f33cc712ef2c6c4ca2f7ace1f428e83f316c)

tunneldigger: set PKG_SOURCE_DATE

opkg requires monotonically increasing version numbers to know which
version of a package is newer. As git commit IDs do not satisfy this
condition, PKG_SOURCE_DATE must be set to the date of the referenced
commit, resulting in the complete version number '2021-03-08-4f72b305-1'.

As the source date also becomes part of the paths inside the download
archive, the source hash must be updated as well.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit 0a3e5dd122abb92f215369eeb0a957114b61746f)

tunneldigger: add group option to UCI config

The group can be used for policy routing and similar purposes.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit 21dd77f6c48f5c59beee5dccc4aee9a2afa3e137)

adblock-fast: bugfix: better detect ABP lists

* bugfix: better detect ABP lists
* update Makefile with BUSYBOX features dependencies
* update the type of dnsmasq_instance setting
* add error message when file type can't be detected
* add reporting when file type can't be detected
* bugfix: include URL on errors related to URL processing/parsing
* rename resolver function to resolver_config to better reflect its use

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

Merge pull request #22207 from commodo/django-update-23.05

[23.05] django: bump to version 4.2.5

iperf3: update to 3.15

see changelog: https://github.com/esnet/iperf/releases/tag/3.15.

Signed-off-by: Leo Douglas <douglarek@gmail.com>
(cherry picked from commit 8a223d4724d996db13bc8077035b27562b5e8fbd)

zerotier: update to 1.12.2

see changelog: https://github.com/zerotier/ZeroTierOne/releases/tag/1.12.2.

Signed-off-by: Leo Douglas <douglarek@gmail.com>
(cherry picked from commit 0343dffefa2b1b5dbd731516ed0a9431d6ed4cae)

crowdsec: new upstream release version 1.5.4

Update crowdsec to latest upstream release version 1.5.4

Signed-off-by: S. Brusch <ne20002@gmx.ch>
Maintainer: Kerma Gérald <gandalf@gk2.net>
Build tested: package build checked, no run test due to limited space

Description: update to latest version of upstream
(cherry picked from commit 7528bf76821eb9234d4665752371c85496ca5b89)

apfree-wifidog: Update to v6.08.1950

Fixed some memory leak bug

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>
(cherry picked from commit 5b3e517be4a1d2674fc12ea81a60ba885423758a)

django: bump to version 4.2.5

Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
(cherry picked from commit 331b5f75f4b4d5b71c6db9bd6658b6eeef01d891)

libmariadb: Fix async api by linking to libucontext

The asynchronous API of libmariadb uses cooperative multi threading
by using the system calls
  * makecontext
  * swapcontext
  * getcontext
  * setcontext
of the ucontext.h C-API.

Thus additionally link libmariadb to libucontext which is a library
providing these system calls on platforms not supporting them out of
the box - like musl based platforms.

Signed-off-by: Volker Christian <me@vchrist.at>
(cherry picked from commit 6748f95168660792a2162d8d35ce1ecf85f2d865)

xfrpc: update to version 2.9.644

Release notes:
https://github.com/liudf0716/xfrpc/releases/tag/2.9.644

Signed-off-by: Dengfeng Liu <liudf0716@gmail.com>

samba4: update to 4.18.6

Fixes various security issues. For detailed history see:

* https://www.samba.org/samba/history/samba-4.18.6.html
* https://www.samba.org/samba/history/samba-4.18.5.html
* https://www.samba.org/samba/history/samba-4.18.4.html
* https://www.samba.org/samba/history/samba-4.18.3.html
* https://www.samba.org/samba/history/samba-4.18.2.html
* https://www.samba.org/samba/history/samba-4.18.1.html

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

czmq: drop libpcre dependency

It seems like the libpcre dependency was added by mistake.
While checking in the source code of czmq (Makefile.am, CMakeLists.txt),
I see there are several dependencies, but there isn't PCRE.

Fixes: 936a48a ("czmq: add new package")
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit e3ab95185cb67e6d5753b2d7380bac74c4ef4acd)

mg: switch pcre to pcre2

Switch pcre to pcre2
https://github.com/openwrt/packages/issues/22006

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