yq: Update to 4.11.0

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

Merge pull request #16150 from jefferyto/golang-1.16.6-openwrt-21.02

[openwrt-21.02] golang: Update to 1.16.6

golang: Update to 1.16.6

Includes fix for CVE-2021-34558 (crypto/tls: clients can panic when
provided a certificate of the wrong type for the negotiated parameters).

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

Merge pull request #16147 from luizluca/21.02/sane-fix_backport

[21.02] sane-backends fix usbid generation (backport)

sane-backends: use macros (properly), remove chmod

- use $(INSTALL_DIR) instead of mkdir
- using $(INSTALL_CONF) and then running chmod is pointless, use
  $(INSTALL_DATA) directly
- /etc/xinetd.d/sane-port doesn't need read protection from non-root
  users, use $(INSTALL_DATA) as well

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

sane-backends: fix usbid file generation

On some build systems (build bots, Debian Buster for example) the
current mechanism in the Build/Install define doesn't run. Replace it
with shell fu that works.

Issue was reported, see [1].

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

Fixes #16085

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

stress-ng: bump to version 0.12.10

Patch `010-soft-float.patch` can be dropped.
It was upstreamed via https://github.com/ColinIanKing/stress-ng/pull/126

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 6f48074e79fd5185798d2bf60583313d93cfde6c)

stress-ng: bump to version 0.12.07

Refreshed patch.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 96692fa6c181db11bc4b72e073c52b025cbd4c98)

stress-ng: bump to version 0.12.06

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 940492c577b9f6c36e3f4f4b9ed8c75586871348)

stress-ng: bump to version 0.12.04

Refreshed patch.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 987c82cc73c3dca39658b36dc3a791aae4cb4d54)

ruby: update to 3.0.2

This release fixes some bugs and these vulnerabilities:

* CVE-2021-31810: Trusting FTP PASV responses vulnerability in Net::FTP
* CVE-2021-32066: A StartTLS stripping vulnerability in Net::IMAP
* CVE-2021-31799: A command injection vulnerability in RDoc

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

Merge pull request #16119 from commodo/python-updates1-21.02

[21.02] python-{simplejson,cffi}: bump versions

Merge pull request #16125 from jefferyto/addrwatch-fixes-openwrt-21.02

[openwrt-21.02] addrwatch: Various fixes

Merge pull request #16128 from 1715173329/yq-2102

[openwrt-21.02] yq: Update to 4.9.8

dawn: update to 2021-07-11

ec9a3a9 fix GCC11 compilation

Thanks to neheb and cotequeiroz.

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

dawn: update to 2021-07-08

555268b ubus: filter neighbors by SSID when preparing nr
3db9607 data storage: match SSID when searching ap entry
a22f5a7 storage: ensure SSID strings are NULL-terminated

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

yq: Update to 4.9.8

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

addrwatch: Various fixes

Makefile changes include:

* Remove USE_UCLIBC, as uclibc is no longer supported

* Package output modules

* Move main binary (back) to /usr/sbin, as it is system administration
  related and requires superuser privileges

New patches:

* 003-add-space-for-null-byte.patch - from
  https://github.com/fln/addrwatch/commit/374cfd2cabe4db9882d8a210adff430cc579f859

* 004-more-specific-library-linking.patch - from
  https://github.com/fln/addrwatch/commit/27b57d9da322fc16c6904d8e35aae4557a3e517b

* 005-use-c99-format-macro-constants.patch - from
  https://github.com/fln/addrwatch/pull/28

Init script changes include:

* Change from explicit disable to explicit enable, so that the service
  is disabled by default and on first install

* Set config option default values to default values of the main binary

* Fix command-line option names and format (from
  https://forum.openwrt.org/t/cant-start-addrwatch-service/60499/3)

* Always use the --quiet command-line option, as the procd instance is
  not configured to capture stdout/stderr

* Change the syslog config option to start the syslog output module

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

yggdrasil: allow HTTPS connections

Signed-off-by: James Vorderbruggen <jamesvorder@gmail.com>
(cherry picked from commit ffff3473966c42133b8faed7d8a120739c5451d4)

yggdrasil: bump to 0.3.16

Signed-off-by: George Iv <zhoreeq@users.noreply.github.com>
(cherry picked from commit 76b642b50ff8a606780c43eef2bb030a60dcdb17)

python-cffi: bump to version 1.14.6

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit e08b94b7538474812c18fc109f0372bbb2710d1f)

python-simplejson: bump to version 3.17.3

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 3f2d7052743500e993a5f4a39cef0dc0eaac4d60)

openvpn: enable LZO support by default for OpenSSL variant

User that don't control both OpenVPN client and server
might still need LZO support, so keep it enable by default for at least
OpenSSL variant.

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 03c3c924965a74b650a45394cc424b4d02f333f1)

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)

mwan3: bump PKG_VERSION to 2.10.11

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 44d79147ea9d75bb4a5488bf2f600d9c76561e60)

mwan3: add troublshoot command from LuCI

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 619b721c2f9b0b1c88f9fde7da75c9e37a060a47)

mwan3: cleanup help output

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit a9dac71e3d7f2d46f7d051cb8ffe235c49177848)

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 #16088 from turris-cz/21.02/lxc-change-gpgkeyserver

lxc: add patch to switch GPG server

apache: update to 2.4.48

Refreshed patch.

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>
(cherry picked from commit 6dfd07097de4e737444cf70c62d34453bbf84f7a)

Merge pull request #16093 from Andy2244/samba-4.14.5_(21)

[21.02] samba4: update to 4.14.5

Merge pull request #16092 from Andy2244/libtirpc-1.3.2_-21]

[21.02] libtirpc: update to 1.3.2

Merge pull request #16091 from Andy2244/rpcbind-1.2.6_-21]

[21.02] rpcbind: update to 1.2.6

Merge pull request #16090 from Andy2244/softethervpn-5.02.5180_(21)

[21.02] softethervpn5: update to 5.02.5180

Merge pull request #16094 from Andy2244/wsdd2-git-2021-06-28_(21)

[21.02] wsdd2: update to git 2021-06-28

transmission: add new syscalls to seccomp filter

Testing showed that additional syscalls are needed on ARMv7.
Add "getegid32", "geteuid32", "getgid32" and "getrandom" as they are
all innocent.
Bump PKG_RELEASE.

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

netdata: update to version 1.30.1

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

wsdd2: update to git 2021-06-28

* update to git 2021-06-28
* add extra startup delay

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

samba4: update to 4.14.5

* update to 4.14.5
* refresh patches

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

softethervpn5: update to 5.02.5180

* update to 5.02.5180
* add dep: libsodium

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

rpcbind: update to 1.2.6

* update to 1.2.6
* remove upstream merged patch

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

libtirpc: update to 1.3.2

* update to 1.3.2

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>

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>

Merge pull request #16065 from 1715173329/yq-2102

[openwrt-21.02] yq: Update to 4.9.7

yq: Update to 4.9.7

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

Merge pull request #16050 from nxhack/2102_libuv_CVE-2021-22918

[21.02] libuv: fix CVE-2021-22918

python3: do a simple ls on pip & setuptools if not selected for build

I seem to forget to check/select setuptools and pip (that come bundled with
Python).
This change will do a simple 'ls' on the 2 wheel files, so that the build
fails even if just building Python.

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

python3: update to version 3.9.6

Refreshed patches.
Bumped pip to 21.1.3.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 44e009364f5a115172f5825fbfd8c0b3730021a5)

mwan3: use default routes from additional tables

Until now the additional tables listed in gobal 'rt_table_lookup' were
not considered for interfaces.
In order to be able to also use interface-defined routes from tables
other than main, consider also tables listed in 'rt_table_lookup'.
Update version to 2.10.10 as requested by maintainer.

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

libuv: fix CVE-2021-22918

idna: fix OOB read in punycode decoder

libuv was vulnerable to out-of-bounds reads in the uv__idna_toascii()
function which is used to convert strings to ASCII. This is called by
the DNS resolution function and can lead to information disclosures or
crashes.

https://github.com/libuv/libuv/commit/b7466e31e4bee160d82a68fca11b1f61d46debae
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990561
https://nodejs.org/en/blog/vulnerability/july-2021-security-releases/

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

Merge pull request #16015 from DeathCamel58/openconnect-backport-iconv/intl-fixes

openconnect: backport iconv/intl fix

Merge pull request #16042 from commodo/django-bump-21.02

[21.02] django: bump to version 3.2.5

django: bump to version 3.2.5

Several bug-fixes.
Fix CVE-2021-35042

Release notes:
  https://docs.djangoproject.com/en/3.2/releases/3.2.5/

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 3ee863421a675c41848261a17df145716a23d907)

Merge pull request #16013 from commodo/python-dateutil-21.02

[21.02] python-dateutil: add setuptools-scm build dep

Merge pull request #16024 from rs/nextdns-1.34.2-openwrt-21.02

[21.02] nextdns: Update to version 1.34.2

nextdns: Update to version 1.34.2

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

tessdata: uncompress tarball only once to speed up builds

The previous approach was to uncompress N times a big tarball (638 MB)
where N=130 is the number of supported languages.  Each iteration would
only extract a single file, but it still needs to uncompress the whole
tarball.  This is of course completely inefficient.

Now, we uncompress the tarball only once to extract all relevant files,
and then iterate N times to copy the file needed for each language.

This massively speeds up builds, at the expense of temporarily requiring
more build space (about 1 GB more)

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>
(cherry picked from commit 7fe513971f4139a52c22bae36097c950731b56f2)

tessdata: update to 2.1.0

Switch to AUTORELEASE for simplicity.

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

openconnect: backport iconv/intl fix

This was pulled from #14741. #14734 affects me as well on Debian 11.

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

python-dateutil: add setuptools-scm build dep

Following:
  https://github.com/openwrt/packages/pull/16004
  https://github.com/openwrt/packages/pull/15995
  https://github.com/openwrt/packages/issues/15988

It seems that dateutil requires setuptools-scm to be installed.
As such, this is being added as a dependency.

Also, bump setuptools-scm to version 6.0.1

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit e2026346cceeb54216090a75c83d527f8c51f321)

adblock: update 4.1.3-2

* add a tcpdump option to resolve IPs in adblock reporting,
  set 'adb_represolve' accordingly (disabled by default). If enabled
  tcpdump will perform a reverse DNS (PTR) lookup for each IP address
* add 'stalkerware' source (provided by @astryzia)
* update readme

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

crun: update to 0.20

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

crun: bump to version 0.19.1

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

crun: Don't build on arc

The package needs libseccomp, which does not currently support arc.
In order to avoid a circular dependency, we must avoid arc here as well.

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

crun: add package crun

crun is the prefered container run-time of podman, it's faster than
runc and has a much lower memory footprint.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 01d1a4969e258f7b08a1284e30bfa9bceba62b9c)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
Fixes: #15870

auc: update to version 0.1.8

This fixes support for x86, auc now selects the right combined image
depending on the system being booted in EFI mode or not.

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

delve: add package

Signed-off-by: Niels Widger <niels@qacafe.com>

Merge pull request #15987 from G-M0N3Y-2503/backport-cache-domains-fix-wildcard

cache-domains: Fixed missing wildcard entries

cache-domains: Fixed missing wildcard entries

The fix requires the use of the generated dnsmasq `lancache.conf` file.
So I moved configuration of the hosts directory out of the UCI and into
the generated dnsmasq configuration file to simplify the script.

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>

Merge pull request #15976 from rs/nextdns-1.33.11-openwrt-21.02

[21.02] nextdns: Update to version 1.33.11

nextdns: Update to version 1.33.11

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

travelmate: startup fixes

* fix a possible race condition during boot
* use the new "device" syntax in the network wizard

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

Merge pull request #15940 from mkrkn/openwrt-21.02

[21.02] openvpn: update to 2.5.3

openvpn: update to 2.5.3

Remove upstreamed patch and fix test.sh script.

Signed-off-by: Magnus Kroken <mkroken@gmail.com>

tcpreplay: bump to version 4.3.4

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 7436d944fa44e27816401868a11a4c9115eb717d)

python-lxml: bump to version 4.6.3

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 89a6254b0a81106a04edab9734051e4f182067df)

pillow: bump to version 8.1.2

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit c6f8536efa9036b5653b508d4252fbb5b3d7c492)

ddns-scripts: get l3 device for bind network using curl

If pppoe is used for wan access. script set 'eth1' as interface for curl
call. The correct interface is however 'pppoe-wan'.

The script uses 'network_get_physdev' function to get real device for
bind_network but this is wrong. We need instead the l3_device of the the
logical interface.

In case if we don't use pppoe connection - 'l3_device' is equal to real device.

This was reported by the github user `welderpb` with P/R:
 https://github.com/openwrt/packages/pull/14431

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 036079b308a6e1ba1ac690a1643264696780ae5e)

ddns-scripts: Fix for domains with dash

Signed-off-by: Wenli Looi <wlooi@ucalgary.ca>
(cherry picked from commit 9e2aad3fde6b1a9c4c0080c2c7434ab41f0b36ce)

ddns-scripts: Fix for wildcard subdomain

Signed-off-by: Wenli Looi <wlooi@ucalgary.ca>
(cherry picked from commit 93344aafa065ebfe63330e60f7d02ecdcf39c9b8)

Merge pull request #15924 from nxhack/2102_icu_691

[21.02] icu: bump to 69.1

icu: bump to 69.1

ICU 69 updates to CLDR 39 locale data with many additions and corrections. ICU 69 also includes significant improvements for measurement unit formatting and number formatting in general, as well as many other bug fixes and enhancements.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

Merge pull request #15909 from mlichvar/21.02-chrony-fix-uci-allow

[21.02] chrony: fix uci NTP access configuration

chrony: fix uci NTP access configuration

The chrony interface hotplug script reuses the handle_allow function
from the init script to allow NTP access on interfaces specified in uci.
The function requires /lib/functions/network.sh. Include the file in the
hotplug script to make the function work as expected.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>

Merge pull request #15901 from nxhack/2102_node_14171

[21.02] node: bump to 14.17.1

Merge pull request #15905 from 1715173329/yq-2102

[openwrt-21.02] yq: Update to 4.9.6

schroot: fix typo

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit 2b52fb6221cc86a9583fc6df38ad0319cdadf5ec)

knot-resolver: change scheduling priority

This should prevent some resolving issues by other router app.

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

samba4: update to 4.13.9

* update to 4.13.9

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 2057fc9ee4d9d33f2b0e48ec9c860945ae227394)

yq: Update to 4.9.6

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

python-cryptography: bump to version 3.4.7

Dropped patches:
  0004-Replace-EVP_CIPHER_CTX_cleanup-with-EVP_CIPHER_CTX_r.patch
  0005-Switch-get_-Update-APIs-to-get0.patch

Reworked patches:
  0001-Add-new-ASN1_STRING_get0_data-API.patch
  0006-Add-X509_STORE_CTX_trusted_stack-compatibility-macro.patch
These 2 require that we keep only the CUSTOMIZATIONS stuff for now. Maybe
later we can drop this.

Ran 'make package/python-cryptography/refresh'.

Added patch:
  0004-disable-rust.patch
upstream did a sloppy job with the CRYPTOGRAPHY_DONT_BUILD_RUST logic; we
need to patch it, to make sure the setuptools-rust isn't installed.
We may need to carry this patch in our tree for a bit longer than upstream,
because in newer versions, CRYPTOGRAPHY_DONT_BUILD_RUST logic gets removed.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 01d1b4581e885bc878de6e075b19a1008ef93569)
Signed-off-by: Jeffery To <jeffery.to@gmail.com>

node: bump to 14.17.1

Notable Changes:
deps: update ICU to 69.1 (Michaël Zasso)
errors: align source-map stacks with spec (Benjamin Coe)

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>

banip: refine/fix nginx search pattern

* fix issue with nginx search pattern reported in forum support thread

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

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)

auc: compare versions using dpkg/opkg's verrevcmp

Using strcmp() to compare a version string doesn't work well.
Use verrevcmp() function from opkg instead.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 794cf3ac59deb28b30f63aeb26f58726595cd885,
as it was previously skipped also switch PKG_REVISION back to manual
to keep it in sync with master branch)

django: bump to version 3.2.4

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 24a8f5874155398df8e64b29897a511d5d603e03)

auc: update to version 0.1.7

No longer fail in case a package is part of multiple lists (which may
happen temporarily in case it becomes 'nonshared').
Bump version to prepare for sync accross branches.

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

auc: fix several issues

 * don't segfault if server reply is incomplete
 * always request 'generic' image on x86/generic and x86/64
 * make SNAPSHOT branches sticky, eg. stay on 21.02-SNAPSHOT and do
   not 'upgrade' to 21.02.0-rc2.
 * output requested server URL when debugging

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

auc: support queue_position status from server

Display position in queue while waiting for build.

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

dockerd: refactoring uciadd and ucidel handling

This change makes the handling of adding and deleting interface, device
bridge and firewall more robust.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 0fded274ecf7af94ac3fa00d5cc22c686789ba3b)