[arch-commits] Commit in nano/trunk (2 files)

[Andreas Radke]

    Date: Monday, April 15, 2019 @ 15:58:45
  Author: andyrtr
Revision: 350791

upgpkg: nano 4.1-1

upstream update 4.1

Modified:
  nano/trunk/PKGBUILD
Deleted:
  nano/trunk/0001-files-initialize-a-variable-before-referencing-it.patch

--------------------------------------------------------------+
 0001-files-initialize-a-variable-before-referencing-it.patch |   39 ----------
 PKGBUILD                                                     |   19 +---
 2 files changed, 5 insertions(+), 53 deletions(-)

Deleted: 0001-files-initialize-a-variable-before-referencing-it.patch
===================================================================
--- 0001-files-initialize-a-variable-before-referencing-it.patch	2019-04-15 14:43:22 UTC (rev 350790)
+++ 0001-files-initialize-a-variable-before-referencing-it.patch	2019-04-15 15:58:45 UTC (rev 350791)
@@ -1,39 +0,0 @@
-From 7ad232d71470cd8c4dc63aeb02f11c9e8df9ecdb Mon Sep 17 00:00:00 2001
-From: Devin Hussey <address at hidden>
-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 <address at hidden>
-
-Bug existed since version 4.0, commit 0f9d60a3.
-
-Signed-off-by: Devin Hussey <address at hidden>
----
- 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-15 14:43:22 UTC (rev 350790)
+++ PKGBUILD	2019-04-15 15:58:45 UTC (rev 350791)
@@ -2,8 +2,8 @@
 # Contributor: Judd <judd at archlinux.org>
 
 pkgname=nano
-pkgver=4.0
-pkgrel=2
+pkgver=4.1
+pkgrel=1
 pkgdesc="Pico editor clone with enhancements"
 arch=('x86_64')
 license=('GPL')
@@ -11,23 +11,14 @@
 groups=('base')
 depends=('ncurses' 'file' 'sh')
 backup=('etc/nanorc')
-source=(https://www.nano-editor.org/dist/v4/${pkgname}-${pkgver}.tar.xz{,.asc}
-        0001-files-initialize-a-variable-before-referencing-it.patch)
-sha256sums=('1e2fcfea35784624a7d86785768b772d58bb3995d1aec9176a27a113b1e9bac3'
-            'SKIP'
-            'f1dce36d1932d925ae3491ab19d3032263fe7c675d0f9d69f30adece6441da96')
+source=(https://www.nano-editor.org/dist/v4/${pkgname}-${pkgver}.tar.xz{,.asc})
+sha256sums=('86bde596a038d6fde619b49d785c0ebf0b3eaa7001a39dbe9316bd5392d221d0'
+            'SKIP')
 validpgpkeys=('8DA6FE7BFA7A418AB3CB2354BCB356DF91009FA7' # "Chris Allegretta <chrisa at asty.org>"
               'A7F6A64A67DA09EF92782DD79DF4862AF1175C5B' # "Benno Schulenberg <bensberg at justemail.net>"
               'BFD009061E535052AD0DF2150D28D4D2A0ACE884' # "Benno Schulenberg <bensberg at telfort.nl>"
 )
 
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # correct a possible non-working ^S keystroke on some systems
-  # http://lists.gnu.org/archive/html/nano-devel/2019-04/msg00000.html
-  patch -Np1 -i ../0001-files-initialize-a-variable-before-referencing-it.patch
-}
-
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \