Merge pull request #12061 from cyrozap/prometheus-node-exporter-lua-time

prometheus-node-exporter-lua: Change node_time_seconds type to "gauge"

Merge pull request #12050 from neheb/neon

neon: update to 0.31.1

prometheus-node-exporter-lua: Change node_time_seconds type to "gauge"

The official node_exporter reports node_time_seconds as a gauge, but
prometheus-node-exporter-lua reports it as a counter. To be consistent
with the official implementation, and because "gauge" is more correct
than "counter" for this metric (system time can decrease, but the
Prometheus documentation states, "A counter is a cumulative metric that
represents a single monotonically increasing counter whose value can
only increase or be reset to zero on restart."), change the type for
node_time_seconds to "gauge".

Signed-off-by: Forest Crossman <redacted>

Merge pull request #12056 from stangri/master-vpnbypass

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

Merge pull request #12064 from wvdakker/master

Shorewall: Bump to 5.2.4.4

Merge pull request #12066 from jqqqqqqqqqq/master

fish: update to 3.1.2

fish: update to 3.1.2

Signed-off-by: Curtis Jiang <redacted>

Shorewall6: Bump to 5.2.4.4

Signed-off-by: W. van den Akker <redacted>

Shorewall: Bump to 5.2.4.4

Signed-off-by: W. van den Akker <redacted>

Shorewall6-lite: Bump to 5.2.4.4

Signed-off-by: W. van den Akker <redacted>

Shorewall-lite: Bump to 5.2.4.4

Signed-off-by: W. van den Akker <redacted>

Shorewall-core: Bump to 5.2.4.4

Signed-off-by: W. van den Akker <redacted>

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

Signed-off-by: Stan Grishin <redacted>

Merge pull request #12053 from neheb/lo

liblo: update to 0.31

Merge pull request #12047 from jekkos/do-ddns-v2

ddns-scripts: Add digitalocean as DDNS provider

ddns-scripts: Add digitalocean as DDNS provider

Signed-off-by: Jeroen Peelaerts <redacted>

liblo: update to 0.31

Refreshed patch.

Signed-off-by: Rosen Penev <redacted>

neon: update to 0.31.1

Upstream changed.

Add license information.

Add PKG_BUILD_PARALLEL for faster compilation.

Remove several outdated options.

Refreshed OpenSSL patch.

Other small cleanups.

Signed-off-by: Rosen Penev <redacted>

Merge pull request #12042 from neheb/yaml

libyaml: update to 0.2.4

Merge pull request #12040 from neheb/mess

meson: update to 0.54.1

Merge pull request #12045 from peter-stadler/pytz

python-pytz: update version to 2020.1

python-pytz: update version to 2020.1

Signed-off-by: Peter Stadler <redacted>

libyaml: update to 0.2.4

Signed-off-by: Rosen Penev <redacted>

meson: update to 0.54.1

Signed-off-by: Rosen Penev <redacted>

vala: update to 0.48.5

Signed-off-by: Rosen Penev <redacted>

idevicerestore: update to 2020-04-20

Signed-off-by: Rosen Penev <redacted>

bind: update to version (security fix)

Signed-off-by: Jan Pavlinec <redacted>

ocserv: updated to 1.0.1

Signed-off-by: Nikos Mavrogiannopoulos <redacted>

openconnect: updated to 8.09

Signed-off-by: Nikos Mavrogiannopoulos <redacted>

Merge pull request #12034 from micmac1/gperf

Revert gperf: remove

Merge pull request #12013 from neheb/moc

mocp: disable ffmpeg

Merge pull request #12019 from cotequeiroz/jamvm_host

jamvm: remove unneeded host build, and the package itself

Merge pull request #12026 from jefferyto/python-dns-pypi

python-dns: Change download source, remove incorrect PKG_CPE_ID

jamvm: remove package

Java support is no longer feasible in openwrt.  It's outdated, and can't
be usd without classpath, which has been removed.

Signed-off-by: Eneas U de Queiroz <redacted>

Merge pull request #11798 from GuLinux/patch-1

openconnect: Allow to set `usergroup` option

Revert gperf: remove

gperf is a basic tool used when building packages. It's not available on
all hosts, in which case having a host package like this one is
required. For instance the CircleCI environment does not contain gperf,
in which case building of software requiring gperf fails.

This commit reverts the gperf removal.

Signed-off-by: Sebastian Kemper <redacted>

Merge pull request #12028 from jefferyto/python-schema-0.7.2

python-schema: Update to 0.7.2, change download source to PyPI

Merge pull request #12027 from jefferyto/python-decorator-4.4.2

python-decorator: Update to 4.4.2, change download source to PyPI

Merge pull request #12029 from jefferyto/django-simple-captcha-pypi

django-simple-captcha: Change download source to PyPI

django-simple-captcha: Change download source to PyPI

Signed-off-by: Jeffery To <redacted>

python-schema: Update to 0.7.2, change download source to PyPI

Signed-off-by: Jeffery To <redacted>

python-decorator: Update to 4.4.2, change download source to PyPI

Signed-off-by: Jeffery To <redacted>

python-dns: Change download source, remove incorrect PKG_CPE_ID

This changes the package to download from PyPI (using pypi.mk) and
removes the incorrect PKG_CPE_ID.

The CPE id was for Debian's python-dns package which contains PyDNS
("pydns" on PyPI). This package contains "dnspython" from PyPI.

Signed-off-by: Jeffery To <redacted>

Merge pull request #12025 from dl12345/snort

snort: bump to 2.9.15.1

snort: bump to 2.9.15.1

Fix compilation error with x86_64 glibc

Fix changed download location on snort.org

Signed-off-by: Ian Cooper <redacted>

Merge pull request #12021 from eglooca/master

netifyd: Updated to v3.00

Merge pull request #11880 from pesintta/acme-user-scripts

(u)acme: add support for user-provided setup and cleanup scripts

uacme: add support for user-provided setup and cleanup scripts

Add possibility for user to provide setup and cleanup scripts for
additional flexibility. Setup-script takes precedence over the built-in
behavior of uacme.

This helps users with more complex use-cases to utilize uacme to update
certificates without adding complexity to the provided run.sh script.

Signed-off-by: Antti Seppälä <redacted>

acme: add support for user-provided setup and cleanup scripts

Add possibility for user to provide setup and cleanup scripts for
additional flexibility. Setup-script takes precedence over the built-in
behavior of acme.

This helps users with more complex use-cases to utilize acme to update
certificates without adding complexity to the provided run.sh script.

Signed-off-by: Antti Seppälä <redacted>

netifyd: Updated to v3.00

Signed-off-by: Darryl Sokoloski <redacted>

jamvm: remove unneeded host build

Host build was added in 2972cc98e ("Add host build") because classpath
required a host java vm.  Now that classpath is gone, host build can be
removed as well.

Signed-off-by: Eneas U de Queiroz <redacted>

mwan3: Update Makefile

Signed-off-by: Brian J. Murrell <redacted>

mwan3: Don't use /128 address for ping source

An interface can have both a /64 and a /128 from a provider.

In such a case, use the address from the /64 to do the ping check, not
the /128.

Signed-off-by: Brian J. Murrell <redacted>

Merge pull request #11979 from neheb/jan

jsoncpp: add size optimizations

Merge pull request #12010 from dl12345/dovecot

dovecot: remove incorrect PKG_BUILD_DEPENDS

mocp: disable ffmpeg

The recent update to ffmpeg broke this.

Instead, use the relevant libraries separately.

Added AAC support. AAC is very common and was recently fixed to be
compatible with BUILD_PATENTED.

Explicitly pass all configure arguments, to avoid future breakage.

Remove autoreconf. autotools files are not being patched.

Add PKG_BUILD_PARALLEL for speed.

Other minor cleanups.

Signed-off-by: Rosen Penev <redacted>

dovecot: remove incorrect PKG_BUILD_DEPENDS

The package Makefile contains a PKG_BUILD_DEPENDS=libiconv
line, which apart from being incorrect if libiconv-full is
specified in the build configuration, is also unnecessary,
since the package Makefile already includes nls.mk which
sets PKG_BUILD_DEPENDS appropriately.

Signed-off-by: Ian Cooper <redacted>

Merge pull request #11998 from jefferyto/uwsgi-pypi

uwsgi: Use pypi.mk to download source tarball

openconnect: Allow to set `usergroup` option in OpenConnect

Just adding the extra option `-g|--usergroup <group>` (required by the VPN server I'm currently using)

Signed-off-by: Marco Gulino <redacted>

switchdev-poller: netifd now keep dev down

Since 19.07, netifd will not try to bring a device up
after someone brought it down. This way, there is no need
to rename the device.

It also fixes a rename error on 19.07 when the *_down device
was being in use (by netifd?).

Signed-off-by: Luiz Angelo Daros de Luca <redacted>

Merge pull request #11997 from jefferyto/scapy-python-package

scapy: Use Python packaging, PyPI download

Merge pull request #12006 from TELUS-BBA/coreutils-fix

coreutils: add upstream patch fixing aarch64 compilation

coreutils: add upstream patch fixing aarch64 compilation

ls: restore 8.31 behavior on removed directories

Signed-off-by: Scott Roberts <redacted>

Merge pull request #12003 from jefferyto/python-cryptography-2.9.2

python-cryptography: Update to 2.9.2

Merge pull request #12001 from jefferyto/radicale2-cleanup

radicale2: Clean up Makefile

Merge pull request #12005 from dl12345/master-perl

perl: fix compilation on x86_64 with glibc and ssp

Merge pull request #12002 from dl12345/master

procps-ng: remove unnecessary PKG_BUILD_DEPENDS

travelmate: fix captive portal detection

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

Signed-off-by: Dirk Brenken <redacted>

perl: fix compilation on x86_64 with glibc and ssp

perl fails to compile on x86_64 with glibc and stack smashing
protection enabled due to libssp not being specified in the
ldflags.

Signed-off-by: Ian Cooper <redacted>

python-cryptography: Update to 2.9.2

Signed-off-by: Jeffery To <redacted>

procps-ng: remove unnecessary PKG_BUILD_DEPENDS

The package Makefile contains an unnecessary PKG_BUILD_DEPENDS
line that builds gettext and libiconv even in cases where the
build has gettext-full and libiconv-full selected.

This behaviour can and does mask errors in other package Makefiles
that are dependent on libiconv-full if it is compiled before
these packages by causing libiconv-stub to be created and put in
the staging tree and potentially linked against by these
dependent packages when they omit to specify an appropriate
PKG_BUILD_DEPENDS line.

procps-ng does not require gettext or libiconv to be built in
order to compile correctly.

Signed-off-by: Ian Cooper <redacted>

radicale2: Clean up Makefile

* Remove preinst, the default prerm script will stop the service
* Use default Python package filespec and shebang fix

Signed-off-by: Jeffery To <redacted>

Merge pull request #11968 from yangfl/master

acme: fix some errors

Merge pull request #11993 from jefferyto/bash-sys-bashrc

bash: Import upstream patches, enable system-wide .bashrc file, source /etc/shinit

Merge pull request #11989 from cherrot/ddns-cloudflare-v4

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

uwsgi: Use pypi.mk to download source tarball

This also removes PKG_BUILD_DIR, which does not need to be explicitly
set.

Signed-off-by: Jeffery To <redacted>

scapy: Use Python packaging, PyPI download

This updates the package to use the default Python package build recipe,
adds a src package, and changes to download from PyPI (using pypi.mk).

Signed-off-by: Jeffery To <redacted>

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 <redacted>

Merge pull request #11737 from antonlacon/ffmpeg-4.2

ffmpeg: update to 4.2.2

ffmpeg: drop call to disable PATENTED_ENCODERS

Presently, this attempts to disable atrac3, h264, hevc and vc1. These
encoders don't exist or are done through other programs (eg libx264).
Handling of those other programs is done elsewhere.

Signed-off-by: Ian Leonard <redacted>

bash: Enable system-wide .bashrc file, source /etc/shinit

This enables a system-wide .bashrc file (/etc/bash.bashrc), as well as
some other options related to startup files, and sources /etc/shinit for
interactive shells.

Fixes https://bugs.openwrt.org/index.php?do=details&task_id=3019.

Signed-off-by: Jeffery To <redacted>

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 <redacted>

ffmpeg: add upstream patches fixing MIPS compilation

Removed the Makefile references.

Signed-off-by: Rosen Penev <redacted>

Merge pull request #11982 from Robby-/master-freeradius3_update_3_0_21

freeradius3: Update to 3.0.21

Merge pull request #11769 from cbz/master

dnscrypt-proxy: Changed 'Provider Key' for securedns to current value

Merge pull request #11987 from Payne-X6/liburcu

liburcu: update to version 0.12.1

Merge pull request #11988 from Payne-X6/libedit

libedit: update to version 20193112-3.1

Merge pull request #11984 from commodo/fix-seafile

 net: seafile-server: fix build

Merge pull request #11985 from commodo/django-pkgs-bumps

Django pkgs bumps

django-appconf: bump to version 1.0.4

Signed-off-by: Alexandru Ardelean <redacted>

django-compressor: bump to version 2.4

Signed-off-by: Alexandru Ardelean <redacted>

liburcu: update to version 0.12.1

Signed-off-by: Jan Hák <redacted>

net: seafile-server: select procps-ng

Otherwise seafile-server isn't selectable since it depends that this
package be enabled.

Signed-off-by: Alexandru Ardelean <redacted>

net: seafile-server: add libevent2 deps on PKG_BUILD_DEPENDS

And libevent2-pthreads to DEPENDS.

While building with -j12 I seem to get:
[ sometimes this also includes libevent2-openssl ]

```
-- EVHTP_VERSION            :  1.2.18
-- EVHTP_DISABLE_SSL        :  OFF
-- EVHTP_DISABLE_EVTHR      :  OFF
-- EVHTP_DISABLE_REGEX      :  OFF
-- EVHTP_BUILD_SHARED       :
-- EVHTP_USE_JEMALLOC       :
-- EVHTP_USE_TCMALLOC       :

-- CMAKE_BUILD_TYPE         : Release
-- CMAKE_INSTALL_PREFIX     : /usr
-- CMAKE_BINARY_DIR         : /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18
-- CMAKE_CURRENT_BINARY_DIR : /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18
-- CMAKE_CURRENT_SOURCE_DIR : /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18
-- PROJECT_BINARY_DIR       : /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18
-- PROJECT_SOURCE_DIR       : /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18
-- CMAKE_MODULE_PATH        : /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/cmake
-- CMAKE_SYSTEM_NAME        : Linux
-- CMAKE_SYSTEM_VERSION     : 1
-- CMAKE_C_COMPILER         : /home/sandu/work/openwrt/openwrt/staging_dir/toolchain-i386_pentium4_gcc-8.4.0_musl/bin/i486-openwrt-linux-musl-gcc
-- CMAKE_AR                 : /home/sandu/work/openwrt/openwrt/staging_dir/toolchain-i386_pentium4_gcc-8.4.0_musl/bin/i486-openwrt-linux-musl-gcc-ar
-- CMAKE_RANLIB             : /home/sandu/work/openwrt/openwrt/staging_dir/toolchain-i386_pentium4_gcc-8.4.0_musl/bin/i486-openwrt-linux-musl-gcc-ranlib
-- CFLAGS                   :   -Os -pipe -march=pentium4 -fno-caller-saves -fno-plt -fhonour-copts -Wno-error=unused-but-set-variable -Wno-error=unused-result -ffile-prefix-map=/home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18=libevhtp-1.2.18 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 -Wl,-z,now -Wl,-z,relro
                              -DNDEBUG

-- Configuring done
CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
Please set them or make sure they are set and tested correctly in the CMake files:
LIBEVENT_THREAD
    linked by target "evhtp" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18
    linked by target "test_proxy" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "example_basic" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "test_client" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "example_https_client" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "test_vhost" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "test_basic" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "test_extensive" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "example_chunked" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "test_query" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "test_perf" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "example_pause" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "example_https_server" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "example_vhost" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples
    linked by target "example_request_fini" in directory /home/sandu/work/openwrt/openwrt/build_dir/target-i386_pentium4_musl/libevhtp-1.2.18/examples

-- Generating done
CMake Warning:
  Manually-specified variables were not used by the project:

    CMAKE_ASM_COMPILER
    CMAKE_ASM_COMPILER_ARG1
    CMAKE_MODULE_LINKER_FLAGS
    CMAKE_SHARED_LINKER_FLAGS
    DL_LIBRARY

CMake Generate step failed.  Build files cannot be regenerated correctly.
```

Signed-off-by: Alexandru Ardelean <redacted>

Merge pull request #11937 from neheb/coreu

coreutils: update to 8.32

libedit: update to version 20193112-3.1

Signed-off-by: Jan Hák <redacted>

Merge pull request #11978 from dl12345/master

irqbalance: fix compilation for USE_GLIBC and BUILD_NLS cases

freeradius3: Update to 3.0.21

Latest stable release.

Signed-off-by: Robby K <redacted>

freeradius3: Removed patches/004-fix-target-python-header-detection.patch as it is no longer needed for the freeradius3-mod-python3 package 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 <redacted>

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

Signed-off-by: Robby K <redacted>