1 |
commit: 4f5d52641c7888cfee8ad317d884d3d0a56e2e89 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 2 18:46:18 2020 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 2 18:47:06 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f5d5264 |
7 |
|
8 |
app-shells/dash: remove old |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
app-shells/dash/Manifest | 1 - |
13 |
app-shells/dash/dash-0.5.10.1-r2.ebuild | 79 ------------------- |
14 |
app-shells/dash/dash-0.5.10.2.ebuild | 81 -------------------- |
15 |
app-shells/dash/files/dash-0.5.10-dumb-echo.patch | 92 ----------------------- |
16 |
app-shells/dash/files/dash-0.5.10.1-parser.patch | 66 ---------------- |
17 |
5 files changed, 319 deletions(-) |
18 |
|
19 |
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest |
20 |
index 0ee0aee331e..a950fe55632 100644 |
21 |
--- a/app-shells/dash/Manifest |
22 |
+++ b/app-shells/dash/Manifest |
23 |
@@ -1,3 +1,2 @@ |
24 |
-DIST dash-0.5.10.1.tar.gz 225253 BLAKE2B 55dbdca7f01d19656e002d6e210bcae920619e2e88d4d174a3e08cbbc40bf867ece3f24ce9690ec64f95b1f0995ab35cabc08381ac031a33b55282cec0b09e73 SHA512 7ca3bbcf8bac84d359cde710a9ab393f05cf8522e969a2c110d2e71620e53f349387128045e68738dc621afe0b48f43ae3d32851187f2ae02d49b3e2575ffa6b |
25 |
DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640 |
26 |
DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d |
27 |
|
28 |
diff --git a/app-shells/dash/dash-0.5.10.1-r2.ebuild b/app-shells/dash/dash-0.5.10.1-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 16020298e80..00000000000 |
31 |
--- a/app-shells/dash/dash-0.5.10.1-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,79 +0,0 @@ |
34 |
-# Copyright 1999-2020 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit flag-o-matic toolchain-funcs versionator |
40 |
- |
41 |
-#MY_PV="$(get_version_component_range 1-3)" |
42 |
-DEB_PATCH="" #$(get_version_component_range 4) |
43 |
-#MY_P="${PN}-${MY_PV}" |
44 |
- |
45 |
-DESCRIPTION="Debian Almquist Shell" |
46 |
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" |
47 |
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz" |
48 |
-if [[ -n "${DEB_PATCH}" ]] ; then |
49 |
- DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}" |
50 |
- SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz" |
51 |
-fi |
52 |
- |
53 |
-LICENSE="BSD" |
54 |
-SLOT="0" |
55 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
56 |
-IUSE="libedit static vanilla" |
57 |
- |
58 |
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" |
59 |
-DEPEND="${RDEPEND} |
60 |
- virtual/pkgconfig |
61 |
- libedit? ( static? ( dev-libs/libedit[static-libs] ) )" |
62 |
- |
63 |
-PATCHES=( |
64 |
- "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch |
65 |
- "${FILESDIR}"/${P}-parser.patch |
66 |
-) |
67 |
- |
68 |
-src_prepare() { |
69 |
- if [[ -n "${DEB_PATCH}" ]] ; then |
70 |
- eapply "${WORKDIR}"/${DEB_PF}.diff |
71 |
- eapply */debian/diff/* |
72 |
- fi |
73 |
- |
74 |
- #337329 #527848 |
75 |
- use vanilla || eapply "${FILESDIR}"/${PN}-0.5.10-dumb-echo.patch |
76 |
- |
77 |
- default |
78 |
- |
79 |
- # Fix the invalid sort |
80 |
- sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins |
81 |
- |
82 |
- # Use pkg-config for libedit linkage |
83 |
- sed -i \ |
84 |
- -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ |
85 |
- configure || die |
86 |
-} |
87 |
- |
88 |
-src_configure() { |
89 |
- # don't redefine stat on Solaris |
90 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
91 |
- export ac_cv_func_stat64=yes |
92 |
- fi |
93 |
- append-cppflags -DJOBS=$(usex libedit 1 0) |
94 |
- use static && append-ldflags -static |
95 |
- # Do not pass --enable-glob due to #443552. |
96 |
- # Autotools use $LINENO as a proxy for extended debug support |
97 |
- # (i.e. they're running bash), so disable that. #527644 |
98 |
- local myeconfargs=( |
99 |
- --bindir="${EPREFIX}"/bin |
100 |
- --enable-fnmatch |
101 |
- --disable-lineno |
102 |
- $(use_with libedit) |
103 |
- ) |
104 |
- econf "${myeconfargs[@]}" |
105 |
-} |
106 |
- |
107 |
-src_install() { |
108 |
- default |
109 |
- if [[ -n "${DEB_PATCH}" ]] ; then |
110 |
- dodoc */debian/changelog |
111 |
- fi |
112 |
-} |
113 |
|
114 |
diff --git a/app-shells/dash/dash-0.5.10.2.ebuild b/app-shells/dash/dash-0.5.10.2.ebuild |
115 |
deleted file mode 100644 |
116 |
index 4610e631867..00000000000 |
117 |
--- a/app-shells/dash/dash-0.5.10.2.ebuild |
118 |
+++ /dev/null |
119 |
@@ -1,81 +0,0 @@ |
120 |
-# Copyright 1999-2020 Gentoo Authors |
121 |
-# Distributed under the terms of the GNU General Public License v2 |
122 |
- |
123 |
-EAPI=6 |
124 |
- |
125 |
-inherit flag-o-matic toolchain-funcs versionator |
126 |
- |
127 |
-#MY_PV="$(get_version_component_range 1-3)" |
128 |
-DEB_PATCH="" #$(get_version_component_range 4) |
129 |
-#MY_P="${PN}-${MY_PV}" |
130 |
- |
131 |
-DESCRIPTION="Debian Almquist Shell" |
132 |
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" |
133 |
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz" |
134 |
-if [[ -n "${DEB_PATCH}" ]] ; then |
135 |
- DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}" |
136 |
- SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz" |
137 |
-fi |
138 |
- |
139 |
-LICENSE="BSD" |
140 |
-SLOT="0" |
141 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
142 |
-IUSE="libedit static vanilla" |
143 |
- |
144 |
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" |
145 |
-DEPEND="${RDEPEND} |
146 |
- virtual/pkgconfig |
147 |
- libedit? ( static? ( dev-libs/libedit[static-libs] ) )" |
148 |
- |
149 |
-PATCHES=( |
150 |
- "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch |
151 |
-) |
152 |
- |
153 |
-src_prepare() { |
154 |
- if [[ -n "${DEB_PATCH}" ]] ; then |
155 |
- eapply "${WORKDIR}"/${DEB_PF}.diff |
156 |
- eapply */debian/diff/* |
157 |
- fi |
158 |
- |
159 |
- #337329 #527848 |
160 |
- use vanilla || eapply "${FILESDIR}"/${PN}-0.5.10-dumb-echo.patch |
161 |
- |
162 |
- default |
163 |
- |
164 |
- # Fix the invalid sort |
165 |
- sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins |
166 |
- |
167 |
- # Use pkg-config for libedit linkage |
168 |
- sed -i \ |
169 |
- -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ |
170 |
- configure || die |
171 |
-} |
172 |
- |
173 |
-src_configure() { |
174 |
- # don't redefine stat on Solaris |
175 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
176 |
- export ac_cv_func_stat64=yes |
177 |
- |
178 |
- # if your headers strictly adhere to POSIX, you'll need this too |
179 |
- [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255 |
180 |
- fi |
181 |
- append-cppflags -DJOBS=$(usex libedit 1 0) |
182 |
- use static && append-ldflags -static |
183 |
- # Do not pass --enable-glob due to #443552. |
184 |
- # Autotools use $LINENO as a proxy for extended debug support |
185 |
- # (i.e. they're running bash), so disable that. #527644 |
186 |
- local myeconfargs=( |
187 |
- --bindir="${EPREFIX}"/bin |
188 |
- --enable-fnmatch |
189 |
- --disable-lineno |
190 |
- $(use_with libedit) |
191 |
- ) |
192 |
- econf "${myeconfargs[@]}" |
193 |
-} |
194 |
- |
195 |
-src_install() { |
196 |
- default |
197 |
- if [[ -n "${DEB_PATCH}" ]] ; then |
198 |
- dodoc */debian/changelog |
199 |
- fi |
200 |
-} |
201 |
|
202 |
diff --git a/app-shells/dash/files/dash-0.5.10-dumb-echo.patch b/app-shells/dash/files/dash-0.5.10-dumb-echo.patch |
203 |
deleted file mode 100644 |
204 |
index 35d32460930..00000000000 |
205 |
--- a/app-shells/dash/files/dash-0.5.10-dumb-echo.patch |
206 |
+++ /dev/null |
207 |
@@ -1,92 +0,0 @@ |
208 |
-http://bugs.gentoo.org/337329 |
209 |
-http://bugs.gentoo.org/527848 |
210 |
- |
211 |
-there's no requirement for `echo` to support escape sequences. bash, by default, |
212 |
-does not, while dash always does. POSIX permits either behavior: |
213 |
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html |
214 |
- |
215 |
-however, since the behavior is not portable, no one should be relying on echo |
216 |
-having any specific behavior. they should use `printf` when they want an escape |
217 |
-sequence. it also makes dash smaller & faster to disable this logic entirely. |
218 |
- |
219 |
---- dash-0.5.10/src/bltin/printf.c |
220 |
-+++ dash-0.5.10/src/bltin/printf.c |
221 |
-@@ -457,22 +457,13 @@ |
222 |
- int |
223 |
- echocmd(int argc, char **argv) |
224 |
- { |
225 |
-- const char *lastfmt = snlfmt; |
226 |
-- int nonl; |
227 |
-+ int i; |
228 |
- |
229 |
-- if (*++argv && equal(*argv, "-n")) { |
230 |
-- argv++; |
231 |
-- lastfmt = "%s"; |
232 |
-+ for (i = 1; i < argc; ++i) { |
233 |
-+ outstr(argv[i], out1); |
234 |
-+ if (i < argc - 1) |
235 |
-+ outc(' ', out1); |
236 |
- } |
237 |
-- |
238 |
-- do { |
239 |
-- const char *fmt = "%s "; |
240 |
-- char *s = *argv; |
241 |
-- |
242 |
-- if (!s || !*++argv) |
243 |
-- fmt = lastfmt; |
244 |
-- |
245 |
-- nonl = print_escape_str(fmt, NULL, NULL, s ?: nullstr); |
246 |
-- } while (!nonl && *argv); |
247 |
-+ outc('\n', out1); |
248 |
- return 0; |
249 |
- } |
250 |
---- dash-0.5.10/src/dash.1 |
251 |
-+++ dash-0.5.10/src/dash.1 |
252 |
-@@ -1182,43 +1182,15 @@ |
253 |
- option turns off the effect of any preceding |
254 |
- .Fl P |
255 |
- options. |
256 |
--.It Xo echo Op Fl n |
257 |
-+.It Xo echo |
258 |
- .Ar args... |
259 |
- .Xc |
260 |
- Print the arguments on the standard output, separated by spaces. |
261 |
--Unless the |
262 |
--.Fl n |
263 |
--option is present, a newline is output following the arguments. |
264 |
- .Pp |
265 |
--If any of the following sequences of characters is encountered during |
266 |
--output, the sequence is not output. Instead, the specified action is |
267 |
--performed: |
268 |
--.Bl -tag -width indent |
269 |
--.It Li \eb |
270 |
--A backspace character is output. |
271 |
--.It Li \ec |
272 |
--Subsequent output is suppressed. This is normally used at the end of the |
273 |
--last argument to suppress the trailing newline that |
274 |
--.Ic echo |
275 |
--would otherwise output. |
276 |
--.It Li \ef |
277 |
--Output a form feed. |
278 |
--.It Li \en |
279 |
--Output a newline character. |
280 |
--.It Li \er |
281 |
--Output a carriage return. |
282 |
--.It Li \et |
283 |
--Output a (horizontal) tab character. |
284 |
--.It Li \ev |
285 |
--Output a vertical tab. |
286 |
--.It Li \e0 Ns Ar digits |
287 |
--Output the character whose value is given by zero to three octal digits. |
288 |
--If there are zero digits, a nul character is output. |
289 |
--.It Li \e\e |
290 |
--Output a backslash. |
291 |
--.El |
292 |
-+No arguments or backslash sequences are supported as they are not portable. |
293 |
-+They will be printed out exactly as passed in. |
294 |
- .Pp |
295 |
--All other backslash sequences elicit undefined behaviour. |
296 |
-+You can replace `echo -n ...` with the portable `printf %s ...` construct. |
297 |
- .It eval Ar string ... |
298 |
- Concatenate all the arguments with spaces. |
299 |
- Then re-parse and execute the command. |
300 |
|
301 |
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 |
302 |
deleted file mode 100644 |
303 |
index 0939b7cb722..00000000000 |
304 |
--- a/app-shells/dash/files/dash-0.5.10.1-parser.patch |
305 |
+++ /dev/null |
306 |
@@ -1,66 +0,0 @@ |
307 |
-From 469c5fd4f57622b1a6571172898ab29430319d4a Mon Sep 17 00:00:00 2001 |
308 |
-From: Herbert Xu <herbert@××××××××××××××××.au> |
309 |
-Date: Fri, 11 May 2018 23:41:25 +0800 |
310 |
-Subject: parser: Fix incorrect eating of backslash newlines |
311 |
- |
312 |
-With the introduction of synstack->syntax, a number of references |
313 |
-to the syntax variable was missed during the conversion. This |
314 |
-causes backslash newlines to be incorrectly removed in single |
315 |
-quote context. |
316 |
- |
317 |
-This patch also combines these calls into a new helper function |
318 |
-pgetc_top. |
319 |
- |
320 |
-Fixes: ab1cecb40478 ("parser: Add syntax stack for recursive...") |
321 |
-Reported-by: Leah Neukirchen <leah@××××.org> |
322 |
-Signed-off-by: Herbert Xu <herbert@××××××××××××××××.au> |
323 |
---- |
324 |
- src/parser.c | 11 ++++++++--- |
325 |
- 1 file changed, 8 insertions(+), 3 deletions(-) |
326 |
- |
327 |
-diff --git a/src/parser.c b/src/parser.c |
328 |
-index 8e40781..8bd3db4 100644 |
329 |
---- a/src/parser.c |
330 |
-+++ b/src/parser.c |
331 |
-@@ -853,6 +853,11 @@ static int pgetc_eatbnl(void) |
332 |
- return c; |
333 |
- } |
334 |
- |
335 |
-+static int pgetc_top(struct synstack *stack) |
336 |
-+{ |
337 |
-+ return stack->syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); |
338 |
-+} |
339 |
-+ |
340 |
- static void synstack_push(struct synstack **stack, struct synstack *next, |
341 |
- const char *syntax) |
342 |
- { |
343 |
-@@ -915,7 +920,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) |
344 |
- attyline(); |
345 |
- if (synstack->syntax == BASESYNTAX) |
346 |
- return readtoken(); |
347 |
-- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); |
348 |
-+ c = pgetc_top(synstack); |
349 |
- goto loop; |
350 |
- } |
351 |
- #endif |
352 |
-@@ -929,7 +934,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) |
353 |
- goto endword; /* exit outer loop */ |
354 |
- USTPUTC(c, out); |
355 |
- nlprompt(); |
356 |
-- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); |
357 |
-+ c = pgetc_top(synstack); |
358 |
- goto loop; /* continue outer loop */ |
359 |
- case CWORD: |
360 |
- USTPUTC(c, out); |
361 |
-@@ -1056,7 +1061,7 @@ toggledq: |
362 |
- USTPUTC(c, out); |
363 |
- } |
364 |
- } |
365 |
-- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl(); |
366 |
-+ c = pgetc_top(synstack); |
367 |
- } |
368 |
- } |
369 |
- endword: |
370 |
--- |
371 |
-cgit v1.1 |
372 |
- |