Merge pull request #14677 from mwarning/zt2

zerotier: update to 1.6.3

zerotier: update to 1.6.3

Signed-off-by: Moritz Warning <moritzwarning@web.de>

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

[19.07] simple-adblock: remove dependency on jsonfilter & old code

simple-adblock: remove dependency on jsonfilter & old code

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

sudo: backport patches for CVE-2021-3156

This security vulnerability is known as Baron Samedit [1] and there is a
research by Qualys [2] and they discovered it. Unfortunately or
fortunately, there isn't present sudoedit on OpenWrt.

Two patches were applied cleanly and the other two required manual
intervention. Those were backported from version 1.9.5p2

[1] https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3156
[2] https://blog.qualys.com/vulnerabilities-research/2021/01/26/cve-2021-3156-heap-based-buffer-overflow-in-sudo-baron-samedit

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

Merge pull request #14575 from Andy2244/samba4-fix-#13758

[19.07] samba4: fix for #13758

samba4: fix for #13758

* fix for possible exploit #13758
* sanetize all external template/config inputs
* fix some shellcheck warnings

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

Merge pull request #14565 from rs/nextdns-1.10.1-openwrt-19.07

[19.07] nextdns: Update to version 1.10.1

Merge pull request #14558 from cartender/pr/19_fix_php7_conf_ac

php7: Fix prepare target incorrectly referencing 'configure.in' instead of 'configure.ac'

nextdns: Update to version 1.10.1

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

php7: Fix prepare target incorrectly referencing 'configure.in' instead of 'configure.ac'

Package release version unchanged as it does not impact the build result in any way.

Signed-off-by: Giovanni Giacobbi <giovanni@giacobbi.net>

msmtp: update to version 1.8.14

Release notes for 1.8.1.3:
https://marlam.de/msmtp/news/msmtp-1-8-13/

Release notes for 1.8.1.4:
https://marlam.de/msmtp/news/msmtp-1-8-13/

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

youtube-dl: update to version 2021.1.16

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

youtube-dl: update to version 2020.12.7

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

Merge pull request #14501 from stangri/19.07-https-dns-proxy

[19.07] https-dns-proxy: bugfix: high CPU utilization

Merge pull request #14499 from nemesisdesign/openwrt-19.07

openwisp-config: update to version 0.5.0

https-dns-proxy: bugfix: high CPU utilization

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

openwisp-config: update to version 0.5.0

Full changelog available at https://github.com/openwisp/openwisp-config/releases/tag/0.5.0

Signed-off-by: Federico Capoano <f.capoano@openwisp.io>
(cherry picked from commit 9f7b8088c374a5c8533c61baf56ae57343f6fb67)

# Conflicts:
# admin/openwisp-config/Makefile

Revert "libzip: update to 1.7.3"

This reverts commit d8f0ebaa3d2582628e34fa9d7d1d003cc94de24e.

Versions 1.7.2 and above mandate CMake 3.1.7, making this unsuitable
for backporting.

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

libzip: update to 1.7.3

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

libzip: update to 1.7.1 (closes #12512)

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

libzip: update to 1.6.1

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

libzip: update to 1.6.0

Also remove upstreamed patch.

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

libzip: fix musl-fts failure

musl doesn't support fts. But with the extra package musl-fts installed,
libzip picks up the fts header and fails at the linking stage:

zipcmp.c:(.text.startup+0x130): undefined reference to `fts_open'
/home/sk/tmp/openwrt/staging_dir/toolchain-mips_24kc_gcc-8.3.0_musl/lib/gcc/mips-openwrt-linux-musl/8.3.0/../../../../mips-openwrt-linux-musl/bin/ld: zipcmp.c:(.text.startup+0x172): undefined reference to `fts_read'

So with musl-fts we need to link in libfts. To address that this commits
patches the cmake setup to check if fts is available in libc itself or
in any external libfts.

So when musl-fts is installed on the system the setup will be the
following:

musl: use libfts
uclibc: use fts from libc
glibc: like uclibc

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit 0c381f7c7a6fbd6d62632fa67671a2dd2a5051a5)

libzip: add package

This introduces libzip which is e.g. a dependency for upcoming upgrade
of PHP to version 7.4.

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

nano: update to 5.5

Update nano editor to version 5.5

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

idevicerestore: update to 1.0.0

Switched to upstream tarballs as they are now available

Removed autoreconf as a result.

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

idevicerestore: update to 2020-04-20

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

idevicerestore: update to 2020-02-17

Fix compilation under glibc.

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

idevicerestore: Update to 2019-12-26

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

idevicerestore: Add package

Allows to flash an iOS device without using iTunes.

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

libirecovery: update to official tarball

Removed autoreconf as a result.

Unfortunately, the two versions are not identical. Bumped PKG_RELEASE
to deal with it.

Disable static libraries as they're fairly useless.

Adjusted filepaths.

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

libirecovery: fix version

The hash was correct but not the source version. No idea how this happened

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

libirecovery: Update to 1.0.0

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

libirecovery: Add package

Needed for idevicerestore

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

haproxy: Update HAProxy to v2.0.20

- Update haproxy download URL and hash

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

Merge pull request #14457 from rs/nextdns-1.9.6-openwrt-19.07

[19.07] nextdns: Update to version 1.9.6

nextdns: Update to version 1.9.6

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

syslog-ng: update to version 3.30.1

Bump version also in config file

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

Merge pull request #14427 from stangri/19.07-https-dns-proxy

[19.07] https-dns-proxy: update to 2020-11-25: add HTTP auth and DSCP support

https-dns-proxy: update to 2020-11-25: add HTTP auth and DSCP codepoint support

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

haveged: update to 1.9.14

Update haveged to version 1.9.14.

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

usbmuxd: update to 1.1.1

Switched to upstream tarballs as they are now available.

Removed autoreconf as a result.

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

usbmuxd: enable systemd support

This is needed as the options loop is totally broken and doesn't accept
both -f and -z together.

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

usbmuxd: Update to 2020-01-20

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

usbmuxd: Update to latest master

usbmuxd must be ran for many of the idevice tools. Added an init
script to make this easier.

Added myself as maintainer.

Fix PKG_CVE_ID.

Added config directory.

Placed in a submenu for easier readability.

Add extra tool

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

usbmuxd: Update to latest git version

Fixes compilation with libimobiledevice.

Small cleanups for consistency.

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

imobiledevice: backport iOS 14 backup patch.

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

libimobiledevice: update to 1.3.0

Upstream created proper tarballs. Switch to those.

Removed autoreconf as a result.

Adjusted filepaths.

Removed upstreamed patch.

Disabled static libraries as they're not useful.

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

libimobiledevice: update to 2020-02-19

Added config directory patch.

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

libimobiledevice: Update to 2020-01-20

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

libimobiledevice: Update to latest master

Added patch to fix Wformat warning.

Fixed license information.

Removed outdated iconv dependency

Placed in a submenu for readability.

Added myself as maintainer.

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

libimobiledevice: Update to 2019-11-29

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

libusbmuxd: update to 2.0.2

Upstream created proper tarballs. Switched to those.

Removed autoreconf as a result.

Adjusted filenames.

Got rid of static compiles as they're pretty useless.

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

libusbmuxd: Several fixes

Add myself as maintainer.

Add PKG_CPE_ID.

Add submenu for easier readability.

Install extra tool.

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

libusbmuxd: Update to 2.0.1

The release of checkra1n necessitated a new release.

Removed inactive maintainer.

Fixed license info.

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

libplist: add missing pkgconfig files in libplist 2.2

Closes #12571.

Same fix as Debian, see:
https://github.com/libimobiledevice/libplist/commit/137716df3f197a7184c1fba88fcb30480dafd6e0#commitcomment-40099153

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

libplist: update to 2.2.0

Upstream finally got a proper tarball. Switched to that.

Remove autoreconf as it's no longer needed.

Adjusted new filepaths.

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

libplist: Several fixes

Add myself as maintainer.

Add PKG_CPE_ID.

Switch to submenu for easier readability.

Change libplist-utils name to the utility.

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

libplist: Update to 2.1.0

The release of checkra1n necessitated a new release.

Removed inactive maintainer.

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

libplist: Switch to normal releases

Also added the capability to use uclibcxx instead of libstdcpp.

Several size optimizations.

Fixed up Makefile to be up to standards.

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

php7: drop patch for openssl deprecated API (fixes #14357)

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

netdata: update to version 1.28.0

Refreshed patches and removed one backported patch

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

adblock: backport fixes

* set PROCD_RELOAD_DELAY correctly
* source changes:
  - add new source 'games_tracking' (https://www.gameindustry.eu)
  - change malwaredomains source mirror
  - remove malwarelist source (source is empty)
  - remove youtube source (does not work at all)
* add check for gnu-sort

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

htop: update to 3.0.4-1

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

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

mwan3: use ping -I for ipv6 after tunnel kernel fix

Now that tunnels have been fixed with openwrt commit
c9c7b4b3945c01c2aadf3ef5d9a77c8200db80f1 for stable branch 19.07
ping with src ip is no longer needed.

fixes #13655

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
* Update commit message
Signed-off-by: Aaron Goodman <aaronjg@stanford.edu>

noddos: remove

According to https://github.com/openwrt/packages/issues/14248 , this
is totally abandoned. The website isn't even up anymore.

Fixes: https://github.com/openwrt/packages/issues/14248
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(backported from commit eb9d5bbf39e89909283c431ae981feac39b02d95)

Merge pull request #14280 from commodo/openwrt-19.07-ulogd

[19.07] ulogd: backports from master

ulogd: Add back autoreconf

Compile fails at times, probably because of the patches.

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

ulogd2: Build IPFIX module

add ulogd_output_IPFIX.so to ulogd-mod-extra

Signed-off-by: Sebastian Fleer <dev@dwurp.de>
(cherry picked from commit 3a06581ad72335e2885eb103e92a84f9aab4173b)

ulogd2: Backport upstream patches

IPFIX support was requested.

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

net: ulogd2: add myself as maintainer

Since this package has been abandoned, I don't mind taking it over.
If there are issues with it, I can also investigate, and be a point-man.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 2a5fb656f2eb54701c16f414b92ff4a600a29e80)

nut: fix _ handling

Taken from https://github.com/openwrt/packages/issues/13359

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

qemu: bump PKG_RELEASE

This is a fixup for 391267fc ("qemu: add patch for qga guest-shutdown
command")

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

[19.07] simple-adblock: config update

simple-adblock: config update

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

Merge pull request #14251 from Andy2244/samba-4.11.17

[19.07] samba4: update to 4.11.17

Merge pull request #14252 from Andy2244/wsdd2-2020-11-19-(19.07)

[19.07] wsdd2: update to git 2020-11-19

wsdd2: update to git 2020-11-19

* update to git 2020-11-19
* cleanup comments
* use uppercase for none mdns option

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

samba4: update to 4.11.17

* update to 4.11.17
* fix CVE-2020-1472, CVE-2020-14318, CVE-2020-14323, CVE-2020-14383

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

htop: update to 3.0.3-1

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

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

htop: update to 3.0.2-1

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

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

qemu: add patch for qga guest-shutdown command

Corresponds to commit 33bbecea in master branch

Ref: https://github.com/openwrt/packages/issues/14244
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

Merge pull request #14235 from TDT-AG/pr/20201215-owrt1907-lcd4linux-fix

[openwrt-19.07] utils/lcd4linux: fix package source

utils/lcd4linux: fix package source

The former svn source is not available any more.
Change package source to openwrt sources server.

Signed-off-by: Martin Schiller <ms@dev.tdt.de>

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

[19.07] simple-adblock: bugfix - config update

simple-adblock: bugfix - config update

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

https-dns-proxy: update binary to 2020-08-21

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

zerotier: add patch to avoid including sys/auxv.h

It seems it's not needed and not supported under uClibc-ng.

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

miniupnpd: Don't override ipv6_listening_ip

Fixes: https://github.com/openwrt/packages/issues/14145
Signed-off-by: Jitao Lu <dianlujitao@gmail.com>
(cherry picked from commit c89a1f3e8bb3ed5470739729918661157b653072)

nano: update to 5.4

Update nano editor to version 5.4.

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

miniupnpd: Pass ipv6 addr to ipv6_listening_ip

Unlike ipv4, this option is supposed to be an IP address, otherwise, an
error occurs on startup:

    can't parse "br-lan" as valid IPv6 listening address

Signed-off-by: Jitao Lu <dianlujitao@gmail.com>
(cherry picked from commit 7077fd8c79eef5f044959bacfd6f66252850968a)

Merge pull request #14115 from mwarning/zt

zerotier: update to 1.6.2

zerotier: update to 1.6.2

Signed-off-by: Moritz Warning <moritzwarning@web.de>

net/miniupnpd: ext_ip_reserved_ignore support

This add an option to ignore ext_ip reserved
Enable this option in config by default.

Fixes: #13773
Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit b76aa9919489f49b472a8f939f6d46ca33d05f64)

miniupnpd: Added chain rule to filter table so udp stun incoming connections rules works

Signed-off-by: Marco Martins <marcomartins86@gmail.com>
(cherry picked from commit 773b87977eb176a15f18d31c71987a398d34ee70)

miniupnpd: update to 2.2.0

Replace daemon patch with upstream solution.

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

net/miniupnpd: check by /etc/init.d/miniupnpd running

Signed-off-by: Chen Minqiang <ptpt52@gmail.com>
(cherry picked from commit 67b48713220e3dd5b322bc1f60b1f6cd271dcac2)

miniupnpd: default to IGDv1

It seems even modern stuff doesn't support v2 correctly. The miniupnp
suite does but other stacks seem to lack support. Default to v1 to
avoid the headache.

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

adblock: reporting fixes/tweaks

* prevents the creation of an invalid json structure
* add more space to the domain column on cli
* removed test.sh script from package

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