nano: update to 3.2

Update nano to version 3.2

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

diff --git a/utils/nano/Makefile b/utils/nano/Makefile
index c52e5803ab9b752c36513cc179610afbae6142e6..a8f2b7b712129a8ebe5b20e29abafe15062702ed 100644 (file)
--- a/utils/nano/Makefile
+++ b/utils/nano/Makefile
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nano
-PKG_VERSION:=3.1
+PKG_VERSION:=3.2
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/nano
-PKG_HASH:=14c02ca40a5bc61c580ce2f9cb7f9fc72d5ccc9da17ad044f78f6fb3fdb7719e
+PKG_HASH:=d12773af3589994b2e4982c5792b07c6240da5b86c5aef2103ab13b401fe6349
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1

diff --git a/utils/nano/patches/001-upstream-fix-for-3.1-tiny-compilation.patch b/utils/nano/patches/001-upstream-fix-for-3.1-tiny-compilation.patch
deleted file mode 100644 (file)
index 58fe198..0000000
--- a/utils/nano/patches/001-upstream-fix-for-3.1-tiny-compilation.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 368ec04870a366b19f1c5801a6868786547968b0 Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Wed, 19 Sep 2018 20:36:39 +0200
-Subject: build: fix compilation again when configured with --enable-tiny
-
-Reported-by: Jordi Mallach <jordi@mallach.net>
----
- src/nano.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/nano.c b/src/nano.c
-index ebb1f11..01f92a1 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -1756,7 +1756,10 @@ int do_input(bool allow_funcs)
-       if (shortcut == NULL)
-               pletion_line = NULL;
-       else {
--              if (ISSET(VIEW_MODE) && shortcut->func != do_toggle_void &&
-+              if (ISSET(VIEW_MODE) &&
-+#ifndef NANO_TINY
-+                                                              shortcut->func != do_toggle_void &&
-+#endif
-                                                               !okay_for_view(shortcut)) {
-                       print_view_warning();
-                       return ERR;
--- 
-cgit v1.0-41-gc330
-