From b620fb1b0929ff9657a2588aaa42b85e3021c102 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 20 Oct 2017 17:35:36 +0100 Subject: gentoo resync : 20.10.2017 --- app-shells/dash/Manifest | 1 - app-shells/dash/files/dash-0.5.9-dumb-echo.patch | 93 ------------------------ 2 files changed, 94 deletions(-) delete mode 100644 app-shells/dash/files/dash-0.5.9-dumb-echo.patch (limited to 'app-shells/dash') diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index d02bfa92478e..bc1863eafe67 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,6 +1,5 @@ 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 -AUX dash-0.5.9-dumb-echo.patch 2534 SHA256 8839fca662ec0456ab55f7f86db28de38f5576bb65bc18592ccf1eb85540be40 SHA512 984341da04a0c925ec976c0074e36d36cfdb83904f23dd4c3bb5efe577dacae12a36821daa184c6f2624a8b32f551a1cbb244ddca4e1846bb6aab2cc13ef145e WHIRLPOOL c71824f71a23e993da3b0da18b47873016e5c378e42a9dc8c12c6c330f5252865bab652deb16031d0b89a4cd1c652d7a313f4b2c37654ec376467c018e8201eb AUX dash-0.5.9.1-dumb-echo.patch 2592 SHA256 656875cf5906cc9bcb8e50aa3e374ed4b9b0fb85859367ec649775bc3390de5d SHA512 8dcbee6a53b46b78986c17860f84f47c94b3137b84cf46cd521ec9e4f0b5b4f5a2afbc9e7faa8130b591b3a0f9d2c9dc7853803c8b092c4ec1b5c5b7411fecbf WHIRLPOOL e375e380cae982bdbc928a63c3c44f2fde6a0bd758f76e832d92d70b93dea9c8003f3b7246dcf668ba3347fc04591348082b266bcdb3006331b22894a263e2db AUX dash-0.5.9.1-format-security.patch 374 SHA256 0ce7a1417b4e780f184588e761b4bea5d068c2312b23d954183076edf2f9432d SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6 WHIRLPOOL 6584caf7d4cb57c0b7324bb8b54b72b110c57c211f6d8813507dee4b92c86fc0665edb11d83b637d19554bb61459f317f5daf24fc54a0a1be29416395ec26f00 DIST dash-0.5.8.tar.gz 223028 SHA256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f SHA512 3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8 WHIRLPOOL df79b1cf81cdbba0d7556175510d1f4d7294185c91a10cc0a8d4a9f940e2c26c681e377103b5f4e5291211b4555340433eae10144cb778d2d4e65e6ab54c98a3 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 9bcf6e65a8a2..000000000000 --- 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. -- cgit v1.2.3