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>

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)

libupnp: remove patch that should not be there

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

minidlna: fix patches from last backport

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

libxslt: update to 1.1.34

Fixes all known CVEs.

Various Makefile cleanups for consistency between packages.

Added PIC explicitly (was implicit). Removed two extra features.

Removed autoreconf and added PKG_BUILD_PARALLEL for faster compilation.

Roughly matched host configure args with target ones.

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

libyaml-cpp: Update to 0.63

Several Makefile cleanups for consistency.

Added ABI_VERSION.

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

wavemon: update to 0.9.1

Remove upstreamed patch.

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

miniupnpd: fix sh syntax error

Add "use_stun" default to prevent sh: out of range error introduced by
c61614a84

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 0f1e7d32afab254a867b8e398612d9522eea3389)

miniupnpd: convert to procd

Massive cleanup of the shell script. Many issues were fixed.

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

miniupnpd: update to 2.1.20191006

Removed upstreamed patch:
100-build-on-OpenWrt.patch

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry picked from commit fcf72ceec4502177cdb9e121a0df4657ebeb50ca)

minidlna: update to latest master

Fixes several issues relating to IPv6.

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

liblz4: Update to 1.9.2

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

liblz4: Remove deprecated utime function

Optionally fixes compilation with uClibc-ng.

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

measurement-kit: update to version 0.10.11

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

websocketpp: Fix compile with Boost 1.70+

Fix compilation for newer Boost versions, same as in the websocketpp 'develop'
branch: https://github.com/zaphoyd/websocketpp/pull/814

Signed-off-by: Bruno Randolf <br1@einfach.org>
(cherry picked from commit e1bb99f83604a63c219a4a753fadbc19e11cc038)

faad2: update to 2.9.1

It seems upstream abandoned sourceforge.

Add license information.

Fix CVE tag. It seems the mass CVE patch placed many wrong CVEs.

Add PKG_BUILD_PARALLEL for faster compilation.

Do not build patented functionality when BUILD_PATENTED is missing.

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

mpc: update to 0.33

Small Makefile cleanups.

Ran script through shellcheck.

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

mpc: update to v0.32 and build with meson

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit 0469c0715b10e8b32fe41e3b3b7248379ffe6046)

libupnpp: link against libm under glibc

Fixes compilation.

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

libupnpp: update to 0.17.2

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

libupnpp: Update to 0.17.1

Fixed up license information.

Added PKG_BUILD_PARALLEL for faster compilation.

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

u2pnpd: update to 0.5

This update fixes #11452 since LFS detection support was added upstream.
While at, update SPDX license tag to latest standard.

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

libupnp: update to 1.8.7

remove upstreamed patch.

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

adblock: fix gawk incompatibility

* fix gawk incompatibility in reporting

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

Merge pull request #11843 from neheb/py3

[19.07]meson: use python3

ruby: update to 2.6.6

This release includes security fixes, specially:

* CVE-2020-10663: Unsafe Object Creation Vulnerability in JSON (Additional fix)
* CVE-2020-10933: Heap exposure vulnerability in the socket library

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>

mac-telnet: fix mirror hash

Fixes: 8399121e6 ("mac-telnet: install uci as config file")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9de79455410dde258af28e262d9a22f7bf3526b7)

mac-telnet: install uci as config file

Also mark it as configuration file while being at it.

Fixes: #11846
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 8399121e6035d7fccb7111e527d0b99dde29d098)

mac-telnet: mark uci as conffile

Fixes: 8399121e6 ("mac-telnet: install uci as config file")
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 9f231909ebf332c033788455cf837294b100fda8)

transmission: add init file STOP directive

Transmission should stop early on system shutdown to avoid
for example fstab unmount disks when transmission is writing.

Signed-off-by: Francesco G <gfrancesco@users.noreply.github.com>
(cherry picked from commit 4fcc44bc89559683daf56cb8342e8996a7147c98)

transmission: add syscalls to seccomp filter

Syscalls observered when running on arm32. Add them to seccomp rule.

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

transmission: add service triggers and bump PKG_RELEASE

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit c6c8ceb0b4dd107e9b411bc0289d2db2e6726be1)

transmission: update config options

add missing 'peer_id_ttl_hours' and remove 'scrape_paused_torrents'
which is not exist in transmission wiki.

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit 53fd02d62c22fe71442e938ce776f9f23d7beeac)

meson: use python3

meson supports python 3.5.3 and up only.

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

libid3tag: add pkg-config file

Required for meson to find this library in a sane way.

- In OpenWrt 19.07, there were recently updated mpd to its the latest
version available (current 0.21.22) with transition to meson.
Because of that mpd fails to build due to:

Run-time dependency id3tag found: NO (tried pkgconfig)

This commit fixes it

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit 1b37a1d2a869f1d91fcf376ae407c540e3a6252b)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[added commit message for OpenWrt 19.07]

adblock: fix another reporting bug

* add a final sort step, this fixes dns reporting with
  multiple pcap files as input

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

meson: update to version 0.54.0

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

ninja: updated to 1.10.0

Removed upstreamed patches.

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

libmpdclient: update to 2.18

Fix URLs and other small cleanups.

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

libmpdclient: build with meson

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit 8a7d276618ebd0d065dd6c0eca523d11d8a7a088)

mpd: update to 0.21.22

Removed upstreamed patches. Only the first was really needed.

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

mpd: allow AAC decoding with mini variant

This is possible as libfaad no longer has patented functionality based on
BUILD_PATENTED.

AAC is a very popular format, so it makes sense to have some kind of
version included.

The ffmpeg package does not provide and cannot provide AAC decoding
without BUILD_PATENTED, therefore enabled FAAD for all variants.

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

mpd: link against libpthread under glibc

Fixes compilation.

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

mpd: update to 0.21.20

Updated patches to latest patchset and removed upstreamed ones.

Ran init script through shellcheck. Restart using SIGHUP.

Added logging from stderr as any kind of logging is missing in --no-daemon
mode.

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

mpd: fix ffmpeg AIFF and AMR support

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

mpd: replace mpg123 with libmad

libmad is almost half the size of libmpg123. The docoding is done with
integers instead of floats.

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

mpd: fix compilation with uClibc-ng

With mpd's build system, it requires either an iconv built into the libc
or icu. Since uClibc-ng as configured by OpenWrt currently has no iconv,
use icu for it to work around the problem. This is the simplest solution.

Added a patch to use boost's rounding functions. They are more appropriate
and work with uClibc-ng.

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

mpd: update to 0.21.19

Changed URLs to HTTPS.

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

mpd: update to v0.21.16 and build with meson

One patch was dropped (probably not required anymore).

Old options have been dropped and new ones added. The order is as found
in meson_options.txt. mpd-mini and mpd-full retained their feature sets.

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit 5aaa1e7da49dcac0189a086edd17c4b70b5edfbe)

treewide: Use default PKG_BUILD_DIR when possible

This removes lines that set PKG_BUILD_DIR when the set value is no
different from the default value.

Specifically, the line is removed if the assigned value is:

* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

  The default PKG_BUILD_DIR was updated[1] to incorporate BUILD_VARIANT
  if it is set, so now this is identical to the default value.

* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)

  if PKG_SOURCE_SUBDIR is set to $(PKG_NAME)-$(PKG_VERSION), making it
  the same as the previous case

* $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

  This is the same as the default PKG_BUILD_DIR when there is no
  BUILD_VARIANT.

* $(BUILD_DIR)/[name]-$(PKG_VERSION)

  where [name] is a string that is identical to PKG_NAME

[1]: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=e545fac8d968864a965edb9e50c6f90940b0a6c9

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

nsd: Update to 4.2.1

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

xmlrpc-c: Update to 1.51.03

Small Makefile reorganization.

Switch BUILD_PARALLEL to 1. Seems to work now.

Added nanosleep patch that replaces usleep usage.

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

libuwsc: update to 3.3.2

Signed-off-by: Jianhui Zhao <jianhuizhao329@gmail.com>
(cherry picked from commit 46ec912121f2746dcd04a55e853e3c04a4266d57)

monit: update to the latest release

Remove SSL patch that has been made obsolete by upstream updates.

Update monit package to the latest release: v5.26.0. This release
supports TLSv1.3 and fixes a few bugs and vulnerabilities.

Signed-off-by: Val Kulkov <val.kulkov@gmail.com>
(cherry picked from commit 9980d766ac23d1fb0fd59ada87eef1485872b512)

monit: enable / fix IPv6 detection during build

thanks to @val-kulkov for noticing

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
(cherry picked from commit 7cc74e4d8bfcd1af7aaa18ce2f8fd40dc9a14c14)

nlbwmon: update to latest Git HEAD

34a1887 nfnetlink: disable sequence number checking

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 53c48fae1502e7f87fd93ff299db98cd119fa304)

adblock: update 4.0.4

* add 'ca-bundle' dependency
* fix a sort bug in report engine
* fix potential bugs in the f_extconf function

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

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

[19.07] https-dns-proxy: bugfix: memory leak

https-dns-proxy: bugfix: memory leak

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

nlbwmon: update to latest Git HEAD

e757e06 nfnetlink: allow specifying the socket buffer size
33c77cb nfnetlink: properly handle nl_recvmsgs() failures
95cced5 protocol: Include whitespace when reading names

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit d81d777a0f009fe74d233de307a03f9951d6b960)

nlbwmon: bump to latest git

e921ca0a Add further commonly used protocols to the protocol file.

Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry picked from commit 5e140462e42af3e5cb7680863794339f11ddda7d)

nlbwmon: add procd reload trigger for nlbwmon config

Signed-off-by: Richard Yu <yurichard3839@gmail.com>
(cherry picked from commit d5517583104c8521d978a911bff921588ba0e988)

mosh: use mips16 and remove configure patch

MIPS16 is not needed here.

Removed configure patch and replaced with a configure var.

Removed autoreconf as configure is no longer being patched.

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

mosh: Fix compilation with libcxx

Partial backport of upstream patch.``

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

mosh: Add protobuf host build dependency

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

mosh: add package

Maintainer: Jakub Tymejczyk <jakub@tymejczyk.pl>
Compile tested: ramips, Xiaomi Router 3G, fc54256
Run tested: ramips, Xiaomi Router 3G, 0f54d96

Description:
Mosh is "Remote terminal application that allows roaming, supports
intermittent connectivity, and provides intelligent local echo and line
editing of user keystrokes".

Project's site: https://mosh.org

Makefile and patch taken from: https://github.com/mchwalisz/mosh-openwrt
updated by me

Signed-off-by: Jakub Tymejczyk <jakub@tymejczyk.pl>
(Makefile cleanup and size optimizations)
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit 5ac5cf0b98930b6bac9e47581bafccd80478212e)

Merge pull request #11800 from dibdot/adblock-19.07

[19.07] adblock: release 4.0.3

adblock: release 4.0.3

* new package dependencies: coreultis-sort and
  a download util with SSL support
* focus on speed (multicore-support) to handle quite big lists
* include more than 40 pre-configured blocklist sources in a compressed
  json file (/etc/adblock/adblock.sources.gz)
* dynamic SafeSearch support for google, bing, duckduckgo,
  yandex, youtube and pixabay (CNAME (bind) & IP (dnsmaq, unbound))
* DNS backend autodetection
* Download Utility autodetection
* Report Interface autodetection
* Easy cron wrapper to set an adblock related auto-timer for
  automatic blocklist updates
* raw domain/blocklist support (e.g. for dnscrypt support)
* re-add restrictive Jaillist support
* rework online doc
* Complete LuCI rewrite (migrated to client side JS)

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

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

[19.07] simple-adblock: bugfixes: remove escape chars from log, restore from cache on boot

simple-adblock: bugfixes: remove escape chars from log, restore from cache on boot

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

nano: update to 4.9.2

Update nano editor to version 4.9.2

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

graphicsmagic: update to version 1.3.35 (security fix)

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

Merge pull request #11772 from micmac1/19.07-apache-2443

[19.07] apache: security bump to 2.4.43

meson: update to 0.53.2

Switched to PyPI.

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

meson: update to 0.53.1

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

meson: fix building host binaries with ccache

With CONFIG_CCACHE, $HOSTCC is 'ccache gcc' while $TARGET_CC points to a
single wrapper script. Compiling target binaries with ccache works, but
doesn't for host binaries, because we need to supply an argv array for
argc > 1 in the meson cross file.

Always pass an array for the c and c++ compiler, and while at it, do it
for the target as well - just to be on the safe side if that ever
changes.

Fixes #10982.

Signed-off-by: Andre Heider <a.heider@gmail.com>
(cherry picked from commit f5c8565d1bbd8f97b1f62319398543a56d591814)

python-requests: update to version 2.23.0

Package python-idna was updated 2 weeks ago in OpenWrt 19.07.
It causes an issue:

pkg_resources.ContextualVersionConflict: (idna 2.9 (/usr/lib/python3.7/site-packages), Requirement.parse('idna<2.9,>=2.5'), {'requests'})

This is fixed in 2.23.0.

Signed-off-by: Javier Marcet <javier@marcet.info>
(cherry picked from commit d62e8b9f3cd3ab9a0df23f721c24f9ef4d16836c)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
[add commit message]

dnscrypt-proxy2: update to version 2.0.42

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

apache: security bump to 2.4.43

This minor version bump fixes:

CVE-2020-1934
CVE-2020-1927

Upstream added cross-compile compatibility to apxs, so we can drop a sed
script. Upstream also added the OpenWrt layout, so we can drop our local
copy.

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

nano: update to 4.9.1

Update nano editor to version 4.9.1

 2020.03.31 - GNU nano 4.9.1 "Sapperdeflap"
 Two bugs introduced in version 4.9 are fixed: the cursor
 getting misplaced when undoing line cuts, and filtering
 of the whole buffer to a new buffer not working.

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