Merge branch 'next'

This merges the next branch accumulated during the 2017.11 release
cycle back into the master branch.

A few conflicts had to be resolved:

 - In the DEVELOPERS file, because Fabrice Fontaine was added as a
   developer for libupnp in master, and for libupnp18 in
   next. Resolution is simple: add him for both.

 - linux/Config.in, because we updated the 4.13.x release used by
   default in master, while we moved to 4.14 in next. Resolution: use
   4.14.

 - package/libupnp/libupnp.hash: a hash for the license file was added
   in master, while the package was bumped into next. Resolution: keep
   the hash for the license file, and keep the hash for the newest
   version of libupnp.

 - package/linux-headers/Config.in.host: default version of the kernel
   headers for 4.13 was bumped to the latest 4.13.x in master, but was
   changed to 4.14 in next. Resolution: use 4.14.

 - package/samba4/: samba was bumped to 4.6.11 in master for security
   reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --cc DEVELOPERS
index b25823b6a3bdc7d212b6b72e9b2db6103bef8f99,35507de9530122eeb91a24cf53d843925007b8ea..0f5847efe0905eb9a6d470a58f118f2ade048be0
--- 1/DEVELOPERS
--- 2/DEVELOPERS
+++ b/DEVELOPERS
@@@ -610,9 -617,10 +619,11 @@@ F:       package/gupnp-dlna
  F:    package/gupnp-tools/
  F:    package/hiredis/
  F:    package/igd2-for-linux/
 +F:    package/libupnp/
+ F:    package/libupnp18/
  F:    package/minissdpd/
  F:    package/motion/
+ F:    package/rygel/
  F:    package/tinycbor/
  F:    package/tinydtls/
  
@@@ -1411,9 -1424,9 +1429,10 @@@ F:     package/minetest
  F:    package/minetest-game/
  F:    package/openpowerlink/
  F:    package/physfs/
+ F:    package/solarus/
  F:    package/stress-ng/
  F:    package/supertux/
 +F:    package/supertuxkart/
  F:    package/terminology/
  F:    package/upower/
  F:    package/xenomai/

diff --cc Makefile
Simple merge

diff --cc package/dovecot/dovecot.mk
index fa69acfa20951143e9e3317220fd06d2093669fe,25a78b9f78846f95ea095a905ba20bafaf3ccba1..71a76c2818391fd4785362a8e2600a2c4948e6c8
--- 1/package/dovecot/dovecot.mk
--- 2/package/dovecot/dovecot.mk
+++ b/package/dovecot/dovecot.mk
@@@ -5,10 -5,10 +5,10 @@@
  ################################################################################
  
  DOVECOT_VERSION_MAJOR = 2.2
- DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).31
+ DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).33.2
  DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR)
  DOVECOT_INSTALL_STAGING = YES
 -DOVECOT_LICENSE = LGPL-2.1
 +DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015
  DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT
  DOVECOT_DEPENDENCIES = \
        host-pkgconf \

diff --cc package/libpjsip/libpjsip.mk
Simple merge

diff --cc package/libupnp/libupnp.hash
index 314c68e826395b279e33f5689c74abe6b164a832,3b45d5311c5ccff9e85423b4a7e333b38d17f9fa..929e5c42e7869857d224f89972811f27ebbce195
--- 1/package/libupnp/libupnp.hash
--- 2/package/libupnp/libupnp.hash
+++ b/package/libupnp/libupnp.hash
@@@ -1,3 -1,2 +1,3 @@@
  # Locally computed:
- sha256        0bdfacb7fa8d99b78343b550800ff193264f92c66ef67852f87f042fd1a1ebbc        libupnp-1.6.22.tar.bz2
+ sha256        7d83d79af3bb4062e5c3a58bf2e90d2da5b8b99e2b2d57c23b5b6f766288cf96        libupnp-1.6.24.tar.bz2
 +sha256        0375955c8a79d6e8fa0792d45d00fc4e7710d7ac95bcbd27f9225a83f5c946fd        LICENSE

diff --cc package/linux-headers/Config.in.host
index cff856eaebd18675d54a2006f8e13de0aea6ffee,1a5630ae3eb35379cd43922df079d5cae200fe4b..b7f188cd722ffcb24915fa1bb5f027ed03b56b13
--- 1/package/linux-headers/Config.in.host
--- 2/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@@ -249,5 -257,6 +257,6 @@@ config BR2_DEFAULT_KERNEL_HEADER
        default "4.10.17"       if BR2_KERNEL_HEADERS_4_10
        default "4.11.12"       if BR2_KERNEL_HEADERS_4_11
        default "4.12.14"       if BR2_KERNEL_HEADERS_4_12
 -      default "4.13.12"       if BR2_KERNEL_HEADERS_4_13
 +      default "4.13.16"       if BR2_KERNEL_HEADERS_4_13
+       default "4.14"          if BR2_KERNEL_HEADERS_4_14
        default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION

diff --cc package/rauc/rauc.mk
Simple merge

diff --cc package/samba4/samba4.mk
Simple merge