unbound: update to version 1.10.1

Fixes:
CVE-2020-12662
CVE-2020-12663

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

Merge pull request #12206 from micmac1/mar-1907-10413

[19.07] mariadb: minor version bump with CVE fixes and backports

mariadb: install config files readable for all

Backport from master.

Until now $(INSTALL_CONF) is used for configuration files that go into
/etc/mysql. This commit replaces that with $(INSTALL_DATA). The
configuration files are not only parsed by the server, but also by the
clients (which can be anybody).

This also removes a comment about a cron job from one of the
configuration files. There is no cron job.

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

mariadb: move mysql_upgrade to the client package

Backport from master.

It's really a client. It connects to the running server as a client, to
upgrade the DBs. And it depends on both mysql and mysqlcheck.

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

mariadb: bump to 10.2.32

Fixes:

  CVE-2020-2752
  CVE-2020-2812
  CVE-2020-2814
  CVE-2020-2760

Upstream added support files for auth_pam plugin. This commit adds them
to the package.

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

Merge pull request #12187 from jefferyto/golang-1.13.11-default-platform-options-openwrt-19.07

[openwrt-19.07] golang: Update to 1.13.11, set default platform options

golang: Set/reset default platform options for target Go compiler

Because the first stage for building target Go is actually a host build,
the default platform options (GO386, GOARM, etc.) are detected from the
host. These values are written to a source file and kept when building
the second stage.

This modifies this source file to set the appropriate values for the
target platform, and reset values for other platforms to their
cross-compiling / most compatible defaults.

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

golang: Update to 1.13.11

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

php7: update to version 7.2.31

This fixes:
  - CVE-2019-11048

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

Merge pull request #12171 from rs/nextdns-1.5.8-openwrt-19.07

[19.07] nextdns: Update to version 1.5.8

nextdns: Update to version 1.5.8

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

Merge pull request #12169 from jefferyto/arm-aarch64-vfp-neon-openwrt-19.07

[openwrt-19.07] treewide: Backport VFP/NEON fixes/updates

treewide: Enable VFP/NEON optimizations for aarch64

For speexdsp, support for NEON on aarch64 was added in 1.2.0[1].

[1]: https://github.com/xiph/speexdsp/pull/8

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

treewide: Update ARM NEON/VFP detection

With openwrt/openwrt@8dcc1087602e2dd606e4f6e81a06aee62cfd4f4c, the ARM
FPU compiler options are no longer part of CONFIG_TARGET_OPTIMIZATION.

This updates various packages that look for NEON/VFP support to search
CONFIG_CPU_TYPE instead.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 2d99ee3004a1b3aa099d90bff4eae627d11c53e8)
[adapted patch for pulseaudio using autotools build]

Merge pull request #12158 from Robby-/openwrt-19.07-eaptlstmpdir

[19.07] freeradius3: Fix to init script.

freeradius3: Fix to init script.

To use eap tls, 'tmpdir' must be created before server starts.
This 'tmpdir' is used to store and verify client certificate,
and therefore radiusd do 'chmod go-rwx'.

If 'tmpdir' does NOT exists, server failed to start and default
'tmpdir' is '/tmp/radiusd'. So init script MUST create default
'tmpdir' like other directories.

Signed-off-by: Eiji MATSUMOTO <toudaiman@gmail.com>

Merge pull request #12141 from EricLuehrsen/unbound_1907_1100

[openwrt-19.07] unbound: update to 1.10.0

unbound: update to 1.10.0

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

miniupnpd: make hotplug work again

hotplug scripts are sourced not exec'd so #!/bin/sh /etc/rc.common
doesn't pull in the functions defined in /etc/rc.common thus since
'enabled' isn't defined the following sequence always fails:

enabled miniupnpd || exit 0

Unfortunately sourcing /etc/rc.common doesn't appear to work so come up
with some alternatives.

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

Merge pull request #12127 from aleksander0m/aleksander/mm-qmi-19.07

ModemManager and libqmi stable releases in 19.07

modemmanager: release 1.12.10

https://lists.freedesktop.org/archives/modemmanager-devel/2020-May/007828.html

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
(cherry picked from commit 3feeacc051b396f7014a19ac1deb834d1a5de704)

modemmanager: fix compilation under uClibc-ng

Needs nls.mk as a result of the glib2 change.

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

libqmi: update version to 1.24.12

https://lists.freedesktop.org/archives/libqmi-devel/2020-May/003296.html

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
(cherry picked from commit 6584192deb824a8737c41a3ca92ee0b6f0b21b88)

wifidog-ng: remove incorrect PKG_BUILD_DIR override

As wifidog-ng builds a kernel module, it must use a PKG_BUILD_DIR in
KERNEL_BUILD_DIR instead of BUILD_DIR, otherwise old build artifacts may
be incorrectly reused when switching between different targets of same
architecture without a full clean.

Instead of fixing up the override, just remove it and instead move the
kernel.mk include above package.mk, so PKG_BUILD_DIR is set up correctly
by default.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
(cherry picked from commit 25babf817f1a45daf58e9af597f55ad93bb7c6fa)

Merge pull request #12111 from jefferyto/ddns-scripts-backport-fixes-openwrt-19.07

[openwrt-19.07] ddns-scripts: Backport fixes

Merge pull request #12107 from rs/nextdns-1.5.7-openwrt-19.07

[19.07] nextdns: Update to version 1.5.7

ddns-scripts: Increment PKG_RELEASE and internal version number

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

ddns-scripts: cloudflare.com-v4: Fix grep patterns.

Related commit: 0080bb4b

Use `\s*` instead of ` \?` to match 0 or multiple spaces.

Signed-off-by: Zheng Luo <cherrotluo@gmail.com>
(cherry picked from commit 88b03577c43b5b5c1cb97a3892914e2e222c5008)

ddns-scripts: cloudflare.com-v4: Fix success check for new response format
JSON response now has spaces between parameters. Accept this new format and the old one.

Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
(cherry picked from commit 0080bb4bba61171dd2b0654ce36359e5191db01a)

ddns-scripts: fix logging bug

Fixes issue #11282, this patch was provided by PaulFertser on the #openwrt
IRC.

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

ddns-scripts: use HTTP for IPv6 dyndns URL

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

ddns-scripts: remove HTTPS from dyndns URL

HTTPS support is not provided by default.

Also fixed a mistakenly added ].

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

ddns-scripts: use new DDNS URL for dyndns.org

https://github.com/openwrt/packages/issues/8360

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

ddns-scripts: update ddnss.de response

https://github.com/openwrt/packages/issues/8013

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

ddns-scripts: Use https for domains.google.com

Without https the update fails with:

```
 132954       : #> /usr/bin/curl -RsS -o /var/run/ddns/myddns_ipv4.dat --stderr /var/run/ddns/myddns_ipv4.err --noproxy '*' 'http://CENSORED:***PW***@domains.google.com/nic/update?hostname=CENSORED&myip=CENSORED'
 132954       : DDNS Provider answered:
<HTML>
<HEAD>
<TITLE>Moved Temporarily</TITLE>
</HEAD>
<BODY BGCOLOR="#FFFFFF" TEXT="#000000">
<H1>Moved Temporarily</H1>
The document has moved <A HREF="https://domains.google.com/nic/update?hostname=CENSORED&amp;myip=CENSORED">here</A>.
</BODY>
</HTML>
 132954 ERROR : IP update not accepted by DDNS Provider
```

Signed-off-by: Paul Tobias <tobias.pal@gmail.com>
(cherry picked from commit 21f5cdd2fa2d4336d4c77d22d404252be1b82ebd)

nextdns: Update to version 1.5.7

Signed-off-by: Algin Maduro <1469047+mad-it@users.noreply.github.com>

youtube-dl: update to version 2020.5.3

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

gerbera: add

This is a proper replacement for MiniDLNA with none of its problems.

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

Merge pull request #12080 from stangri/19.07-vpn-policy-routing

[19.07] vpn-policy-routing: support phys-dev policies

vpn-policy-routing: support phys-dev policies

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

Merge pull request #12070 from stangri/19.07-vpn-policy-routing

[19.07] vpn-policy-routing: bugfix: remove non-ASCII from log; update README

Merge pull request #12057 from stangri/19.07-vpnbypass

[19.07] vpnbypass: bugfix: remove non-ASCII from system log; update README

vpn-policy-routing: bugfix: remove non-ASCII from log; update README

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

vpnbypass: bugfix: remove non-ASCII from system log; update README

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

openconnect: updated to 8.09

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

ocserv: updated to 1.0.1

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

youtube-dl: update to version 2020.3.24

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

Merge pull request #11999 from jefferyto/bash-import-patches-openwrt-19.07

[openwrt-19.07] bash: Import upstream patches

travelmate: fix captive portal detection

* made captive portal detection more bullet proof, fixes #11990

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

bash: Import upstream patches

Source:
https://ftp.gnu.org/gnu/bash/bash-5.0-patches/
(bash50-003 to bash50-017)

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

Merge pull request #11992 from Robby-/openwrt-19.07-freeradius3_update_3_0_21

[19.07] freeradius3: Update to 3.0.21

Merge pull request #11994 from jefferyto/python-2.7.18-openwrt-19.07

[openwrt-19.07] python: Update to 2.7.18, refresh patches

expat: Update to version 2.2.9

Fixes CVE-2019-15903

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

python: Update to 2.7.18, refresh patches

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

freeradius3: Update to 3.0.21

Latest stable release.

Signed-off-by: Robby K <robbyke@gmail.com>

freeradius3: Updated patches/004-fix-target-python-header-detection.patch to remove the rlm_python3 specific changes as it is no longer needed to compile and updated the Makefile to reflect this due to the following change/commit in freeradius:
https://github.com/FreeRADIUS/freeradius-server/commit/307678b268cf8898a65632147ecc40d37ea3f9d3

This is in preparation for the 3.0.21 update.

Signed-off-by: Robby K <robbyke@gmail.com>

freeradius3: Refreshed patches/002-disable-session-cache-CVE-2017-9148.patch in preparation for the 3.0.21 update.

Signed-off-by: Robby K <robbyke@gmail.com>

freeradius3: Fix the ordering in the Makefile.

Signed-off-by: Robby K <robbyke@gmail.com>

mwan3: fix whitespace issue

fixes #11965

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

mwan3: Ping IPv6 hosts using address not interface

Pinging IPv6 hosts using an interface as a source specifier seems
troublesome.  See https://bugs.openwrt.org/index.php?do=details&task_id=2897
for more detail.

Use the desired source interface's IP address instead.

Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>
(cherry picked from commit 6721587e8b491f1a539cdcc507b0f4811ff2b448)

mwan3: change license to SPDX compatible identifier

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

mwan3: update version to 2.8.2

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

mwan3: add httping_ssl option

Till now we could only ping http targets on port 80. With this change by
adding the config boolean config option httping_ssl we could also ping
https ping targets on port 443.

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

mwan3: fix variable naming

The variable IPT is not valid at this point. Set the variable usage to IPT4
fixes this issue.

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

Merge pull request #11986 from jefferyto/python-target-build-tools-openwrt-19.07

[openwrt-19.07] python,python3: Fix host build tool names recorded in target files

python: Fix host build tool names recorded in target files

Python will record the values of CC, CXX, AR, and RANLIB (and other
configure options) used during compilation. pip will use these programs
when asked to compile extension modules on the target device.

* If ccache is used during build, CC and CXX will be ccache_cc and
  ccache_cxx, respectively, which are not available on-device (#11912).

* If an external toolchain is used during build, the values of these
  variables will contain the external toolchain prefix, which may not be
  available on target.

* If the normal toolchain is used during build, AR and RANLIB will
  contain the toolchain prefix, but the names of ar and ranlib on-device
  do not contain the prefix; they are named "ar" and "ranlib".

This changes the values of these variables in Python's files to match
the names available on-device, and without any toolchain prefix.

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

python3: Fix host build tool names recorded in target files

Python will record the values of CC, CXX, AR, and READELF (and other
configure options) used during compilation. pip will use these programs
when asked to compile extension modules on the target device.

* If ccache is used during build, CC and CXX will be ccache_cc and
  ccache_cxx, respectively, which are not available on-device (#11912).

* If an external toolchain is used during build, the values of these
  variables will contain the external toolchain prefix, which may not be
  available on target.

* If the normal toolchain is used during build, AR and READELF will
  contain the toolchain prefix, but the names of ar and readelf
  on-device do not contain the prefix; they are named "ar" and
  "readelf".

This changes the values of these variables in Python's files to match
the names available on-device, and without any toolchain prefix.

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

Merge pull request #11976 from br101/pingcheck-update

pingcheck: Update and add script directories

pingcheck: Update and add script directories

- Update to version with longer interface names.

- Add /etc/pingcheck/(on|off)line.d/ directories with an example
  script. Closes #11263

Signed-off-by: Bruno Randolf <br1@einfach.org>

mpd: update to 0.21.23

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

Merge branch 'BKPepe-19.07-php7' into openwrt-19.07 (fixes #11923)

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

Merge branch '19.07-php7' of https://github.com/BKPepe/packages into
a local branch for conflict resolving.

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

php7: fix dependencies for mysqlnd (fixes #11113)

When during the build the openssl extension is also selected, then
the mysqlnd extension depends on it, too.

Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit 50b1cd3757497a569538d751f4681a40df1b1202)

Merge pull request #11948 from dvtirol/rlm_rest-19.07

OpenWrt 19: freeradius3: Support building freeradius3-mod-rest

freeradius3: Support building freeradius3-mod-rest

Signed-off-by: Tobias Girstmair <tobias.girstmair@tirol.gv.at>

Merge pull request #11946 from jefferyto/python-pip-pep517-pyc-fix-openwrt-19.07

[openwrt-19.07] python-pip,python3-pip: Fix error when installing packages that require compilation

python-pip: Fix error when installing packages that require compilation

This addresses one of the issues raised in #11912.

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

python3-pip: Fix error when installing packages that require compilation

This addresses one of the issues raised in #11912.

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

travelmate: refine logical interface selection

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

less: add ALTERNATIVES

This package can not be installed if you have installed less from
busybox.

Collected errors:
 * check_data_file_clashes: Package less wants to install file /bin/less
        But that file is already provided by package  * busybox
 * opkg_install_cmd: Cannot install package less.

To avoid this error, I moved it from /bin/less to /usr/bin/less.

If you install it now, it changes symlink from busybox to /usr/bin/less
/bin/less -> busybox*
/bin/less -> /usr/bin/less*

When you remove it, it changes symlink back to busybox.

That's why postint and postrm scripts are no longer needed.

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

Merge pull request #11938 from aleksander0m/aleksander/modem-updates-19.07

libqmi and MM updates for stable 19.07

modemmanager: release 1.12.8

https://lists.freedesktop.org/archives/modemmanager-devel/2020-March/007729.html

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
(cherry picked from commit 052d9274eff6accf383ea3e416bc95465e1f3268)

modemmanager: release 1.12.6

https://lists.freedesktop.org/archives/modemmanager-devel/2020-February/007713.html

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
(cherry picked from commit d121e270e88f0015589b5c00f563c767ac145b09)

libqmi: update version to 1.24.10

https://lists.freedesktop.org/archives/libqmi-devel/2020-April/003275.html

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
(cherry picked from commit 5f995ccb47006dfc096b68b84ac1885d7ef9d32a)

libqmi: update to version 1.24.8

https://lists.freedesktop.org/archives/libqmi-devel/2020-March/003248.html

Signed-off-by: Aleksander Morgado <aleksander@aleksander.es>
(cherry picked from commit b3fe4254ab4549d88ea32be3faa9636338d7d179)

libqmi: bump libqmi version

Signed-off-by: Nicholas Smith <nicholas.smith@telcoantennas.com.au>
(cherry picked from commit e9813262f93b65420134655651f9d842e06b4829)

Merge pull request #11928 from jefferyto/golang-1.13.10-openwrt-19.07

[openwrt-19.07] golang: Update to 1.13.10

travelmate: release 1.5.4

* add 'status_service' as workaround to init for 19.07
* fix 'wifionice' auto-login script
* fix autologin script matching
* change wifi scanning to logical interface name,
  no longer use the radio device

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

golang: Update to 1.13.10

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

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

[19.07] simple-adblock: bugfix: start downloads on cold boot/fresh install

simple-adblock: bugfix: start downloads on cold boot

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

php7: update to version 7.2.30

Fixes:
CVE-2020-7066
CVE-2020-7064

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

Merge pull request #11882 from yousong/wget1907

[19.07] acme: depends on wget-ssl

acme: depends on wget-ssl

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit d917d662aedd9c133217b5c6d8c5a4f4a6bd3dea)

wget: make the ssl variant provides wget-ssl

This is to address the need for specifying dependency on a wget
implementation with ssl support.

Now we have a game of names for opkg

 1. uclient-fetch: minimal version by openwrt project
 2. wget-nossl: gnu wget w/o ssl support
 3. wget-ssl: for the moment since this commit, gnu wget w/ ssl support
 4. wget: uclient-fetch, wget-nossl, or wget-ssl
 5. gnu-wget: wget-nossl or wget-ssl

By the time we provide some dummy package like uclient-fetch-ssl and
make it also provide wget-ssl, I guess by then we will also need
gnu-wget-ssl...

Ref: https://github.com/openwrt/packages/issues/11534
Ref: https://github.com/openwrt/packages/pull/9941
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 585e4a38feca24c9650d4e762b44146ecd75d4d0)

wget: do not provide itself

The package wget should not say that it provides itself.

This also make gnu-wget provide general so it is not written in Makefile
twice.

Signed-off-by: Karel Kočí <karel.koci@nic.cz>
(cherry picked from commit 75f2be7d509e802f2d946d732e7a7539c2b27d2e)

adblock: filter spurious line endings in sources

* prevent processing of spurious line endings
  that confuses (g)awk

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

git: update to version 2.26.1

Fixes: CVE-2020-5260
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 0551a5b030160054e755a750a62b2af84809dfb6)

git: update to version 2.25.1

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

git: update to version 2.25.0

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