diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2020-06-02 10:58:56 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2020-06-02 10:59:39 +0200 |
commit | 4bacce7ef70e00b25409f2b7354a058283773033 (patch) | |
tree | 0a0be7835e389468b7619eaef21fd1d8cac226cf /app-shells/dash | |
parent | app-shells/dash: Bump to version 0.5.11 (diff) | |
download | gentoo-4bacce7ef70e00b25409f2b7354a058283773033.tar.gz gentoo-4bacce7ef70e00b25409f2b7354a058283773033.tar.bz2 gentoo-4bacce7ef70e00b25409f2b7354a058283773033.zip |
app-shells/dash: Removed old
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'app-shells/dash')
-rw-r--r-- | app-shells/dash/Manifest | 1 | ||||
-rw-r--r-- | app-shells/dash/dash-0.5.9.1-r3.ebuild | 76 | ||||
-rw-r--r-- | app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch | 92 | ||||
-rw-r--r-- | app-shells/dash/metadata.xml | 3 |
4 files changed, 0 insertions, 172 deletions
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 0ee67432d184..d017019d91ab 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,3 +1,2 @@ DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d SHA512 0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640 DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1 -DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild deleted file mode 100644 index 4463f80ecbca..000000000000 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs versionator - -#MY_PV="$(get_version_component_range 1-3)" -DEB_PATCH="" #$(get_version_component_range 4) -#MY_P="${PN}-${MY_PV}" - -DESCRIPTION="Debian Almquist Shell" -HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/" -SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz" -if [[ -n "${DEB_PATCH}" ]] ; then - DEB_PF="${PN}_${MY_PV}-${DEB_PATCH}" - SRC_URI+=" mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz" -fi - -LICENSE="BSD" -SLOT="0" -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" -IUSE="libedit static vanilla" - -RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" -DEPEND="${RDEPEND} - virtual/pkgconfig - libedit? ( static? ( dev-libs/libedit[static-libs] ) )" - -PATCHES=( "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch ) - -src_prepare() { - if [[ -n "${DEB_PATCH}" ]] ; then - eapply "${WORKDIR}"/${DEB_PF}.diff - eapply */debian/diff/* - fi - - #337329 #527848 - use vanilla || eapply "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch - - default - - # Fix the invalid sort - sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins - - # Use pkg-config for libedit linkage - sed -i \ - -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ - configure || die -} - -src_configure() { - # don't redefine stat on Solaris - if [[ ${CHOST} == *-solaris* ]] ; then - export ac_cv_func_stat64=yes - fi - append-cppflags -DJOBS=$(usex libedit 1 0) - use static && append-ldflags -static - # Do not pass --enable-glob due to #443552. - # Autotools use $LINENO as a proxy for extended debug support - # (i.e. they're running bash), so disable that. #527644 - local myeconfargs=( - --bindir="${EPREFIX}"/bin - --enable-fnmatch - --disable-lineno - $(use_with libedit) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - if [[ -n "${DEB_PATCH}" ]] ; then - dodoc */debian/changelog - fi -} diff --git a/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch b/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch deleted file mode 100644 index cbf5febafd19..000000000000 --- a/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch +++ /dev/null @@ -1,92 +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. - ---- dash-0.5.9.1/src/bltin/printf.c -+++ dash-0.5.9.1/src/bltin/printf.c -@@ -449,21 +449,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 (likely((nonl + !*argv) > 1)) -- 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; - } ---- dash-0.5.9.1/src/dash.1 -+++ dash-0.5.9.1/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 -+No arguments or backslash sequences are supported as they are not portable. -+They will be printed out exactly as passed in. - .Pp --All other backslash sequences elicit undefined behaviour. -+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. diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml index 0d01a34d50df..096fcd3509dd 100644 --- a/app-shells/dash/metadata.xml +++ b/app-shells/dash/metadata.xml @@ -8,9 +8,6 @@ <upstream> <remote-id type="cpe">cpe:/a:dash:dash</remote-id> </upstream> - <use> - <flag name="vanilla">Support echo -n, and enable echo -e all the time (unsupported)</flag> - </use> <longdescription lang="en"> DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) and is POSIX compliant. |