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)

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)

python3: Add readline to dependency finder script

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

mg: bump to 6.9

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

Merge pull request #15857 from jefferyto/python3-readline-openwrt-21.02

[openwrt-21.02] python3: add python3-readline subpackage

banip: update 0.7.9

* add switch 'ban_fetchinsecure' to allow insecure downloads
  without certificate check (disabled by default)
* better explain 'ban_fetchparm' in readme

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

adblock: update 4.1.3

* fix a small json syntax issue in adblock.sources
* add easylist addon to reg_fr source
* add switch 'adb_fetchinsecure' to allow insecure downloads
  without certificate check (disabled by default)
* better explain 'adb_fetchparm' in readme

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

python3: add python3-readline subpackage

Python3 comes with a built-in readline module. It wasn't included up until
now; mostly because it wasn't considered.

This change introduces it as a sub-package of the main Python3 package.
readline support is included in Python.

libreadline pulls libncursesw as a package, so python3-ncurses was
updated to pull libncursesw as well.
It should be the same package; mostly done for consistency.

Resolves the issue reported here:
  https://forum.openwrt.org/t/python3-repl-missing-readline/90039

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

btrfs-progs: update to 5.11

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

shairport-sync: update to 3.3.8

Explicitly add libdaemon configure flag. It seems the default was
changed.

Add AUTORELEASE for simplicity.

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

Merge pull request #15840 from jefferyto/python-twisted-tls-conch-openwrt-21.02

[openwrt-21.02] python-twisted: Add tls/conch dependencies

python-twisted: Add tls/conch dependencies

By adding these dependencies, it is much easier for users (both
applications that use Twisted and end users) to have secure
communications by default.

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

Merge pull request #15836 from jefferyto/python-twisted-21.2.0-openwrt-21.02

[openwrt-21.02] python-twisted: Update to 21.2.0, redo patches

python-twisted: Update to 21.2.0, redo patches

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

Merge pull request #15827 from jefferyto/python-package-updates-openwrt-21.02

[openwrt-21.02] python-six,et_xmlfile, django: bump package versions

Merge pull request #15834 from jefferyto/python-incremental-21.3.0-openwrt-21.02

[openwrt-21.02] python-incremental: Update to 21.3.0, refresh patch

Merge pull request #15831 from jefferyto/python-zope-interface-5.4.0-openwrt-21.02

[openwrt-21.02] python-zope-interface: Update to 5.4.0

Merge pull request #15829 from jefferyto/python-attrs-21.2.0-openwrt-21.02

[openwrt-21.02] python-attrs: Update to 21.2.0

python-incremental: Update to 21.3.0, refresh patch

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

python-zope-interface: Update to 5.4.0

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

net/mosquitto: Update to 2.0.11

This is a security and bugfix release.

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

Fixes a remotely triggered memory leak
Fixes broker reconnections in certain failure situations
Fixes (non-standard) qos0 queuing

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

python-attrs: Update to 21.2.0

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

python-idna: bump to version 3.2

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

django: bump to version 3.2.3

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

et_xmlfile: bump to version 1.1.0

Updating Eneas' email as requested on Github:
  https://github.com/openwrt/packages/pull/15622

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

python-six: bump to version 1.16.0

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

django: bump to version 3.2

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

Merge pull request #15824 from jefferyto/golang-1.16.5-openwrt-21.02

[openwrt-21.02] golang: Update to 1.16.5

golang: Update to 1.16.5

1.16.1 included fixes for:

* CVE-2021-27918 - encoding/xml: infinite loop when using
  xml.NewTokenDecoder with a custom TokenReader
* CVE-2021-27919 - archive/zip: can panic when calling Reader.Open

1.16.4 included fixes for:

* CVE-2021-31525 - net/http: ReadRequest can stack overflow due to
  recursion with very large headers

1.16.5 includes fixes for:

* CVE-2021-33195 - net: Lookup functions may return invalid host names
* CVE-2021-33196 - archive/zip: malformed archive may cause panic or
  memory exhaustion
* CVE-2021-33197 - net/http/httputil: ReverseProxy forwards Connection
  headers if first one is empty

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

samplicator: add samplicator

Samplicator receives UDP datagrams on a given port and resends those
datagrams to a specified set of receivers.

Use Cases:
- replicate Flow Samples to multiple receivers
- use with conntrackd to synchronize via unicast to multiple targets

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

Merge pull request #15812 from G-M0N3Y-2503/docker-20.10.7-backport

Docker 20.10.7

docker: Updated to 20.10.7

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

dockerd: Updated to 20.10.7

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

libnetwork: Updated to 2021-05-25 for docker 20.10.7

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

containerd: Updated to 1.4.6 for docker 20.10.7

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

runc: Updated to 1.0.0-rc95 for docker 20.10.7

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

Merge pull request #15782 from blocktrron/pr-2102-xr_usb_serial_common

xr_usb_serial_common: fix kernel 5.4 builds

Merge pull request #15799 from PolynomialDivision/gpsd-2102

[21.02] Pull latest changes from gpsd

gpsd: fix compilation with x86 glibc

The sysroot has to point to the toolchain directory. The directory
includes libraries like libm. However, the STAGING_DIR needs to be
added to the CFLAGS.

Fixes #15773

[As suggested by jow]

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

gpsd: Add a new package gpsd-utils to add gpsdctl

gpsd-utils include management tools for GPS daemon - and this commmit
particularly introduces gpsdctl to add/remove device from the GPS
daemon's device list over control socket.

Signed-off-by: ekathva advaita <ekathva@hotmail.com>
(cherry picked from commit a86c3666f3bef77dd7002ca0c4f55b543695d534)

Merge pull request #15790 from DeathCamel58/libnet-config-21.02

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

libnet: Export `libnet-config` in development environments
Affects: libnet
Ref: Issue #15767, PR#15770

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

Merge pull request #15779 from stangri/21.02-https-dns-proxy

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

xr_usb_serial_common: fix kernel 5.4 builds

Building the xr_usb_serial module fails for Kenel 5.4 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)

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

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

Merge pull request #15776 from 1715173329/xray-2102

[openwrt-21.02] xray-core: bump geodata to latest version

xray-core: bump geodata to latest version

Also removed `fullcone` option as this is outdated.

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

Merge pull request #15764 from jamesmacwhite/iperf-3.10.1-21.02

[21.02] iperf3: Update to version 3.10.1

iperf3: Update to version 3.10.1

Signed-off-by: James White <james@jmwhite.co.uk>

Merge pull request #15760 from stangri/21.02-miniupnpd

miniupnpd: disable ext_ip_reserved_ignore by default; fix grammar

ocserv: updated to 1.1.3

Signed-off-by: Nikos Mavrogiannopoulos <n.mavrogiannopoulos@gmail.com>