[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/

[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/

[Patrice Clement]

commit:     488872bd2a698af501f88470badb5a67bdb3b4b6
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Oct 10 11:35:55 2017 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Oct 20 07:44:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488872bd

app-shells/dash: remove unused patch.

Closes: https://github.com/gentoo/gentoo/pull/5905

 app-shells/dash/files/dash-0.5.9-dumb-echo.patch | 93 ------------------------
 1 file changed, 93 deletions(-)

diff --git a/app-shells/dash/files/dash-0.5.9-dumb-echo.patch b/app-shells/dash/files/dash-0.5.9-dumb-echo.patch
deleted file mode 100644
index 9bcf6e65a8a..00000000000
--- a/app-shells/dash/files/dash-0.5.9-dumb-echo.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-http://bugs.gentoo.org/337329
-http://bugs.gentoo.org/527848
-
-there's no requirement for `echo` to support escape sequences. bash, by default,
-does not, while dash always does.  POSIX permits either behavior:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html
-
-however, since the behavior is not portable, no one should be relying on echo
-having any specific behavior.  they should use `printf` when they want an escape
-sequence.  it also makes dash smaller & faster to disable this logic entirely.
-
---- a/src/bltin/printf.c
-+++ b/src/bltin/printf.c
-@@ -442,21 +442,12 @@
- int
- echocmd(int argc, char **argv)
- {
--	int nonl;
--
--	nonl = *++argv ? equal(*argv, "-n") : 0;
--	argv += nonl;
--
--	do {
--		int c;
--
--		if (likely(*argv))
--			nonl += print_escape_str("%s", NULL, NULL, *argv++);
--		if (nonl > 0)
--			break;
--
--		c = *argv ? ' ' : '\n';
--		out1c(c);
--	} while (*argv);
-+	int i;
-+	for (i = 1; i < argc; ++i) {
-+		outstr(argv[i], out1);
-+		if (i < argc - 1)
-+			outc(' ', out1);
-+	}
-+	outc('\n', out1);
- 	return 0;
- }
---- a/src/dash.1
-+++ b/src/dash.1
-@@ -1182,43 +1182,15 @@
- option turns off the effect of any preceding
- .Fl P
- options.
--.It Xo echo Op Fl n
-+.It Xo echo
- .Ar args... 
- .Xc
- Print the arguments on the standard output, separated by spaces.
--Unless the
--.Fl n
--option is present, a newline is output following the arguments.
--.Pp
--If any of the following sequences of characters is encountered during
--output, the sequence is not output.  Instead, the specified action is
--performed:
--.Bl -tag -width indent
--.It Li \eb
--A backspace character is output.
--.It Li \ec
--Subsequent output is suppressed.  This is normally used at the end of the
--last argument to suppress the trailing newline that
--.Ic echo
--would otherwise output.
--.It Li \ef
--Output a form feed.
--.It Li \en
--Output a newline character.
--.It Li \er
--Output a carriage return.
--.It Li \et
--Output a (horizontal) tab character.
--.It Li \ev
--Output a vertical tab.
--.It Li \e0 Ns Ar digits
--Output the character whose value is given by zero to three octal digits.
--If there are zero digits, a nul character is output.
--.It Li \e\e
--Output a backslash.
--.El
- .Pp
--All other backslash sequences elicit undefined behaviour.
-+No arguments or backslash sequences are supported as they are not portable.
-+They will be printed out exactly as passed in.
-+.Pp
-+You can replace `echo -n ...` with the portable `printf %s ...` construct.
- .It eval Ar string ...
- Concatenate all the arguments with spaces.
- Then re-parse and execute the command.

[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/

[Lars Wendler]

commit:     2d1ae12644c7a9d32152385178906610eb7c3e7f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed May 16 09:45:14 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed May 16 09:45:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1ae126

app-shells/dash: Use official upstream patch.

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 app-shells/dash/files/dash-0.5.10.1-parser.patch | 37 +++++++++++++++++++-----
 1 file changed, 30 insertions(+), 7 deletions(-)

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
index 485fc7e6772..0939b7cb722 100644
--- a/app-shells/dash/files/dash-0.5.10.1-parser.patch
+++ b/app-shells/dash/files/dash-0.5.10.1-parser.patch
@@ -1,8 +1,28 @@
-https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html
+From 469c5fd4f57622b1a6571172898ab29430319d4a Mon Sep 17 00:00:00 2001
+From: Herbert Xu <herbert@gondor.apana.org.au>
+Date: Fri, 11 May 2018 23:41:25 +0800
+Subject: parser: Fix incorrect eating of backslash newlines
 
---- dash-0.5.10.1/src/parser.c
-+++ dash-0.5.10.1/src/parser.c
-@@ -853,6 +853,11 @@
+With the introduction of synstack->syntax, a number of references
+to the syntax variable was missed during the conversion.  This
+causes backslash newlines to be incorrectly removed in single
+quote context.
+
+This patch also combines these calls into a new helper function
+pgetc_top.
+
+Fixes: ab1cecb40478 ("parser: Add syntax stack for recursive...")
+Reported-by: Leah Neukirchen <leah@vuxu.org>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+---
+ src/parser.c | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/parser.c b/src/parser.c
+index 8e40781..8bd3db4 100644
+--- a/src/parser.c
++++ b/src/parser.c
+@@ -853,6 +853,11 @@ static int pgetc_eatbnl(void)
  	return c;
  }
  
@@ -14,7 +34,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html
  static void synstack_push(struct synstack **stack, struct synstack *next,
  			  const char *syntax)
  {
-@@ -915,7 +920,7 @@
+@@ -915,7 +920,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs)
  			attyline();
  			if (synstack->syntax == BASESYNTAX)
  				return readtoken();
@@ -23,7 +43,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html
  			goto loop;
  		}
  #endif
-@@ -929,7 +934,7 @@
+@@ -929,7 +934,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs)
  					goto endword;	/* exit outer loop */
  				USTPUTC(c, out);
  				nlprompt();
@@ -32,7 +52,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html
  				goto loop;		/* continue outer loop */
  			case CWORD:
  				USTPUTC(c, out);
-@@ -1056,7 +1061,7 @@
+@@ -1056,7 +1061,7 @@ toggledq:
  					USTPUTC(c, out);
  				}
  			}
@@ -41,3 +61,6 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html
  		}
  	}
  endword:
+-- 
+cgit v1.1
+