ffmpeg: work around hard/soft float configs for libffmpeg-full

Hard float includes: mp3lame
Soft float includes: shine (mp3 encoder)

libx264 is included when selected iff BUILD_PATENTED is true.

fdk-aac will not be available in libffmpeg-full due to incompatible license with libx264.
Custom builds can override licensing restrictions but results may not be re-distributable.

Signed-off-by: Ted Hess <thess@kitschensync.net>

net/mosquitto: bump to 1.5.4

Security and bugfix release.  Full release notes available at:
https://mosquitto.org/blog/2018/11/version-154-released/

Security:
* client certificates not validated for websockets listeners.

Bugfixes:
* wills with disconnected clients better handled
* bridge restart_timeout properly observed

Signed-off-by: Karl Palsson <karlp@etactica.com>

haveged: update to 1.9.4

Version bump to 1.9.4

Development has moved to github.
 * old site: http://www.issihosts.com/haveged
 * new site: https://github.com/jirka-h/haveged

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

ccrypt: Update to 1.11

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

Merge pull request #7301 from micmac1/maria37

(18.06) mariadb: security bump to 10.1.37

Merge pull request #7231 from padre-lacroix/bandwidthd-18.06

Bandwidthd 18.06: fix undefined references to inline functions

mariadb: security bump to 10.1.37

Notable Changes (copied from release notes):

  Various fixes from MySQL 5.6.42: MDEV-17533, MDEV-17532, MDEV-17531
  MDEV-16465: fixed a bug with DDL and FOREIGN KEY
  Fulltext index fixes:
    MDEV-12547: extended the range of innodb_ft_result_cache_limit on 64-bit systems
    MDEV-16865: InnoDB fts_query() ignores KILL
  Fixes for the following security vulnerabilities:
    CVE-2018-3282
    CVE-2016-9843
    CVE-2018-3174
    CVE-2018-3143
    CVE-2018-3156
    CVE-2018-3251

OpenWrt changes:
  - dropped obsolete ucontext patch (issue fixed upstream)
  - refreshed 130-c11_atomics.patch

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

bandwidthd: [18.06] fix undefined references to inline functions
This is basically same commit that took place in master 3 weeks ago.
gcc-7 with -Os makes inline functions disappeard. It is caused by
the new C11 inline semantics. pass option -fgnu89-inline to gcc let
it use gnu inline semantics.
see https://wiki.debian.org/GCC7#Porting_help

Compile tested on 18.06.  Run tested on OpenWrt 18.06.1 r7258-5eb055306f
QEMU Virtual CPU version (cpu64-rhel6)

Signed-off-by: Jean-Michel Lacroix <lacroix@lepine-lacroix.info>

build,circleci: fix container digest

I used podman/buildah to build this image, and the local sha256 is not the same than
the docker hub sha256. The layers are the same, so maybe just docker hub changing the manifest

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

build,circleci: add 'time' to container build image

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

isc-dhcp: drop .conf suffix on dhcrelay config file

Resolves issue #7235

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit b0e73634f757141e07044596d71c4138d60a88eb)

build,circleci: copy and adjust config from master

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

glib2: update to 2.58.1

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

ruby: bump to 2.5.3

Fix only release, including:
* CVE-2018-16396: Tainted flags are not propagated in Array#pack
  and String#unpack with some directives
* CVE-2018-16395: OpenSSL::X509::Name equality check does not work
  correctly

Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(cherry picked from commit 74216a55e1fb3e6d748e7e769c0a308eaf4c7859)

libssh: mark as BROKEN due to CVE-2018-10933

The only known user of this library is currently unable to get their
application to work with with the fixed 0.7.6 release of this library.

To prevent accidental use by unknown parties of a flawed library, mark
it as BROKEN.

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

patch: Add missing CVE-2018-6951 patch

The last commit added PKG_CPE_ID and now uscan detects a CVE that I missed

Reordered patches by date

Signed-off-by: Rosen Penev <rosenp@gmail.com>
[tweaked commit message]
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
(cherry picked from commit 394ff73e5390599545412d14d48e9185a927dc21)

patch: Fix CVE-2018-6952 and CVE-2018-1000156

Patches taken from official git repository.

Added PKG_CPE_ID for proper CVE tracking.

Added PKG_BUILD_PARALLEL for faster compilation.

Also adjusted Makefile to be more similar to other projects.

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

Merge pull request #7160 from EricLuehrsen/o1806_ub_181

[openwrt-18.06] unbound: update to 1.8.1

Merge pull request #7164 from pacien/181009-1806-pkg-tinc

tinc: update to 1.0.35 (security update) [openwrt-18.06]

watchcat: make compatible with updated busybox ash array handling (fixes #7148)

Signed-off-by: Nuno Goncalves <nunojpg@gmail.com>

tinc: update to 1.0.35

Critical security update for:
* CVE-2018-16737,
* CVE-2018-16738,
* CVE-2018-16758

Announcement:
https://www.tinc-vpn.org/pipermail/tinc/2018-October/005311.html

Signed-off-by: Pacien TRAN-GIRARD <pacien.trangirard@pacien.net>

unbound: update to 1.8.1

bug fixes for memory leaks
bug fixes for DNS over TLS

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

iotivity, i2pd, domoticz: Bump PKG_RELEASE to force re-build with Boost upgrade to 1.68

Signed-off-by: Ted Hess <thess@kitschensync.net>

gnutls: updated to 3.5.19

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

mosquitto: bump to 1.5.3

Full changelog at https://github.com/eclipse/mosquitto/blob/v1.5.3/ChangeLog.txt

Primary change:
CVE fix for CVE-2018-12543 - prevent crash on topics that begin with $
but are not $SYS

Selected other fixes relevant to OpenWrt since 1.5.1:
- Fix retained messages not sent by bridges on outgoing topics at the first
  connection. Closes #701.
- Fix duplicate clients being added to by_id hash before the old client was
  removed. Closes #645.
- Fix excessive CPU usage when the number of sockets exceeds the system limit.
  Closes #948.
- Fix for bridge connections when using WITH_ADNS=yes.
- Fix round_robin false behaviour. Closes #481.
- Fix segfault on HUP when bridges and security options are configured.
  Closes #965.

Signed-off-by: Karl Palsson <karlp@etactica.com>

sendmail: fix confLIBSEARCHPATH to $(STAGING_DIR)

This fix issue 'cannot find -lnsl' on build server which has libnsl.so in
/usr/lib

Signed-off-by: Guo Li <uxgood.org@gmail.com>

jamvm: Use <fenv.h> instead of <fpu_control.h>

musl libc (http://musl-libc.org lack the non-standard <fpu_control.h>
header, which is used in src/os/linux/{i386,x86_64}/init.c files to
setup the floating point precision. This patch makes it use the
standard C <fenv.h> header instead.

Original patch at Felix Janda at
https://sourceforge.net/p/jamvm/patches/6/

Signed-off-by: Guo Li <uxgood.org@gmail.com>
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

fdm: Merge latest version and build fixes from master

Signed-off-by: Ted Hess <thess@kitschensync.net>

boost: Merge updates (1.68.0) and build fixes from master

Makefile and package changes to support builds with both Python 2.x and Python 3.x versions.

Python versioning is automatically configured from lang/python repository xxx-version.mk files.

Signed-off-by: Ted Hess <thess@kitschensync.net>

Merge pull request #7084 from brianjmurrell/add-foolsm-to-18.06

foolsm: Add package foolsm

cshark: update to latest git HEAD

This fixes GCC8 compile due to buffer overrun

Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>
(cherry picked from commit e3144f00a3c5c05987680fd647f73349bd376076)

strongswan: refresh patches

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 3bc3949e28aa16f74fd63fc8c5bddc4277081f21)

strongswan: fix OpenWrt hotplug script handling

Commit 6cd8fcabe added ipsec hotplug script support by calling "exec
/sbin/hotplug-call ipsec".
Using the exec call breaks the insertion of iptables rules by the _updown.in
script as hotplug-call just replaces the current shell meaning the commands
following exec do not run since the shell is replaced and as a result lead to
connectivity issues.
Fix this by removing the exec command in front of /sbin/hotplug-call.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit d0ac611bf0dbf10d16e1b3dae6ba1d3ea80befc6)

strongswan: add openwrt hotplug script handling

Ipsec user script (/etc/ipsec.user) now get called indirectly by openwrt
"/sbin/hotplug-call". So other packages could also install their scripts
in "/etc/hotplug.d/ipsec".

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
(cherry picked from commit 6cd8fcabe6d1727192bf447c7adc8e1eb42ab8f7)

strongswan: include nls.mk for mysql plugin

ibmariadb 10.2 needs to be linked in together with iconv.

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

net-snmp: fix inbound firewall rule support

Commit ae5ee6ba6c506b42d942c98349b3a54181790ec8 added support for inbound
firewall rule support but some corner cases were not covered.

In case net-snmp is started and the network interface is already up
the procd firewall rule is created but not applied by fw3 as
service_started calling procd_set_config_changed firewall was missing.

When stopping net-snmp clean up the net-snmp inbound firewall rules in
iptables by calling procd_set_config_changed firewall in stop_service
which will trigger fw3 to remove the inbound firewall rules.

Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit 0bd19db0498780c3ac1e69ebc16c1334a609e285)

tdb: Remove libbsd dependency

libbsd gets picked up since it's no longer limited to glibc.

Patch identical to libtalloc one. Same codebase.

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

tdb: bump to latest version

Signed-off-by: BangLang Huang <banglang.huang@foxmail.com>
(cherry picked from commit d1804d38d45e1ed3ff4684278498fc3b8c3d761a)

tdb: avoid installing duplicate files

Use $(CP) instead of $(INSTALL) so that libtdb.so.1 is installed as
symlink, and not duplicated.

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

node: Fix incorrect detection of arm_version and arm_fpu

Automatic detection of the arm architecture does not work well.

http://downloads.lede-project.org/snapshots/faillogs/arm_arm1176jzf-s_vfp/packages/node/compile.txt

```
../deps/v8/src/arm/assembler-arm.cc:176:2: error: #error "CAN_USE_ARMV7_INSTRUCTIONS should match CAN_USE_VFP3_INSTRUCTIONS"
 #error "CAN_USE_ARMV7_INSTRUCTIONS should match CAN_USE_VFP3_INSTRUCTIONS"
   ^~~~~
```

https://github.com/openwrt/packages/issues/5728

Explicitly set cpu arch optimization flag to the compiler option so that "configure" script correctly identifies "arm version".

(Raspberry Pi Zero W)
Raspbian:
```
raspberrypi:~ $ echo | gcc -dM -E - | grep ARM_ARCH
```
OpenWrt (cross-env):
```
ubuntu:~ $ echo | ./arm-openwrt-linux-muslgnueabi-gcc -dM -E - | grep ARM_ARCH
```
```
ubuntu:~ $ echo | ./arm-openwrt-linux-muslgnueabi-gcc -mcpu=arm1176jzf-s -dM -E - | grep ARM_ARCH
```

Also specifying an option lines compactly.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry picked from commit 3482320c2a4bdca5f090fdc3ddfa3273d2b9c805)

node: fix host build fail

modify patch.
 https://github.com/nodejs/node/pull/19196

made not to use libressl headers
 fix to include path not to use "host/include"

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
(cherry picked from commit 818770d27364f31ba7a984d7f49374789463fc29)

nano: update to 3.1

* Update nano editor to 3.1
* Apply a post-release upstream patch to fix compilation

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

Nano: Update to 3.0
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
(cherry picked from commit 0ceaa4e32cdcbbc9036a4bb5143f22252dc33f75)

foolsm: Add package foolsm

Signed-off-by: Brian J. Murrell <brian@interlinx.bc.ca>
(cherry picked from commit 5cff94399d39016790921552a13719214cb46d73)

Merge pull request #7053 from mlichvar/chrony-fix-ipv6-allow-18.06

chrony: fix configuration of IPv6 client access (18.06)

chrony: fix configuration of IPv6 client access

Fix the init script to allow access from IPv6 subnets of the interface
specified in allow section in /etc/config/chrony.

Fixes issue #7039.

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

adblock: bugfix 3.5.5v2

* fix uci wrapper calls
* fix link in readme

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

adblock: update 3.5.5

* accept only ascii aka punycode chars in blocklists to prevent possible
dns backend warnings
* fix cornercase issues in json parsing (backend & frontend)
* slightly optimize tld compression performance
* refine logging
* use uci wrapper where possible
* change indentation from spaces to tabs (saves 8kb)
* add experimental youtube blocklist source

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

socat: Fix CRDLY, TABDLY and CSIZE shifts for PowerPC

Signed-off-by: Ted Hess <thess@kitschensync.net>

sqm-scripts: Bump to v1.2.4

Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>

php7: update to 7.2.9

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

php7: add dependency to hash for mysqlnd

The following error shows that mysqlnd depends on functions
provided by hash:

root@OpenWrt:/etc/php7# php-cli -m
PHP Warning:  PHP Startup: Unable to load dynamic library
'mysqlnd.so' (tried: /usr/lib/php/mysqlnd.so (Error
relocating /usr/lib/php/mysqlnd.so: PHP_SHA256Final: symbol
not found), /usr/lib/php/mysqlnd.so.so (Error loading shared
library /usr/lib/php/mysqlnd.so.so: No such file or
directory)) in Unknown on line 0

So let's model this dep in package metadata.

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

libxml2: add cpe id for CVE tracking

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

Merge pull request #6834 from micmac1/xml2-cve-18.06

libxml2: fix CVE-2018-9251 and CVE-2018-14567

libxml2: fix CVE-2018-9251 and CVE-2018-14567

Backport from master.

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

net/mosquitto: update to 1.5.1

Bugfix release.  Full changelog at:
https://mosquitto.org/blog/2018/08/version-151-released/

Of most interest to OpenWrt:
* Remove use of AI_ADDRCONFIG, which means the broker can be used on systems where only the loopback interface is defined.
* Fix IPv6 addresses not being able to be used as bridge addresses.
* Fix problem opening listeners on Pi caused by unsigned char being default.
* Fix segfault on startup if bridge CA certificates could not be read.
* Fix possible endian issue when reading the memory_limit option.
* library and client bugfixes including: https://github.com/openwrt/packages/issues/6765

Signed-off-by: Karl Palsson <karlp@etactica.com>

Merge pull request #6805 from micmac1/tiff-18.06

tiff: fix remaining CVEs

tiff: fix remaining CVEs

Backport Rosen's commit in master to 18.06 to address open CVEs. This
fixes:

CVE-2017-11613
CVE-2018-5784
CVE-2018-7456
CVE-2018-8905
CVE-2018-10963

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

Merge pull request #6782 from EricLuehrsen/unbound_odhcpd_fix

[openwrt-18.06] unbound: drop odhcpd leases with wrong field count

unbound: drop odhcpd leases with wrong field count

Signed-off-by: Eric Luehrsen <ericluehrsen@gmail.com>
(cherry pick commit: 59617f076d7cbdd04a341bf7cfb5f3d9772b5765)

ffmpeg: Add build overrides for some specific CPUs: Octeon, X86 and 24kf.

Octeon: Rename octeonplus to oction+
MIPS 24kf: Inline ASM fails to build (unknown reason)
X86: Configure finds NASM and assumes YASM if name explictly set (wrong switches)

Signed-off-by: Ted Hess <thess@kitschensync.net>

ffmpeg: Add cpu_type to configure opts. Upgrade to 3.2.12

Fixes certain combinations of architecture/cpu_type failing builds

Signed-off-by: Ted Hess <thess@kitschensync.net>

Merge pull request #6759 from micmac1/postgresql-18.06

postgresql: security bump to 9.6.10 for 18.06

postgresql: security bump to 9.6.10

This update includes fixes for the following CVEs:

- CVE-2018-1115
- CVE-2018-10925
- CVE-2018-10915

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

perl: version modules and non-base packages

Currently external modules and non-base packages are numbered
from their own internal number space, and even though the Perl
ABI number is embedded into them this isn't externally visible.

For example, perl-html-parser-3.72.1 could be built for ABI
5.26 or for 5.28, we can't easily tell.  This changes all of
that by embedding the ABI number into the filename.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 0d9584724ff1c011f587540c2d25be8a90a81413)

Merge pull request #6736 from micmac1/maria-1806-10.1.35-cve

mariadb[18.06]: security bump to 10.1.35

mariadb: security bump to 10.1.35

Bump minor version. Bugfix release. 100% backward compatible.

Includes fixes for:

CVE-2018-3064
CVE-2018-3063
CVE-2018-3058
CVE-2018-3066

Also includes CPPFLAGS fix from master (to get fortify-source headers
etc.).

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

travelmate: update 1.2.2

* fix restart behaviour after successful connection
* fix labeling of faulty stations
* optimize re-connect behaviour at locations where multiple uplinks with
the same SSID are in range
* use procd pidfile handling
* refine logging
* small fixes

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

usbip: remove nonshared flag (#6681)

Since https://git.openwrt.org/d0e0b7049f88774e67c3d5ad6b573f7070e5f900,
OpenWrt SDKs ship the appropriate sources for building usbip userspace
packages, so special nonshared handling is not required anymore.

Sucessfully tested by compiling usbip utilities for various architectures
using self built SDKs after applying the change linked above.

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

perl: update to 5.28

Refresh patches 900 and 910.

Add fix (920) for improperly gated variable.

Add workaround (020) for Storable's run-time check for stacksize.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit b94744496ffc56df20088fe3be862f9b9ee47f0e)

travis: don't need git cloning progress

Since Travis runs as a batch job and logs are typically looked at
after-the-fact (if at all), there's not any point to seeing progress
when cloning git repos.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit fc3beffeff252bb1d1efd43ff8a63687d16ac0b2)

isc-dhcp: write resolv.conf per network & dhcp settings

The internal nameservers and the DHCP default domain should be
squirted into /tmp/resolv.conf.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit db6adb616de20b8942069c1935276baf6557ac04)

perl: build with -fno-strict-liasing and -fwrapv

Looking at Configure and Porting/config.sh, it seems that Perl
requires both of these options to build correctly.

Should fix FS #1464.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

nut: Fix for nut-upsmon without nut-server

nut-monitor failed to create required dir /var/etc/nut, as
well as failing to set appropriate user on the directory and
conf files.  Fixing this closes
https://github.com/openwrt/packages/issues/6644

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
(cherry picked from commit 98fdf16ecb9c8e24fd7c534cd0696105d472ccbb)

nut: Update my email

Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com>
(cherry picked from commit b4fe49d2b246ef49b0cb3812a5e9da49f308ea30)

nut: Add PKG_FIXUP:=autoreconf

We need to force this since a *.m4 file is patched.

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

nut: added compatibility with openssl-1.1

Also added a fix in a check for empty string.

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

Merge pull request #6638 from chris5560/ddns-18.06

ddns-scripts[18.06]: bump to version 2.7.8-1

ddns-scripts[18.06]: bump to version 2.7.8-1

- synchronize with "master" incl. add service FreeDNS.42.pl
- remove Cloudflare v1 protocol support #6084 #6519
- fix goip.de update url #6448 #6519
- change Cloudflare v4 to read "Proxied" from current setting at Cloudflare Dashboard #5097 #6364 #6505
- fix replace of password inside logfile #6568
- remove myself as PKG_MAINTAINER

Signed-off-by: Christian Schoenebeck <christian.schoenebeck@gmail.com>

privoxy: fix uci configuration parsing after upstream OpenWrt changes

OpenWrt changed the way the uci shell parsing functions deal with list
configuration items.

This change broke the generation of the privoxy runtime configuration
because no callbacks were emitted anymore.

Fix the problem by defining a list_cb() that simply calls the existing
option_cb() to deal with list item values.

Ref: c9c0fc28a9 ("base-files: fix UCI config parsing and callback handling")
Ref: https://forum.lede-project.org/t/openwrt-snapshot-privoxy-error/15919
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 3113d62393fcd364a402aae55139eba4bf38fab8)

usbip: adapt package to new kernel/libudev

The sources for usbip are within the kernel.  A patch that was included
with the package, which changed the old signal name SIGCLD to the new
one, SIGCHLD, was merged upstream.  However, different targets use
different kernel versions.  Current version 4.14 and 4.9 are fine, but
older versions do not have the patch applied.  So, I used
-DSIGCLD=SIGCHLD to please both worlds.

libudev-fbsd currently used by openwrt does not implement the
udev_device_get_devpath function.  eudev's implementation of libudev
sets it as (src/libudev/libudev-device.c):
udev_device->devpath = udev_device->syspath + strlen("/sys");
I used a command-line define to use the same logic, as it works with
new and old versions of the kernel--the use of ..devpath is quite
recent.

I also linked with libbsd, when using glibc.

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

usbip: Remove obsolete patches

These patches are obsolete and are never applied.

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

Merge pull request #6617 from dibdot/travelmate-18.06

travelmate[18.06]: backport release 1.2.1 to 18.06 branch

Merge pull request #6616 from dibdot/adblock-18.06

adblock[18.06]: backport release 3.5.4 to 18.06 branch

krb5: update to 1.16.1

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

krb5: set replay cache directory to /tmp

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

krb5: update depends, adapt FS#1310

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

travelmate[18.06]: backport release 1.2.1 to 18.06 branch

Tested with latest 18.06 branch (OpenWrt 18.06-SNAPSHOT,
r7175+5-ca0c649a38)

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

adblock[18.06]: backport release 3.5.4 to 18.06 branch

Tested with latest 18.06 branch (OpenWrt 18.06-SNAPSHOT,
r7175+5-ca0c649a38)

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

lxc: nl: avoid NULL pointer dereference

This backports upstream fix from the master branch.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 13d57a5e9f1996109416724ba145a33e07248fb6)
(cherry picked from commit 6e1104cc6da900bb5a014217fa79d964246f7a40)

prometheus-node-exporter-lua: add conntrack collector

Also fix missing dependency of openwrt collector

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

prometheus-node-exporter-lua: set myself as maintainer

This was OKed sometimes ago by @simonswine
https://github.com/openwrt/packages/pull/5128

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>

Merge pull request #6572 from EricLuehrsen/unbound_1806_doc

[openwrt-18.06] unbound: fix TLS override documentation

unbound: fix TLS override documentation

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

Merge pull request #6537 from mhei/openwrt-18.06-php7

[openwrt-18.06] php7: update to latest version and include bugfixes

php7: update to 7.2.8

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

php7: fix load order of mysqli extension

This problem was reported by Teun Lubberhuizen, thanks!

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

php7: update to 7.2.7

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

php7: add package dependency on zoneinfo-core

Having "select PACKAGE_zoneinfo-core" wasn't enough for builds without
php7-cli=y or php7-cgi=y. It didn't result in installing zoneinfo-core
when using "opkg install" (during runtime or when building images with
CONFIG_TARGET_PER_DEVICE_ROOTFS).

Missing zoneinfo results in PHP fatal errors, e.g.:
Fatal error: DateTime::createFromFormat(): Timezone database is corrupt - this should *never* happen!

For years users were told to manually install zoneinfo-core package.
This problem was hidden for some time (including 17.01 release) due to
disabled support for CONFIG_PHP7_SYSTEMTZDATA. It's now back as support
for --with-system-tzdata was enabled again.

The proper solution is to simply make php7 package depend on
zoneinfo-core when PHP7_SYSTEMTZDATA is used.

Fixes: 84e5012e8853 ("php7: re-enable system timezone data usage")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>

php7: use mysqlnd

This is in anticipation of the MariaDB upgrade from mariadb 10.1.x to
10.2.x. With the latter the PHP MySQL plugins fail to compile, e.g.:

In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:63:0,
                 from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:
/home/equeiroz/src/openwrt-asus/staging_dir/target-mipsel_74kc_musl/usr/include/mysql/my_global.h:3:2: warning: #warning This file should not be included by clients, include only <mysql.h> [-Wcpp]
 #warning This file should not be included by clients, include only <mysql.h>
  ^~~~~~~
In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:79:0,
                 from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:
/home/equeiroz/src/openwrt-asus/staging_dir/target-mipsel_74kc_musl/usr/include/mysql/my_sys.h:3:2: warning: #warning This file should not be included by clients, include only <mysql.h> [-Wcpp]
 #warning This file should not be included by clients, include only <mysql.h>
  ^~~~~~~
In file included from /home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/mysqli.c:34:0:
/home/equeiroz/src/openwrt-asus/build_dir/target-mipsel_74kc_musl/php-7.2.6/ext/mysqli/php_mysqli_structs.h:82:10: fatal error: my_list.h: No such file or directory
 #include <my_list.h>

Upstream seems unlikely to fix this, see
https://bugs.php.net/bug.php?id=75612. In the bug report it is suggested
to not use libmysqlclient/libmariadbclient and instead utilize mysqlnd
(MySQL Native Driver) provided by PHP. This is the default anyway.

So add the mysqlnd module and remove the libmariadbclient depends.

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