From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 333831382C5 for ; Mon, 14 May 2018 09:54:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A90DE085B; Mon, 14 May 2018 09:54:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 10699E085B for ; Mon, 14 May 2018 09:54:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E2A53335CAE for ; Mon, 14 May 2018 09:54:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 291C82E for ; Mon, 14 May 2018 09:54:02 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1526291634.6be2c5a6ab0b465e2591435715bae6db830e2356.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-shells/dash/dash-0.5.10.1-r1.ebuild app-shells/dash/dash-0.5.10.1-r2.ebuild app-shells/dash/files/dash-0.5.10.1-parser.patch X-VCS-Directories: app-shells/dash/files/ app-shells/dash/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 6be2c5a6ab0b465e2591435715bae6db830e2356 X-VCS-Branch: master Date: Mon, 14 May 2018 09:54:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ffe8ef07-2443-40d5-86f1-cf1181c80833 X-Archives-Hash: 571686635fa34b3eaf0e5461f78e7ea9 commit: 6be2c5a6ab0b465e2591435715bae6db830e2356 Author: Lars Wendler gentoo org> AuthorDate: Mon May 14 09:51:21 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon May 14 09:53:54 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be2c5a6 app-shells/dash: Revbump to fix dash parser. Removed old. Package-Manager: Portage-2.3.36, Repoman-2.3.9 ...-0.5.10.1-r1.ebuild => dash-0.5.10.1-r2.ebuild} | 1 + app-shells/dash/files/dash-0.5.10.1-parser.patch | 43 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/app-shells/dash/dash-0.5.10.1-r1.ebuild b/app-shells/dash/dash-0.5.10.1-r2.ebuild similarity index 98% rename from app-shells/dash/dash-0.5.10.1-r1.ebuild rename to app-shells/dash/dash-0.5.10.1-r2.ebuild index d51383e2eb1..09d6f32c73f 100644 --- a/app-shells/dash/dash-0.5.10.1-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.1-r2.ebuild @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch + "${FILESDIR}"/${P}-parser.patch ) src_prepare() { diff --git a/app-shells/dash/files/dash-0.5.10.1-parser.patch b/app-shells/dash/files/dash-0.5.10.1-parser.patch new file mode 100644 index 00000000000..485fc7e6772 --- /dev/null +++ b/app-shells/dash/files/dash-0.5.10.1-parser.patch @@ -0,0 +1,43 @@ +https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html + +--- dash-0.5.10.1/src/parser.c ++++ dash-0.5.10.1/src/parser.c +@@ -853,6 +853,11 @@ + return c; + } + ++static int pgetc_top(struct synstack *stack) ++{ ++ return stack->syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); ++} ++ + static void synstack_push(struct synstack **stack, struct synstack *next, + const char *syntax) + { +@@ -915,7 +920,7 @@ + attyline(); + if (synstack->syntax == BASESYNTAX) + return readtoken(); +- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); ++ c = pgetc_top(synstack); + goto loop; + } + #endif +@@ -929,7 +934,7 @@ + goto endword; /* exit outer loop */ + USTPUTC(c, out); + nlprompt(); +- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); ++ c = pgetc_top(synstack); + goto loop; /* continue outer loop */ + case CWORD: + USTPUTC(c, out); +@@ -1056,7 +1061,7 @@ + USTPUTC(c, out); + } + } +- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); ++ c = pgetc_top(synstack); + } + } + endword: