Received: by mail.netbsd.org (Postfix, from userid 605) id 8CFEB84E5F; Mon, 1 Apr 2019 10:26:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1411A84E5A for ; Mon, 1 Apr 2019 10:26:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id WX9A5pxidEVN for ; Mon, 1 Apr 2019 10:26:42 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 83AE784D3F for ; Mon, 1 Apr 2019 10:26:42 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 81835FB16; Mon, 1 Apr 2019 10:26:42 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_155411440287130" MIME-Version: 1.0 Date: Mon, 1 Apr 2019 10:26:42 +0000 From: "Sebastian Wiedenroth" Subject: CVS commit: pkgsrc/editors/nano To: pkgsrc-changes@NetBSD.org Reply-To: wiedi@netbsd.org X-Mailer: log_accum Message-Id: <20190401102642.81835FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_155411440287130 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiedi Date: Mon Apr 1 10:26:42 UTC 2019 Modified Files: pkgsrc/editors/nano: Makefile distinfo Added Files: pkgsrc/editors/nano/patches: patch-src_files.c Log Message: nano: fixing a possible non-functioning ^S keystroke To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 pkgsrc/editors/nano/Makefile cvs rdiff -u -r1.50 -r1.51 pkgsrc/editors/nano/distinfo cvs rdiff -u -r0 -r1.3 pkgsrc/editors/nano/patches/patch-src_files.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_155411440287130 Content-Disposition: inline Content-Length: 2589 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/nano/Makefile diff -u pkgsrc/editors/nano/Makefile:1.78 pkgsrc/editors/nano/Makefile:1.79 --- pkgsrc/editors/nano/Makefile:1.78 Sun Mar 24 19:42:34 2019 +++ pkgsrc/editors/nano/Makefile Mon Apr 1 10:26:42 2019 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.78 2019/03/24 19:42:34 wiedi Exp $ +# $NetBSD: Makefile,v 1.79 2019/04/01 10:26:42 wiedi Exp $ DISTNAME= nano-4.0 +PKGREVISION= 1 CATEGORIES= editors MASTER_SITES= https://www.nano-editor.org/dist/v${PKGVERSION_NOREV:R}/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/editors/nano/distinfo diff -u pkgsrc/editors/nano/distinfo:1.50 pkgsrc/editors/nano/distinfo:1.51 --- pkgsrc/editors/nano/distinfo:1.50 Sun Mar 24 19:42:34 2019 +++ pkgsrc/editors/nano/distinfo Mon Apr 1 10:26:42 2019 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.50 2019/03/24 19:42:34 wiedi Exp $ +$NetBSD: distinfo,v 1.51 2019/04/01 10:26:42 wiedi Exp $ SHA1 (nano-4.0.tar.xz) = 586f369d622a883acf06d1143a7b3c8754acc011 RMD160 (nano-4.0.tar.xz) = b6bb83e30ec4484a6fa8f3d5366387918a480e1f SHA512 (nano-4.0.tar.xz) = 2cef28df05f890bc27ef8faa9eb5350f8de2cc6cc69b4dc8e11c19248911630a7088ddbee57c8a8aa56df6efaab13124132d0cda55e5ae1f151265723d7d0ede Size (nano-4.0.tar.xz) = 1533992 bytes SHA1 (patch-configure) = 4a618bf99332fcfce2413be14400b919d042cc30 +SHA1 (patch-src_files.c) = 59c486e32c18f883139c918fe846946a67a826a6 Added files: Index: pkgsrc/editors/nano/patches/patch-src_files.c diff -u /dev/null pkgsrc/editors/nano/patches/patch-src_files.c:1.3 --- /dev/null Mon Apr 1 10:26:42 2019 +++ pkgsrc/editors/nano/patches/patch-src_files.c Mon Apr 1 10:26:42 2019 @@ -0,0 +1,26 @@ +$NetBSD: patch-src_files.c,v 1.3 2019/04/01 10:26:42 wiedi Exp $ + +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. + +--- src/files.c.orig 2019-03-23 08:26:13.000000000 +0000 ++++ src/files.c +@@ -2101,7 +2101,7 @@ int do_writeout(bool exiting, bool withp + + while (TRUE) { + const char *msg; +- int response, choice; ++ int response = 0, choice = 0; + functionptrtype func; + #ifndef NANO_TINY + const char *formatstr, *backupstr; --_----------=_155411440287130--