feed/packages.git
22 months agopython3: bump to version 3.10.9
Alexandru Ardelean [Wed, 25 Jan 2023 12:12:16 +0000 (14:12 +0200)]
python3: bump to version 3.10.9

Refresh patches.
Bump setuptools to 65.5.0
Bump pip to 22.3.1
  Removed patch: patches-pip/001-pep517-pyc-fix.patch
  No longer needed as per:
    https://github.com/pypa/pip/commit/fa4b2efbabffb96536c10bfb94477912a0f20e7f

Signed-off-by: Alexandru Ardelean <alex@shruggie.ro>
22 months agoMerge pull request #20371 from mhei/22.03-php8-update-8.1.14
Michael Heimpold [Thu, 26 Jan 2023 06:48:44 +0000 (07:48 +0100)]
Merge pull request #20371 from mhei/22.03-php8-update-8.1.14

[22.03] php8: update to 8.1.14

22 months agoMerge pull request #20373 from stangri/openwrt-22.03-pbr
Stan Grishin [Mon, 23 Jan 2023 10:42:42 +0000 (03:42 -0700)]
Merge pull request #20373 from stangri/openwrt-22.03-pbr

[22.03] pbr: bugfix: fix is_domain()

22 months agobash: update to version 5.2.15
Josef Schlehofer [Fri, 20 Jan 2023 03:43:58 +0000 (04:43 +0100)]
bash: update to version 5.2.15

Refreshed patches

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

22 months agopbr: bugfix: fix is_domain()
Stan Grishin [Sun, 22 Jan 2023 23:13:18 +0000 (23:13 +0000)]
pbr: bugfix: fix is_domain()

* fixes https://github.com/openwrt/packages/issues/20352

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

22 months agophp8: update to 8.1.14
Michael Heimpold [Wed, 11 Jan 2023 21:08:59 +0000 (22:08 +0100)]
php8: update to 8.1.14

This fixes:
    - CVE-2022-31631

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
22 months agov2ray-core: Update to 5.2.1
Tianling Shen [Wed, 18 Jan 2023 10:22:47 +0000 (18:22 +0800)]
v2ray-core: Update to 5.2.1

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

22 months agoatlas-sw-probe: add more binaries
Josef Schlehofer [Wed, 18 Jan 2023 06:57:20 +0000 (07:57 +0100)]
atlas-sw-probe: add more binaries

They were added in these commits [1] [2] and if they are not included,
the RIPE Atlas SW Probe does not work correctly.

This should also prevent this from happening in the future as it now. We include all
files with .sh extension file type.

[1] https://github.com/RIPE-NCC/ripe-atlas-software-probe/commit/70ced29fc3217dd8d61e2b78506b6103ded100aa
[2] https://github.com/RIPE-NCC/ripe-atlas-software-probe/commit/71a4ff0e68c55464f766ddb9f1dfe21b22e530db

Fixes: https://github.com/openwrt/packages/issues/20338
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 1a368a54095d67ea2efb25b7a205999650793bee)

22 months agopython-docutils: bump to version 0.19
Eneas U de Queiroz [Sat, 21 Jan 2023 18:46:42 +0000 (20:46 +0200)]
python-docutils: bump to version 0.19

Package does not currently build because of distutil dependency.  Fix
this by updating to the latest version.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
(cherry picked from commit 4a16e5eb8c29a5c5584920c29d112e469804a263)
[do not use AUTORELEASE]

22 months agofrp: update to 0.46.1
Van Waholtz [Tue, 10 Jan 2023 08:31:30 +0000 (16:31 +0800)]
frp: update to 0.46.1

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

22 months agofrp: update to 0.46.0
Van Waholtz [Thu, 5 Jan 2023 11:31:44 +0000 (19:31 +0800)]
frp: update to 0.46.0

Add `test.sh`.

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

22 months agonano: update to 7.2
Hannu Nyman [Sat, 21 Jan 2023 10:20:16 +0000 (12:20 +0200)]
nano: update to 7.2

Update nano editor to version 7.2.

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

23 months agogit: update to 2.34.6
Michal Vasilek [Wed, 18 Jan 2023 12:00:54 +0000 (13:00 +0100)]
git: update to 2.34.6

Fixes CVE-2022-23521
Fixes CVE-2022-41903
Fixes CVE-2022-39260
Fixes CVE-2022-39253
Fixes CVE-2022-29187

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

23 months agoxray-core: Update to 1.7.2
Tianling Shen [Mon, 9 Jan 2023 07:08:16 +0000 (15:08 +0800)]
xray-core: Update to 1.7.2

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

23 months agoyq: Update to 4.30.8
Tianling Shen [Mon, 16 Jan 2023 08:26:41 +0000 (16:26 +0800)]
yq: Update to 4.30.8

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

23 months agoyq: Update to 4.30.7
Tianling Shen [Sat, 14 Jan 2023 12:51:54 +0000 (20:51 +0800)]
yq: Update to 4.30.7

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

23 months agoboinc-wrapper: add new package
Vitalii Koshura [Wed, 7 Sep 2022 11:47:33 +0000 (13:47 +0200)]
boinc-wrapper: add new package

Signed-off-by: Vitalii Koshura <lestat.de.lionkur@gmail.com>
(cherry picked from commit 40e144be7d4b4a7a9d3d3fd45b39878c73dee406)

23 months agopython-requests: update URL
Karl Palsson [Thu, 12 Jan 2023 12:14:53 +0000 (12:14 +0000)]
python-requests: update URL

The old 2.python-requests.org URL is not reachable on modern browsers,
and is not the current canonical URL for the project.  Update to the
current best URL for the project.

Signed-off-by: Karl Palsson <karlp@etactica.com>
(cherry picked from commit 4969de2bdf2a0f740a92f6c2fe1f719357b8a81f)

23 months agonetperf: use git tarball
Rosen Penev [Sat, 14 Jan 2023 02:22:36 +0000 (18:22 -0800)]
netperf: use git tarball

netperf.org is gone now. Only github is left.

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

23 months agobc: use @DEBIAN
Rosen Penev [Sat, 14 Jan 2023 01:28:33 +0000 (17:28 -0800)]
bc: use @DEBIAN

Seems Debian no longer offers ftp.

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

23 months agopython-exceptiongroup: bump to 1.1.0
Julien Malik [Tue, 3 Jan 2023 10:41:21 +0000 (11:41 +0100)]
python-exceptiongroup: bump to 1.1.0

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
(cherry picked from commit f04af1261cc3951305e7a2cb2acf0e596a8ce488)

23 months agoborgbackup: bump to 1.2.3
Julien Malik [Tue, 3 Jan 2023 10:42:45 +0000 (11:42 +0100)]
borgbackup: bump to 1.2.3

Signed-off-by: Julien Malik <julien.malik@paraiso.me>
(cherry picked from commit 5dffc0af0e8f7b8e609c309985ea23e95ed46fef)

23 months agosnowflake: update to 2.4.2
Nick Hainke [Sun, 15 Jan 2023 19:13:16 +0000 (20:13 +0100)]
snowflake: update to 2.4.2

Changes in version v2.4.2 - 2023-01-13
- Issue 40208: Enhance help info for capacity flag
- Issue 40232: Update README and fix help output
- Issue 40173: Increase clientIDAddrMapCapacity
- Issue 40177: Manually unlock mutex in ClientMap.SendQueue
- Issue 40177: Have SnowflakeClientConn implement io.WriterTo
- Issue 40179: Reduce turbotunnel queueSize from 2048 to 512
- Issue 40187/40199: Take ownership of buffer in QueuePacketConn QueueIncoming/WriteTo
- Add more tests for URL encoded IPs (safelog)
- Fix server flag name
- Issue 40200: Use multiple parallel KCP state machines in the server
- Add a num-turbotunnel server transport option
- Issue: 40241: Switch default proxy STUN server to stun.l.google.com

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

23 months agomiredo: add miredo.conf conffile
ValdikSS ValdikSS [Tue, 17 Jan 2023 17:49:39 +0000 (19:49 +0200)]
miredo: add miredo.conf conffile

Keep miredo.conf modified configuration upon upgrades

Signed-off-by: ValdikSS ValdikSS <iam@valdikss.org.ru>
(cherry picked from commit 95acb627f4b6853cd8fa0329f127d52118013e65)

23 months agoMerge pull request #20318 from stangri/openwrt-22.03-simple-adblock
Stan Grishin [Tue, 17 Jan 2023 03:59:32 +0000 (20:59 -0700)]
Merge pull request #20318 from stangri/openwrt-22.03-simple-adblock

[22.03] simple-adblock: update sed for allowing domains

23 months agoMerge pull request #20336 from stangri/openwrt-22.03-pbr
Stan Grishin [Tue, 17 Jan 2023 03:58:10 +0000 (20:58 -0700)]
Merge pull request #20336 from stangri/openwrt-22.03-pbr

[22.03] pbr: update to 1.0.1-14

23 months agopbr: update to 1.0.1-14
Stan Grishin [Tue, 17 Jan 2023 00:41:48 +0000 (00:41 +0000)]
pbr: update to 1.0.1-14

* improve install/uninstall messages
* fix ips add command
* add boot() to init file

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

23 months agoatlas-sw-probe: update to version 5080
Josef Schlehofer [Sun, 15 Jan 2023 12:18:35 +0000 (13:18 +0100)]
atlas-sw-probe: update to version 5080

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

23 months agogolang: Update to 1.19.5
Tianling Shen [Wed, 11 Jan 2023 03:36:27 +0000 (11:36 +0800)]
golang: Update to 1.19.5

Go1.19.5 (released 2023-01-10) includes fixes to the compiler,
the linker, and the crypto/x509, net/http, sync/atomic,
and syscall packages.

Removed upstreamed patch.

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

23 months agoatlas-probe: update to 2.6.3
Rosen Penev [Sat, 14 Jan 2023 01:08:54 +0000 (17:08 -0800)]
atlas-probe: update to 2.6.3

Switch to git tarballs.

Remove upstreamed patches and add OpenSSL patch.

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

23 months agosimple-adblock: update sed for allowing domains
Stan Grishin [Sat, 14 Jan 2023 23:00:30 +0000 (23:00 +0000)]
simple-adblock: update sed for allowing domains

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

23 months agoxz: update to version 5.4.1
Hannu Nyman [Sat, 14 Jan 2023 09:36:18 +0000 (11:36 +0200)]
xz: update to version 5.4.1

Update to 5.4.1  (keep in sync with xz in tools/)

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

23 months agodocker-compose: Update to version 2.15.1
Javier Marcet [Mon, 9 Jan 2023 19:56:58 +0000 (20:56 +0100)]
docker-compose: Update to version 2.15.1

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit e7f2e6f01cbf8cdde49c8683e7e1c6fd50b6487a)

23 months agospeedtestpp: drop libxml2 dependency
Oskari Rauta [Sat, 7 Jan 2023 20:42:44 +0000 (22:42 +0200)]
speedtestpp: drop libxml2 dependency

Co-authored-by: Tianling Shen <cnsztl@gmail.com>
Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>
(cherry picked from commit 281d62420383369a145ad41090ff498ee7067727)

23 months agoyt-dlp: update to 2023.1.6
Michal Vasilek [Tue, 10 Jan 2023 09:23:22 +0000 (10:23 +0100)]
yt-dlp: update to 2023.1.6

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

23 months agoocserv: disable libmaxminddb detection
Hannu Nyman [Mon, 9 Jan 2023 20:02:44 +0000 (22:02 +0200)]
ocserv: disable libmaxminddb detection

Disable libmaxminddb detection to fix a build error
due to missing dependency.
(the libmaxminddb library is now detected, but is unncessary.)

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

23 months agoknot: disable libmaxminddb detection
Hannu Nyman [Mon, 9 Jan 2023 20:01:32 +0000 (22:01 +0200)]
knot: disable libmaxminddb detection

Disable libmaxminddb detection to fix a build error due to
missing dependency.
(the libmaxminddb library is now detected, but is unncessary.)

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

23 months agoMerge pull request #20242 from aquilacooper/openwrt-22.03-update-stubby-to-0.4.3-1
Hannu Nyman [Mon, 9 Jan 2023 15:45:07 +0000 (17:45 +0200)]
Merge pull request #20242 from aquilacooper/openwrt-22.03-update-stubby-to-0.4.3-1

[openwrt-22.03] stubby: Update to 0.4.3

23 months agopython-pytz: bump to version 2022.7
Alexandru Ardelean [Wed, 4 Jan 2023 10:27:35 +0000 (12:27 +0200)]
python-pytz: bump to version 2022.7

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
23 months agobind: disable geoip
Javier Marcet [Mon, 9 Jan 2023 15:29:47 +0000 (17:29 +0200)]
bind: disable geoip

Signed-off-by: Javier Marcet <javier@marcet.info>
[modified also PKG_RELEASE]
(cherry picked from commit 073ee02500ca5bd0b5b530efcc662690c55ca2ac)

23 months agodocker-compose: Update to version 2.15.0
Javier Marcet [Thu, 5 Jan 2023 18:05:34 +0000 (19:05 +0100)]
docker-compose: Update to version 2.15.0

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit e38eee42a5cddb1693a55e59042925fccb59cef9)

23 months agostubby: Restart on interface trigger
Aquila Cooper [Sat, 7 Jan 2023 11:34:00 +0000 (11:34 +0000)]
stubby: Restart on interface trigger

Cherry-picked from commit 3c04a6d235346f82b9c5a79baeee1367eeb2a979.

Force restart stubby if any of the trigger interfaces goes up or down. Avoids DoT DNS lookup timeouts when default route changes, in case of multiple
upstream interfaces.

Signed-off-by: Aquila Cooper <aquila@cpr.is>
23 months agostubby: Update to 0.4.3
Aquila Cooper [Sat, 7 Jan 2023 10:55:00 +0000 (10:55 +0000)]
stubby: Update to 0.4.3

Changelog from upstream (https://github.com/getdnsapi/stubby/blob/v0.4.3/ChangeLog):

* 2022-12-22: version 0.4.3
  * Fix Issue getdnsapi/stubby#330 and PR getdnsapi/stubby#324: PrivateUsers=false needed in systemd
    stubby.service file for stubby to start.
    Thanks Archcan and Petr Menšík
  * PR getdnsapi/stubby#323: Reduce log messages when interface is offline.
    Thanks Russ Bubley and Andre Heider

* 2022-08-19: version 0.4.2
  * Fix Issue getdnsapi/stubby#320: Stubby doesn't start without "log_level"
    entry. Thanks Johnny S. Lee

* 2022-08-19: Version 0.4.1
  * Several updates to the servers in the config file:
     * sinodun.dnsovertls*.com servers are removed and will be
       decommissioned in the near future. This leaves only the
       getdnsapi.net server as the default.
       A recommendation is made that users choose additional servers
       from the list available.
     * Additional Quad9 servers added (thanks pataquets).
     * LDN servers removed as the service is now stopped.
     * Tidy up of remaining server data.
     * Change `comment` lines on Uncensored server data to more clearly
       be comments (not valid YAML)
     * Fix and improve descriptions of default values
     * getdnsapi.net DoT servers liston on port 443 now too
  * Fixes for parsing of quoted key values for `tls-ca-file`,
    `tls-curves-list` and `resolvconf`
  * Add Dockerfile into `contrib` - thanks to pataquets.
  * Strengthen version checking for LibIDN2 during the cmake step so
    LibIDN2 version 2.3.3 can be properly found (thanks jpbion).
  * Updated stubby.service file. Thanks Bruno Pagani
  * log level configurable in config file with log_level setting
    Command line setting (with -v or -l) overrules the config file
    setting

Signed-off-by: Aquila Cooper <aquila@cpr.is>
23 months agoMerge pull request #20234 from aquilacooper/patch-2
Hannu Nyman [Sat, 7 Jan 2023 09:24:23 +0000 (11:24 +0200)]
Merge pull request #20234 from aquilacooper/patch-2

[openwrt-22.03] getdns: Update to 1.7.3

23 months agogetdns: Update to 1.7.3
Aquila Cooper [Sat, 7 Jan 2023 04:50:00 +0000 (04:50 +0000)]
getdns: Update to 1.7.3

Changelog from upstream (https://github.com/getdnsapi/getdns/releases/tag/v1.7.3):

* 2022-12-22: Version 1.7.3
  * PR getdnsapi/getdns#532: Increase CMake required version 3.5 -> 3.20, because we
    need cmake_path for Absolute paths in pkg-config (See Issue getdnsapi/getdns#517)
    Thanks Gabriel Ganne
  * Updated to Stubby 0.4.3 quickfix release

* 2022-08-19: Version 1.7.2
  * Stubby updated to 0.4.2 quickfix release

* 2022-08-19: Version 1.7.1
  * Always send the `dot` ALPN when using DoT
  * Strengthen version determination for Libidn2 during cmake processing
    (thanks jpbion).
  * Fix for issue in UDP stream selection in case of timeouts.
    Thanks Shikha Sharma
  * Fix using asterisk in ipstr for any address. Thanks uzlonewolf.
  * Issue getdnsapi/stubby#295: rdata not correctly written for validation for
    certain RR type. Also, set default built type to RelWithDebInfo and
    expose CFLAGS via GETDNS_BUILD_CFLAGS define and via
    getdns_context_get_api_information()
  * Issue getdnsapi/getdns#524: Bug fixes from submodules' upstream?
    Thanks Johnnyslee
  * Issue getdnsapi/getdns#517: Allow Absolute path CMAKE_INSTALL_{INCLUDE,LIB}DIR in
    pkg-config files. Thanks Alex Shpilkin
  * Issue getdnsapi/getdns#512: Update README.md to show correct PGP key location.
    Thanks Katze Prior.

Signed-off-by: Aquila Cooper <aquila@cpr.is>
23 months agolibtorrent-rasterbar: Update to 2.0.8
Tianling Shen [Sun, 1 Jan 2023 08:33:26 +0000 (16:33 +0800)]
libtorrent-rasterbar: Update to 2.0.8

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

23 months agosyncthing: update to 1.23.0
Van Waholtz [Thu, 5 Jan 2023 10:59:11 +0000 (18:59 +0800)]
syncthing: update to 1.23.0

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

23 months agolibmaxminddb: install pkgconfig file
Rosen Penev [Wed, 4 Jan 2023 00:15:16 +0000 (16:15 -0800)]
libmaxminddb: install pkgconfig file

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

23 months agolibmaxminddb: update to 1.7.1
Rosen Penev [Fri, 4 Nov 2022 03:39:56 +0000 (20:39 -0700)]
libmaxminddb: update to 1.7.1

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

23 months agoAdGuardHome: update to v0.107.21
YiZhen Choo [Thu, 15 Dec 2022 18:28:38 +0000 (02:28 +0800)]
AdGuardHome: update to v0.107.21

Signed-off-by: YiZhen Choo <yizhen.c02@gmail.com>
(cherry picked from commit 60ae1e56378e7e614918f6ecda52f92ab6e18c73)

23 months agolibnetwork: Update to dcdf8f1 for Docker v20.10.22
Gerard Ryan [Tue, 3 Jan 2023 04:20:03 +0000 (14:20 +1000)]
libnetwork: Update to dcdf8f1 for Docker v20.10.22

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
(cherry picked from commit ec191eb08e5673b8670cd180abbc8ff5036a218b)

23 months agocontainerd: Update to v1.6.13 for Docker v20.10.22
Gerard Ryan [Tue, 3 Jan 2023 04:19:38 +0000 (14:19 +1000)]
containerd: Update to v1.6.13 for Docker v20.10.22

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
(cherry picked from commit b684f741e4c6df51a2e0d6cdfd804b511d2d7264)

23 months agodocker: Update to v20.10.22
Gerard Ryan [Tue, 3 Jan 2023 04:19:15 +0000 (14:19 +1000)]
docker: Update to v20.10.22

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
(cherry picked from commit fc7a7f61378bc71f9a698ce47a70047477f1dd38)

23 months agodockerd: Update to v20.10.22
Gerard Ryan [Tue, 3 Jan 2023 04:18:20 +0000 (14:18 +1000)]
dockerd: Update to v20.10.22

Signed-off-by: Gerard Ryan <G.M0N3Y.2503@gmail.com>
(cherry picked from commit 3c06e3a249efa362df0ab6d579d0cc494d2fab31)

23 months agoowntone: Update to 28.5
Espen Jürgensen [Mon, 2 Jan 2023 19:21:08 +0000 (21:21 +0200)]
owntone: Update to 28.5

Signed-off-by: Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
(cherry picked from commit 983006f12a041dfe9f4f7b8bee21b5b463453ee3)

23 months agoowntone: update to 28.4
Espen Jürgensen [Mon, 2 Jan 2023 19:20:53 +0000 (21:20 +0200)]
owntone: update to 28.4

Included changes:
* Install web UI
* Remove libantlr3c dependency
* Add Spotify support to description
* Updated conf file

Signed-off-by: Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
(cherry picked from commit feda8e036d14a2ad2504da075a4323bfa033c6c6)

23 months agomxml: update to 3.3.1
Espen Jürgensen [Sun, 1 Jan 2023 18:36:47 +0000 (20:36 +0200)]
mxml: update to 3.3.1

Signed-off-by: Espen Jürgensen <espenjurgensen+openwrt@gmail.com>
(cherry picked from commit 94f6216ef5d3e1587750cf383cc9763d524d1e5b)

23 months agodocker-compose: Update to version 2.14.2
Javier Marcet [Wed, 21 Dec 2022 19:49:02 +0000 (20:49 +0100)]
docker-compose: Update to version 2.14.2

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 4c58d6d288f303a7a729e88d82496d0f1afd5301)

23 months agodocker-compose: Update to version 2.14.1
Javier Marcet [Fri, 16 Dec 2022 14:33:32 +0000 (15:33 +0100)]
docker-compose: Update to version 2.14.1

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 24faf56110522e8a10be394e83af632cd022f0b7)

23 months agodocker-compose: Update to version 2.14.0
Javier Marcet [Fri, 2 Dec 2022 20:43:36 +0000 (21:43 +0100)]
docker-compose: Update to version 2.14.0

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 37a86626e05b8324e0d6234cf4f3a3f65c88c0a4)

23 months agodocker-compose: Update to version 2.12.2
Javier Marcet [Fri, 21 Oct 2022 20:41:30 +0000 (22:41 +0200)]
docker-compose: Update to version 2.12.2

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 17badaee1c630db3cf2c05b7fe903d2f225cece7)

23 months agodocker-compose: Update to version 2.12.0
Javier Marcet [Tue, 18 Oct 2022 20:40:06 +0000 (22:40 +0200)]
docker-compose: Update to version 2.12.0

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit d4134174bcd985c15b0407e3f7d39e089bc81cce)

23 months agodocker-compose: Update to version 2.11.2
Javier Marcet [Tue, 27 Sep 2022 18:10:56 +0000 (20:10 +0200)]
docker-compose: Update to version 2.11.2

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 25e3d9ef42260600264d73a3379064e7e8f4fbd7)

23 months agodocker-compose: Update to version 2.11.1
Javier Marcet [Sat, 24 Sep 2022 15:49:53 +0000 (17:49 +0200)]
docker-compose: Update to version 2.11.1

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 86fc30e177188f4b8bf2934dc2f75b2a6d455696)

23 months agodocker-compose: Update to version 2.11.0
Javier Marcet [Wed, 14 Sep 2022 13:06:51 +0000 (15:06 +0200)]
docker-compose: Update to version 2.11.0

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 2aee5cfa461c25ccbc782a372ca380014e8e3355)

23 months agodocker-compose: Update to version 2.10.2
Javier Marcet [Sat, 27 Aug 2022 12:28:09 +0000 (14:28 +0200)]
docker-compose: Update to version 2.10.2

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit ebf86a645affaa6db89d564f7f1d93feeed009a7)

23 months agodocker-compose: Update to version 2.9.0
Javier Marcet [Mon, 1 Aug 2022 17:02:16 +0000 (19:02 +0200)]
docker-compose: Update to version 2.9.0

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 35b1a03b8393ab8b8324db455cbf459faac064b2)

23 months agodocker-compose: Update to version 2.7.0
Javier Marcet [Thu, 21 Jul 2022 14:35:14 +0000 (16:35 +0200)]
docker-compose: Update to version 2.7.0

What's Changed:

 - Enhancements:

   - add support of environment secret during build step by @glours

 - Fixes:

   - networks: prevent issues due to duplicate names by @milas
   - Use appropriate dependency condition for one-shot containers when
   running compose up --wait by @laurazard
   - Fix environment variable expansion by @ulyssessouza in
   compose-spec/compose-go#276
   - Validate depended-on services exist in consistency check by
   @laurazard in compose-spec/compose-go#281
   - Fix hash usage in environment values by @ulyssessouza in
   compose-spec/compose-go#283
   - build: respect dependency order for classic builder by @milas
   - fix: panic caused by empty string argument by @nicksieger
   - (re)start should not impact one-off containers by @ndeloof
   - Fix issue with close networks name on up and down command by
   @glours
   - keep the container reference when volumes_from target a container
   and not a service by @glours
   - build.go: initialize CustomLabels map if nil by @paroque28

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit de563c1ae154e2a46f8942adaed79479b07a2fee)

23 months agodocker-compose: Update to version 2.6.1
Javier Marcet [Sun, 26 Jun 2022 16:24:40 +0000 (18:24 +0200)]
docker-compose: Update to version 2.6.1

Enhancements:

 - Support for setting secret from env variable by @ndeloof

Fixes:

 - Do not start unrelated dependencies on run by @laurazard
 - Fix service not found errors when using --no-deps by @nicksieger
 - Respect COMPOSE_REMOVE_ORPHANS env var on down by @nicksieger
 - Fix project level bind mounts volumes by @ulyssessouza
 - Respect deploy.limits.cpus and deploy.limits.pids by @glours

Internal:

 - Upgrade: Go v1.18.3 by @thaJeztah
 - Upgrade: compose-go v1.2.8 by @milas
 - Upgrade: buildx v0.8.2 by @dependabot
 - Upgrade: containerd v1.6.6 by @dependabot

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 5995e4d90b51239f3caaae75abeb8712979261b4)

23 months agodocker-compose: Update to version 2.6.0
Javier Marcet [Tue, 31 May 2022 19:03:28 +0000 (21:03 +0200)]
docker-compose: Update to version 2.6.0

What's Changed:

 - fix TestLocalComposeUp which fail locally and bump compose-go to
 1.2.7 by @glours
 - attach only to services declared by project applying profiles by
 @ndeloof
 - Add ddev's e2e test by @ulyssessouza
 - Fix local run of make e2e-compose-standalone by @ulyssessouza
 - fix: prevent flickering prompt when pulling same image from N
 services by @maxcleme
 - add tags property to build section by @glours
 - update golang version to 1.18 by @glours
 - bump compose-go to 1.2.6 by @maxcleme
 - add e2e tests to verify env variables priority by @glours
 - Import dotenv file to os environment by @ulyssessouza

New Contributors:

 - @maxcleme made their first contribution

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 8089548622c46a7f0b18b2a98a52bc658e544f3c)

23 months agodocker-compose: Update to version 2.5.1
Javier Marcet [Tue, 24 May 2022 16:45:21 +0000 (18:45 +0200)]
docker-compose: Update to version 2.5.1

What's Changed:

 - Fix relative paths on envfile label by @ulyssessouza
 - down: Reject all arguments by @Jille
 - Clarify what default work dir is when multiple compose files by
 @quite
 - compose down exit=0 if nothing to remove by @ndeloof
 - cp command: copy to all containers of a service as default
 behaviour by @glours
 - Fix extra space printed with --no-log-prefix option by @jan4843
 - bump compose-go to 1.2.5 by @ndeloof

New Contributors:

 - @Jille made their first contribution
 - @quite made their first contribution
 - @jan4843 made their first contribution

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 32d87ae946ea27c89419fee80f635473fc0fbb60)

23 months agodocker-compose: Update to version 2.5.0
Javier Marcet [Sun, 1 May 2022 14:27:04 +0000 (16:27 +0200)]
docker-compose: Update to version 2.5.0

What's Changed:

 - Fix search/replace typo in --no-TTY documentation by @ericfreese
 - Fix panic with down command when -p flag specified by @glours
 - use project we just created to start services by @ndeloof
 - include services declared by links as implicit dependencies by
 @ndeloof
 - pull to respect pull_policy by @ndeloof
 - don't ignore error by @ndeloof
 - project name MUST be lowercase by @ndeloof
 - add support for build secrets by @ndeloof
 - create also a checksums.txt file, add --binary by @MaxPeal
 - add support for ppc64le for docker compose by @snehakpersistent
 - inspect image ID after pull to se com.docker.compose.image by
 @ndeloof
 - Fix cannot setup IPAM gateway by @qnap-ericfan

New Contributors:

 - @ericfreese made their first contribution
 - @MaxPeal made their first contribution
 - @snehakpersistent made their first contribution
 - @qnap-ericfan made their first contribution

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit ac02159f6370cdb70677b91d4bc9da49d7323d3a)

23 months agodocker-compose: Update to version 2.4.1
Javier Marcet [Wed, 6 Apr 2022 08:15:24 +0000 (10:15 +0200)]
docker-compose: Update to version 2.4.1

What's Changed:

 - now we use directly the Docker CLI to run autoremove flag should
 be p… by @glours
 - use ssh config when building from compose up by @glours
 - get Tty from container to know adequate way to attach to by
 @ndeloof

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 3e4ec2a9a82077c533fa5d1c26cf3e4764de50cd)

23 months agodocker-compose: Update to version 2.4.0
Javier Marcet [Sat, 2 Apr 2022 10:48:49 +0000 (12:48 +0200)]
docker-compose: Update to version 2.4.0

What's Changed:

 - pass interactive flag to ExecOptions for the RunExec command by
 @glours
 - go.mod: pin k8s version to fix build on go1.16, and update buildx
 to v0.8.1 by @thaJeztah
 - support cache_from|to|no|pull by @ndeloof
 - fix race condition on start-stop e2e tests running in parrallel by
 @glours
 - Add support of ssh authentications defined in compose file or via
 cli… by @glours
 - fix typo in ssh option description by @mschoettle
 - Takes COMPOSE_PROJECT_NAME into consideration on commands by
 @ulyssessouza
 - Remove dead warning code by @ulyssessouza
 - Fix down command without any resource to delete by @ulyssessouza
 - vendor: github.com/containerd/containerd v1.6.2 by @thaJeztah

New Contributors:

 - @mschoettle made their first contribution

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit 29a007ee5b15ff99c1dabebf2106519fa23a6bc1)

23 months agodocker-compose: Update to version 2.3.4
Javier Marcet [Tue, 29 Mar 2022 13:07:37 +0000 (15:07 +0200)]
docker-compose: Update to version 2.3.4

What's Changed:

 - don't fail trying to remove container with no candidate by @ndeloof
 - recreate container after image has been rebuilt/pulled by @ndeloof
 - ps: un-deprecate --filter, and enhance docs by @thaJeztah
 - Bump github.com/spf13/cobra from 1.3.0 to 1.4.0 by @dependabot
 - Remove DEPRECATED text, since it's just the default by
 @ulyssessouza
 - Bump Buildx to v0.8.0 by @ndeloof
 - kill only need project name by @ndeloof
 - don't remove external volumes/networks by @ndeloof
 - use docker/cli RunExec and RunStart to handle all the
 interactive/tty/* terminal logic by @ndeloof
 - Validate doc on pr by @glours

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit b33c5dbd0695d5d2198c6888d3f75243b904f494)

23 months agotelnet-bsd: add package
Daniel Engberg [Sat, 24 Jun 2017 15:36:42 +0000 (17:36 +0200)]
telnet-bsd: add package

net/telnet-bsd: Add telnet-bsd 1.2 to repo

Patch sources:
https://gitweb.gentoo.org/repo/gentoo.git/tree/net-misc/telnet-bsd/files
https://ftp.uni-erlangen.de/gentoo-portage/net-misc/telnet-bsd/files

Template for excluding telnetd:
https://github.com/theeternalsw0rd/telnet-macos

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
[set me as maintainer, add patches suggested by @pkgadd]
Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit 51d381e5493f5d414316dfb8f6d8464683e9be11)
Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
23 months agodomoticz: update to 2022.1
Lucian Cristian [Thu, 31 Mar 2022 20:07:58 +0000 (23:07 +0300)]
domoticz: update to 2022.1

change to codeload
fix python 3.10 plugin loading and usage

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
(cherry picked from commit e1ed4ee3d33630b32ea3fb4a9463b00dd0844f92)

23 months agobind: update to version 9.18.10
Philip Prindeville [Wed, 28 Dec 2022 08:21:34 +0000 (01:21 -0700)]
bind: update to version 9.18.10

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 07f528b33121c5b26b868b6a72700e4029fe8f81)
Signed-off-by: Noah Meyerhans <frodo@morgul.net>
23 months agoMerge pull request #20156 from paper42/libarchive-cve-22
Josef Schlehofer [Wed, 28 Dec 2022 10:47:21 +0000 (11:47 +0100)]
Merge pull request #20156 from paper42/libarchive-cve-22

[22.03] libarchive: update to 3.5.3, fix CVE-2022-36227

23 months agogolang: backport an upstream fix for non-retpoline-compatible error
Tianling Shen [Tue, 27 Dec 2022 05:18:29 +0000 (13:18 +0800)]
golang: backport an upstream fix for non-retpoline-compatible error

This fixes the following build error:
```
Building targets
runtime
<autogenerated>:1: non-retpoline-compatible: 00200 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/time.go:915)       JMP     (R15)(R12*8)
<autogenerated>:1: non-retpoline-compatible: 00115 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/type.go:614)       JMP     (AX)(SI*8)
<autogenerated>:1: non-retpoline-compatible: 00028 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/time.go:452)       JMP     (R11)(R10*8)
<autogenerated>:1: non-retpoline-compatible: 00021 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/error.go:261)      JMP     (DX)(CX*8)
<autogenerated>:1: non-retpoline-compatible: 00050 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/time.go:691)       JMP     (CX)(R12*8)
<autogenerated>:1: non-retpoline-compatible: 00024 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/debuglog.go:616)   JMP     (CX)(SI*8)
<autogenerated>:1: non-retpoline-compatible: 00079 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/time.go:617)       JMP     (R9)(R8*8)
<autogenerated>:1: non-retpoline-compatible: 00025 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/cgocall.go:453)    JMP     (R9)(DX*8)
<autogenerated>:1: non-retpoline-compatible: 00018 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/type.go:66)        JMP     (DX)(CX*8)
<autogenerated>:1: non-retpoline-compatible: 00020 (/home/username/works/openwrt/staging_dir/hostpkg/lib/go-cross/src/runtime/alg.go:156)        JMP     (SI)(DX*8)
<autogenerated>:1: too many errors
```

Fixes: #20026
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 35f33c99b126cfa3ac51b9d7634340d43458b7db)

23 months agov2ray-geodata: Update to latest version
Tianling Shen [Tue, 27 Dec 2022 03:46:24 +0000 (11:46 +0800)]
v2ray-geodata: Update to latest version

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

23 months agov2ray-core: Update to 5.2.0
Tianling Shen [Tue, 27 Dec 2022 08:42:33 +0000 (16:42 +0800)]
v2ray-core: Update to 5.2.0

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

23 months agoxray-core: Update to 1.7.0
Tianling Shen [Tue, 27 Dec 2022 08:42:00 +0000 (16:42 +0800)]
xray-core: Update to 1.7.0

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

23 months agorclone: Update to 1.61.1
Tianling Shen [Sat, 24 Dec 2022 03:23:26 +0000 (11:23 +0800)]
rclone: Update to 1.61.1

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

23 months agocloudreve: Update to 3.6.2
Tianling Shen [Sat, 24 Dec 2022 03:18:45 +0000 (11:18 +0800)]
cloudreve: Update to 3.6.2

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

23 months agoxray-core: Update to 1.6.6-2
Tianling Shen [Sun, 25 Dec 2022 07:01:03 +0000 (15:01 +0800)]
xray-core: Update to 1.6.6-2

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

23 months agoyq: Update to 4.30.6
Tianling Shen [Sun, 25 Dec 2022 06:58:12 +0000 (14:58 +0800)]
yq: Update to 4.30.6

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

23 months agodnsproxy: Update to 0.46.5
Tianling Shen [Sun, 25 Dec 2022 06:58:03 +0000 (14:58 +0800)]
dnsproxy: Update to 0.46.5

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

23 months agodnslookup: Update to 1.8.1
Tianling Shen [Sun, 25 Dec 2022 06:57:49 +0000 (14:57 +0800)]
dnslookup: Update to 1.8.1

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

23 months agocloudflared: Update to 2022.12.1
Tianling Shen [Sun, 25 Dec 2022 06:57:37 +0000 (14:57 +0800)]
cloudflared: Update to 2022.12.1

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

23 months agonatmap: update to 20221225
Richard Yu [Mon, 26 Dec 2022 04:29:02 +0000 (12:29 +0800)]
natmap: update to 20221225

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit 6163de4ffa21ad3fdd0df167d2ad926954e4f673)

23 months agonatmap: fix service not stopped when disabled in luci
Richard Yu [Mon, 26 Dec 2022 04:28:52 +0000 (12:28 +0800)]
natmap: fix service not stopped when disabled in luci

luci removes `enable` option when disabled,
fix by setting default value to 0.

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit 8111d494749ad1f56218852fb9a587e99c173870)

23 months agonatmap: add Package/conffiles
Richard Yu [Mon, 26 Dec 2022 04:28:36 +0000 (12:28 +0800)]
natmap: add Package/conffiles

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit 39af47f1c08ba161b0320e6d3af02ed19f549911)

23 months agonode: bump to v16.19.0
Hirokazu MORIKAWA [Tue, 20 Dec 2022 01:51:56 +0000 (10:51 +0900)]
node: bump to v16.19.0

Notable Changes
*OpenSSL 1.1.1s
*Root certificates updated to NSS 3.85
*Time zone update to 2022f

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

23 months agoMerge pull request #20160 from stangri/openwrt-22.03-pbr
Stan Grishin [Thu, 22 Dec 2022 21:56:57 +0000 (14:56 -0700)]
Merge pull request #20160 from stangri/openwrt-22.03-pbr

[22.03] pbr: bugfix: Makefile, rt_tables fix

23 months agopbr: bugfix: Makefile, rt_tables fix
Stan Grishin [Thu, 22 Dec 2022 18:52:41 +0000 (18:52 +0000)]
pbr: bugfix: Makefile, rt_tables fix

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

23 months agolibarchive: add missing CONFLICT
Michal Vasilek [Thu, 22 Dec 2022 12:05:51 +0000 (13:05 +0100)]
libarchive: add missing CONFLICT

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
23 months agolibarchive: fix CVE-2022-36227
Michal Vasilek [Thu, 22 Dec 2022 10:16:29 +0000 (11:16 +0100)]
libarchive: fix CVE-2022-36227

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
23 months agolibarchive: update to 3.5.3
Michal Vasilek [Thu, 22 Dec 2022 10:16:02 +0000 (11:16 +0100)]
libarchive: update to 3.5.3

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
23 months agoMerge pull request #20154 from ysc3839/natmap-fix-2203
Tianling Shen [Thu, 22 Dec 2022 06:59:00 +0000 (14:59 +0800)]
Merge pull request #20154 from ysc3839/natmap-fix-2203

[22.03] natmap: add forward_port option