python-urllib3: update to version 1.25.10 (security fix)

Fixes:
CVE-2020-26137

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

Merge pull request #13635 from rs/nextdns-1.8.6-openwrt-19.07

[19.07] nextdns: Update to version 1.8.6

nextdns: Update to version 1.8.6

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

Merge pull request #13624 from mlichvar/chrony-update-3.5.1

[19.07] chrony: update to 3.5.1

chrony: update to 3.5.1

Fixes CVE-2020-14367.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>

nextdns: mark /etc/config/nextdns as configuration file

Conffile was set for OpenWrt master, but it is not present in OpenWrt
19.07. When /etc/config/nextdns is not set as conffile, it gets
overwritten by each update of nextdns and the user needs to set up it again.

This can be simply reproduced by these steps:
opkg update
opkg install nextdns
edit or add smth to /etc/config/nextdns, save it
then do: opkg install nextdns --force-reinstall
And /etc/config/nextdns gets overwritten by default values

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

simple-adblock: config update file fix

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

Merge pull request #13602 from nxhack/1907_libuv_cve

[19.07] libuv: update to 1.40.0

libuv: update to 1.40.0

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

nano: update to 5.3

Update nano editor to version 5.3.

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

btrfs-progs: update to version 5.7

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

btrfs-progs: update to version 5.6

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

python-pytz: update to 2019.03

Signed-off-by: Fabian Lipken <dynasticorpheus@gmail.com>
(cherry picked from commit 0f2cf9ebd6e4f836c3824433a421928bf13d5275)

adblock: refresh blocklist sources

* rename 'smarttv' to 'smarttv_tracking'
* added 'firetv_tracking' and 'android_tracking' (thanks @panache67)
* added 'gaming' (thanks @hasanlo in openwrt forum)
* update readme

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

Merge pull request #13549 from gladiac1337/haproxy-2.0.18-openwrt-19.07

[openwrt-19.07] haproxy: Update HAProxy to v2.0.18

syslog-ng: bump version in config file

This fixes issues:
syslog-ng[3895]: WARNING: Configuration file format is too old, syslog-ng is running in compatibility mode. Please update it to use the syslog-ng 3.29 format at your time of convenience. To upgrade the configuration, please review the warnings about incompatible changes printed by syslog-ng, and once completed change the @version header at the top of the configuration file; config-version='3.26'

Fixes: 06f3ac21b4d7be5a31f6739ab57e140260cdcd95 ("syslog-ng: update to
version 3.29.1")

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

syslog-ng: tweak shell code of network_localhost little bit

We can get rid of pipe with -n flag to sysctl.

Signed-off-by: Karel Kočí <cynerd@email.cz>
(cherry picked from commit 7b7d074c8d18ce7122d50ec207fd71a3bd88c47b)

python-sentry-sdk: Update to version 0.12.3

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

haproxy: Update HAProxy to v2.0.18

- Update haproxy download URL and hash

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

Merge pull request #13468 from ja-pa/tor-update-0.4.4.5-19.07

[OpenWrt 19.07]tor: update to version 0.4.4.5

Merge pull request #13542 from miska/mariadb-owrt-19.07

[19.07] mariadb: Update to the latest version from 10.2 branch

tor: update to version 0.4.4.5

Disable ac_cv_func_mallinfo because of arc arch.

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

mariadb: Update to the latest version from 10.2 branch

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>

Merge pull request #13532 from flyn-org/openwrt-19.07

gstreamer1: enable build options necessary for most applications

Werkzeug: Update to version 0.16.0

- Remove PKG_BUILD_DEPENDS as it is no longer necessary.
- The Python3 is already included in DEPENDS.
- Remove PKG_BUILD_DIR and PKG_UNPACK was for dual Python version.
- Change TITLE and description
- Add source package

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

Flask: update to version 1.1.2

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 90790b6b8f8413002ab6c8cf921daacf849884e7)

Flask: Update to version 1.1.1

- Change TITLE and URL to better one
- Add source package

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

gstreamer1: enable build options necessary for most applications

Commit eee7ce2b changed gstreamer1's build options, and this broke
some applications.

First, -Doption-parsing=false is intended for very specific embedded
applications rather general packages. Please see:

https://github.com/openwrt/packages/pull/8847
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/388

Second, -Dregistry=false seems to break plugin discovery. Symptoms of
this include broken applications and gst-inspect-1.0 listing zero plugins.

Fixes #13531.

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

python-ifaddr: update to version 0.1.7

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

Merge pull request #13529 from rs/nextdns-1.8.5-openwrt-19.07

[19.07] nextdns: Update to version 1.8.5

nextdns: Update to version 1.8.5

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

Merge pull request #13464 from ja-pa/ipmitool-security-fix-19.07

[OpenWrt 19.07] ipmitool: fix CVE-2020-5208

ipmitool: fix CVE-2020-5208

All patches has been applied upstream.

Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
(cherry picked from commit b2a9219f738344ddd164c9904cc9019db96d4658)

nextdns: Update to version 1.8.4

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

openconnect: updated to 8.10 to address CVE-2020-12823

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

python-zeroconf: update to version 0.28.0

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

python-zeroconf: update to version 0.24.4

Update copyright

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

Merge pull request #13466 from aaronjg/openwrt-19.07

mwan3: fix typo in mwan3_set_sticky_iptables [19.07] [bugfix]

mwan3: fix typo in mwan3_set_sticky_iptables

fixes #13443

Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>

ocserv: include ocserv-worker

Resolves: #13465

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

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