[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: 699457813484ed203c50f1bbc404b16676a57c81
Author: Lars Wendler gentoo org>
AuthorDate: Sat Jan 9 14:50:36 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Sat Jan 9 14:56:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69945781
app-shells/dash: Security revbump to fix -n calls
Bug: https://bugs.gentoo.org/754267
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler gentoo.org>
app-shells/dash/dash-0.5.11.3-r1.ebuild| 61 ++
.../dash-0.5.11.3-check_nflag_in_evaltree.patch| 46
2 files changed, 107 insertions(+)
diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild
b/app-shells/dash/dash-0.5.11.3-r1.ebuild
new file mode 100644
index 000..1c194ba1661
--- /dev/null
+++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+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;
+
+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 ~sparc-solaris
~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="libedit static"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+ libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.5.11.3-check_nflag_in_evaltree.patch" #754267
+)
+
+src_prepare() {
+ 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() {
+ if [[ ${CHOST} == *-solaris* ]] ; then
+ # don't redefine stat, open, dirent, etc. on Solaris
+ export ac_cv_func_stat64=yes
+ export ac_cv_func_open64=yes
+
+ # if your headers strictly adhere to POSIX, you'll need this too
+ [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags
-DNAME_MAX=255
+ fi
+ if [[ ${CHOST} == powerpc-*-darwin* ]] ; then
+ sed -i -e 's/= stpncpy(s, \([^,]\+\), \([0-9]\+\))/+=
snprintf(s, \2, "%s", \1)/' \
+ src/jobs.c || die
+ fi
+ append-cppflags -DJOBS=$(usex libedit 1 0)
+ use static && append-ldflags -static
+ # Do not pass --enable-glob due to #443552.
+ local myeconfargs=(
+ CC_FOR_BUILD="$(tc-getBUILD_CC)"
+ --bindir="${EPREFIX}"/bin
+ --enable-fnmatch
+ $(use_with libedit)
+ )
+ econf "${myeconfargs[@]}"
+}
diff --git a/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch
b/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch
new file mode 100644
index 000..94740223fc8
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch
@@ -0,0 +1,46 @@
+From 29d6f2148f10213de4e904d515e792d2cf8c968e Mon Sep 17 00:00:00 2001
+From: Herbert Xu
+Date: Thu, 4 Jun 2020 21:53:55 +1000
+Subject: eval: Check nflag in evaltree instead of cmdloop
+
+This patch moves the nflag check from cmdloop into evaltree. This
+is so that nflag will be in force even if we enter the shell via a
+path other than cmdloop, e.g., through sh -c.
+
+Reported-by: Joey Hess
+Signed-off-by: Herbert Xu
+---
+ src/eval.c | 3 +++
+ src/main.c | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/eval.c b/src/eval.c
+index d10be38..9476fbb 100644
+--- a/src/eval.c
b/src/eval.c
+@@ -213,6 +213,9 @@ evaltree(union node *n, int flags)
+
+ setstackmark();
+
++ if (nflag)
++ goto out;
++
+ if (n == NULL) {
+ TRACE(("evaltree(NULL) called\n"));
+ goto out;
+diff --git a/src/main.c b/src/main.c
+index 7a28534..5c49fdc 100644
+--- a/src/main.c
b/src/main.c
+@@ -233,7 +233,7 @@ cmdloop(int top)
+ out2str("\nUse \"exit\" to leave shell.\n");
+ }
+ numeof++;
+- } else if (nflag == 0) {
++ } else {
+ int i;
+
+ job_warning = (job_warning == 2) ? 1 : 0;
+--
+cgit 1.2.3-1.el7
+
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: 4bacce7ef70e00b25409f2b7354a058283773033
Author: Lars Wendler gentoo org>
AuthorDate: Tue Jun 2 08:58:56 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Jun 2 08:59:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bacce7e
app-shells/dash: Removed old
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Lars Wendler gentoo.org>
app-shells/dash/Manifest | 1 -
app-shells/dash/dash-0.5.9.1-r3.ebuild | 76 --
app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch | 92 --
app-shells/dash/metadata.xml | 3 -
4 files changed, 172 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 0ee67432d18..d017019d91a 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 4463f80ecbc..000
--- 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 cbf5febafd1..000
--- 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
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: 8150f54880d314e05ea95e167a77fab7af230146
Author: Mike Gilbert gentoo org>
AuthorDate: Sat May 2 18:42:21 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat May 2 18:47:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8150f548
app-shells/dash: fix build with gcc -fno-common
Closes: https://bugs.gentoo.org/707364
Signed-off-by: Mike Gilbert gentoo.org>
app-shells/dash/dash-0.5.10.2-r1.ebuild| 5 ++-
.../dash/files/dash-0.5.20.2-gcc-fno-common.patch | 38 ++
2 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild
b/app-shells/dash/dash-0.5.10.2-r1.ebuild
index f04c97dff90..a552c0f62f0 100644
--- a/app-shells/dash/dash-0.5.10.2-r1.ebuild
+++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild
@@ -19,7 +19,10 @@ RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
DEPEND="${RDEPEND}
libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-PATCHES=( "${FILESDIR}/${PN}-0.5.9.1-format-security.patch" )
+PATCHES=(
+ "${FILESDIR}/dash-0.5.9.1-format-security.patch"
+ "${FILESDIR}/dash-0.5.20.2-gcc-fno-common.patch"
+)
src_prepare() {
default
diff --git a/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch
b/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch
new file mode 100644
index 000..08d5ed08a39
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch
@@ -0,0 +1,38 @@
+From 4459ec7f6cd394b9d01bd9d537b0f04975583dff Mon Sep 17 00:00:00 2001
+From: Jeroen Roovers
+Date: Mon, 16 Mar 2020 19:25:00 +0100
+Subject: [PATCH] input: Fix compiling against libedit with -fno-common
+To: d...@vger.kernel.org
+
+With -fno-common, which will be enabled by default in GCC 10, we see
+this error:
+
+ld: input.o:(.bss+0x0): multiple definition of `el';
+histedit.o:(.bss+0x8): first defined here
+
+To fix this, simply remove the definition as it is not needed.
+
+Signed-off-by: Jeroen Roovers
+Signed-off-by: Mike Gilbert
+---
+ src/input.c | 4
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/input.c b/src/input.c
+index ae0c4c8..e84eca8 100644
+--- a/src/input.c
b/src/input.c
+@@ -67,10 +67,6 @@ MKINIT char basebuf[IBUFSIZ]; /* buffer for top level
input file */
+ struct parsefile *parsefile = /* current input file */
+ int whichprompt; /* 1 == PS1, 2 == PS2 */
+
+-#ifndef SMALL
+-EditLine *el; /* cookie for editline package */
+-#endif
+-
+ STATIC void pushfile(void);
+ static int preadfd(void);
+ static void setinputfd(int fd, int push);
+--
+2.25.1
+
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: 4f5d52641c7888cfee8ad317d884d3d0a56e2e89
Author: Mike Gilbert gentoo org>
AuthorDate: Sat May 2 18:46:18 2020 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sat May 2 18:47:06 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f5d5264
app-shells/dash: remove old
Signed-off-by: Mike Gilbert gentoo.org>
app-shells/dash/Manifest | 1 -
app-shells/dash/dash-0.5.10.1-r2.ebuild | 79 ---
app-shells/dash/dash-0.5.10.2.ebuild | 81
app-shells/dash/files/dash-0.5.10-dumb-echo.patch | 92 ---
app-shells/dash/files/dash-0.5.10.1-parser.patch | 66
5 files changed, 319 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 0ee0aee331e..a950fe55632 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,3 +1,2 @@
-DIST dash-0.5.10.1.tar.gz 225253 BLAKE2B
55dbdca7f01d19656e002d6e210bcae920619e2e88d4d174a3e08cbbc40bf867ece3f24ce9690ec64f95b1f0995ab35cabc08381ac031a33b55282cec0b09e73
SHA512
7ca3bbcf8bac84d359cde710a9ab393f05cf8522e969a2c110d2e71620e53f349387128045e68738dc621afe0b48f43ae3d32851187f2ae02d49b3e2575ffa6b
DIST dash-0.5.10.2.tar.gz 225196 BLAKE2B
af48879d29aee8041949b51f08eb89c3938e77b2e05553a3e1a9939da7b00fd80f7b9fb35f33e18b0c11850bfb1b8377e9dc9bcfd80754fd29c9d160e0ce5a4d
SHA512
0ae29be77794df0ba254967649b9728611a75fbb3acd32ab6634d76399d1ce97c7d12d31da465482a7e4f3207093415c496c39525cace9b78ab3cb9444dd7640
DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B
a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b
SHA512
d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
diff --git a/app-shells/dash/dash-0.5.10.1-r2.ebuild
b/app-shells/dash/dash-0.5.10.1-r2.ebuild
deleted file mode 100644
index 16020298e80..000
--- a/app-shells/dash/dash-0.5.10.1-r2.ebuild
+++ /dev/null
@@ -1,79 +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
- "${FILESDIR}"/${P}-parser.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.10-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/dash-0.5.10.2.ebuild
b/app-shells/dash/dash-0.5.10.2.ebuild
deleted file mode 100644
index 4610e631867..000
--- a/app-shells/dash/dash-0.5.10.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: fd5b82cc1650651864fb8714c59796fef6defc89
Author: Lars Wendler gentoo org>
AuthorDate: Mon May 14 08:02:55 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Mon May 14 08:02:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd5b82cc
app-shells/dash: Revbump to fix typo in dumb-echo patch.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-shells/dash/{dash-0.5.10.1.ebuild => dash-0.5.10.1-r1.ebuild} | 0
app-shells/dash/files/dash-0.5.10-dumb-echo.patch | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-shells/dash/dash-0.5.10.1.ebuild
b/app-shells/dash/dash-0.5.10.1-r1.ebuild
similarity index 100%
rename from app-shells/dash/dash-0.5.10.1.ebuild
rename to app-shells/dash/dash-0.5.10.1-r1.ebuild
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
index 6b19b5b59f7..35d32460930 100644
--- a/app-shells/dash/files/dash-0.5.10-dumb-echo.patch
+++ b/app-shells/dash/files/dash-0.5.10-dumb-echo.patch
@@ -24,7 +24,7 @@ sequence. it also makes dash smaller & faster to disable
this logic entirely.
- lastfmt = "%s";
+ for (i = 1; i < argc; ++i) {
+ outstr(argv[i], out1);
-+ if (1 < argc - 1)
++ if (i < argc - 1)
+ outc(' ', out1);
}
-
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: 657e84223348f84ea6922a3e6e5bebaad17a3fd1
Author: Lars Wendler gentoo org>
AuthorDate: Sun May 13 15:23:45 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun May 13 15:24:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=657e8422
app-shells/dash: Bump to version 0.5.10.1. Removed old.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-shells/dash/Manifest | 1 +
...{dash-0.5.10-r2.ebuild => dash-0.5.10.1.ebuild} | 1 -
app-shells/dash/files/dash-0.5.10-jobs.patch | 88 --
3 files changed, 1 insertion(+), 89 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index ee7a784a8a9..c6b2df6dc22 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,2 +1,3 @@
+DIST dash-0.5.10.1.tar.gz 225253 BLAKE2B
55dbdca7f01d19656e002d6e210bcae920619e2e88d4d174a3e08cbbc40bf867ece3f24ce9690ec64f95b1f0995ab35cabc08381ac031a33b55282cec0b09e73
SHA512
7ca3bbcf8bac84d359cde710a9ab393f05cf8522e969a2c110d2e71620e53f349387128045e68738dc621afe0b48f43ae3d32851187f2ae02d49b3e2575ffa6b
DIST dash-0.5.10.tar.gz 225242 BLAKE2B
c21b04aea58599c4a487ec7325bc1ffac2fb4b9be911e07cb0da3fd62eb15b5eb8d30857fad6cbc01fa36a948ac5e5e226566b42d4f9507f709e4d6636cf84f6
SHA512
47383284faf2cbdf65471b72196bdcea46efb8b01041fdc7685a811ae125ba77e5af653939255bda20bd3d56a13f838d85e0003549dcede6b75a37625816cb30
DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B
a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b
SHA512
d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
diff --git a/app-shells/dash/dash-0.5.10-r2.ebuild
b/app-shells/dash/dash-0.5.10.1.ebuild
similarity index 98%
rename from app-shells/dash/dash-0.5.10-r2.ebuild
rename to app-shells/dash/dash-0.5.10.1.ebuild
index b268b07aea0..d51383e2eb1 100644
--- a/app-shells/dash/dash-0.5.10-r2.ebuild
+++ b/app-shells/dash/dash-0.5.10.1.ebuild
@@ -29,7 +29,6 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.5.9.1-format-security.patch
- "${FILESDIR}"/${P}-jobs.patch
)
src_prepare() {
diff --git a/app-shells/dash/files/dash-0.5.10-jobs.patch
b/app-shells/dash/files/dash-0.5.10-jobs.patch
deleted file mode 100644
index a4c83d88dcb..000
--- a/app-shells/dash/files/dash-0.5.10-jobs.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 9e5cd41d9605e4caaac3aacdc0482f6ee220a298 Mon Sep 17 00:00:00 2001
-From: Herbert Xu
-Date: Mon, 7 May 2018 00:40:34 +0800
-Subject: jobs - Do not block when waiting on SIGCHLD
-
-Because of the nature of SIGCHLD, the process may have already been
-waited on and therefore we must be prepared for the case that wait
-may block. So ensure that it doesn't by using WNOHANG.
-
-Furthermore, multiple jobs may have exited when gotsigchld is set.
-Therefore we need to wait until there are no zombies left.
-
-Lastly, waitforjob needs to be called with interrupts off and
-the original patch broke that.
-
-Fixes: 03876c0743a5 ("eval: Reap zombies after built-in...")
-Signed-off-by: Herbert Xu
- src/eval.c | 12
- src/jobs.c | 13 ++---
- 2 files changed, 14 insertions(+), 11 deletions(-)
-
-diff --git a/src/eval.c b/src/eval.c
-index a27d657..39c4e41 100644
a/src/eval.c
-+++ b/src/eval.c
-@@ -859,10 +859,8 @@ bail:
- if (!(flags & EV_EXIT) || have_traps()) {
- INTOFF;
- jp = makejob(cmd, 1);
-- if (forkshell(jp, cmd, FORK_FG) != 0) {
-- INTON;
-+ if (forkshell(jp, cmd, FORK_FG) != 0)
- break;
-- }
- FORCEINTON;
- }
- listsetvar(varlist.list, VEXPORT|VSTACK);
-@@ -875,11 +873,8 @@ bail:
- if (execcmd && argc > 1)
- listsetvar(varlist.list, VEXPORT);
- }
-- if (evalbltin(cmdentry.u.cmd, argc, argv, flags)) {
-- if (exception == EXERROR && spclbltin <= 0) {
-- FORCEINTON;
-- break;
-- }
-+ if (evalbltin(cmdentry.u.cmd, argc, argv, flags) &&
-+ !(exception == EXERROR && spclbltin <= 0)) {
- raise:
- longjmp(handler->loc, 1);
- }
-@@ -892,6 +887,7 @@ raise:
- }
-
- status = waitforjob(jp);
-+ FORCEINTON;
-
- out:
- if (cmd->ncmd.redirect)
-diff --git a/src/jobs.c b/src/jobs.c
-index 1a97c54..606d603 100644
a/src/jobs.c
-+++ b/src/jobs.c
-@@ -975,10 +975,17 @@ waitforjob(struct job *jp)
- int st;
-
- TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0));
--
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: ed9b5301d7a11ee89997c2d932aca99da5e25bcc
Author: Lars Wendler gentoo org>
AuthorDate: Sun May 13 11:32:46 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Sun May 13 11:33:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9b5301
app-shells/dash: Revbump to add official jobs patch.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-shells/dash/dash-0.5.10-r2.ebuild| 79 +
app-shells/dash/files/dash-0.5.10-jobs.patch | 88
2 files changed, 167 insertions(+)
diff --git a/app-shells/dash/dash-0.5.10-r2.ebuild
b/app-shells/dash/dash-0.5.10-r2.ebuild
new file mode 100644
index 000..b268b07aea0
--- /dev/null
+++ b/app-shells/dash/dash-0.5.10-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~sh
~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
+ "${FILESDIR}"/${P}-jobs.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.10-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.10-jobs.patch
b/app-shells/dash/files/dash-0.5.10-jobs.patch
new file mode 100644
index 000..a4c83d88dcb
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.10-jobs.patch
@@ -0,0 +1,88 @@
+From 9e5cd41d9605e4caaac3aacdc0482f6ee220a298 Mon Sep 17 00:00:00 2001
+From: Herbert Xu
+Date: Mon, 7 May 2018 00:40:34 +0800
+Subject: jobs - Do not block when waiting on SIGCHLD
+
+Because of the nature of SIGCHLD, the process may have already been
+waited on and therefore we must be prepared for the case that wait
+may block. So ensure that it doesn't by using WNOHANG.
+
+Furthermore, multiple jobs may have exited when gotsigchld is set.
+Therefore we need to wait until there are no zombies left.
+
+Lastly, waitforjob needs to be called with interrupts off and
+the original patch broke that.
+
+Fixes: 03876c0743a5 ("eval: Reap zombies after built-in...")
+Signed-off-by: Herbert Xu
+---
+ src/eval.c | 12
+ src/jobs.c | 13 ++---
+ 2 files changed, 14 insertions(+), 11 deletions(-)
+
+diff --git a/src/eval.c b/src/eval.c
+index a27d657..39c4e41 100644
+--- a/src/eval.c
b/src/eval.c
+@@ -859,10 +859,8 @@ bail:
+ if (!(flags & EV_EXIT) || have_traps()) {
+ INTOFF;
+ jp = makejob(cmd, 1);
+- if (forkshell(jp, cmd, FORK_FG) != 0) {
+- INTON;
++ if (forkshell(jp, cmd, FORK_FG) != 0)
+ break;
+- }
+ FORCEINTON;
+
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: b3cd383722ae22bc2567f1b4f8a875e79dd56bca
Author: Lars Wendler gentoo org>
AuthorDate: Wed May 9 11:31:34 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed May 9 11:31:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3cd3837
app-shells/dash: Fixed subshell regression.
See https://patchwork.kernel.org/patch/10382199/
Closes: https://bugs.gentoo.org/655320
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../dash/{dash-0.5.10.ebuild => dash-0.5.10-r1.ebuild} | 5 -
app-shells/dash/files/dash-0.5.10-subshells.patch| 16
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/app-shells/dash/dash-0.5.10.ebuild
b/app-shells/dash/dash-0.5.10-r1.ebuild
similarity index 95%
rename from app-shells/dash/dash-0.5.10.ebuild
rename to app-shells/dash/dash-0.5.10-r1.ebuild
index 72821681d9b..97e4202bc4d 100644
--- a/app-shells/dash/dash-0.5.10.ebuild
+++ b/app-shells/dash/dash-0.5.10-r1.ebuild
@@ -27,7 +27,10 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-PATCHES=( "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.9.1-format-security.patch
+ "${FILESDIR}"/${P}-subshells.patch
+)
src_prepare() {
if [[ -n "${DEB_PATCH}" ]] ; then
diff --git a/app-shells/dash/files/dash-0.5.10-subshells.patch
b/app-shells/dash/files/dash-0.5.10-subshells.patch
new file mode 100644
index 000..5943db11e69
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.10-subshells.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/655320
+https://patchwork.kernel.org/patch/10382199/
+
+--- dash-0.5.10/src/jobs.c
dash-0.5.10/src/jobs.c
+@@ -975,8 +975,8 @@
+ int st;
+
+ TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0));
+- while ((jp && jp->state == JOBRUNNING) || gotsigchld)
+- dowait(DOWAIT_BLOCK, jp);
++ while (jp ? jp->state == JOBRUNNING : gotsigchld)
++ dowait(jp ? DOWAIT_BLOCK : DOWAIT_NORMAL, jp);
+ if (!jp)
+ return exitstatus;
+ st = getstatus(jp);
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: 1b59f6f5286ba1a1bf45b5d7bbafb16bb35ef2d9
Author: Lars Wendler gentoo org>
AuthorDate: Tue May 8 11:32:35 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue May 8 11:32:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b59f6f5
app-shells/dash: Bump to version 0.5.10
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-shells/dash/Manifest | 1 +
app-shells/dash/dash-0.5.10.ebuild| 76 +++
app-shells/dash/files/dash-0.5.10-dumb-echo.patch | 92 +++
3 files changed, 169 insertions(+)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 2fe1a5ea3ef..770bc40b76e 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,3 +1,4 @@
+DIST dash-0.5.10.tar.gz 225242 BLAKE2B
c21b04aea58599c4a487ec7325bc1ffac2fb4b9be911e07cb0da3fd62eb15b5eb8d30857fad6cbc01fa36a948ac5e5e226566b42d4f9507f709e4d6636cf84f6
SHA512
47383284faf2cbdf65471b72196bdcea46efb8b01041fdc7685a811ae125ba77e5af653939255bda20bd3d56a13f838d85e0003549dcede6b75a37625816cb30
DIST dash-0.5.8.tar.gz 223028 BLAKE2B
f1db15fc23e089c2f2efe1c86e3f027c454b02d31528527040b51f28f22ba969ac35c2b88430e44c5f822c2607bdb5a35ec3d6b026dd32afcce2c0444eda31d2
SHA512
3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8
DIST dash-0.5.9.1.tar.gz 225217 BLAKE2B
a80aa00ea5418d00b03c9ded21ef5c3a28d599059d1ac2f20082867b71ece6afac2f0bce9bc09946450c7618ad2c7f95df63b3d519a7f56552a291d09e44a71b
SHA512
d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d
DIST dash_0.5.8-2.diff.gz 41715 BLAKE2B
d396eab85bd86b18cc532da192c8034da990e9e4a822840635042e2810e32164502ec44c9a1b4f52701e9bc2acd1859a446a36383805527121dd1ef2e14c8010
SHA512
f067ca162cc463a60b5bcd7926bd6ab1f6cb1757e9cd7894cbf7ba5849b6d9af5381b8ec7264c503db544242690db067b6c034041e262ff93d237f1c06e50e56
diff --git a/app-shells/dash/dash-0.5.10.ebuild
b/app-shells/dash/dash-0.5.10.ebuild
new file mode 100644
index 000..72821681d9b
--- /dev/null
+++ b/app-shells/dash/dash-0.5.10.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~sh
~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.10-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.10-dumb-echo.patch
b/app-shells/dash/files/dash-0.5.10-dumb-echo.patch
new file mode 100644
index 000..6b19b5b59f7
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.10-dumb-echo.patch
@@ -0,0 +1,92 @@
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/, app-shells/dash/files/
commit: 272e2bfc933b91683ca1813166f2226686d2767e
Author: Lars Wendler gentoo org>
AuthorDate: Tue Aug 16 07:16:33 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Aug 16 07:18:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=272e2bfc
app-shells/dash: Removed old.
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler gentoo.org>
app-shells/dash/Manifest | 3 --
app-shells/dash/dash-0.5.7.4.ebuild| 58
app-shells/dash/dash-0.5.8.1-r2.ebuild | 62 --
app-shells/dash/files/dash-0.5.5.1-octal.patch | 29
4 files changed, 152 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 1a56350..e43d900 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,6 +1,3 @@
-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
DIST dash-0.5.9.tar.gz 224831 SHA256
92793b14c017d79297001556389442aeb9e3c1cc559fd178c979169b1a47629c SHA512
91d4cc69dae8bc73f8da4f771d993f91b041f19637a6dfec9b9acfd8c97d2d819fb445f9ba608f0e7e5df431a934be3b29a93dde7cc3d6400d06e7d7b40dc15f
WHIRLPOOL
aafe991df7b966bfa16e229c5e9c1891a37f8bb25603b8a87060a0f3b657525026d33250249e159f5a173898ca471f894dd268fed9b458fd1ddf5b989d143da4
-DIST dash_0.5.7-4.diff.gz 42834 SHA256
649d97aa0c48dc0db73c08d7e89a004b9d413279a823388161940342016284f0 SHA512
6b53684deebb9ac8ac0f42fa25ff5cad7f717b01473bdb29e968ea2cf3753f83013d70dcea4d4d3e7906b09760f086b10acaff0ebb3445bd392d8276fb865224
WHIRLPOOL
efa53e58c6223ef8d9b84780ef873d2a268fc1f40f879f5c731cf37717050b2333a01eb01a44d55e58c14e1c78c6e6d41b4652278311d72657089632358a9aab
-DIST dash_0.5.8-1.diff.gz 41661 SHA256
d751769cc1ef8b825a177e782f1cd3e35bde7c268107fa4febf8d235e12c64d9 SHA512
38e5c4d5b5525b6d1749f6fe6a810fde3233d3412b8cf3bb1f07db162c0d0a8bcbb39c79df846e4b2c43dbea00820fd935a4af707a6ac161b1daa710ae2417b4
WHIRLPOOL
a4612fca6f29f17e80ea531699f5fab22837b9ee20b8a73776258e9bf087821d0d9e494c12fd76b657ad112478912074666e61d008664c2daab0cf7b3a25cb95
DIST dash_0.5.8-2.diff.gz 41715 SHA256
00168a934864c26cae9a51367fe7ea013ece2d4844ff8bd6893fc00a8fa7b38c SHA512
f067ca162cc463a60b5bcd7926bd6ab1f6cb1757e9cd7894cbf7ba5849b6d9af5381b8ec7264c503db544242690db067b6c034041e262ff93d237f1c06e50e56
WHIRLPOOL
1c904df104c6026d3ec53843fb67563d88dd8a4babb779b369ccd037e1774d722a85ad92c184d713cd7a440be4885c7e739da17f038fcf88545afc527ddabb3f
diff --git a/app-shells/dash/dash-0.5.7.4.ebuild
b/app-shells/dash/dash-0.5.7.4.ebuild
deleted file mode 100644
index 5a6d473..000
--- a/app-shells/dash/dash-0.5.7.4.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic toolchain-funcs
-
-DEB_PV=${PV%.*}
-DEB_PATCH=${PV##*.}
-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"
-HOMEPAGE="http://gondor.apana.org.au/~herbert/dash/;
-SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${PN}-${DEB_PV}.tar.gz
- mirror://debian/pool/main/d/dash/${DEB_PF}.diff.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86
~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="libedit static"
-
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${WORKDIR}"/${DEB_PF}.diff
- epatch */debian/diff/*
- 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
-
- # Use pkg-config for libedit linkage
- sed -i "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex
static --static '')\`:" configure.ac
-
- # May as well, as the debian patches force this anyway
- eautoreconf
-}
-
-src_configure() {
- use static && append-ldflags -static
- # Do not pass --enable-glob due to #443552.
-
