* [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
@ 2018-05-14 8:09 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2018-05-14 8:09 UTC (permalink / raw
To: gentoo-commits
commit: 48803d38b5a42e55608b1606469de1cda353b05e
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 08:04:00 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 14 08:04:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48803d38
app-shells/dash: Removed old.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-shells/dash/Manifest | 1 -
app-shells/dash/dash-0.5.10-r1.ebuild | 79 -----------------------
app-shells/dash/files/dash-0.5.10-subshells.patch | 16 -----
3 files changed, 96 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index c6b2df6dc22..28e096423d1 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.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-r1.ebuild b/app-shells/dash/dash-0.5.10-r1.ebuild
deleted file mode 100644
index 97e4202bc4d..00000000000
--- a/app-shells/dash/dash-0.5.10-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# 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}-subshells.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-subshells.patch b/app-shells/dash/files/dash-0.5.10-subshells.patch
deleted file mode 100644
index 5943db11e69..00000000000
--- a/app-shells/dash/files/dash-0.5.10-subshells.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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);
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
@ 2023-12-28 4:04 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-12-28 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 14a8049c50adcb84c71b0fbd31801f42d3892a75
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 03:56:00 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 03:56:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14a8049c
app-shells/dash: drop 0.5.11.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-shells/dash/Manifest | 1 -
app-shells/dash/dash-0.5.11.5.ebuild | 58 ----------------------
.../dash-0.5.11.3-check_nflag_in_evaltree.patch | 46 -----------------
3 files changed, 105 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 0bcb6fd2e1ed..f3fce9ed5e5e 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,2 +1 @@
-DIST dash-0.5.11.5.tar.gz 240681 BLAKE2B 71c5e0acc127a01c75233b6d0a563979e5d856f16e3d108a68eb54d0b4b00f527f382e3e6aa963f9cff71bfaea2f524ba204ed04b7d006bd781784b2351e38c4 SHA512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf
DIST dash-0.5.12.tar.gz 246054 BLAKE2B f4c5e7088d7b591e0890a0e1363ef4f70074f4033ae34d3f82d71379cee78876e1e89b5d8e4afa3ce9380f8d94c3e8970c480a21257f87706112dd883667893e SHA512 13bd262be0089260cbd13530a9cf34690c0abeb2f1920eb5e61be7951b716f9f335b86279d425dbfae56cbd49231a8fdffdff70601a5177da3d543be6fc5eb17
diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild
deleted file mode 100644
index f1053e616242..000000000000
--- a/app-shells/dash/dash-0.5.11.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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
- 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
deleted file mode 100644
index 94740223fc8e..000000000000
--- a/app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 29d6f2148f10213de4e904d515e792d2cf8c968e Mon Sep 17 00:00:00 2001
-From: Herbert Xu <herbert@gondor.apana.org.au>
-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 <id@joeyh.name>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- 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(&smark);
-
-+ 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
-
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
@ 2020-09-04 11:48 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2020-09-04 11:48 UTC (permalink / raw
To: gentoo-commits
commit: eb4fa416f9beef50c217853ead0f074666566597
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 11:48:23 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 11:48:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb4fa416
app-shells/dash: Removed old
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-shells/dash/Manifest | 1 -
app-shells/dash/dash-0.5.10.2-r1.ebuild | 56 ----------------------
.../dash/files/dash-0.5.20.2-gcc-fno-common.patch | 38 ---------------
.../dash/files/dash-0.5.9.1-format-security.patch | 13 -----
4 files changed, 108 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 925df4efde0..dea2bfa7e01 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.1.tar.gz 244439 BLAKE2B 88f877954aca739621133fadd32cf8bf1ca5d334ef212da622501b1235caee3a91e9b8b481c7a45f3fb6d6eee1036c2e0f1fd387638c910eff90e8e0a1eaa419 SHA512 6403ac793c87c9101bd5f3b2df74200ce1a992d0c432aa79375d4479b87c83279f303239af5080728c8a64ef4520e39fe8f0f1e037a0a38ffce1e4dd057d9c72
DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4
diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild b/app-shells/dash/dash-0.5.10.2-r1.ebuild
deleted file mode 100644
index cb4780554ab..00000000000
--- a/app-shells/dash/dash-0.5.10.2-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 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 ~x86-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}/dash-0.5.9.1-format-security.patch"
- "${FILESDIR}/dash-0.5.20.2-gcc-fno-common.patch"
-)
-
-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() {
- # don't redefine stat on Solaris
- if [[ ${CHOST} == *-solaris* ]] ; then
- export ac_cv_func_stat64=yes
-
- # if your headers strictly adhere to POSIX, you'll need this too
- [[ ${CHOST##*solaris2.} -le 10 ]] && append-cppflags -DNAME_MAX=255
- fi
- append-cppflags -DJOBS=$(usex libedit 1 0)
- use static && append-ldflags -static
- # Do not pass --enable-glob due to #443552.
- local myeconfargs=(
- --bindir="${EPREFIX}"/bin
- --enable-fnmatch
- $(use_with libedit)
- )
- econf "${myeconfargs[@]}"
-}
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
deleted file mode 100644
index 08d5ed08a39..00000000000
--- a/app-shells/dash/files/dash-0.5.20.2-gcc-fno-common.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4459ec7f6cd394b9d01bd9d537b0f04975583dff Mon Sep 17 00:00:00 2001
-From: Jeroen Roovers <jer@gentoo.org>
-Date: Mon, 16 Mar 2020 19:25:00 +0100
-Subject: [PATCH] input: Fix compiling against libedit with -fno-common
-To: dash@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 <jer@gentoo.org>
-Signed-off-by: Mike Gilbert <floppym@gentoo.org>
----
- 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 = &basepf; /* 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
-
diff --git a/app-shells/dash/files/dash-0.5.9.1-format-security.patch b/app-shells/dash/files/dash-0.5.9.1-format-security.patch
deleted file mode 100644
index ea2114f392b..00000000000
--- a/app-shells/dash/files/dash-0.5.9.1-format-security.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1037030#c2
-
---- a/src/jobs.c
-+++ a/src/jobs.c
-@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly)
- goto out;
- #endif
- }
-- col = fmtstr(s, 32, strsignal(st));
-+ col = fmtstr(s, 32, "%s", strsignal(st));
- #ifdef WCOREDUMP
- if (WCOREDUMP(status)) {
- col += fmtstr(s + col, 16, " (core dumped)");
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
@ 2018-05-14 9:54 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2018-05-14 9:54 UTC (permalink / raw
To: gentoo-commits
commit: 6be2c5a6ab0b465e2591435715bae6db830e2356
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon May 14 09:51:21 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon May 14 09:53:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6be2c5a6
app-shells/dash: Revbump to fix dash parser. Removed old.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
...-0.5.10.1-r1.ebuild => dash-0.5.10.1-r2.ebuild} | 1 +
app-shells/dash/files/dash-0.5.10.1-parser.patch | 43 ++++++++++++++++++++++
2 files changed, 44 insertions(+)
diff --git a/app-shells/dash/dash-0.5.10.1-r1.ebuild b/app-shells/dash/dash-0.5.10.1-r2.ebuild
similarity index 98%
rename from app-shells/dash/dash-0.5.10.1-r1.ebuild
rename to app-shells/dash/dash-0.5.10.1-r2.ebuild
index d51383e2eb1..09d6f32c73f 100644
--- a/app-shells/dash/dash-0.5.10.1-r1.ebuild
+++ b/app-shells/dash/dash-0.5.10.1-r2.ebuild
@@ -29,6 +29,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${PN}-0.5.9.1-format-security.patch
+ "${FILESDIR}"/${P}-parser.patch
)
src_prepare() {
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
new file mode 100644
index 00000000000..485fc7e6772
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.10.1-parser.patch
@@ -0,0 +1,43 @@
+https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html
+
+--- dash-0.5.10.1/src/parser.c
++++ dash-0.5.10.1/src/parser.c
+@@ -853,6 +853,11 @@
+ return c;
+ }
+
++static int pgetc_top(struct synstack *stack)
++{
++ return stack->syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl();
++}
++
+ static void synstack_push(struct synstack **stack, struct synstack *next,
+ const char *syntax)
+ {
+@@ -915,7 +920,7 @@
+ attyline();
+ if (synstack->syntax == BASESYNTAX)
+ return readtoken();
+- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl();
++ c = pgetc_top(synstack);
+ goto loop;
+ }
+ #endif
+@@ -929,7 +934,7 @@
+ goto endword; /* exit outer loop */
+ USTPUTC(c, out);
+ nlprompt();
+- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl();
++ c = pgetc_top(synstack);
+ goto loop; /* continue outer loop */
+ case CWORD:
+ USTPUTC(c, out);
+@@ -1056,7 +1061,7 @@
+ USTPUTC(c, out);
+ }
+ }
+- c = syntax == SQSYNTAX ? pgetc() : pgetc_eatbnl();
++ c = pgetc_top(synstack);
+ }
+ }
+ endword:
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
@ 2018-05-08 11:34 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2018-05-08 11:34 UTC (permalink / raw
To: gentoo-commits
commit: 3fc79e80f4844cd86efe37912340e8e127e24cae
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue May 8 11:33:59 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue May 8 11:33:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fc79e80
app-shells/dash: Removed old.
Package-Manager: Portage-2.3.36, Repoman-2.3.9
app-shells/dash/Manifest | 2 -
app-shells/dash/dash-0.5.8.2.ebuild | 61 ------------
app-shells/dash/dash-0.5.9.1-r1.ebuild | 73 --------------
app-shells/dash/dash-0.5.9.1-r2.ebuild | 73 --------------
app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch | 105 ---------------------
.../dash/files/dash-0.5.8.1-eval-warnx.patch | 12 ---
6 files changed, 326 deletions(-)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 770bc40b76e..ee7a784a8a9 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,4 +1,2 @@
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.8.2.ebuild b/app-shells/dash/dash-0.5.8.2.ebuild
deleted file mode 100644
index 31bc5f3be81..00000000000
--- a/app-shells/dash/dash-0.5.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit 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="Debian Almquist Shell"
-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.8.1-dumb-echo.patch #337329 #527848
- epatch "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch
-
- # 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() {
- 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
- econf \
- --bindir="${EPREFIX}"/bin \
- --enable-fnmatch \
- --disable-lineno \
- $(use_with libedit)
-}
-
-src_install() {
- default
- dodoc */debian/changelog
-}
diff --git a/app-shells/dash/dash-0.5.9.1-r1.ebuild b/app-shells/dash/dash-0.5.9.1-r1.ebuild
deleted file mode 100644
index d2edb4b7565..00000000000
--- a/app-shells/dash/dash-0.5.9.1-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils 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"
-IUSE="libedit static vanilla"
-
-RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
-
-#S=${WORKDIR}/${MY_P}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch
-)
-
-src_prepare() {
- if [[ -n "${DEB_PATCH}" ]] ; then
- epatch "${WORKDIR}"/${DEB_PF}.diff
- epatch */debian/diff/*
- fi
- epatch "${PATCHES[@]}"
-
- #337329 #527848
- use vanilla || epatch "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch
-
- # 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() {
- 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
- econf \
- --bindir="${EPREFIX}"/bin \
- --enable-fnmatch \
- --disable-lineno \
- $(use_with libedit)
-}
-
-src_install() {
- default
- if [[ -n "${DEB_PATCH}" ]] ; then
- dodoc */debian/changelog
- fi
-}
diff --git a/app-shells/dash/dash-0.5.9.1-r2.ebuild b/app-shells/dash/dash-0.5.9.1-r2.ebuild
deleted file mode 100644
index d775db54f94..00000000000
--- a/app-shells/dash/dash-0.5.9.1-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 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] ) )"
-
-src_prepare() {
- if [[ -n "${DEB_PATCH}" ]] ; then
- eapply "${WORKDIR}"/${DEB_PF}.diff
- eapply */debian/diff/*
- fi
- default
-
- #337329 #527848
- use vanilla || eapply "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch
-
- # 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.8.1-dumb-echo.patch b/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch
deleted file mode 100644
index 4059a80e330..00000000000
--- a/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch
+++ /dev/null
@@ -1,105 +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
-@@ -439,34 +444,12 @@
- int
- echocmd(int argc, char **argv)
- {
-- int nonl = 0;
-- struct output *outs = out1;
--
-- if (!*++argv)
-- goto end;
-- if (equal(*argv, "-n")) {
-- nonl = ~nonl;
-- if (!*++argv)
-- goto end;
-+ int i;
-+ for (i = 1; i < argc; ++i) {
-+ outstr(argv[i], out1);
-+ if (i < argc - 1)
-+ outc(' ', out1);
- }
--
-- do {
-- int c;
--
-- nonl += conv_escape_str(*argv);
-- outstr(stackblock(), outs);
-- if (nonl > 0)
-- break;
--
-- c = ' ';
-- if (!*++argv) {
--end:
-- if (nonl) {
-- break;
-- }
-- c = '\n';
-- }
-- outc(c, outs);
-- } while (*argv);
-+ 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.
diff --git a/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch b/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch
deleted file mode 100644
index 51530bfdaf5..00000000000
--- a/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix one of the Debian patches -- it uses warnx but doesn't include err.h.
-
---- a/src/eval.c
-+++ b/src/eval.c
-@@ -36,6 +36,7 @@
- #include <signal.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <err.h>
-
- /*
- * Evaluate a command.
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
@ 2017-09-13 0:21 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2017-09-13 0:21 UTC (permalink / raw
To: gentoo-commits
commit: 900e6203d4015711887137bcd03c913361dbf41f
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 00:20:46 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 00:20:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=900e6203
app-shells/dash: fix build with format-security
Package-Manager: Portage-2.3.8, Repoman-2.3.3
app-shells/dash/dash-0.5.9.1-r3.ebuild | 76 ++++++++++++++++++++++
.../dash/files/dash-0.5.9.1-format-security.patch | 13 ++++
2 files changed, 89 insertions(+)
diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild
new file mode 100644
index 00000000000..2074bf271f9
--- /dev/null
+++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 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.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-format-security.patch b/app-shells/dash/files/dash-0.5.9.1-format-security.patch
new file mode 100644
index 00000000000..ea2114f392b
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.9.1-format-security.patch
@@ -0,0 +1,13 @@
+Origin: https://bugzilla.redhat.com/show_bug.cgi?id=1037030#c2
+
+--- a/src/jobs.c
++++ a/src/jobs.c
+@@ -427,7 +427,7 @@ sprint_status(char *s, int status, int sigonly)
+ goto out;
+ #endif
+ }
+- col = fmtstr(s, 32, strsignal(st));
++ col = fmtstr(s, 32, "%s", strsignal(st));
+ #ifdef WCOREDUMP
+ if (WCOREDUMP(status)) {
+ col += fmtstr(s + col, 16, " (core dumped)");
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
@ 2016-09-28 8:40 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2016-09-28 8:40 UTC (permalink / raw
To: gentoo-commits
commit: 5f0b322850dba9944fdb0f15b9e3e1587d38f929
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 08:07:17 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 08:40:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f0b3228
app-shells/dash: Bump to version 0.5.9.1
Package-Manager: portage-2.3.1
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-shells/dash/Manifest | 1 +
app-shells/dash/dash-0.5.9.1.ebuild | 72 +++++++++++++++++
app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch | 92 ++++++++++++++++++++++
3 files changed, 165 insertions(+)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index e43d900..b3907bf 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,3 +1,4 @@
DIST dash-0.5.8.tar.gz 223028 SHA256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f SHA512 3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8 WHIRLPOOL df79b1cf81cdbba0d7556175510d1f4d7294185c91a10cc0a8d4a9f940e2c26c681e377103b5f4e5291211b4555340433eae10144cb778d2d4e65e6ab54c98a3
+DIST dash-0.5.9.1.tar.gz 225217 SHA256 5ecd5bea72a93ed10eb15a1be9951dd51b52e5da1d4a7ae020efd9826b49e659 SHA512 d56a043b8fab4693d3f70cceb531c37174e7ded4acd5549e53048d7ce29125ff21d7e758f51a4a73e06250d051e246467039989275838c19a2579edea3f72b7d WHIRLPOOL 233ced314d1091a7a27fc9a0f86a3d87f9a08d067a8b171ead7294a12b573071e9d63a5607424eb6d4f7a0c193f374a461cd94b205412928b93341d4b75a9095
DIST dash-0.5.9.tar.gz 224831 SHA256 92793b14c017d79297001556389442aeb9e3c1cc559fd178c979169b1a47629c SHA512 91d4cc69dae8bc73f8da4f771d993f91b041f19637a6dfec9b9acfd8c97d2d819fb445f9ba608f0e7e5df431a934be3b29a93dde7cc3d6400d06e7d7b40dc15f WHIRLPOOL aafe991df7b966bfa16e229c5e9c1891a37f8bb25603b8a87060a0f3b657525026d33250249e159f5a173898ca471f894dd268fed9b458fd1ddf5b989d143da4
DIST dash_0.5.8-2.diff.gz 41715 SHA256 00168a934864c26cae9a51367fe7ea013ece2d4844ff8bd6893fc00a8fa7b38c SHA512 f067ca162cc463a60b5bcd7926bd6ab1f6cb1757e9cd7894cbf7ba5849b6d9af5381b8ec7264c503db544242690db067b6c034041e262ff93d237f1c06e50e56 WHIRLPOOL 1c904df104c6026d3ec53843fb67563d88dd8a4babb779b369ccd037e1774d722a85ad92c184d713cd7a440be4885c7e739da17f038fcf88545afc527ddabb3f
diff --git a/app-shells/dash/dash-0.5.9.1.ebuild b/app-shells/dash/dash-0.5.9.1.ebuild
new file mode 100644
index 00000000..39d1f83
--- /dev/null
+++ b/app-shells/dash/dash-0.5.9.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils 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="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/${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"
+IUSE="libedit static"
+
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
+
+#S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch #337329 #527848
+ "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch
+)
+
+src_prepare() {
+ if [[ -n "${DEB_PATCH}" ]] ; then
+ epatch "${WORKDIR}"/${DEB_PF}.diff
+ epatch */debian/diff/*
+ fi
+ epatch "${PATCHES[@]}"
+
+ # 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() {
+ 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
+ econf \
+ --bindir="${EPREFIX}"/bin \
+ --enable-fnmatch \
+ --disable-lineno \
+ $(use_with libedit)
+}
+
+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
new file mode 100644
index 00000000..cbf5feb
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.9.1-dumb-echo.patch
@@ -0,0 +1,92 @@
+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.
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
@ 2016-08-16 7:19 Lars Wendler
0 siblings, 0 replies; 8+ messages in thread
From: Lars Wendler @ 2016-08-16 7:19 UTC (permalink / raw
To: gentoo-commits
commit: cd93cde6dacdd5df92ee894defcfda9922260438
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 07:15:16 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 07:18:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd93cde6
app-shells/dash: Bump to version 0.5.9 (bug #590694).
Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
app-shells/dash/Manifest | 1 +
app-shells/dash/dash-0.5.9.ebuild | 72 ++++++++++++++++++
app-shells/dash/files/dash-0.5.9-dumb-echo.patch | 93 ++++++++++++++++++++++++
3 files changed, 166 insertions(+)
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index 9dc89c1..1a56350 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,5 +1,6 @@
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.9.ebuild b/app-shells/dash/dash-0.5.9.ebuild
new file mode 100644
index 0000000..c602b3b
--- /dev/null
+++ b/app-shells/dash/dash-0.5.9.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils 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="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/${MY_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"
+IUSE="libedit static"
+
+RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ libedit? ( static? ( dev-libs/libedit[static-libs] ) )"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.5.9-dumb-echo.patch #337329 #527848
+ "${FILESDIR}"/${PN}-0.5.8.1-eval-warnx.patch
+)
+
+src_prepare() {
+ if [[ -n "${DEB_PATCH}" ]] ; then
+ epatch "${WORKDIR}"/${DEB_PF}.diff
+ epatch */debian/diff/*
+ fi
+ epatch "${PATCHES[@]}"
+
+ # 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() {
+ 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
+ econf \
+ --bindir="${EPREFIX}"/bin \
+ --enable-fnmatch \
+ --disable-lineno \
+ $(use_with libedit)
+}
+
+src_install() {
+ default
+ if [[ -n "${DEB_PATCH}" ]] ; then
+ dodoc */debian/changelog
+ fi
+}
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
new file mode 100644
index 0000000..9bcf6e6
--- /dev/null
+++ b/app-shells/dash/files/dash-0.5.9-dumb-echo.patch
@@ -0,0 +1,93 @@
+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.
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-12-28 4:04 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-14 8:09 [gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2023-12-28 4:04 Sam James
2020-09-04 11:48 Lars Wendler
2018-05-14 9:54 Lars Wendler
2018-05-08 11:34 Lars Wendler
2017-09-13 0:21 Thomas Deutschmann
2016-09-28 8:40 Lars Wendler
2016-08-16 7:19 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox