Update echo docs in man page to match change in behavior.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 71 insertions, 6 deletions

diff --git a/app-shells/dash/ChangeLog b/app-shells/dash/ChangeLog
index 62a1e9272454..3c50f669482e 100644
--- a/app-shells/dash/ChangeLog
+++ b/app-shells/dash/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/dash
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.136 2015/07/23 20:44:50 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/dash/ChangeLog,v 1.137 2015/07/28 16:15:09 vapier Exp $
+
+  28 Jul 2015; Mike Frysinger <vapier@gentoo.org>
+  files/dash-0.5.8.1-dumb-echo.patch:
+  Update echo docs in man page to match change in behavior.
 
   23 Jul 2015; Pacho Ramos <pacho@gentoo.org> dash-0.5.8.2.ebuild:
   ppc stable wrt bug #552144
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 1cb8a7bce9c3..c66cd518046a 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -2,7 +2,7 @@
 Hash: SHA256
 
 AUX dash-0.5.5.1-octal.patch 628 SHA256 06741af243014a22ba1b530a5d4e4abd70b944dcb16f9e1ed86290745ff3dbd0 SHA512 cf5764ef60a4a36aff532b2182d76c59746134126b57444f77169be499f21334aebffa4a7db2bd83a6f6be66bd968630351be579b47fbbab1c2876e68126db4b WHIRLPOOL 653bda3038e10bf6e04d0636afcf3177d23023749e20192137eaa8cc1d1c8f8a046f55b9009a896b55c99c60af249ba5d536032e016b3c801440c051ebf2e5ff
-AUX dash-0.5.8.1-dumb-echo.patch 1172 SHA256 38a620b2aa52c78d6379e0dbeda2476f01fe620481958cbf1f92a6c9ce69a479 SHA512 c5dcc40a8daad9d71ce2da31e9066a44e3c8fdd4597781eef0f7108c9fd4e32124e6f1e52bf1c041bc1fd04f879fb2a6f52246567d87927fe16bd51721c21803 WHIRLPOOL ddb0db472444fd404493fb3619ea54dcd327f050b51fc27e09a746d855170925ddc06094ab7135284f01dcc4575cc460bfee1ba627c42aab5bd34409fbb09e52
+AUX dash-0.5.8.1-dumb-echo.patch 2669 SHA256 7f024dac7ac6dedd54121308834f6ec2c83464abcc2ab553a2af217d2f8f3461 SHA512 5e849eae3022463832c247ac85f085893b068df1043d5a4df4c09c4f7eeb541c659f90b8f516eea09fc8a92828c723a156e08743b6405f0e21badc547823f3aa WHIRLPOOL f21fcd414b568e2dd17f3927844019be5342476beb69789197053cc29bc10c998cf96c0b2c02274a39f80b368b343aa160e5703c2b7d4d9253684711d891ebf7
 AUX dash-0.5.8.1-eval-warnx.patch 241 SHA256 13840812b0e03039c4061fac9bfd01106e53ce51e9bfb794c8c4015e6f3033e9 SHA512 fc44b181f236927e3e15f79c8304f212a55d332acfe981a526e957ff27b8ee56f128e1a5c805045218918f7f6d32945ea2d5b099e988f34cf2f56ad061d654ce WHIRLPOOL 6687f231588d3a47f236b1a4ccbba38f5fccf53e441789e789176c4f73dcabe11298c0ae3da6a09a8e51d23766607ee80a88c239223ba4d7372403a7b1159ad9
 DIST dash-0.5.7.tar.gz 223794 SHA256 ae89fa9f1145b7748cf0740e1df04cd52fdf8a285da4911dd0f04983efba4e39 SHA512 77ad016fa5fb3fcb0d940b29d3fa914f546d79cdf2221ed47e4dec6d3a005b25d2d32ee1fdd4f662a7a84274572b72235b82e4c39995c7ca0bb049a7d88595b5 WHIRLPOOL cc11d46a76aa201cb02c4f58e6b1b77fe859d34d7f8b6e6320263a2446dc4d229549823e6628875e0caa21a90fe3743026ba5809ba1a78788d8dd9c94207aa48
 DIST dash-0.5.8.tar.gz 223028 SHA256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f SHA512 3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8 WHIRLPOOL df79b1cf81cdbba0d7556175510d1f4d7294185c91a10cc0a8d4a9f940e2c26c681e377103b5f4e5291211b4555340433eae10144cb778d2d4e65e6ab54c98a3
@@ -12,12 +12,22 @@ DIST dash_0.5.8-2.diff.gz 41715 SHA256 00168a934864c26cae9a51367fe7ea013ece2d484
 EBUILD dash-0.5.7.4.ebuild 1701 SHA256 369733cc09e7beebccdb9cb7639721ef670cd6d4d5c4acce83d2b2be3a07427d SHA512 2ef36acf69fe5515e29d5f7cc98384b93e7975c2437cb8ec56a7c63b0cf316d8bd3667ac4e0e378d8985036bb4f1bd186b287cb553a43a853327d15f0069448e WHIRLPOOL 7dc4ac9620543a35ad7c1e16c3c5664e9354feeb11fd6efabe9cfe48433ea6d90fe46942b612ddd7400eb0559362c7180ffc9b64eef9932bfdb31e69632f10f3
 EBUILD dash-0.5.8.1-r2.ebuild 1900 SHA256 da776d66bc89bf0811b24325da0498c3054c61b0365c86da19b3bf9413a9c2c1 SHA512 3fe3ded66f7e46db6d0885ab495245f854615592b04bc65e1080fefc0752fa3c4ff5c3afad3c0d72f8231371f8a7ef105545b02371d94532122488580d3ae1fa WHIRLPOOL c26ea21e2aac45b52ce6230ff79717ee6cd9995c1751140bdbc8fa455e159b7ae39752766b10c02b95ee1785d6df8eae550d32f9cdb084b0ccae86bc9540cf14
 EBUILD dash-0.5.8.2.ebuild 1884 SHA256 ce68e1b37c6397076e4828475b4eb4f51669dc57c11ca9191755db62e3e9dde8 SHA512 08395bba86cab4bab64c0f10511bad1c3bd17c7ac3dbc40bdcbcf66e0b219ebaa562a87625b6741ccd1e9a8995bfd5f6e4aab693e16a51b9a01a9540b4122d60 WHIRLPOOL a38909105d0972ca824a551893c91f24b11f1aad520481fc8f2a1d820aedf74146e346fcb7d2b9f9230b5007baa19889db51d6a195a955c0f4b8968a5c8545d7
-MISC ChangeLog 18099 SHA256 b3cc7cbc1beb62094b650ca78f8ff4f6744560810d21fb02b8aeef6b63f749d7 SHA512 a530d4110b2fde6db2a90837a41d2c4d07e263a9f86b3e28b3fefaa5460b4e45d900acb5d994d17331d371e9fec21a124692a54c3efc91ed6663262320ceb32e WHIRLPOOL 81a254e3afed667ecfb7717865db13bf2b9d5493acad3251e44d96bc4491309036755dc70ea5837768b55c422fd9bd05401b9cfecacdd41c309de0945d5e3e2b
+MISC ChangeLog 18249 SHA256 8603fd4a2bb147a85bbc0d443ecb01237ca2607e5de8e3131f7677c5053dbf42 SHA512 2a33ff70bbb487004062b25f615229b2f36ccb8e906cac77cee864ac8b3d86451ad5f791019cdd1305256cff4e610497df25d9884e2b49ebe4484d5652073156 WHIRLPOOL 015ff7d5fb87a8cbbbb0917924801179c458aa83a77f8152ef3589a387b29a8e6cf9b447f3125384999df25880647d777862d114316495c15553c35b611a76da
 MISC metadata.xml 243 SHA256 993fdb79c93960c7504ae6bd3a41c266d501fc535ce291310c899f7ec02d5a89 SHA512 84daa02e03e46d74c588d3e3a4bba66b32122f3e903799272bb3a41ce3eb43a301b1cfb69828348005aaeedf84317cf5e913ed0434d5a5c4d038562dba4c85ea WHIRLPOOL 52ed699028813630102a2aafdf579e97c1740c95f683afb31160ec8c2f8adb8cc185e5957461f9fb0223f69fb96f16b634cce3d16c7796a9dbac677aa12f4543
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWxUkMACgkQCaWpQKGI+9SNtACePczMvSb0ahtITEw5clxX8Ou2
-K14AnRHRnSSVERWgweeEo6HVxap/0sX/
-=yNX9
+iQIcBAEBCAAGBQJVt6qRAAoJEPGu1DbS6WIAby4P/1IZ0dMSE/r+zhU2KP2demQP
+6Fq8IuqYwnYRUZEniUY0/7ZlfUKwvYwP+NTL+3JWAvJhHtiF0wqT4Dbi8tm+/gHl
+s7kazRWxKv7Yx8P+DyIYCSfuZraJz2HT3ED1kXhtJVlMFgec4D/WtXDBX/Z8nRho
+R3dImCti0aZWFhUzjRfyoHVciqfXUevP93j+u4YJDOv4tnj3xGWIIkL2Pr21Lw4l
+MpDJVEo3tkJri0eCz9WxNi0RE7HnfCOVKTkEJg6QzaokMSF1YlChP7XfTEGxasx/
+xNkR81EiwrDUh1Vt0jaoNSx0PORquag/3OGJVkN7jC6nTA0pY9qsUOgwDt1PQjxL
+UwKnGUgFUPiiM73SMI+iyYExgtNrIstMngdp4RmiN0ZmjxL1IuWFQs9LW2LhbCDE
+mfm69PCjmH4qI1/+NLi5Gs/lVHjK4+8ykH1lJyLbZHy70g9rjeK0vc5NpV8TIlht
+cAt763Yb4AmnDULtN9eAdGuVlfA0C32GODn7fzfMoJSjQgQ0hCrPp7ck+M6vhWA1
+RmpnxxyGtm2oU4SDZkW2UOmgRg610i63UCYVXCmBnfKkY9ezOor+pFoW4AOy8GF7
+ewpmEWeoaDPlw4V6/+RwIPMuEujxvCeAK1aZbK5YGJrhM0iH2pSQM5Gqaom8c8Um
+RgUdosH70GPf9o1F8Iu1
+=lGFV
 -----END PGP SIGNATURE-----
diff --git a/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch b/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch
index e8a37d667b9a..4059a80e3301 100644
--- a/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch
+++ b/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch
@@ -52,3 +52,54 @@ sequence.  it also makes dash smaller & faster to disable this logic entirely.
 +	outc('\n', out1);
  	return 0;
  }
+--- a/src/dash.1
++++ b/src/dash.1
+@@ -1180,43 +1180,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.