softethervpn: Really fix iconv support

softethervpn overrides nls.mk by defining its iconv functions. This only
works if the libc has iconv. In addition, it does not allow external
libiconv usage. TARGET_LDFLAGS is also the wrong place to add -liconv.

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

softethervpn: add package name to build dir

Current build dir is set at just v$(PKG_VERSION).

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from 80b61c3e57c0d7deef587046ef38315f5adb230e)

softethervpn: cleanup host/build, pass HOST_*FLAGS

Remove hack to avoid readline host dependency, now that readline is
being host/built.
Pass on HOST_CFLAGS, HOST_CPPFLAGS, & HOST_LDFLAGS, to fix buildbots
host-compile errors about not finding openssl headers.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
(cherry-picked from e3c6fcb79647b09f669addf4d7fa37151e19b3f1)

python: add patch for CVE-2018-20852

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

python: bump to version 2.7.16

This change updates Python to version 2.7.16, which is a bugfix release
in the Python 2.7 series.
This also removes patches back-ported from upstream.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>

python3: update to version 3.6.9

3.6.9 is the latest security fix release of Python 3.6.

- Fixes: CVE-2018-20852, CVE-2019-9948, CVE-2019-9740, CVE-2019-5010
- Refreshed patches
- Removed a few backports patches

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

diffutils: provide diff, cmp as alternatives

Resolves openwrt/packages#6361

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(Backported from commit b02e4eafd18eb436f0d4ebcc1cf345bb024fc093)

Merge pull request #9463 from ps790/patch-4

softethervpn: Update to rtm version 4.29-9680

Merge pull request #9461 from ps790/patch-2

softethervpn: Pass FLAGS to CC for hamcorebuilder

coreutils: add alternatives support

Fixes openwrt/packages#9290

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

bridge-utils: fix conflict with busybox brctl

Busybox brctl applet conflicts with the version from bridge-utils.
Fix this by using ALTERNATIVE support for brctl in bridge-utils.

Fixes openwrt/packages#8812

Signed-off-by: Konstantin Demin <rockdrilla@gmail.com>
[PKG_RELEASE bump]
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry-picked from commit fabd9efdea6a57dfc58d9c57f5b31cb1ee4aa9a0)

softethervpn: Update to rtm version 4.29-9680

Update SoftEther VPN to the latest rtm version 4.29-9680

Compile tested: Atheros AR7xxx/AR9xxx, TP-LINK Archer C7 v2, 18.06.4

Signed-off-by: Philipp Schuster <philippschuster@gmx.com>

softethervpn: Pass FLAGS to CC for hamcorebuilder

CFLAGS, CPPFLAGS & LDFLAGS need to be passed with CC because they are being ingored.
This is already contained in the master branch but was missing in 18.06. Without these flags the compilation fails.

Compile tested: Atheros AR7xxx/AR9xxx, TP-LINK Archer C7 v2, 18.06.4

Signed-off-by: Philipp Schuster <philippschuster@gmx.com>

wifidog: fix getting ip from interface, cleanup

Patch taken from upstream fixes an Invalid argument error while trying
to get the IP address of an interface.
Makefile was updated to current style.
(cherry-picked from 5ab9f3e3576d7fd28cf55ac604dbf485eb1b0de3)

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>

irssi: update to version 1.2.1 (security fix)

Fixes CVE-2019-13045

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
Signed-off-by: Peter Wagner <tripolar@gmx.at>

Merge pull request #9396 from stangri/openwrt-18.06-simple-adblock

[18.06] simple-adblock: options to filter non-ASCII domains, local compressed storage

simple-adblock: options to filter non-ASCII domains, local compressed storage

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

ocserv: updated to 0.12.4

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

Merge pull request #9292 from BKPepe/18.06-youtube

[OpenWrt 18.06] youtube-dl: update to version 2019.06.21

php7: update to 7.2.19

Compile and run tested on mxs platform

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

php7: update to 7.2.18

Compile and run tested on mxs platform.

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

znc: backport fix for CVE-2019-12816

Backport the fix for CVE-2019-12816 from 1.7.4 to 1.6.x.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

youtube-dl: update to version 2019.06.21

Small Makefile polishing
- removed PKG_BUILD_DIR
- PKG_MAINTAINER is above PKG_LICENSE
- URL should be under TITLE

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

Revert "php7: Fix compilation without deprecated OpenSSL APIs"

This reverts commit a176ffa0a114a8a59b783c63ac8f493754abf4bc.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

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

Revert "php7: update to 7.2.18"

This reverts commit 8e9429f3e9918ca561d147d75a70e24cb8cd0435.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

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

Revert "php7: update to 7.2.19"

This reverts commit 8abaf8a3088f2290cd17964ac7d5e8467ebe1061.
I just noticed that I accidentally used wrong openwrt branch
to compile this, with 18.09 branch the compilation fails.

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

libxml2: update to 2.9.9

Also drop the CVE patches which are already covered by this new release.

Compile tested for and run tested on mxs platform.

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

libxml2: Fix CVE-2018-14404

Embarrasingly, I missed this one last time.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: Michael Heimpold <mhei@heimpold.de>
(cherry picked from commit b7870ea71125311c24095a7bfd9be717b563ef7b)

php7: update to 7.2.19

Compile and run tested on mxs platform

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

php7: update to 7.2.18

Compile and run tested on mxs platform.

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

php7: Fix compilation without deprecated OpenSSL APIs

Refreshed patches.

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

php7: update to 7.2.17

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

nano: update to 4.3

Update nano to 4.3

Release notes at https://nano-editor.org/news.php

2019.06.18 - GNU nano 4.3
* The ability to read from and write to a FIFO has been regained.
* Startup time is reduced by fully parsing a syntax only when needed.
* Asking for help (^G) when using --operatingdir does not crash.
* The reading of a huge or slow file can be stopped with ^C.
* Cut, zap, and copy operations are undone separately when intermixed.
* M-D reports the correct number of lines (zero for an empty buffer).

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

Merge pull request #9272 from gladiac1337/openwrt-18.06

[openwrt-18.06] haproxy: Update HAProxy to v1.8.20

Merge pull request #9268 from EricLuehrsen/unbound_192_1806

[openwrt-18.06] unbound: update to 1.9.2 with package bug fixes

haproxy: Update HAProxy to v1.8.20

- Update haproxy download URL and hash
- Add new patches (see https://www.haproxy.org/bugs/bugs-1.8.20.html)
- Make halog use our CFLAGS
- Update statically linked LUA to v5.3.5

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

unbound: update to 1.9.2 with package bug fixes

- fix package makefile resulted in resolved symlink and copied
double file contents of libunbound.so during install
- treat RFC6762 'local.' as nxdomain because avahi and other services
will disable if SOA or NS records appear in central DNS
- NLNetLabs has moved download and documentation sites

cherry-pick and squash from openwrt-19.07
add3e6c699e148460fa7bca4011b9fbf95a0ef75
936a71739c062772b4580ed06e4d57874d53a822
4618c741502d392212864b10fe1f671424f9a79e

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

Merge pull request #9232 from neheb/13

[18.06]haproxy: Remove unnecessary OpenSSL depends

haproxy: Remove unnecessary OpenSSL depends
All of these are either not needed or not valid.

Added a patch to remove the OPENSSL_WITH_DEPRECATED dependency.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from 430906bd7833a130f3673ed3fde4a5702d52e41b)
(refreshed patches)

lm-sensors: install libsensors using CP instead of INSTALL_DATA

INSTALL_DATA turns all of the symlinks to files, increasing size.

Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
(cherry-picked from 3417ee01220e7ce2190845a6d8b5f16311b93258)

boost: Release update with minor fix

This commit fixes the bug described in issue #8146 [1], where the
package fails to build if the boost package is selected without
selecting any of the internal non-header-only libraries.

[1]: https://github.com/openwrt/packages/issues/8146

Signed-off-by: Carlos Miguel Ferreira <carlosmf.pt@gmail.com>
(cherry-picked from 92c93ca0f4647a1fa198d205e4fa3397cfa9b3da)

znc: update my email address

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>

Merge pull request #9193 from ryzhovau/getdns_lib-18.06

getdns: fix library double packing (18.06 branch)

getdns: fix library double packing

Signed-off-by: Alexander Ryzhov <github@ryzhov-al.ru>

nlbwmon: update to latest Git HEAD

4574e6e nfnetlink: prevent tight retry loops
163a211 client: fix commit error information
21290db nlbwmon: merge existing data
abe701d database: do not overwrite unexpectedly preexisting databases
ef3fa58 socket: handle EAGAIN on send()

Ref: https://github.com/jow-/nlbwmon/issues/23
Ref: https://github.com/jow-/nlbwmon/issues/26
Ref: https://github.com/jow-/nlbwmon/issues/30
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c528e01f4cb5112cbd26b973400ad424280a61e1)

Merge pull request #9058 from micmac1/sqlite3-arm-endian-owrt18

(18.06) sqlite3: fix arm endian issue

sqlite3: fix arm endian issue

Forum user portuquesa raised a topic (see [1]) about being unable to use
Asterisk on his armeb xscale device. We narrowed it down to sqlite3.
Asterisk was unable to insert a simple table into its db.

In short, sqlite3 assumes little endian for every ARM device. This worked OK
for 4 Byte (unaligned) access. But once upstream (back in 2015) added a
function which accesses 2 Bytes (see [2]) this failed for some (if not all) ARM
big endian devices. ARM CPUs are bi-endian for 4 Byte reads but not for 2 Byte
reads.

This patch fixes the problem by setting the endianness adequately for
ARM targets, for both 32 bit and 64 bit varieties. The patch was applied
upstream (see [3]).

[1] https://forum.openwrt.org/t/solved-asterisk13-or-15-sqlite3-database-problem/36856
[2] https://github.com/sqlite/sqlite/commit/329428e2088aabb1db2dc6e48108b76551405a8e
[3] https://www.sqlite.org/src/info/b7aad929619f7043

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

Merge pull request #8966 from BKPepe/18.06-ytdl

[OpenWrt 18.06] youtube-dl: update to version 2019.05.11

youtube-dl: update to version 2019.05.11

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

Merge pull request #8765 from BKPepe/1806-urllib3

[OpenWrt 18.06] python-urllib3: update to 1.24.3

Merge pull request #8954 from jonathanunderwood/openwrt-18.06-getdns-stubby-from-master

[18.06] stubby and getdns: cherry pick commits from master

nfs-kernel-server: use portmap, drop rpcbind

stubby: set PKG_SOURCE_VERSION using PKG_VERSION

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>

stubby: remove PKG_SOURCE from Makefile

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>

stubby: add support for TLS configuration options

  - tls_cipher_list
  - tls_ciphersuites
  - tls_min_version
  - tls_max_version

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>

stubby: add support for tls_port resolver config option (#8889)

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>

stubby: update to 0.2.6

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>

getdns: update to version 1.5.2

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>

stubby: Update PKG_RELEASE

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

stubby: fix handling of pkis in config (#8888)

Signed-off-by: Jonathan G. Underwood <jonathan.underwood@gmail.com>

stubby: fixed duplicate IPv6 address in stubby.yml; fixed typo in README.md

Signed-off-by: Jannik Vieten <me@exploide.net>

Merge pull request #8938 from lucize/doveup18

dovecot: [18.06] update to 2.2.36.1

dovecot: update to 2.2.36.1

Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>

python-urllib3: update to 1.24.3

- Fixes CVE-2019-9740, CVE-2019-11324
- RFC 3986 compliant
- Fix TITLE, which was too long for make menuconfig
- Add PKG_LICENSE_FILES
- Remove current maintainer

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

Merge pull request #8781 from neheb/pros

[18.06] Prosody: backport changes from master

Merge pull request #8767 from neheb/cr2

[18.06] crtmpserver: Update to official git repo

Merge pull request #8816 from neheb/lo

[18.06] loudmouth: Disable debug and fix compilation

Merge pull request #8815 from neheb/gr

[18.06] grilo: Remove build dependency on perl-xml-parser

Merge pull request #8881 from micmac1/maria_10.1.39

(18.06) mariadb: bump to 10.1.39

libxslt: add PKG_CPE_ID for proper CVE tracking

Signed-off-by: Jiri Slachta <jiri@slachta.eu>

Merge pull request #8882 from micmac1/xslt-cve-18

(18.06) libxslt: backport patch for CVE-2019-11068

mariadb: bump to 10.1.39

Fixes CVE-2019-2614 and CVE-2019-2627.

Added PKG_CPE_ID.

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

libxslt: backport patch for CVE-2019-11068

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

Merge pull request #8871 from neheb/ad

[18.06] addrwatch: Add -std=gnu89 to fix compilation

addrwatch: Add -std=gnu89 to fix compilation

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

Merge pull request #8779 from neheb/libsec

[18.06] libseccomp: Update to 2.3.3

Merge pull request #8780 from neheb/apc

[18.06] apcupsd: preset shutdown binary

Merge pull request #8770 from neheb/es

[18.06] espeak: Fix build issues. Cleanup patches

Merge pull request #8772 from neheb/oa

[18.06] oath-toolkit: Add patch from Fedora to fix compilation

Merge pull request #8778 from neheb/liba

[18.06] libartnet: Fix compile with GCC7

Merge pull request #8850 from EricLuehrsen/unbound_dhcp_1806

[18.06] unbound: fix local dns synthesis corner cases

add rpcbind

Signed-off-by: Peter Wagner <tripolar@gmx.at>

unbound: fix local dns synthesis corner cases

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

Merge pull request #8777 from neheb/sendm

[18.06] sendmail: link with gcc instead of ld

Merge pull request #8817 from neheb/bonnnnn

bonnie++: Remove wrongly added patch during cherry-pick

bonnie++: Remove wrongly added patch during cherry-pick

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

loudmouth: Disable debug and fix compilation

Reduces size and and eliminates -Werror

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

grilo: Remove build dependency on perl-xml-parser

Given that we don't enable a bunch of stuff, we can patch this out.

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

nfs-kernel-server: fix missing libbsd dependency

libbsd may compile before nfs-kernel-server, it  will make
nfs-kernel-server depends libbsd.so.0, that is not we want to see. so
gave option to 'configure' to disable libbsd detect and tell it we have
no libbsd

Signed-off-by: Guo Li <uxgood.org@gmail.com>
(cherry picked from commit 3fc7f7b8cc151ab6490189405cb526b70c9bf6e6)

nfs-kernel-server: update to 2.3.3

Signed-off-by: Peter Wagner <tripolar@gmx.at>
(cherry picked from commit e5216bb0d5fac4d9cc1caf077cb45174f6ccdd7d)

nfs-kernel-server: Switch to xz tarball

Switch to smaller xz tarball

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit cfba4f0874c7b4df342dc90951a2a01730b3ebba)

nfs-kernel-server: switch to libtirpc, enable ipv6

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 22ebb5a8d62a808dd8a13faf3913769f5b9ee24a)

nfs-kernel-server: fix missing host symbol res_querydomain/missing-include-dir

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 19dfe3b173609bed21496012a8c859f714351db8)

nfs-kernel-server: add -Wno-error=format-security to TARGET_CFLAGS to a fix compily error

Signed-off-by: Peter Wagner <tripolar@gmx.at>
(cherry picked from commit b1be3f9c06d5286e1e698edb580e629ae03f0393)

nfs-kernel-server: update to 2.3.2

Signed-off-by: Peter Wagner <tripolar@gmx.at>
(cherry picked from commit 0d1f48893c0a32fc63a9ab187f588f38709e944f)

libtirpc: enable host build

* include /etc/netconfig
* cleanup old patches
* update via patch to 1.0.4-rc2

Signed-off-by: Andy Walsh <andy.walsh44+github@gmail.com>
(cherry picked from commit 4896e9c36e6834039a2eb98e6799ca8a75b1048b)

znc: Clean up Makefile and fix compilation on PPC

Some of these hacks were needed when uClibc++ was used. Now that it is not
we can remove them.

Remove libpthread dependency. Not only is it unneeded, package-defaults
already specifies it.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[jonas.gorski: cherry-pick from master]
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
(cherry picked from commit 9cb7cc71e7da9d06194b813d6263c0b8427eb1c3)

nano: update to 4.2

* update nano to 4.2

Release notes at https://nano-editor.org/news.php

2019.04.24 - GNU nano 4.2
* The integrated spell checker does not crash when 'spell' is missing.
* Option --breaklonglines works also when --ignorercfiles is used.
* Automatic hard-wrapping is more persistent in pushing words to the
  same overflow line.

Tested with ipq806x/R7800 and mvebu/WRT3200ACM

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

Merge pull request #8764 from BKPepe/1806-youtubedl

[OpenWrt 18.06] youtube-dl: update to version 2019.04.24

Merge pull request #8766 from neheb/qu

[18.06] quasselc: Update to latest version