syslog-ng: disable mqtt

For now, disable mqtt as it was automatically enabled as the build
system finds compiled libpaho-mqtt-c and requires dependency.

---
Here is the output:
Package syslog-ng is missing dependencies for the following libraries:
libpaho-mqtt3c.so.1
---

This is a new feature since syslog-ng 3.33.1 and if anyone is interested
in it, it can be enabled.

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

syslog-ng: update to version 3.33.1

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

- Bump version in config
It fixes:
WARNING: Configuration file format is too old, syslog-ng is running in compatibility mode. Please update it to use the syslog-ng 3.33 format at your time of convenience. To upgrade the configuration, please review the warnings about incompatible changes printed by syslog-ng, and once completed change the @version header at the top of the configuration file; config-version='3.31'

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

Merge pull request #16087 from turris-cz/19.07/lxc-update-gpg-keyserver

lxc: add patch to switch GPG server

czmq: disable nss

While bumping czmq to version 4.2.1 from master branch into OpenWrt
19.07, it automatically detects nss when compiled before czmq.

These steps can verify this:

make package/nss/compile V=s
make package/czmq/compile V=s

Then czmq requires many dependencies:
Package czmq is missing dependencies for the following libraries:
libnspr4.so
libnss3.so
libnssutil3.so
libplc4.so
libplds4.so
libsmime3.so
libsoftokn3.so
libssl3.so

And this fails. If you are using SDK and wants to have just a few
packages then czmq gets compiled if any of those packages are not
present in build system.

This was also mentioned in the release notes for czmq 4.2.1:
https://github.com/zeromq/czmq/releases/tag/v4.2.1

> Note for packagers: NSS can now be used and linked against to avoid using
an internal embedded reimplementation of SHA. It is enabled by default if
present.

NSS was disabled before, so let's disable it.

This is required only for OpenWrt 19.07 as this is done differently in OpenWrt 21.02 and OpenWrt
master and czmq is compiled there.

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

apache: update to 2.4.48

Fixes:

CVE-2019-17567
CVE-2020-13938
CVE-2020-13950
CVE-2020-35452
CVE-2021-26690
CVE-2021-26691
CVE-2021-30641
CVE-2021-31618

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(partially cherry picked from commit 6dfd07097de4e737444cf70c62d34453bbf84f7a)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[removed patch, which is not in OpenWrt 19.07 branch, used integer in
PKG_RELEASE instead of autorelease]

czmq: update to version 4.2.1

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
(cherry picked from commit 39b4c6454561e09d51e8ec062920727c584dca08)

lxc: add patch to switch GPG server

By default, there was used sks-keyservers.net pool, which has invalid
SSL certificate and they also announced that their service is deprecate
and no longer maintained.

Use the same GPG server as LXC is using by default in the newer
releases.

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

msmtp: update to version 1.8.15

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

Merge pull request #16051 from BKPepe/openwrt-19.07

python3: update to version 3.7.11

youtube-dl: update to version 2021.4.7

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

youtube-dl: update to version 2021.2.10

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

python3: update to version 3.7.11

Fixes: CVE-2021-3426
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>

Merge pull request #16004 from commodo/python-dateutil-setuptools-scm

[19.07] python-dateutil: pin setuptools-scm version to 5.0.2

Merge pull request #16023 from rs/nextdns-1.34.2-openwrt-19.07

[19.07] nextdns: Update to version 1.34.2

nextdns: Update to version 1.34.2

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

Merge pull request #15663 from Ansuel/fix-ddns-script

[19-07] ddns-scripts: standardize required params declaration

ddns-scripts: standardize required params declaration

The luci app scan the script and search for params in the form of
$required_params.
This script use the form "${required_params}" and cause confusion
with the luci app by hiding needed values. Fix this by using the
standard way to declare required params following other ddns scripts.

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>

python-dateutil: pin setuptools-scm version to 5.0.2

This is known to still work with Python2.

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

Revert "python-dateutil: disable setuptools-scm for build"

This reverts commit 29da5d65b6dc10ee6c2f8bfc7c868245289b2157.

That fix doesn't work fully correct as the egg directory has version 0.0.0.

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

python-dateutil: disable setuptools-scm for build

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

It seems that the newer setuptools-scm package (6.0.1) has some
Python3-only syntax.
For the 19.07 release, where Python2 is still around this causes the
python-dateutil package to fail to build.

See https://github.com/pypa/setuptools_scm/issues/541

However, removing 'setuptools-scm' from the build also works.
This change does that.

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

Merge pull request #15974 from rs/nextdns-1.33.11-openwrt-19.07

[19.07] nextdns: Update to version 1.33.11

nextdns: Update to version 1.33.11

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

nano: update to 5.8

Update nano editor version to 5.8.

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

net/mosquitto: Update to 1.6.15

This is a security release

Full release notes: https://mosquitto.org/blog/2021/06/version-2-0-11-released/

Fixes a remotely triggered memory leak

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

Merge pull request #15806 from blocktrron/pr-xr-usb-serial-1907

xr_usb_serial_common: fix build

xr_usb_serial_common: add PKG_MIRROR_HASH

The CI complained about a missing PKG_MIRROR_HASH.

Signed-off-by: David Bauer <mail@david-bauer.net>

xr_usb_serial_common: fix build

Building the xr_usb_serial module fails for recent 4.14 kernel with
CONFIG_PM enabled:

xr_usb_serial_common.c:1574:15: error: 'ASYNCB_INITIALIZED' undeclared
(first use in this function); did you mean 'RCU_INITIALIZER'?

Use tty_port_initialized in order to determine the status of the TTY
port.

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

Merge pull request #15770 from DeathCamel58/libnet-1.2.x-libnet-config-fix

[19.07] libnet-1.2.x: Export `libnet-config` in development environments

Merge pull request #15780 from stangri/19.07-https-dns-proxy

[19.07] https-dns-proxy: update to 2021-06-03-1

https-dns-proxy: update to 2021-06-03-1

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

libnet: Export `libnet-config` in development enviornments

Affects `libnet-1.2.x`

Signed-off-by: Dylan Corrales <deathcamel58@gmail.com>

banip: remove logd dependency

* removed logd dependency, see openwrt#13820 for reference

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #15728 from stangri/19.07-https-dns-proxy

[19.07] https-dns-proxy: 2021-05-14 bugfix: fallback to HTTP/1 by default

https-dns-proxy: 2021-05-14 bugfix: fallback to HTTP/1 by default

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

netdata: update to version 1.30.1

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

Merge pull request #15717 from stangri/19.07-https-dns-proxy

[19.07] https-dns-proxy: update to 2021-05-14-1; bugfixes for dhcp server backup

https-dns-proxy: update to 2021-05-14-1; bugfixes for dhcp server backup

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

syslog-ng: update to 3.32.1

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

nano: update version to 5.7

Upgrade nano editor to version 5.7.

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

nextdns: Update to version 1.32.1

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

bind: bump to 9.16.15

Fixes the following security issues:

* CVE-2021-25216 - A specially crafted GSS-TSIG query could cause a buffer
                   overflow in the ISC implementation of SPNEGO.
* CVE-2021-25215 - named crashed when a DNAME record placed in the ANSWER
                   section during DNAME chasing turned out to be the final
                   answer to a client query.
* CVE-2021-25214 - Insufficient IXFR checks could result in named serving a
                   zone without an SOA record at the apex, leading to a
                   RUNTIME_CHECK assertion failure when the zone was
                   subsequently refreshed. This has been fixed by adding an
                   owner name check for all SOA records which are included
                   in a zone transfer.

Signed-off-by: Noah Meyerhans <frodo@morgul.net>

zerotier: update to 1.6.5

Minor ZeroTier update. Refreshed patches.

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

Merge pull request #15509 from hswong3i/openwrt-19.07-SQUID_enable-ssl-crtd

[openwrt-19.07][cherry-pick] squid: Enable dynamic SSL certificate generation

squid: Enable dynamic SSL certificate generation

Maintainer: @neheb / @BKPepe / @zhanhb
Compile tested: ipq806x, generic, netgear_r7800, master
Run tested: ipq806x, generic, netgear_r7800, openwrt-19.07

Description:

Squid now only support HTTPS proxy in TCP tunnel mode (e.g. `ssl_bump splice all`):

    https_port 3128 ssl-bump tls-cert=/etc/squid/squid.pem generate-host-certificates=on
    ssl_bump splice all

In order to operate in SSL Bump mode, we need to compile with `--enable-ssl-crtd` for following configuration:

    https_port 3128 ssl-bump tls-cert=/etc/squid/squid.pem generate-host-certificates=on
    sslcrtd_program /usr/lib/squid/security_file_certgen -s /car/cache/squid/ssl_db -M 4MB
    ssl_bump stare all
    ssl_bump bump all

This PR switch the `SQUID_enable-ssl-crtd` into `default y`, therefore default enable SSL Bump mode.

Signed-off-by: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
(cherry picked from commit dbda77686d5dccb3d3999ed2e7dec18aab11fff8)

mosquitto: fix log_type config support

As pointed out in https://github.com/openwrt/packages/issues/15506

The remainder of that patch isn't appropriate for 1907 however.

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

ksmbd-tools: update to 3.3.9

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

dnscrypt-proxy2: sync blocked-names to upstream one

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

dnscrypt-proxy2: upgrade to 2.0.45

Signed-off-by: James Long <james@jclong.net>
(cherry picked from commit 6467b6535b401bfc046096dc535729896697b0a1)

adblock: fix polish source URL

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #15477 from rs/nextdns-1.32.0-openwrt-19.07

[19.07] nextdns: Update to version 1.32.0

nextdns: Update to version 1.32.0

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

Merge pull request #15468 from rs/nextdns-1.12.5-openwrt-19.07

[19.07] nextdns: Update to version 1.12.5

nextdns: Update to version 1.12.5

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

irqbalance: upgrade to version 1.8.0

Upgrade irqbalance to version 1.8.0

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

pulseaudio: update to 14.0

Remove upstreamed OpenSSL patch.

Update MESON_ARGS.

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

pulseaudio: fix compilation without deprecated OpenSSL APIs

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

pulseaudio: fix compilation with ICONV_FULL

Reordered check to check external iconv first.

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

pulseaudio: Update ARM NEON/VFP detection

With openwrt/openwrt@8dcc1087602e2dd606e4f6e81a06aee62cfd4f4c, the ARM
FPU compiler options are no longer part of CONFIG_TARGET_OPTIMIZATION.

This updates various packages that look for NEON/VFP support to search
CONFIG_CPU_TYPE instead.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>

pulseaudio: do not build NEON with unsupported platforms

Unfortunately, meson's check is totally broken.

Fortunately, it's fairly easy to workaround.

Fixes compilation with all ARM platforms that don't support NEON.

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

pulseaudio: add lto and gc-sections to reduce size

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

pulseaudio: fix pkgconfig paths

Turns out, packages like mpd that use pkgconfig to find pulseaudio
end up using host paths.

Fixes compilation with at least mpd.

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

pulseaudio: update to 13.0

Converted to use meson for compilation speed.

Removed libwrap dependency. Upstream no longer supports it.

Removed intltool and glib2 host dependencies. They seem to be no
longer needed.

Removed upstream patch.

Minor cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 78d84d4c9cb4c6da404d47ddc7dc5c18fa4c33cb)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[rebased on commit from master branch]

pulseaudio: Backport upstream patch

Fixes compilation with recent alsa-libs.

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

Merge pull request #15384 from VolunteerComputingHelp/openwrt-19.07

Transfer of boinc 7.16.16 from 21.02 to 19.07

Merge pull request #15413 from luizluca/19.07/ruby-2.6.7

[19.07] ruby: update to 2.6.7

ruby: update to 2.6.7

Fixes two CVEs:

CVE-2020-25613: Potential HTTP Request Smuggling Vulnerability in WEBrick
CVE-2021-28965: XML round-trip vulnerability in REXML

After this release, ruby 2.6 is now in security maintenance phase.

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>

netdata: disable shared memory totals by default

Fix log spam:
daemon.err netdata[2090]: PROCFILE: Cannot open file '/proc/sysvipc/shm'
This is caused by a non existant /proc/sysvipc/shm because of the
CONFIG_PROC_STRIPPED option that is enabled by default in the kernel
generic target config

Signed-off-by: Tiago Gaspar <tiagogaspar8@gmail.com>
(cherry picked from commit 5f65d87bb7727be85e7d3e02045302d6eb76ff7e)

https-dns-proxy: bugfix: race condition with dnsmasq

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

boinc: Transfer v7.16.16 from 21.02 to 19.07

Intentionally unchanged from 43d21e650d4409b45ccc2c70fe507a29f783dda3,
i.e. the pull request #14862 from neheb/boi

Signed-off-by: Steffen Moeller <moeller@debian.org>

adblock: fix games_tracking source url

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #15254 from dibdot/19.07

[19.07] travelmate: minimal change to fix cp detection

travelmate: minimal change to fix cp detection

* fix cp detection proposed by @ChristianKuehnel
* add/adapt mikrotik login script provided by @Christian Kuehnel

Signed-off-by: Dirk Brenken <dev@brenken.org>

rpcd-mod-lxc: add postinst to reload rpcd on update/installation

This is dependency of luci-app-lxc and when users install that package
it is no way clear that they have to reload rpcd to get it working
correctly. Without it container listing does not work.
In general this reload should be in this package simply because other
rpcd-mod-* packages reload rpcd as well.

Signed-off-by: Karel Kočí <karel.koci@nic.cz>
(cherry picked from commit 54b6116d7d3f6df94df621dcabdc0c158fd4b5f2)

ksmbd-tools: update to 3.3.8

Major changes are:
  disable symlink by default.
  remove smack inherit leftovers.
  Enable guest access on IPC$ share by default.

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

ksmbd-tools: Add a mDNS TXT record for the ksmbd service

MacOS ignores Bonjour services for which TXT records are not returned. This changes forces umdns service to return a TXT record (`daemon=ksmbd`) for the ksmbd service. The exact content is unimportant and to the best of my knowledge nothing reads the `daemon` tag.

Symptoms of the problem (which are also debugging steps):
* Finder refuses to open the OpenWRT "computer" in the Network list.
* Discovery.app (Bonjour Browser) lists the _ssh._tcp service, but the submenu for it doesn't unfold and no address is shown.
* `dns-sd -L OpenWrt _smb._tcp` doesn't return any address.

Signed-off-by: Kirill Nikolaev <cyril7@gmail.com>
(cherry picked from commit 272b0a5c1873a34f6609e7af38395cea3f02bda5)

ksmbd-tools: update to 3.3.7

Major change are:

ksmbd.control -s terminate ksmbd.mountd as well as kernel server.
Update configuration.txt and README.
Turn off smb2 leases by default again.

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

ksmbd-tools: update to 3.3.6

Major changes are:

Add missing g_rwlock_init() for rpc_samr and rpc_lsaprc.
Fix potential potential null pointer dereferencing error.
Fix memleak.

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

ksmbd-tools: update to 3.3.5

Major changes for version 3.3.5 are:
- Rename "streams" parameter to "vfs objects = streams_xattr".
- Enable smb2 leases by default.
- Ignore ksmbd.subauth creation failure.
- Fix bugs that related to guest ok = yes.

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
(cherry picked from commit 58f91090f598892d12f435e02e09f3b37fd059d3)

nut: fix typo in nutshutdown script

Even it's only cosmetic and should not affect the function of regular system,
fix the name of the IPKG_INSTROOT variable.
Typo was added long ago with 8400c9a6ec799.

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>
(cherry picked from commit f25f49a8b7c5a038f8a50dbb74e10db19f26d15a)

netdata: update to version 1.29.3

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

syslog-ng: update to version 3.31.2

Bump config file

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

adblock: fix init status command

Signed-off-by: Dirk Brenken <dev@brenken.org>

Merge pull request #15295 from lucize/librefix

[19.07] libreswan: update cu 3.32

libreswan: update cu 3.32

CVE and NSS fix

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

Merge pull request #15252 from ja-pa/gnutls-security-fix-19.07

[OpenWrt 19.07] gnutls: patch security issue

Merge pull request #15255 from ja-pa/mariadb-10.2.37-openwrt-19.07

[OpenWrt 19.07] mariadb: update to version 10.2.37

Merge pull request #15256 from cartender/pr_libftdi1_19

[19.07] libftdi1: Improve build binary reproducibility

libftdi1: Improve build binary reproducibility

The library embeds the result of "git describe" inside the source code, making the binary result dependent of the particular commit being used in the build root when building inside a git working copy.

As this is unnecessary information, remove this option and fallback to the default "unknown", which is also the value compiled by tools that do not clone but export the openwrt base tree.

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

Merge pull request #15214 from BKPepe/aiohttp-19.07

python-aiohttp: backport fix for CVE-2021-21330

https-dns-proxy: bugfix: correct PROCD firewall object

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

mariadb: update to version 10.2.37

Fixes CVE-2021-27928

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>

gnutls: patch security issue

Fixes
CVE-2021-20231
CVE-2021-20232

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>

Merge pull request #15221 from stangri/19.07-https-dns-proxy

[19.07] https-dns-proxy: support for additional Force DNS ports

php: add fix for updated ICU 68+

Recently, I updated icu for issues with node feed, but it broke
compiling of php7.

Error:
/foo/target-aarch64_cortex-a53_musl/php-7.2.34/ext/intl/collator/collator_sort.c:349:26: error: 'TRUE' undeclared (first use in this function)
  collator_sort_internal( TRUE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
                          ^~~~
/foo/target-aarch64_cortex-a53_musl/php-7.2.34/ext/intl/collator/collator_sort.c:349:26: note: each undeclared identifier is reported only once for each function it appears in
/foo/target-aarch64_cortex-a53_musl/php-7.2.34/ext/intl/collator/collator_sort.c: In function 'zif_collator_asort':
/foo/target-aarch64_cortex-a53_musl/php-7.2.34/ext/intl/collator/collator_sort.c:543:26: error: 'FALSE' undeclared (first use in this function); did you mean 'FILE'?
  collator_sort_internal( FALSE, INTERNAL_FUNCTION_PARAM_PASSTHRU );
                          ^~~~~
                          FILE
make[3]: *** [Makefile:1031: ext/intl/collator/collator_sort.lo] Error 1

More details:
https://github.com/php/php-src/commit/8eaaabd

Backport of patch from PHP7.3 didn't work for me, but this one was suggested that
Homebrew is using it and it works for me. However, PHP7.2 is EoL.

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

https-dns-proxy: support for additional Force DNS ports

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

bind: update to version 9.16.13

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

nnn: update to version 3.4

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

python-aiohttp: backport fix for CVE-2021-21330

More details:
https://github.com/aio-libs/aiohttp/security/advisories/GHSA-v6wp-4m6f-gcjg

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

icu: update to 68.2

Maintainer: me
Compile tested: head r15324-920b692, aarch64, x86_64
Run tested: (qemu-5.2.0) aarch64

Description:
Update to 68.2

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

icu: update to 68.1

It updates to CLDR 38. New features including locale-dependent smart unit preferences (road distance, temperature, etc.) and locale ID canonicalization conformant with CLDR.

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