python-pytest: update to version 6.2.3

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

Merge pull request #15235 from TDT-AG/pr/20210323-collectd-mod-ubi

collectd: add bad blocks percent calculation for ubi plugin

Merge pull request #15359 from BKPepe/zeroconf

zeroconf: update to version 0.29.0

Merge pull request #15358 from BKPepe/ytdl

youtube-dl: update to version 2021.4.7

minisatip: add libdvbcsa support

Unconditionally enable with BUILD_PATENTED.

Simplify configure args.

Add missing PKG_CONFIG_DEPENDS

Signed-off-by: Rosen Penev <rosenp@gmail.com>

lualanes: build with CMake

Faster to compile.

Add license information.

Several cleanups for consistency between packages.

Small patch fix now that uClibc-ng is gone.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

zeroconf: update to version 0.29.0

Update copyright in Makefile

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

youtube-dl: update to version 2021.4.7

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

mosquitto: bump to 2.0.10

This is a security fix, affecting 2.0.0 through to 2.0.9.  Mosquitto instances
could be remotely DoS'd by authenticated clients.

Release notes at: https://github.com/eclipse/mosquitto/blob/v2.0.10/ChangeLog.txt
CVE number has not yet been assigned.

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

haproxy: Update HAProxy to v2.2.13

- Update haproxy download URL and hash

Signed-off-by: Christian Lachner <gladiac@gmail.com>

Merge pull request #15337 from SvenRoederer/xinetd-include

xinetd: honor ${IPKG_INSTROOT} when sourcing /lib/functions.sh

meson: fix compilation with at least spice

This commit should also get rid of pointless option warnings.

Also removed an extra ) that was causing a bad cpu value.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

pillow: bump to version 8.2.0

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

libmaxminddb: build with CMake

Faster and less error prone.

Small cleanups.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

strongswan: bump to 5.9.2

Retire weak algorithms like MD5 and 3DES.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

strongswan: force PIC on all builds

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

libcap: drop from feed

The libcap package was moved to OpenWrt base.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

python3: bump to version 3.9.4

For some reason Python3 jumped from 3.9.2 to 3.9.4 in about a week.

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

uacme: add retries

Prior to this commit, the acme service attempted to obtain certificates
once and then terminated, regardless of whether the certificate could be
obtained or not. This commit introduces a new uci option "retries" to
the "certificate" section. If this option is set to N, the acme service
will attempt to obtain the certificate up to N times before terminating.
There is a waiting pause between the retries to comply with the rate
limits of Let'sEncrypt.

The waiting pause is:
-  2 minutes for staging certificates
- 24 minutes for production certificates

The current "Failed Validation" rate limits of Let'sEncrypt are:
- staging:   60 per hour -> 1 failure every 1 minute in avg.
- production: 5 per hour -> 1 failure every 12 minutes in avg.

This means that we are within rate limits by a factor of two.

By default the option "retries" is set to "1", which means that acme
behaves as before by default. If the variable is set to "0", infinite
retries are performed.

This feature is helpful, when you already want to initiate the
certificate request, but you are still waiting for your dns server to be
configured, your network to appear or other conditions.

Signed-off-by: Leonardo Mörlein <git@irrelefant.net>

lua-openssl: try to fix buildbot

Something is weird there. Can't reproduce on CI or locally.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

libdvbcsa: add BUILD_PATENTED

This was missing in the initial commit.

Add AUTORELEASE as well for simplicity.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

uacme: propagate rc of uacme in issue_cert()

Before this commit, issue_cert always returned 1 no matter if uacme
returned 1, 2, 3, ... With this commit, the return code of the uacme
binary is propagated. Therefore the caller of issue_cert can
differentiate between "no renew necessary" and "an error occurred".

Signed-off-by: Leonardo Mörlein <me@irrelefant.net>

uacme: allow including run-uacme

With this commit, the run-acme script can be included into other scripts
by setting INLCUDE_ONLY=1.

Signed-off-by: Leonardo Mörlein <me@irrelefant.net>

jool: Update to 4.1.5

Compile and run tested on: mvebu (Turris Omnia)

Signed-off-by: Ondřej Caletka <ondrej@caletka.cz>

python-dotenv: update to v0.17.0

Signed-off-by: Javier Marcet <javier@marcet.info>

Merge pull request #14708 from pprindeville/strongswan-add-swanctl-initd

strongswan: migrate to swanctl configs

strongswan: migrate to swanctl configs

Derived from the ipsec initd script, with the following changes:

(1) various code improvements, corrections (get rid of left/right
    updown scripts, since there's only one), etc;
(2) add reauth and fragmentation parameters;
(3) add x.509 certificate-based authentication;

and other minor changes.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

Merge pull request #15339 from pprindeville/strongswan-reset-ipsec.conf

strongswan: remove synthesized ipsec conf files

dbus: update to 1.13.18

Switch to building with CMake for faster compilation.

Switch to AUTORELEASE for simplicity.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Merge pull request #15329 from G-M0N3Y-2503/cache-domains-fix

cache-domains: Fixed host files directory

Merge pull request #15330 from 1715173329/xray

xray-core: Update to 1.4.2

bash: fixing missing PARAMS() macro in strtod.c

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

libdvbcsa: add new package

Libdvbcsa is a free implementation of the DVB Common Scrambling Algorithm DVB/CSA - with encryption and decryption capabilities.

OpenWrt packages like `tvheadend` and `minisatip` can benefit from it.

Signed-off-by: Rafał Dzięgiel <rafostar.github@gmail.com>

Merge pull request #15074 from ja-pa/python-greenlet

python-eventlet & python-greenlet: add new packages

Merge pull request #15025 from ja-pa/python-flask-socketio

python-flask-socketio: add new package

Merge pull request #15080 from ja-pa/python-pysocks

python-pysocks: add new package

overture: update to 1.7

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>

netifyd: support filter parameter

netifyd supports a '-F' filter option in 'bpf' notation to filter
packets from its consideration.

Add support for a uci 'filter' option. eg. filter to exclude SSDP
multicasts from a particularly noisy device:

option filter 'not (udp and dst 239.255.255.250 and dst port 1900 and src 192.168.1.5)'

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>

python-flask-httpauth: add new package

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

restic-rest-server: fix configuration option names

Signed-off-by: Anton Ryzhov <anton@ryzhov.me>

yggdrasil: bump to 0.3.16

Signed-off-by: George Iv <zhoreeq@users.noreply.github.com>

rp-pppoe: use pppoe.so instead of rp-pppoe.so

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>

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>

xinetd: honor ${IPKG_INSTROOT} when sourcing /lib/functions.sh

Avoid "file not found"-error when embedding via Imagebuilder.

Signed-off-by: Sven Roederer <devel-sven@geroedel.de>

banip: bugfix 0.7.6-2

* fix housekeeping of external list sources

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

lua-openssl: update to 0.7.8-0

Swith to building with CMake to avoid huge patching of the stock
Makefile.

Reorganize Makefile for consistency between packages.

Add patch to fix deprecated OpenSSL functions.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

poco: update to 1.10.1

Switch to AUTORELEASE for simplicity.

Move MAINTAINER line up for consistency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

xray-core: Update to 1.4.2

Updated geo datas to latest version.

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

xray-core: init: add browser dialer support

Since v1.4.1, Xray has introduced a new feature to transfer data via
browsers, which can disguise itself as a normal browser to cheat
network censorship.

For more details, see https://github.com/XTLS/Xray-core/pull/421.

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

cache-domains: Fixed host files directory
* Hid unnecessary output

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

Merge pull request #15301 from ja-pa/git-lfs-2.13.3

git-lfs: update to version 2.13.3

strongswan: remove synthesized ipsec conf files

If you shutdown ipsec service, and it doesn't clean up
/var/ipsec/ipsec.conf, then when you start swanctl service it
might see an incompatible file on startup.  Remedy is to
remove unneeded files when shutting down the service.  They
can always be regenerated when the service starts again.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

Merge pull request #15286 from pprindeville/strongswan-move-ipsec.secrets

strongswan: move ipsec conf files to subpackage

openvpn: fix invoking user up & down commands from hotplug wrapper

This commit adds a number of fixes to the OpenVPN up/down hotplug command
wrapper which currently fails to actually invoke user defined up and down
commands for uci configurations not using external native configurations.

 - Use the `--setenv` to pass the user configured `up` and `down` commands
   as `user_up` and `user_down` environment variables respectively

 - Instead of attempting to scrape the `up` and `down` settings from the
   (possibly generated) native OpenVPN configuration in
   `/etc/hotplug.d/openvpn/01-user`, read them from the respective
   environment variables instead

 - Fix parsing of native configuration values in `get_openvpn_option()`;
   first try to parse a given setting as single quoted value, then as
   double quoted and finally as non-quoted, potentially white-space
   escaped one. This ensures that `up '/bin/foo'` is interpreted as
   `/bin/foo` and not `'/bin/foo'`

Ref: https://forum.openwrt.org/t/openvpn-up-down-configuration-ignored/91126
Supersedes: #15121, #15284
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

Merge pull request #15327 from ja-pa/curl-7.76.0

curl: update to version 7.76.0 (security fix)

tmate-ssh-server: add package

The `tmate` tool is a fork of `tmux` which allows remote access to a
device without setting up any port forwarding. This commits adds the
backend server which handles connections.

Signed-off-by: Paul Spooren <mail@aparcar.org>

curl: update to version 7.76.0

Fixes CVE-2021-22876 and CVE-2021-22890

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

xray-core: Update to 1.4.1

Updated geodata to latest version.

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

yq: Update to 4.6.3

- Re-assigned myself as the maintainer
- Used $(AUTORELEASE) for PKG_RELEASE

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

strongswan: move ipsec conf files to subpackage

These config files are only used by the ipsec interface to charon,
and shouldn't be part of the base package.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

autopart: add package

The 'autopart' package is intended for devices with rather large
block device storage (ie. SATA or MMC).
It automatically allocates the free space on the block device used
for booting into an LVM2 physical volume.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

ovsd: add package

Add Open vSwtich configuration daemon for netifd.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

podman: Add selinux variant and several improvements

* add -selinux variant which depends on libselinux
* init script for background service
* updated configurations
* maintainer change as requested

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>

python3-pyroute2: update to version 0.5.16

Signed-off-by: Martin Matějek <martin.matejek@gmx.com>

Merge pull request #15311 from commodo/stress-ng

stress-ng: bump to version 0.12.06

oci-runtime-tools: provide rootfs-arm64 for oci-runtime-tests

Download static busybox to provide rootfs-amd64.tar.gz for test-suite.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

podman: add 'crun' to containers.conf

Now that 'crun' has been packaged, add support for it in podman.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

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>

cni-plugins: depend on kmod-veth

cni-plugins makes use of veth, make sure kernel module is installed.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

libseccomp: don't build on ARC

ARC architecture is not yet supported by libseccomp.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

Merge pull request #15300 from commodo/python-updates1

Python updates1

Merge pull request #15298 from egorenar/icecast

icecast: fix whitespace in init file

Merge pull request #15299 from egorenar/mpd

mpd: run mpd as a non-root user

Merge pull request #15303 from Payne-X6/master

knot: update to version 3.0.5

conmon: fix segfault, correct a typo and update description

Signed-off-by: Oskari Rauta <oskari.rauta@gmail.com>

knot: update to version 3.0.5

Signed-off-by: Jan Hak <jan.hak@nic.cz>

stress-ng: bump to version 0.12.06

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

git-lfs: update to version 2.13.3

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

icecast: fix whitespace in init file

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>

mpd: run mpd as a non-root user

* Make /etc/mpd.conf worldreadable.

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>

numpy: bump to version 1.20.2

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

python-lxml: bump to version 4.6.3

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

gunicorn: bump to version 20.1.0

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

django-restframework: bump to version 3.12.4

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

whois: update to 5.5.9

* Updated the .ga TLD server.
* Removed the .cd and cf TLD servers.
* Removed 72 new gTLDs which are no longer active.

Signed-off-by: Paul Spooren <mail@aparcar.org>

apk: update to 2.12.4

Ariadne Conill (1):
      database: do not chroot(".") unless actually necessary

Martin Vahlensieck (1):
      Use correct port when redirected

Timo Teräs (5):
      db: fix control character check to use uint8_t
      libfetch: send Proxy-Authorization also for https connect
      del: report correctly package's provides names

Signed-off-by: Paul Spooren <mail@aparcar.org>

Merge pull request #15289 from dibdot/banip

banip: update to 0.7.6

Merge pull request #15291 from egorenar/mpd-lame-encoder

mpd-full: enable lame and vorbis encoders

frr: update to 7.5.1 and backports

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

mpd-full: enable lame and vorbis encoders

Enable Vorbis encoder for OGG format and lame for MP3.
This enables mpd to stream OGG and MP3 to e.g. Icecast2.

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>

banip: update to 0.7.6

* rework the central iptables function to significantly
  reduce the code complexity and the overall number of iptables calls
* check early and only once in the chain for ctstate NEW and
  return otherwise (thanks @ldir-EDB0)
* made the whitelist ordering within the chain more flexible

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

Merge pull request #15012 from neheb/ninja

treewide: build CMake projects with Ninja

treewide: build CMake projects with Ninja

faster to compile.

A small selection of packages was tested going from:

Executed in  696.30 secs   fish           external
   usr time   82.98 mins  395.00 micros   82.98 mins
   sys time    9.02 mins    0.00 micros    9.02 mins

to:

Executed in  592.20 secs   fish           external
   usr time   84.84 mins  361.00 micros   84.84 mins
   sys time    8.85 mins   57.00 micros    8.85 mins

Tested by running make -j 12 and wiping staging/build_dir/target_x

Signed-off-by: Rosen Penev <rosenp@gmail.com>

ninja: add custom target support for ninja-cmake

Allows fixing compilation with at least mariadb.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Merge pull request #15288 from neheb/fontco

fontconfig: compile with meson

fontconfig: compile with meson

Faster compilation.

Backport upstream patch fixing cross compilation.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Merge pull request #15280 from egorenar/imagemagick-freetype-link-fix

imagemagick: fix linking of host libfreetype

imagemagick: fix linking of host libfreetype

Host's libfreetype is being linked during build.

libtool: warning: relinking 'MagickWand/libMagickWand-7.Q8.la'
libtool: install: (cd /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5; /bin/sh "/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/libtool"  --tag CC --mode=relink arm-openwrt-linux-muslgnueabi-gcc -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/libpng16 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/freetype2 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include/libpng16 -I/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/include -Os -pipe -fno-caller-saves -fno-plt -fhonour-copts -Wno-error=unused-but-set-variable -Wno-error=unused-result -mfloat-abi=hard -fmacro-prefix-map=/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5=ImageMagick-7.0.9-5 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro -flto -Wall -fexceptions -pthread -DMAGICKCORE_HDRI_ENABLE=0 -DMAGICKCORE_QUANTUM_DEPTH=8 -no-undefined -Wl,--version-script=./MagickWand/libMagickWand.map -version-info 7:0:0 -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/usr/lib -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/lib -znow -zrelro -o MagickWand/libMagickWand-7.Q8.la -rpath /usr/lib MagickWand/libMagickWand_7_Q8_la-animate.lo MagickWand/libMagickWand_7_Q8_la-compare.lo MagickWand/libMagickWand_7_Q8_la-composite.lo MagickWand/libMagickWand_7_Q8_la-conjure.lo MagickWand/libMagickWand_7_Q8_la-convert.lo MagickWand/libMagickWand_7_Q8_la-deprecate.lo MagickWand/libMagickWand_7_Q8_la-display.lo MagickWand/libMagickWand_7_Q8_la-drawing-wand.lo MagickWand/libMagickWand_7_Q8_la-identify.lo MagickWand/libMagickWand_7_Q8_la-import.lo MagickWand/libMagickWand_7_Q8_la-magick-cli.lo MagickWand/libMagickWand_7_Q8_la-magick-image.lo MagickWand/libMagickWand_7_Q8_la-magick-property.lo MagickWand/libMagickWand_7_Q8_la-magick-wand.lo MagickWand/libMagickWand_7_Q8_la-mogrify.lo MagickWand/libMagickWand_7_Q8_la-montage.lo MagickWand/libMagickWand_7_Q8_la-operation.lo MagickWand/libMagickWand_7_Q8_la-pixel-iterator.lo MagickWand/libMagickWand_7_Q8_la-pixel-wand.lo MagickWand/libMagickWand_7_Q8_la-script-token.lo MagickWand/libMagickWand_7_Q8_la-stream.lo MagickWand/libMagickWand_7_Q8_la-wand.lo MagickWand/libMagickWand_7_Q8_la-wandcli.lo MagickWand/libMagickWand_7_Q8_la-wand-view.lo MagickCore/libMagickCore-7.Q8.la -lm -inst-prefix-dir /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/ipkg-install)
libtool: relink: arm-openwrt-linux-muslgnueabi-gcc -shared  -fPIC -DPIC  MagickWand/.libs/libMagickWand_7_Q8_la-animate.o MagickWand/.libs/libMagickWand_7_Q8_la-compare.o MagickWand/.libs/libMagickWand_7_Q8_la-composite.o MagickWand/.libs/libMagickWand_7_Q8_la-conjure.o MagickWand/.libs/libMagickWand_7_Q8_la-convert.o MagickWand/.libs/libMagickWand_7_Q8_la-deprecate.o MagickWand/.libs/libMagickWand_7_Q8_la-display.o MagickWand/.libs/libMagickWand_7_Q8_la-drawing-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-identify.o MagickWand/.libs/libMagickWand_7_Q8_la-import.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-cli.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-image.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-property.o MagickWand/.libs/libMagickWand_7_Q8_la-magick-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-mogrify.o MagickWand/.libs/libMagickWand_7_Q8_la-montage.o MagickWand/.libs/libMagickWand_7_Q8_la-operation.o MagickWand/.libs/libMagickWand_7_Q8_la-pixel-iterator.o MagickWand/.libs/libMagickWand_7_Q8_la-pixel-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-script-token.o MagickWand/.libs/libMagickWand_7_Q8_la-stream.o MagickWand/.libs/libMagickWand_7_Q8_la-wand.o MagickWand/.libs/libMagickWand_7_Q8_la-wandcli.o MagickWand/.libs/libMagickWand_7_Q8_la-wand-view.o   -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/usr/lib -L/home/egorenar/Repositories/openwrt-rel/staging_dir/toolchain-arm_cortex-a15+neon-vfpv4_gcc-8.4.0_musl_eabi/lib -L/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/ipkg-install/usr/lib -L/usr/lib -lMagickCore-7.Q8 -L/home/egorenar/Repositories/openwrt-rel/staging_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/usr/lib -lfreetype -lz -lltdl -lm  -Os -mfloat-abi=hard -fstack-protector -Wl,-z -Wl,now -Wl,-z -Wl,relro -flto -pthread -Wl,--version-script=./MagickWand/libMagickWand.map   -pthread -Wl,-soname -Wl,libMagickWand-7.Q8.so.7 -o MagickWand/.libs/libMagickWand-7.Q8.so.7.0.0
/usr/lib/libfreetype.so: file not recognized: file format not recognized
collect2: error: ld returned 1 exit status
libtool:   error: error: relink 'MagickWand/libMagickWand-7.Q8.la' with the above command before installing it
make[5]: *** [Makefile:6264: install-libLTLIBRARIES] Error 1
make[5]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[4]: *** [Makefile:12263: install-am] Error 2
make[4]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[3]: *** [Makefile:12257: install] Error 2
make[3]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5'
make[2]: *** [Makefile:153: /home/egorenar/Repositories/openwrt-rel/build_dir/target-arm_cortex-a15+neon-vfpv4_musl_eabi/ImageMagick-7.0.9-5/.built] Error 2
make[2]: Leaving directory '/home/egorenar/Repositories/openwrt-rel/feeds/packages/multimedia/imagemagick'
time: package/feeds/packages/imagemagick/compile#105.77#18.23#212.14
    ERROR: package/feeds/packages/imagemagick failed to build.
make[1]: *** [package/Makefile:114: package/feeds/packages/imagemagick/compile] Error 1
make[1]: Leaving directory '/home/egorenar/Repositories/openwrt-rel'
make: *** [/home/egorenar/Repositories/openwrt-rel/include/toplevel.mk:230: package/imagemagick/compile] Error 2

Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>

Merge pull request #14711 from pprindeville/strongswan-make-includes-persistent

strongswan: make the include's in the .conf files persistent

podman: update to version 3.0.1

Signed-off-by: Daniel Golle <daniel@makrotopia.org>