diff --git a/packages/tools/nano/package.mk b/packages/tools/nano/package.mk index 392e538d4a..a75cd8ef2f 100644 --- a/packages/tools/nano/package.mk +++ b/packages/tools/nano/package.mk @@ -3,11 +3,11 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nano" -PKG_VERSION="4.0" -PKG_SHA256="1e2fcfea35784624a7d86785768b772d58bb3995d1aec9176a27a113b1e9bac3" +PKG_VERSION="4.2" +PKG_SHA256="1143defce62e391b241252ffdb6e5c1ded56cfe26d46ee81b796abe0ccc45df9" PKG_LICENSE="GPL" PKG_SITE="http://www.nano-editor.org/" -PKG_URL="http://ftpmirror.gnu.org/${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.xz" +PKG_URL="http://ftpmirror.gnu.org/nano/${PKG_NAME}-${PKG_VERSION}.tar.xz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Nano is an enhanced clone of the Pico text editor." diff --git a/packages/tools/nano/patches/nano-999.01-initialize-a-variable-before-referencing-it.patch b/packages/tools/nano/patches/nano-999.01-initialize-a-variable-before-referencing-it.patch deleted file mode 100644 index 7edc25a6d9..0000000000 --- a/packages/tools/nano/patches/nano-999.01-initialize-a-variable-before-referencing-it.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7ad232d71470cd8c4dc63aeb02f11c9e8df9ecdb Mon Sep 17 00:00:00 2001 -From: Devin Hussey
-Date: Thu, 28 Mar 2019 17:28:47 -0400 -Subject: [PATCH] files: initialize a variable before referencing it - -The lack of initialization caused a nasty bug on some targets (such as -ARMv7) which would make it so that ^S would just say "Cancelled". - -While x86 (both 64 and 32 bits) seems to initialize 'response' to zero or -a positive number, ARM does not, and there is usually a negative value in -its place, which triggers the 'if (response < 0)' check and, as a result, -the code says "Cancelled". - -This fixes https://savannah.gnu.org/bugs/?56023. -Reported-by: Devin Hussey - -Bug existed since version 4.0, commit 0f9d60a3. - -Signed-off-by: Devin Hussey ---- - src/files.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/files.c b/src/files.c -index 84e3f684..fd54c168 100644 ---- a/src/files.c -+++ b/src/files.c -@@ -2101,7 +2101,7 @@ int do_writeout(bool exiting, bool withprompt) - - while (TRUE) { - const char *msg; -- int response, choice; -+ int response = 0, choice = 0; - functionptrtype func; - #ifndef NANO_TINY - const char *formatstr, *backupstr; --- -2.20.1 -