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.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 47 insertions, 86 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/Manifest b/app-shells/dash/Manifest
index 7c8222e81fb5..0e9513d1601b 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,22 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX dash-0.5.6.1-read-ifs.patch 2192 RMD160 92aba8f39d598a36bf132bebbd52dff2815ee314 SHA1 3b75e9720e61843951c385f0e8a60725d6866410 SHA256 082c400a460f78bc27cb69c05816d54d93041d0c763b573508911093089b896d
-DIST dash-0.5.4.tar.gz 212145 RMD160 322fc2fffc5fddf4223d39c57eaeb9b4222303fa SHA1 f6dc33364e42e73e39fb1193845c02e031b817bb SHA256 a9dc8f0237f632dd2c1bfeff80b1052e75fafaef0d767e3beab0bd8becced623
+AUX dash-0.5.5.1-octal.patch 628 RMD160 06afd8ea14336dd6ff2acdc51eb7b0128661f579 SHA1 81d270a6e98bc85968285542cc664d69bfec0f0f SHA256 06741af243014a22ba1b530a5d4e4abd70b944dcb16f9e1ed86290745ff3dbd0
 DIST dash-0.5.5.1.tar.gz 208094 RMD160 8831123af32ab699314edbca18350e7ec778df77 SHA1 fd73f0a34477eaf8bacc36beee75d94551954a61 SHA256 1c6717a1014c73aa16bc78a4767f1e00b40ff2a01a6c2cf2cce9a5335c24493f
-DIST dash-0.5.6.tar.gz 213112 RMD160 18011693fec1fbc211c0bc307446557954a39219 SHA1 c62f94f09feb5eeb5e4b90793c5b6d5dad6ac003 SHA256 8527b4bf3b3a711e2d9a461020f73546244aaf9d19020e6c0d5e81e349e8d862
-DIST dash_0.5.4-11.diff.gz 126585 RMD160 832ae1fd9da8660a78c8c8f52b1a1dcbbd898e49 SHA1 caea68454754fa9cdb10a050b5e5750c5f80993b SHA256 3cc057d3e3ccd15497ef6f048944a5088b48fb9218b31bf5597c448aba76cc45
 DIST dash_0.5.5.1-2.diff.gz 30224 RMD160 8be771e0831ba3f19c51882b832f7af46f2f383a SHA1 1d0aaf980a158c20ae9ba7cdf66a1ecb836be6be SHA256 fd5bf5db5719804b1f8b49911b07de66ec18d3a3312ba5c3c233a888823f1739
-DIST dash_0.5.6.1-1~exp0.diff.gz 37971 RMD160 38841ddef07a42e09af2e37b7ba18ce67c1c34e9 SHA1 33945a0e5c025f38c18fe5086abf3d52310a731a SHA256 e8a4337849e4872d131ca3f1b823efcc6f40107e3ba40d5f1ae7bfcc34fd2fe6
-EBUILD dash-0.5.4.11.ebuild 1606 RMD160 f08df2f60945a2d8d16ccacec8e37decb9ecbf40 SHA1 d10ba50f06caebb4dfe60163be0ceee743fce9e1 SHA256 2517819bd6e79725ac5e55cc2828208586f30a5882323ed47a7fabd103988f94
+DIST dash_0.5.5.1-7.diff.gz 48211 RMD160 20b69fe3b13867e317b245b116a5dd3355876c7d SHA1 dddd265fdb3cce11715f46135053330054cba370 SHA256 aea83843e9e7ab15d642237081d229b3ab44ca33b9565efcdc637865053a32ba
 EBUILD dash-0.5.5.1.2.ebuild 1608 RMD160 694a7d13fd51599b7ee142e042a1cddbb172c5d8 SHA1 de6fe3e464dcb90938e6b6bb9cc16ad1f3c7f2d8 SHA256 1f3b0aa4a64fdedc1b58bfb0e2e71c269698e414bed4a610d880a846da6c031e
-EBUILD dash-0.5.6.1-r1.ebuild 1712 RMD160 7802c0a076586e8ae357d3c8bfcb3c22a7b75a70 SHA1 3765173a956a126f25720365067b1ad20b54aa99 SHA256 9537b858b29f302883b296e458ebfbc2653552fd87f3f894eb6469008003c891
-MISC ChangeLog 10855 RMD160 e13753a8bee70a2f245f4ee5972d52bbcb656abf SHA1 7fd87a092666c570375604d59673684fcfc24796 SHA256 962494cd7f76c3418313b7e22ede2af62331f9d81cceee2923e5904965cecdd8
+EBUILD dash-0.5.5.1.7.ebuild 1609 RMD160 8f99789afbd598001be501e92b6e56a098e3bf76 SHA1 5758c8548c189a91c3bb2936df5a4635096d627a SHA256 06639e54abcf80aacc49fd0fde4982bae72ca2a99520720c14d7b88fac59f903
+MISC ChangeLog 11208 RMD160 045355b3c9bd12ee7c9955c9df14ab1cc86b6535 SHA1 d96055dab6f22557c1dc12fe6e049240f86fd5f6 SHA256 cba700b118996db3fb0aeefaaae00c6b80a90396d6fbbf436c2befbee70f4703
 MISC metadata.xml 165 RMD160 84307ea324cd4f0f46d52f2fa096a1873e2fbe53 SHA1 c7b83ef947fe7e8273cc512fee9bba06586a58f9 SHA256 23a8851c12bd4cf7cf0528250ad5605be6b0780bbec0c51331d6d2c618c13f6a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkyLqXgACgkQTwhj9JtAlp6jDQD/ZE569ta+dm+ErokrmufBWV61
-IydmbvRGYpLbo9rR3Y0A/A7dXNksVAZt5DHAqKsVmsEKKi5V/vInHL0C/N0ve/Qf
-=Fq6O
+iF4EAREIAAYFAkyRQZ0ACgkQTwhj9JtAlp4iggEAkubuoQecw7lBxkcegwMY8G56
+IwXo4+oaIYF7eLacDfwA/3Om50T6pQE1FE/wwQaB0btt1CMZuLs7TSbAXnUAiI4C
+=4wXT
 -----END PGP SIGNATURE-----
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);
-