From: Thomas Petazzoni Date: Fri, 1 Dec 2017 20:56:44 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7;p=buildroot.git 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 --- 1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 diff --cc DEVELOPERS index b25823b6a3,35507de953..0f5847efe0 --- a/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 package/dovecot/dovecot.mk index fa69acfa20,25a78b9f78..71a76c2818 --- a/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/libupnp/libupnp.hash index 314c68e826,3b45d5311c..929e5c42e7 --- a/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 cff856eaeb,1a5630ae3e..b7f188cd72 --- a/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