vpnbypass: README update, code cleanup

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

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

ocserv: updated to 1.1.1

miniupnpd: add miniupnpd ipv6_disable option, #11971 close

Signed-off-by: Alexey Kuznetsov <axet@me.com>
(cherry picked from commit 9b6537b4877077cbc68b9156da363d834fe53a69)

Merge pull request #13434 from stangri/19.07-simple-adblock

[19.07 simple-adblock: add config auto-update feature

simple-adblock: add config auto-update feature

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

collectd: update to 5.12.0

Update collectd to version 5.12.0.

* Refresh patches
* Remove upstreamed patch 920-fix-ubi-data-source-type.patch
* Backport a patch from upstream to fix a missing define
  (920-backport-netlink-reg-noerror.patch)

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

collectd: update PKG_RELEASE

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

collectd: remove quotation on interval this is an number

The value is a number and not a string.

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

collectd: move include line

Currently the init script generates a config file from uci, that has the
include line before the interval line. This means, that anything happening
in the include directory does not yet see the changed Interval.

Moving the include line before the uci generation process fix this issue.

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

collectd: update PKG_RELEASE

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

collectd: fix ubi data source type

Currently the values are stored in the ubi plugin as data source type
`counter`. But this makes no sense, because the values change very slowly
and I don't want to know the rate of change. It is better to store the
value as data source type `gauge`. Then I can see the current value.

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

collectd: add ubi uci and plugin info

Add uci binding for ubi plugin.

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

collectd: enable ubi plugin

Enable ubi plugin.

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

zmq: fix compilation when libbsd is present

Limit libbsd support to glibc.

Remove wrong python variable.

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

pigeonhole: update to 0.5.11

This fixes an error in the previous package when building against recent
OpenWrt releases:

In file included from /builder/shared-workdir/build/sdk/staging_dir/target-x86_64_musl/usr/include/dovecot/lib.h:50,
                 from ext-variables-common.c:4:
ext-variables-common.c: In function 'ext_variables_load':
ext-variables-common.c:91:14: error: expected ')' before 'PRIuSIZE_T'
       "(>= %"PRIuSIZE_T" bytes)",

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

zmq: update to version 4.3.3 (security fix)

Fixes
CVE-2020-15166

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

zmq: fix the installed files

the versioned so files are needed.

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

zmq: fix pkgconfig file

It seems upstream broke it. This in turn broke depending packages.

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

zmq: update to 4.3.2

Remove upstreamed patches.

Add uClibc++ patch for those that need it.

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

zmq: switch to building with CMake

Faster compilation.

Before:

time make package/zmq/compile -j 12
Executed in   24.98 secs   fish           external
   usr time   97.41 secs  263.00 micros   97.40 secs
   sys time   12.51 secs   34.00 micros   12.51 secs

After:

time make package/zmq/compile -j 12
Executed in   18.17 secs   fish           external
   usr time   85.22 secs  248.00 micros   85.22 secs
   sys time    9.23 secs   32.00 micros    9.23 secs

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

Merge pull request #13397 from ja-pa/libxml2-patch-19.07

[OpenWrt 19.07] libxml2: patch security issues

libxml2: patch security issues

Fixes
CVE-2019-19956
CVE-2020-24977
CVE-2019-20388
CVE-2020-7595

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

Merge pull request #13392 from etactica/u2pnpd-1907

[19.07] u2pnpd: convert to procd

net/u2pnpd: convert init to procd

Drops pid files, no longer needed with procd management.
Now properly reloads on reload_config after UCI changes.

Signed-off-by: Karl Palsson <karlp@etactica.com>
[ Fixed two shellcheck warnings and bump PKG_RELEASE ]
Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Merge pull request #13385 from odmdas/odmdas-freeradius3-radtest-19.07

[19.07] freeradius3: enable radtest utility and adapt it to OpenWrt

freeradius3: fix hostname invocation in radtest

Canonical radtest start results in an error:

$ radtest bob hello localhost 0 testing123
/usr/bin/radtest: line 1: hostname: not found
(0) Error parsing "stdin": Failed to get value

hostname command is not present in OpenWrt.
Instead, hostname can be obtained from file /proc/sys/kernel/hostname.

added: 005-get-hostname-from-proc-in-radtest.patch

(backported from commit 8b2792a)
Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com>

freeradius3: enable radtest utility

radtest utility is used in many manuals to check the operation of
radius server.

At the moment all parameters must be specified at startup, for example:

$ radtest bob hello localhost 0 testing123 0 localhost

(backported from commit 6480acd)
Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com>

Merge pull request #13382 from Andy2244/samba_4-11-12

[19.07] samba4: update to 4.11.12

samba4: update to 4.11.12

* update to 4.11.12
* fix optional modules not included on module build (vfs_btrfs, vfs_linux_xfs_sgid)

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

youtube-dl: update to version 2020.9.6

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

msmtp: update to version 1.8.12

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

dovecot: disable zstd

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

syslog-ng: update to version 3.29.1

Changelog: https://github.com/syslog-ng/syslog-ng/releases/tag/syslog-ng-3.29.1

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

php7: update to 7.2.33

This fixes:
  - CVE-2020-7068

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

Merge pull request #13356 from rs/nextdns-1.8.3-openwrt-19.07

[19.07] nextdns: Update to version 1.8.3

nextdns: Update to version 1.8.3

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

gnutls: update to version 3.6.15 (security fix)

Fixes:
CVE-2020-24659

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

Merge pull request #13336 from rs/nextdns-1.8.2-openwrt-19.07

[19.07] nextdns: Update to version 1.8.2

Merge pull request #13334 from ja-pa/python-rsa-fix-19.07

[OpenWrt 19.07] python-rsa: downgrade to version 4.5 for python2

dovecot: update to version 2.3.11.3 (security fix)

Fixes:
CVE-2020-12100
CVE-2020-12673
CVE-2020-12674

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

nextdns: Update to version 1.8.2

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

python-rsa: downgrade to version 4.5 for python2

Note:
This fixes error introduced in https://github.com/openwrt/packages/commit/7af8eaad11ad2e449ed47529f1b325d7643b7817
Version 4.6 doesn't support python2

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

Merge pull request #13310 from EricLuehrsen/unbound_20200904_1907

[19.07] unbound: improve odhcpd rapid update robustness

unbound: improve odhcpd rapid update robustness

cherry-pick: bce5f44f5af6510db484389b8cc0636f6de08877
Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>

htop: update to 3.0.1-1

Build-tested: x86/64
Run-tested: ipq806x (R7800)

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit 1d989fc64db697b7482999a02c2b46ff3ca4d113)

htop: update to 3.0.0-1

new upstream, new release taken from ChangeLog[1]:
 New maintainers - after a prolonged period of inactivity from Hisham,
 the creator and original maintainer, a team of community maintainers
 have volunteered to take over a fork at https://htop.dev and
 https://github.com/htop-dev to keep the project going.

1. https://github.com/htop-dev/htop/blob/master/ChangeLog

Signed-off-by: John Audia <graysky@archlinux.us>
(cherry picked from commit acbdaf863fd8e2d6896073181a788b4ba106b43d)

htop: fix compilation with GCC10

Patch taken from upstream.

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

python-rsa: update to version 4.6 (security fix)

Fixes CVE-2020-13757

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

knot: update to version 2.9.6

Signed-off-by: Jan Hak <jan.hak@nic.cz>
(cherry picked from commit 60a35cd1c69b195386ba39b09256d5c7e01e97ae)

Merge pull request #13269 from ja-pa/git-security-update-19.07

[OpenWrt 19.07] git: update to version 2.26.2 (security fix)

git: update to version 2.26.2 (security fix)

Fixes CVE-2020-11008

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

Merge pull request #13266 from jefferyto/pip-locked-openwrt-19.07

[openwrt-19.07] python,python3: Use locked for host pip

python,python3: Use locked for host pip

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

nano: update to 5.2

Update nano editor to version 5.2.

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

clamav: update to version 0.102.4 (security fix)

Fixes
CVE-2020-3481

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

clamav: update to version 0.102.3 (security fix)

Fixes:
CVE-2020-3341
CVE-2020-3327

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

clamav: update to 0.102.2

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

bind: New upstream version 9.16.6

Several security issures are addressed:

 - CVE-2020-8620 It was possible to trigger an assertion failure by sending
   a specially crafted large TCP DNS message.
 - CVE-2020-8621 named could crash after failing an assertion check in
   certain query resolution scenarios where QNAME minimization and
   forwarding were both enabled. To prevent such crashes, QNAME minimization is
   now always disabled for a given query resolution process, if forwarders are
   used at any point.
 - CVE-2020-8622 It was possible to trigger an assertion failure when
   verifying the response to a TSIG-signed request.
 - CVE-2020-8623 When BIND 9 was compiled with native PKCS#11 support, it
   was possible to trigger an assertion failure in code determining the
   number of bits in the PKCS#11 RSA public key with a specially crafted
   packet.
 - CVE-2020-8624 update-policy rules of type subdomain were incorrectly
   treated as zonesub rules, which allowed keys used in subdomain rules to
   update names outside of the specified subdomains. The problem was fixed by
   making sure subdomain rules are again processed as described in the ARM.

Full release notes are available at
https://ftp.isc.org/isc/bind9/9.16.6/doc/arm/html/notes.html#notes-for-bind-9-16-6

Signed-off-by: Noah Meyerhans <frodo@morgul.net>
(cherry picked from commit cf61f7f8ef17bbf518b2ccc7536bb0f3c8828f52)

bind: update to 9.16.4

This update fixes the following CVE's:
- CVE-2020-8618
- CVE-2020-8619

More info on bug fixes and feature changes in:
https://downloads.isc.org/isc/bind9/9.16.4/doc/arm/html/notes.html

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

Merge pull request #13187 from stangri/19.07-simple-adblock

[19.07] simple-adblock: bugfix: update config; use command -v

simple-adblock: bugfix: update config; use command -v

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

nspr: update to version 4.27

Note:
new version required by nss 3.55

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

nspr: nspr add -flto to compile

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

nspr: fix compilation with newer musl

Include proper sgidefs define.

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

nspr: update to 4.25

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

nss: update to version 3.55 (security fix)

Fixes
CVE-2020-12403
CVE-2020-12401
CVE-2020-6829
CVE-2020-12400

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

nss: update to 3.53

also enable parallel build as now is safe

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

nss: fix build for mips64
disable arm32_neon on unsupported target

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

nss: revert -flto change
it seems that it can lead to segfault in libfreebl3.so

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

nss: add -flto and makefile cleanup

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

nss: update to 3.52

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

nss: update to 3.51.1

also refresh patches

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

nss: update to 3.51

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

nss: update to 3.50

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

nss: update to 3.49.2

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

libffi: fix build failure on powerpc platforms

This is an upstream backport.

Currently on the buildbots, having libffi unavailable leads to long
range build failures.

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

libffi: update to 3.3

Remove autoreconf. autotools files are no longer patched.

Add PKG_BUILD_PARALLEL for faster compilation.

Removed upstreamed patches.

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

libffi: do not build in a special directory

There's no need. It also breaks host builds.

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

net/mosquitto: Update to 1.6.12

Security release.  From the changelog:

- In some circumstances, Mosquitto could leak memory when handling PUBLISH
  messages. This is limited to incoming QoS 2 messages, and is related
  to the combination of the broker having persistence enabled, a clean
  session=false client, which was connected prior to the broker restarting,
  then has reconnected and has now sent messages at a sufficiently high rate
  that the incoming queue at the broker has filled up and hence messages are
  being dropped. This is more likely to have an effect where
  max_queued_messages is a small value. This has now been fixed. Closes
  https://github.com/eclipse/mosquitto/issues/1793

Changelog: https://mosquitto.org/blog/2020/08/version-1-6-12-released/

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

python3: fix rebasing error

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

python: fix host compilation with clang

Matched rpath parameter with Makefile.

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

python3: fix host compilation with clang

Matched rpath parameter with Makefile.

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

Merge pull request #13132 from jjm2473/lvm2-fix-mac-sh-for-1907

lvm2: fix CE in mac (backport)

lvm2: fix CE in mac

command-count.h generated by makefile was wrong
when using default shell in mac,
set shell to bash to fix it.

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
(cherry picked from commit 9bb0962d6e3a2d5faf28a9624da82a936d961f19)

openvswitch: backport patch to fix build against kernel 4.14.193

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

adblock: refresh blocklist sources

* remove 'dshield' and 'sysctl' (discontinued)
* switch 'malwaredomains', 'shallalist' and 'winhelp' to https
* add a second regional list for poland (provided by matx1002)
* update readme

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

rtl_433: update to 20.02

Added PKG_BUILD_PARALLEL for faster compilation.

Fixed license information.

Removed upstreamed patch.

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

nano: update to 5.1

Update nano to version 5.1.

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

nano: update to 5.0

Update nano editor to version 5.0.
http://git.savannah.gnu.org/cgit/nano.git/tree/NEWS

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

irqbalance: update to 1.7.0

Update irqbalance to version 1.7.0
Refresh patches.

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

mosquitto: update to 1.6.11

Full release notes: https://mosquitto.org/blog/2020/08/version-1-6-11-released/

Variety of generally minor bugfixes, mostly in the broker.

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

Merge pull request #13092 from jefferyto/golang-1.13.15-openwrt-19.07

[openwrt-19.07] golang: Update to 1.13.15

golang: Update to 1.13.15

This includes a fix for CVE-2020-16845 (encoding/binary: ReadUvarint and
ReadVarint can read an unlimited number of bytes from invalid inputs).

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

nlbwmon: add hotplug script to reload after interface ifup

Add a hotplug script to reload nlbwmon's config after interface
ifup actions.

That should improve the detection of the IPv6 LAN address
that can get enabled a bit later in the boot process.

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

nlbwmon: add conffiles

Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
Adapted from treewide commit 0ec746ccb6 for just nlbwmon.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>

Merge pull request #13054 from micmac1/apa2446-19.07

[19.07] apache: security bump to 2.4.46

Merge pull request #13056 from odmdas/odmdas-freeradius3-Makefile-19.07

[19.07] freeradius3: add missing conffiles to Makefile

freeradius3: add missing conffiles to Makefile

Config files
/etc/freeradius3/policy.d/accounting
/etc/freeradius3/policy.d/filter
/etc/freeradius3/proxy.conf
/etc/freeradius3/sites-available/default
and link
/etc/freeradius3/sites-enabled/default
are in the freeradius3 package and are mentioned in the main config file
/etc/freeradius3/radiusd.conf
Thus, they must be explicitly specified in the Makefile.

File
/etc/freeradius3/sites/default
is not included in the package, is not created during installation,
is not mentioned in the main config file and should therefore be excluded
from the Makefile.

Signed-off-by: Alexey Dobrovolsky <dobrovolskiy.alexey@gmail.com>
(cherry picked from commit f6974b8f3c547ff3afc8a50f835cc6d200b6d14d)

apache: security bump to 2.4.46

From CHANGES_2.4:

SECURITY: CVE-2020-11984 (cve.mitre.org)
  mod_proxy_uwsgi: Malicious request may result in information disclosure
  or RCE of existing file on the server running under a malicious process
  environment. [Yann Ylavic]

SECURITY: CVE-2020-11993 (cve.mitre.org)
  mod_http2: when throttling connection requests, log statements
  where possibly made that result in concurrent, unsafe use of
  a memory pool. [Stefan Eissing]

SECURITY:
  mod_http2: a specially crafted value for the 'Cache-Digest' header
  request would result in a crash when the server actually tries
  to HTTP/2 PUSH a resource afterwards.
  [Stefan Eissing, Eric Covener, Christophe Jaillet]

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

apache/apr/apr-util: remove maintainer

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>