Update to latest 0.5.5.x Debian version. Drop 0.5.6.x for now since Debian no longer has it either. Fix octal parsing #337329 by Michał Górny.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 40 insertions, 75 deletions

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index 70bad8071f72..60737b16f487 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/dash
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 
+*dash-0.5.5.1.7 (15 Sep 2010)
+
+  15 Sep 2010; Mike Frysinger <vapier@gentoo.org> +dash-0.5.5.1.7.ebuild,
+  +files/dash-0.5.5.1-octal.patch, -dash-0.5.6.1-r1.ebuild,
+  -files/dash-0.5.6.1-read-ifs.patch:
+  Update to latest 0.5.5.x Debian version. Drop 0.5.6.x for now since Debian no
+  longer has it either. Fix octal parsing #337329 by Michał Górny.
+
   11 Sep 2010; Mike Frysinger <vapier@gentoo.org> dash-0.5.6.1-r1.ebuild:
   Drop forced libedit static linking #334693.
 
diff --git a/app-shells/dash/dash-0.5.6.1-r1.ebuild b/app-shells/dash/dash-0.5.5.1.7.ebuild
index 349a7aba02ac..8a03d23172b2 100644
--- a/app-shells/dash/dash-0.5.6.1-r1.ebuild
+++ b/app-shells/dash/dash-0.5.5.1.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.6.1-r1.ebuild,v 1.4 2010/09/11 16:06:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/dash-0.5.5.1.7.ebuild,v 1.1 2010/09/15 21:56:19 vapier Exp $
 
 EAPI="2"
 
@@ -8,7 +8,7 @@ inherit autotools eutils flag-o-matic toolchain-funcs
 
 DEB_PV=${PV%.*}
 DEB_PATCH=${PV##*.}
-DEB_PF="${PN}_${DEB_PV}.${DEB_PATCH}-1~exp0"
+DEB_PF="${PN}_${DEB_PV}-${DEB_PATCH}"
 MY_P="${PN}-${DEB_PV}"
 
 DESCRIPTION="DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant"
@@ -30,10 +30,8 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${WORKDIR}"/${DEB_PF}.diff
-	rm  */debian/diff/0006--INPUT-exit-127-if-command_file-is-given-but-doesn-t.diff \
-		|| die #328929
 	epatch */debian/diff/*
-	epatch "${FILESDIR}"/${P}-read-ifs.patch #331535
+	epatch "${FILESDIR}"/${PN}-0.5.5.1-octal.patch #337329
 
 	# Fix the invalid sort
 	sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins
diff --git a/app-shells/dash/files/dash-0.5.5.1-octal.patch b/app-shells/dash/files/dash-0.5.5.1-octal.patch
new file mode 100644
index 000000000000..760e4ad56209
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.5.1-octal.patch
@@ -0,0 +1,29 @@
+http://bugs.gentoo.org/337329
+
+do not interpret \\1 as an octal sequence.  require it to start with \\0.
+
+--- a/src/bltin/printf.c
++++ b/src/bltin/printf.c
+@@ -247,18 +247,10 @@ conv_escape_str(char *str)
+ 		 * They start with a \0, and are followed by 0, 1, 2, 
+ 		 * or 3 octal digits. 
+ 		 */
+-		if (ch == '0') {
+-			unsigned char i;
+-			i = 3;
+-			ch = 0;
+-			do {
+-				unsigned k = octtobin(*str);
+-				if (k > 7)
+-					break;
+-				str++;
+-				ch <<= 3;
+-				ch += k;
+-			} while (--i);
++		if (ch >= '1' && ch <= '9') {
++			/* Filter \1...\9; let \0 fall to conv_escape(). */
++			ch = '\\';
++			--str;
+ 			continue;
+ 		}
+ 
diff --git a/app-shells/dash/files/dash-0.5.6.1-read-ifs.patch b/app-shells/dash/files/dash-0.5.6.1-read-ifs.patch
deleted file mode 100644
index ac52610639c8..000000000000
--- a/app-shells/dash/files/dash-0.5.6.1-read-ifs.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff --git a/src/expand.c b/src/expand.c
-index f2f964c..3ba1a38 100644
---- a/src/expand.c
-+++ b/src/expand.c
-@@ -205,7 +205,7 @@ expandarg(union node *arg, struct arglist *arglist, int flag)
- 	 * TODO - EXP_REDIR
- 	 */
- 	if (flag & EXP_FULL) {
--		ifsbreakup(p, &exparg);
-+		ifsbreakup(p, &exparg, 0);
- 		*exparg.lastp = NULL;
- 		exparg.lastp = &exparg.list;
- 		expandmeta(exparg.list, flag);
-@@ -1022,9 +1022,11 @@ recordregion(int start, int end, int nulonly)
-  * Break the argument string into pieces based upon IFS and add the
-  * strings to the argument list.  The regions of the string to be
-  * searched for IFS characters have been stored by recordregion.
-+ * If bltin is set, use bltinlookup to search for IFS in the
-+ * environment of the currently executing built-in command.
-  */
- void
--ifsbreakup(char *string, struct arglist *arglist)
-+ifsbreakup(char *string, struct arglist *arglist, int bltin)
- {
- 	struct ifsregion *ifsp;
- 	struct strlist *sp;
-@@ -1040,7 +1042,13 @@ ifsbreakup(char *string, struct arglist *arglist)
- 	if (ifslastp != NULL) {
- 		ifsspc = 0;
- 		nulonly = 0;
--		realifs = ifsset() ? ifsval() : defifs;
-+		if (!bltin)
-+			realifs = ifsset() ? ifsval() : defifs;
-+		else {
-+			realifs = bltinlookup("IFS");
-+			if (realifs == NULL)
-+				realifs = defifs;
-+		}
- 		ifsp = &ifsfirst;
- 		do {
- 			p = string + ifsp->begoff;
-diff --git a/src/expand.h b/src/expand.h
-index 405af0b..8eb5f07 100644
---- a/src/expand.h
-+++ b/src/expand.h
-@@ -69,7 +69,7 @@ char *_rmescapes(char *, int);
- int casematch(union node *, char *);
- void recordregion(int, int, int);
- void removerecordregions(int); 
--void ifsbreakup(char *, struct arglist *);
-+void ifsbreakup(char *, struct arglist *, int bltin);
- 
- /* From arith.y */
- intmax_t arith(const char *);
-diff --git a/src/miscbltin.c b/src/miscbltin.c
-index 5ab1648..6810f5f 100644
---- a/src/miscbltin.c
-+++ b/src/miscbltin.c
-@@ -85,9 +85,10 @@ readcmd_handle_line(char *line, char **ap, size_t len)
- 	backup = sstrdup(line);
- 
- 	arglist.lastp = &arglist.list;
-+	removerecordregions(0);
- 	recordregion(0, len - 1, 0);
- 	
--	ifsbreakup(s, &arglist);
-+	ifsbreakup(s, &arglist, 1);
- 	*arglist.lastp = NULL;
- 	removerecordregions(0);
-