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>

1 files changed, 0 insertions, 43 deletions

diff --git a/package/nano/0001-fix-compilation-when-configured-with-enable-tiny.patch b/package/nano/0001-fix-compilation-when-configured-with-enable-tiny.patch
deleted file mode 100644
index db684f9832..0000000000
--- a/package/nano/0001-fix-compilation-when-configured-with-enable-tiny.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 28cfab7580c42a6d6c9c5d787ce736094fd51a0c Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Tue, 29 Aug 2017 19:28:44 +0200
-Subject: tweaks: fix compilation when configured with --enable-tiny
-
-When moving the cursor to the top-left corner, it is not necessary
-to compute leftedge because firstcolumn IS the relevant leftedge.
-
-Reported-by: Jordi Mallach <jordi@debian.org>
-
-Downloaded from upstream master branch:
-http://git.savannah.gnu.org/cgit/nano.git/commit/?id=28cfab7580c42a6d6c9c5d787ce736094fd51a0c
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- src/move.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/move.c b/src/move.c
-index d138356..ce276e4 100644
---- a/src/move.c
-+++ b/src/move.c
-@@ -121,7 +121,7 @@ void do_page_up(void)
- 	openfile->current = openfile->edittop;
- 	openfile->current_y = 0;
- 
--	leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+	leftedge = openfile->firstcolumn;
- 	target_column = 0;
-     } else
- 	get_edge_and_target(&leftedge, &target_column);
-@@ -152,7 +152,7 @@ void do_page_down(void)
- 	openfile->current = openfile->edittop;
- 	openfile->current_y = 0;
- 
--	leftedge = leftedge_for(openfile->firstcolumn, openfile->edittop);
-+	leftedge = openfile->firstcolumn;
- 	target_column = 0;
-     } else
- 	get_edge_and_target(&leftedge, &target_column);
--- 
-cgit v1.0-41-gc330
-