[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: d2c93a02e41fc211476d104989c75c4d5b32eb20 Author: Sam James gentoo org> AuthorDate: Sun Aug 11 10:40:18 2024 + Commit: Sam James gentoo org> CommitDate: Sun Aug 11 10:40:18 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c93a02 app-shells/dash: drop ancient sed locale workaround This goes back a while to e515c9f26e5967d35c3f83b21f984bee53ab22e6 and then 5a798cae614346d6aa0ad8b85cfd5c65f2150587 (gentoo commits). Fixed upstream in fe393c0f9ab72de5a7d32aab53e5e8275cad8735. Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 3 --- app-shells/dash/dash-.ebuild | 3 --- 2 files changed, 6 deletions(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index 951b11271623..59890c831e69 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -29,9 +29,6 @@ DEPEND=" src_prepare() { default - # Fix the invalid sort - sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins || die - [[ ${PV} == ]] && eautoreconf # Use pkg-config for libedit linkage diff --git a/app-shells/dash/dash-.ebuild b/app-shells/dash/dash-.ebuild index 0c10e51d5343..86b5b85b179a 100644 --- a/app-shells/dash/dash-.ebuild +++ b/app-shells/dash/dash-.ebuild @@ -29,9 +29,6 @@ DEPEND=" src_prepare() { default - # Fix the invalid sort - sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins || die - [[ ${PV} == ]] && eautoreconf # Use pkg-config for libedit linkage
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 76f10f547f002195b01bf3774050909acec767e1 Author: Sam James gentoo org> AuthorDate: Sun Aug 11 10:32:39 2024 + Commit: Sam James gentoo org> CommitDate: Sun Aug 11 10:32:39 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76f10f54 app-shells/dash: add dash releases are infrequent. Further, there's various POSIX.1-2024 changes in git which may be useful to test. Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 13 ++--- app-shells/dash/{dash-0.5.12.ebuild => dash-.ebuild} | 13 ++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index 7659ef8d0f3b..951b11271623 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,11 +7,16 @@ 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"; +if [[ ${PV} == ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/dash/dash.git"; + inherit autotools git-r3 +else + SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"; + 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" +fi 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" @@ -27,6 +32,8 @@ src_prepare() { # Fix the invalid sort sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins || die + [[ ${PV} == ]] && eautoreconf + # Use pkg-config for libedit linkage sed -i \ -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \ diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-.ebuild similarity index 74% copy from app-shells/dash/dash-0.5.12.ebuild copy to app-shells/dash/dash-.ebuild index 7659ef8d0f3b..0c10e51d5343 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,11 +7,16 @@ 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"; +if [[ ${PV} == ]] ; then + EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/dash/dash.git"; + inherit autotools git-r3 +else + SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"; + 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" +fi 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" @@ -27,6 +32,8 @@ src_prepare() { # Fix the invalid sort sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins || die + [[ ${PV} == ]] && eautoreconf + # Use pkg-config for libedit linkage sed -i \ -e "/LIBS/s:-ledit:\`$(tc-getPKG_CONFIG) --libs libedit $(usex static --static '')\`:" \
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
commit: 14a8049c50adcb84c71b0fbd31801f42d3892a75 Author: Sam James gentoo org> AuthorDate: Thu Dec 28 03:56:00 2023 + Commit: Sam James gentoo org> CommitDate: Thu Dec 28 03:56:00 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14a8049c app-shells/dash: drop 0.5.11.5 Signed-off-by: Sam James 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.. --- 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.. --- 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 -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(&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"); -
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 3b2a829738585ff2712142f6f85819ddb37aa98b Author: Arthur Zamarin gentoo org> AuthorDate: Sat Jan 28 20:21:38 2023 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Jan 28 20:21:38 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b2a8297 app-shells/dash: Stabilize 0.5.12 hppa, #892169 Signed-off-by: Arthur Zamarin gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index 0476571e258c..887c95e1a77e 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 0bd26fcd937e3c62892b560158148f3ea5db3bdb Author: Sam James gentoo org> AuthorDate: Fri Jan 27 06:31:45 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 06:31:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd26fcd app-shells/dash: Stabilize 0.5.12 arm64, #892169 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index 3c6f595de79f..eaa6df32d1ac 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: bcf4b703307348969c70a91c30878f3013ef1e9c Author: Sam James gentoo org> AuthorDate: Fri Jan 27 06:27:24 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 06:27:24 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcf4b703 app-shells/dash: Stabilize 0.5.12 amd64, #892169 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index 05f6aa6cbbff..3c6f595de79f 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 9ba2f6ef2030604f04d761e83f7e61b702e16180 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 06:27:21 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 06:27:21 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba2f6ef app-shells/dash: Stabilize 0.5.12 x86, #892169 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index b2a8b7ddec38..c30a475698b9 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: cd34af1c80489e20001b6fd36dce0894898838b2 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 06:27:23 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 06:27:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd34af1c app-shells/dash: Stabilize 0.5.12 arm, #892169 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index c30a475698b9..05f6aa6cbbff 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 7de5fa3981505b8e458e333a5d26a437f02139c2 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 06:27:20 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 06:27:20 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de5fa39 app-shells/dash: Stabilize 0.5.12 ppc64, #892169 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index f43486ec81ea..b2a8b7ddec38 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 6ce6c817d5a3bd76b2aca00ea9009ea46f2a16f2 Author: Sam James gentoo org> AuthorDate: Fri Jan 27 06:22:32 2023 + Commit: Sam James gentoo org> CommitDate: Fri Jan 27 06:22:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ce6c817 app-shells/dash: Stabilize 0.5.12 ppc, #892169 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.12.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-shells/dash/dash-0.5.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild index aff6edbe6cec..f43486ec81ea 100644 --- a/app-shells/dash/dash-0.5.12.ebuild +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,7 +11,7 @@ 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 5023beed4336f7b5c7f9f94751e249ac41d023c3 Author: Sam James gentoo org> AuthorDate: Mon Dec 12 18:33:00 2022 + Commit: Sam James gentoo org> CommitDate: Mon Dec 12 18:43:10 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5023beed app-shells/dash: add 0.5.12 Signed-off-by: Sam James gentoo.org> app-shells/dash/Manifest | 1 + app-shells/dash/dash-0.5.12.ebuild | 64 ++ 2 files changed, 65 insertions(+) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index ebddbeec1dcc..0bcb6fd2e1ed 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1 +1,2 @@ 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.12.ebuild b/app-shells/dash/dash-0.5.12.ebuild new file mode 100644 index ..aff6edbe6cec --- /dev/null +++ b/app-shells/dash/dash-0.5.12.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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 ~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] ) ) +" + +src_prepare() { + default + + # Fix the invalid sort + sed -i -e 's/LC_COLLATE=C/LC_ALL=C/g' src/mkbuiltins || die + + # 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 + + use static && append-ldflags -static + + append-cppflags -DJOBS=$(usex libedit 1 0) + + # 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[@]}" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: f259840bb473ccb744c4f02270f1be09bd1f4bfd Author: WANG Xuerui gentoo org> AuthorDate: Fri Dec 2 17:55:50 2022 + Commit: WANG Xuerui gentoo org> CommitDate: Fri Dec 2 18:44:14 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f259840b app-shells/dash: keyword 0.5.11.5 for ~loong Signed-off-by: WANG Xuerui gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index a29123e18ede..d7fbb0f5bab2 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://gondor.apana.org.au/~herbert/dash/files/${P}.tar.gz"; LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 637bc32f73b8ee18a02d67f3acf77565be31061b Author: James Le Cuirot gentoo org> AuthorDate: Sun Jan 9 10:33:55 2022 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Jan 9 10:41:06 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=637bc32f app-shells/dash: Keyword 0.5.11.5 for ~m68k Manually tested and working. Signed-off-by: James Le Cuirot gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index 3e66849d6059..a29123e18ede 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 7aa3f8bebc9e25736ca45e880747c031fb71f7d1 Author: Rolf Eike Beer sf-mail de> AuthorDate: Thu Dec 9 16:19:42 2021 + Commit: Sam James gentoo org> CommitDate: Thu Dec 9 21:58:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aa3f8be app-shells/dash: stable 0.5.11.5 for hppa, bug #828263 Package-Manager: Portage-3.0.28, Repoman-3.0.3 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index a69f1942bf62..3e66849d6059 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -11,7 +11,7 @@ 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 1c47d09edbc81fa704272c64658b60e5671042c4 Author: Sam James gentoo org> AuthorDate: Mon Dec 6 01:15:33 2021 + Commit: Sam James gentoo org> CommitDate: Mon Dec 6 01:15:33 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c47d09e app-shells/dash: Stabilize 0.5.11.5 arm64, #828263 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index 7694aa716319..72a337fee44a 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -11,7 +11,7 @@ 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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: cb229ce109d70645ac2a7c05117dba2e21991cc5 Author: Arthur Zamarin gentoo org> AuthorDate: Sun Dec 5 19:30:11 2021 + Commit: Arthur Zamarin gentoo org> CommitDate: Sun Dec 5 19:30:40 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb229ce1 app-shells/dash: Stabilize 0.5.11.5 sparc, #828263 Signed-off-by: Arthur Zamarin gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index 55ce668eb8a7..7694aa716319 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -11,7 +11,7 @@ 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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 02ef2ad1b76076abfddb6fa1d8abf447e6ed9a19 Author: Sam James gentoo org> AuthorDate: Sun Dec 5 18:36:30 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 5 18:36:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02ef2ad1 app-shells/dash: Stabilize 0.5.11.5 ppc, #828263 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index 1c036c12233b..55ce668eb8a7 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -11,7 +11,7 @@ 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 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: c9a3cf8038e85d8e2e12621c811d98300555d879 Author: Sam James gentoo org> AuthorDate: Sun Dec 5 18:29:45 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 5 18:29:45 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a3cf80 app-shells/dash: Stabilize 0.5.11.5 x86, #828263 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index 10207f87003c..64d2d2806e52 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -11,7 +11,7 @@ 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 6dc23756c661547f529b637c999792bebc5f1330 Author: Sam James gentoo org> AuthorDate: Sun Dec 5 03:44:38 2021 + Commit: Sam James gentoo org> CommitDate: Sun Dec 5 03:44:38 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dc23756 app-shells/dash: Stabilize 0.5.11.5 amd64, #828263 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index 2f26ecfe3ed2..10207f87003c 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -11,7 +11,7 @@ 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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: ce7364f11016ac3220928b785a0dd37cc084af3a Author: Sam James gentoo org> AuthorDate: Wed Nov 3 21:09:31 2021 + Commit: Sam James gentoo org> CommitDate: Wed Nov 3 21:09:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce7364f1 app-shells/dash: Stabilize 0.5.11.3-r1 hppa, #821187 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index d0227a4ecae..6e0bed98e16 100644 --- a/app-shells/dash/dash-0.5.11.3-r1.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: edd65075f76ae16247956a5616777fe079e91280 Author: Yixun Lan gentoo org> AuthorDate: Fri Sep 10 08:20:54 2021 + Commit: Yixun Lan gentoo org> CommitDate: Fri Sep 10 14:29:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edd65075 app-shells/dash: keyword ~riscv Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Yixun Lan gentoo.org> app-shells/dash/dash-0.5.11.5.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild index 1c194ba1661..2f26ecfe3ed 100644 --- a/app-shells/dash/dash-0.5.11.5.ebuild +++ b/app-shells/dash/dash-0.5.11.5.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 1efa8543a21a1cd27cd7c6ca67b8b294215b3ab7 Author: Lars Wendler gentoo org> AuthorDate: Fri Sep 3 21:36:44 2021 + Commit: Lars Wendler gentoo org> CommitDate: Fri Sep 3 21:37:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1efa8543 app-shells/dash: Bump to version 0.5.11.5 Signed-off-by: Lars Wendler gentoo.org> app-shells/dash/Manifest | 1 + app-shells/dash/dash-0.5.11.5.ebuild | 61 2 files changed, 62 insertions(+) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 0c7dc2fad1d..4ecb52d1a98 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,2 +1,3 @@ DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20 DIST dash-0.5.11.4.tar.gz 240652 BLAKE2B 67c8c148448b8d95d09e5229953a88d52338d71c8e647977b92c12c56f19ffc62f24c775409231409bde9f7e5cf05f97f131a4967dd93fbdc16f539846467e61 SHA512 2344782b80f69b74d00eb153a918c2293eec2316825bf83c1eb4ff787eddf78f67ca3026cfce39b1db8d5ede69c7268951eec1e5711903f2306714b665f84160 +DIST dash-0.5.11.5.tar.gz 240681 BLAKE2B 71c5e0acc127a01c75233b6d0a563979e5d856f16e3d108a68eb54d0b4b00f527f382e3e6aa963f9cff71bfaea2f524ba204ed04b7d006bd781784b2351e38c4 SHA512 5387e213820eeb44d812bb4697543023fd4662b51a9ffd52a702810fed8b28d23fbe35a7f371e6686107de9f81902eff109458964b4622f4c5412d60190a66bf diff --git a/app-shells/dash/dash-0.5.11.5.ebuild b/app-shells/dash/dash-0.5.11.5.ebuild new file mode 100644 index 000..1c194ba1661 --- /dev/null +++ b/app-shells/dash/dash-0.5.11.5.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[@]}" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 65e9f29bcebf1becb16f3ab9f82362721e569c78 Author: Lars Wendler gentoo org> AuthorDate: Sat Jun 5 13:38:23 2021 + Commit: Lars Wendler gentoo org> CommitDate: Sat Jun 5 13:54:12 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e9f29b app-shells/dash: Bump to version 0.5.11.4 Signed-off-by: Lars Wendler gentoo.org> app-shells/dash/Manifest | 1 + app-shells/dash/dash-0.5.11.4.ebuild | 61 2 files changed, 62 insertions(+) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index f34f75bc262..0c7dc2fad1d 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1 +1,2 @@ DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20 +DIST dash-0.5.11.4.tar.gz 240652 BLAKE2B 67c8c148448b8d95d09e5229953a88d52338d71c8e647977b92c12c56f19ffc62f24c775409231409bde9f7e5cf05f97f131a4967dd93fbdc16f539846467e61 SHA512 2344782b80f69b74d00eb153a918c2293eec2316825bf83c1eb4ff787eddf78f67ca3026cfce39b1db8d5ede69c7268951eec1e5711903f2306714b665f84160 diff --git a/app-shells/dash/dash-0.5.11.4.ebuild b/app-shells/dash/dash-0.5.11.4.ebuild new file mode 100644 index 000..1c194ba1661 --- /dev/null +++ b/app-shells/dash/dash-0.5.11.4.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[@]}" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 512a302d75d91952fc441e5d3ac20fe000cbc6d9 Author: Lars Wendler gentoo org> AuthorDate: Mon Jan 11 19:37:44 2021 + Commit: Lars Wendler gentoo org> CommitDate: Mon Jan 11 19:37:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512a302d app-shells/dash: Security cleanup Bug: https://bugs.gentoo.org/754267 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> app-shells/dash/Manifest | 1 - app-shells/dash/dash-0.5.11.2.ebuild | 57 app-shells/dash/dash-0.5.11.3.ebuild | 57 3 files changed, 115 deletions(-) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 0decddc34b4..f34f75bc262 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,2 +1 @@ -DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4 DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20 diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild deleted file mode 100644 index 0b87dea2b6c..000 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# 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] ) )" - -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/dash-0.5.11.3.ebuild b/app-shells/dash/dash-0.5.11.3.ebuild deleted file mode 100644 index 7f5b894786b..000 --- a/app-shells/dash/dash-0.5.11.3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# 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] ) )" - -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 sta
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: d2b17c180a375080c076414a549a3f2cc5a1a102 Author: Sam James gentoo org> AuthorDate: Mon Jan 11 19:13:37 2021 + Commit: Sam James gentoo org> CommitDate: Mon Jan 11 19:13:37 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2b17c18 app-shells/dash: Stabilize 0.5.11.3-r1 arm, #754267 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index 7a2e4a20f6e..d0227a4ecae 100644 --- a/app-shells/dash/dash-0.5.11.3-r1.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: b1c7c82571548ed892e25b531234807b60d16258 Author: Sam James gentoo org> AuthorDate: Mon Jan 11 19:12:51 2021 + Commit: Sam James gentoo org> CommitDate: Mon Jan 11 19:12:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c7c825 app-shells/dash: Stabilize 0.5.11.3-r1 arm64, #754267 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index fe723a3f379..7a2e4a20f6e 100644 --- a/app-shells/dash/dash-0.5.11.3-r1.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 0ad9f5707a97a6e06b464afe135c03a10aab3686 Author: Sam James gentoo org> AuthorDate: Sun Jan 10 21:57:50 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jan 10 21:57:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad9f570 app-shells/dash: Stabilize 0.5.11.3-r1 amd64, #754267 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index 06ac2abe452..fe723a3f379 100644 --- a/app-shells/dash/dash-0.5.11.3-r1.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 96d149589638648665706191d88232449a57 Author: Sam James gentoo org> AuthorDate: Sun Jan 10 12:42:51 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jan 10 12:42:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96d14958 app-shells/dash: Stabilize 0.5.11.3-r1 ppc, #754267 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index 70efe1f154f..06ac2abe452 100644 --- a/app-shells/dash/dash-0.5.11.3-r1.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 680fcc92b3ece67d6e5e92f7d0ea8654c603fbde Author: Sam James gentoo org> AuthorDate: Sun Jan 10 12:42:10 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jan 10 12:42:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=680fcc92 app-shells/dash: Stabilize 0.5.11.3-r1 ppc64, #754267 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index 17cb7d12ddd..70efe1f154f 100644 --- a/app-shells/dash/dash-0.5.11.3-r1.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: d865c5cf1b249a3e5f649c7117e07b10996b Author: Sam James gentoo org> AuthorDate: Sun Jan 10 09:34:59 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jan 10 09:34:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d865c5cf app-shells/dash: Stabilize 0.5.11.3-r1 sparc, #754267 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index f56b5355582..17cb7d12ddd 100644 --- a/app-shells/dash/dash-0.5.11.3-r1.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: fc78185175aa27ec15fb5e7dfc6b5d69a5a10bd0 Author: Sam James gentoo org> AuthorDate: Sun Jan 10 09:28:26 2021 + Commit: Sam James gentoo org> CommitDate: Sun Jan 10 09:28:26 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc781851 app-shells/dash: Stabilize 0.5.11.3-r1 x86, #754267 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.3-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.3-r1.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index 1c194ba1661..f56b5355582 100644 --- a/app-shells/dash/dash-0.5.11.3-r1.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[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(&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 +
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 4809f677a9eaf139451dbf3506be587a68c656b9 Author: Fabian Groffen gentoo org> AuthorDate: Wed Jan 6 13:24:41 2021 + Commit: Fabian Groffen gentoo org> CommitDate: Wed Jan 6 13:24:41 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4809f677 app-shells/dash: drop x86-macos Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 4 ++-- app-shells/dash/dash-0.5.11.3.ebuild | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index b9bf5b026a6..0b87dea2b6c 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +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" diff --git a/app-shells/dash/dash-0.5.11.3.ebuild b/app-shells/dash/dash-0.5.11.3.ebuild index 75cf4db9a5e..7f5b894786b 100644 --- a/app-shells/dash/dash-0.5.11.3.ebuild +++ b/app-shells/dash/dash-0.5.11.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 39b1188b7924ced073b5fce7ac8e40d2c1bfa5ab Author: Lars Wendler gentoo org> AuthorDate: Thu Dec 24 23:12:35 2020 + Commit: Lars Wendler gentoo org> CommitDate: Thu Dec 24 23:17:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39b1188b app-shells/dash: Bump to version 0.5.11.3 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> app-shells/dash/Manifest | 1 + app-shells/dash/dash-0.5.11.3.ebuild | 57 2 files changed, 58 insertions(+) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index a23bad9344e..0decddc34b4 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1 +1,2 @@ DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4 +DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20 diff --git a/app-shells/dash/dash-0.5.11.3.ebuild b/app-shells/dash/dash-0.5.11.3.ebuild new file mode 100644 index 000..75cf4db9a5e --- /dev/null +++ b/app-shells/dash/dash-0.5.11.3.ebuild @@ -0,0 +1,57 @@ +# 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] ) )" + +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[@]}" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 819af439b82a6f4ab7bdd814526e043c6fc775ca Author: Fabian Groffen gentoo org> AuthorDate: Sun Dec 20 16:44:50 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Dec 20 16:45:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819af439 app-shells/dash-0.5.11.2: fix compilation on ppc-macos Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Fabian Groffen gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 4 1 file changed, 4 insertions(+) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index ea4ee62b3c0..1299af651db 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -40,6 +40,10 @@ src_configure() { # 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.
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 6b9120961053455eff6982e205c2c8efd757d3b8 Author: Lars Wendler gentoo org> AuthorDate: Fri Nov 27 12:47:32 2020 + Commit: Lars Wendler gentoo org> CommitDate: Fri Nov 27 12:47:32 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b912096 app-shells/dash: Removed old Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: Lars Wendler gentoo.org> app-shells/dash/Manifest | 1 - app-shells/dash/dash-0.5.11.1.ebuild | 52 2 files changed, 53 deletions(-) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index dea2bfa7e01..a23bad9344e 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,2 +1 @@ -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.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild deleted file mode 100644 index 740faacabec..000 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ /dev/null @@ -1,52 +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] ) )" - -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=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" - --bindir="${EPREFIX}"/bin - --enable-fnmatch - $(use_with libedit) - ) - econf "${myeconfargs[@]}" -}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 6e62335aedb24a2e56dc3ae813c36beacc174faa Author: Sam James gentoo org> AuthorDate: Mon Nov 2 09:10:05 2020 + Commit: Sam James gentoo org> CommitDate: Mon Nov 2 09:10:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e62335a app-shells/dash: Stabilize 0.5.11.2 amd64, #749660 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index d0230de2329..ea4ee62b3c0 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 31558ad2f908bed7c95595c3db14014ddba63863 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Oct 20 07:03:12 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Oct 20 07:04:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31558ad2 app-shells/dash: stable 0.5.11.2 for sparc stable wrt bug #749660 Package-Manager: Portage-3.0.8, Repoman-3.0.2 RepoMan-Options: --include-arches="sparc" Signed-off-by: Sergei Trofimovich gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index 249b73571c9..d0230de2329 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 18a043ba18172823a367cd51da00aa2155511a61 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Oct 20 07:01:10 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Oct 20 07:01:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18a043ba app-shells/dash: stable 0.5.11.2 for ppc64 stable wrt bug #749660 Package-Manager: Portage-3.0.8, Repoman-3.0.2 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index cfd85fbed0d..249b73571c9 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 82e9e4b61ec23cb9bae095686e4629bf3d2d20f2 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Oct 20 06:56:25 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Oct 20 06:57:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e9e4b6 app-shells/dash: stable 0.5.11.2 for ppc stable wrt bug #749660 Package-Manager: Portage-3.0.8, Repoman-3.0.2 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index a8b866781ac..cfd85fbed0d 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: b04426901a5a4de358cb3a49951701c803e41a00 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Oct 20 06:49:39 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Oct 20 06:50:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0442690 app-shells/dash: stable 0.5.11.2 for hppa stable wrt bug #749660 Package-Manager: Portage-3.0.8, Repoman-3.0.2 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index fe5875a2546..a8b866781ac 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 6d7ea73e7bf30efd69fdb7c844c41367961158c5 Author: Sam James gentoo org> AuthorDate: Mon Oct 19 00:13:37 2020 + Commit: Sam James gentoo org> CommitDate: Mon Oct 19 00:13:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7ea73e app-shells/dash: Stabilize 0.5.11.2 arm64, #749660 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index 6597d3ce69f..fe5875a2546 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 2c74f37f16e66e0b82cf76b95e32d68867f71889 Author: Sam James gentoo org> AuthorDate: Sun Oct 18 23:54:10 2020 + Commit: Sam James gentoo org> CommitDate: Sun Oct 18 23:55:06 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c74f37f app-shells/dash: Stabilize 0.5.11.2 arm, #749660 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index 56ff05bf6ec..6597d3ce69f 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 8ec5025fb08cd68e2d45801f87f85f384027248e Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Oct 18 18:03:44 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Oct 18 18:03:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ec5025f app-shells/dash: x86 stable (bug #749660) Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index 1d6d3b32458..56ff05bf6ec 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 6b440355dfd42de32dd00d6f1e02c456876dd7e9 Author: Fabian Groffen gentoo org> AuthorDate: Sun Sep 27 19:29:24 2020 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Sep 27 19:29:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b440355 app-shells/dash-0.5.11.2: fix compilation on Solaris Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Fabian Groffen gentoo.org> app-shells/dash/dash-0.5.11.2.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild index 9482c8379d5..1d6d3b32458 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -32,9 +32,10 @@ src_prepare() { } src_configure() { - # don't redefine stat on Solaris 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
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
commit: eb4fa416f9beef50c217853ead0f074666566597 Author: Lars Wendler gentoo org> AuthorDate: Fri Sep 4 11:48:23 2020 + Commit: Lars Wendler gentoo org> CommitDate: Fri Sep 4 11:48:23 2020 + 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 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..000 --- 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..000 --- 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 -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 t
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: b61aed98d80b24b9cbf359cebc2f333b1f5d69b5 Author: Sam James gentoo org> AuthorDate: Thu Sep 3 23:52:02 2020 + Commit: Sam James gentoo org> CommitDate: Thu Sep 3 23:52:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61aed98 app-shells/dash: ppc64 stable (bug #738228) Package-Manager: Portage-3.0.4, Repoman-2.3.23 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild index 9ec6fecce8e..740faacabec 100644 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 4e3f29cef0b8814d8b13ab4d156adb936f466564 Author: Rolf Eike Beer sf-mail de> AuthorDate: Wed Sep 2 04:10:52 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Sep 2 06:33:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3f29ce app-shells/dash: stable 0.5.11.1 for hppa, bug #738228 Package-Manager: Portage-3.0.4, Repoman-2.3.23 RepoMan-Options: --include-arches="hppa" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-shells/dash/dash-0.5.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild index d8d8acfbd6b..9ec6fecce8e 100644 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: b90d4c88a1b015b8dd8d0dd3530b35c3d0a9e5ca Author: Sam James gentoo org> AuthorDate: Tue Sep 1 03:53:59 2020 + Commit: Sam James gentoo org> CommitDate: Tue Sep 1 03:53:59 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b90d4c88 app-shells/dash: Stabilize 0.5.11.1 ppc, #738228 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild index d4176f23f38..d8d8acfbd6b 100644 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: f5ac96e375a7348727745e624c9c41c194661e7c Author: Lars Wendler gentoo org> AuthorDate: Sat Aug 29 22:04:15 2020 + Commit: Lars Wendler gentoo org> CommitDate: Sat Aug 29 22:10:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5ac96e3 app-shells/dash: Bump to version 0.5.11.2 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Lars Wendler gentoo.org> app-shells/dash/Manifest | 1 + app-shells/dash/dash-0.5.11.2.ebuild | 52 2 files changed, 53 insertions(+) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 8a8705edab2..1ddfe8887f9 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,3 +1,4 @@ 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 DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1 diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.2.ebuild new file mode 100644 index 000..9482c8379d5 --- /dev/null +++ b/app-shells/dash/dash-0.5.11.2.ebuild @@ -0,0 +1,52 @@ +# 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] ) )" + +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=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + --bindir="${EPREFIX}"/bin + --enable-fnmatch + $(use_with libedit) + ) + econf "${myeconfargs[@]}" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 4c1784b0c59aed42713d8dd84aca2ccda444a1b5 Author: Lars Wendler gentoo org> AuthorDate: Sat Aug 29 22:05:21 2020 + Commit: Lars Wendler gentoo org> CommitDate: Sat Aug 29 22:10:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c1784b0 app-shells/dash: Removed old Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Lars Wendler gentoo.org> app-shells/dash/Manifest | 1 - app-shells/dash/dash-0.5.11.ebuild | 52 -- 2 files changed, 53 deletions(-) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 1ddfe8887f9..925df4efde0 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,4 +1,3 @@ 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 -DIST dash-0.5.11.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1 diff --git a/app-shells/dash/dash-0.5.11.ebuild b/app-shells/dash/dash-0.5.11.ebuild deleted file mode 100644 index 9482c8379d5..000 --- a/app-shells/dash/dash-0.5.11.ebuild +++ /dev/null @@ -1,52 +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] ) )" - -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=( - CC_FOR_BUILD="$(tc-getBUILD_CC)" - --bindir="${EPREFIX}"/bin - --enable-fnmatch - $(use_with libedit) - ) - econf "${myeconfargs[@]}" -}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: c3f47d32335df1a79553a2c168d946d02a99e8c9 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 21 15:34:59 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 21 15:35:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f47d32 app-shells/dash: x86 stable wrt bug #738228 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild index b629160694e..d4176f23f38 100644 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 88cca5648ce12c2072da895bb3f15745f8fedb06 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 21 15:31:54 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 21 15:31:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88cca564 app-shells/dash: sparc stable wrt bug #738228 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild index 03fda370ec7..b629160694e 100644 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: e5095620f5673e032f73dc0dd57272cf8ad1cd20 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 21 15:27:00 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 21 15:27:00 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5095620 app-shells/dash: arm stable wrt bug #738228 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild index 34d17169d1a..03fda370ec7 100644 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: c53c119ad22f53e7be03317457e4ec86c9478f67 Author: Agostino Sarubbo gentoo org> AuthorDate: Fri Aug 21 15:25:31 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Fri Aug 21 15:25:31 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c53c119a app-shells/dash: amd64 stable wrt bug #738228 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild index 8f085e23a2f..34d17169d1a 100644 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 68d8b438eec69e5e9f30c00f64fdc9e68f9c52f8 Author: Sam James gentoo org> AuthorDate: Fri Aug 21 07:49:52 2020 + Commit: Sam James gentoo org> CommitDate: Fri Aug 21 07:50:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d8b438 app-shells/dash: Stabilize 0.5.11.1 arm64, #738228 Signed-off-by: Sam James gentoo.org> app-shells/dash/dash-0.5.11.1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild index 9482c8379d5..8f085e23a2f 100644 --- a/app-shells/dash/dash-0.5.11.1.ebuild +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: f3c38f162d41bc8e08310bb968c6cd1291add3b0 Author: Lars Wendler gentoo org> AuthorDate: Wed Jul 8 13:47:43 2020 + Commit: Lars Wendler gentoo org> CommitDate: Wed Jul 8 13:47:55 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3c38f16 app-shells/dash: Bump tov ersion 0.5.11.1 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Lars Wendler gentoo.org> app-shells/dash/Manifest | 1 + app-shells/dash/dash-0.5.11.1.ebuild | 52 2 files changed, 53 insertions(+) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index d017019d91a..8a8705edab2 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,2 +1,3 @@ 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.tar.gz 238776 BLAKE2B 0d399b35c10a33f6a22f51f7b74b9e092fb11d47ae45948f43fab0dd1416061145e7f930f0f0d1119d02cc45790ba19ce040c951322c131e706e5f3f32f2612b SHA512 41c3afa8aa4788f7899b9a4c1bce2dc8629f4405184cdc7269993e72c695cf9537c9e68b654d56f06c604a82ffa73c9160b91368e82a3593a12ff7dea10505d1 diff --git a/app-shells/dash/dash-0.5.11.1.ebuild b/app-shells/dash/dash-0.5.11.1.ebuild new file mode 100644 index 000..9482c8379d5 --- /dev/null +++ b/app-shells/dash/dash-0.5.11.1.ebuild @@ -0,0 +1,52 @@ +# 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] ) )" + +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=( + CC_FOR_BUILD="$(tc-getBUILD_CC)" + --bindir="${EPREFIX}"/bin + --enable-fnmatch + $(use_with libedit) + ) + econf "${myeconfargs[@]}" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: b8051ce978d14ad43b84011a89550a9e121018d4 Author: Manoj Gupta google com> AuthorDate: Thu Jun 11 00:58:37 2020 + Commit: Mike Gilbert gentoo org> CommitDate: Sat Jun 13 14:58:01 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8051ce9 app-shells/dash: Respect portage host cc variable Pass CC_FOR_BUILD to econf. Otherwise it invokes gcc instead of portage specified HOST/BUILD CC. Signed-off-by: Manoj Gupta google.com> Signed-off-by: Mike Gilbert gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/16206 app-shells/dash/dash-0.5.11.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/app-shells/dash/dash-0.5.11.ebuild b/app-shells/dash/dash-0.5.11.ebuild index 1bd542ff827..9482c8379d5 100644 --- a/app-shells/dash/dash-0.5.11.ebuild +++ b/app-shells/dash/dash-0.5.11.ebuild @@ -43,6 +43,7 @@ src_configure() { 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)
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 14862bdd368de259024c427b18eff48267e740e0 Author: Lars Wendler gentoo org> AuthorDate: Tue Jun 2 08:56:32 2020 + Commit: Lars Wendler gentoo org> CommitDate: Tue Jun 2 08:59:38 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14862bdd app-shells/dash: Bump to version 0.5.11 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.11.ebuild | 51 ++ 2 files changed, 52 insertions(+) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index a950fe55632..0ee67432d18 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,2 +1,3 @@ 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.11.ebuild b/app-shells/dash/dash-0.5.11.ebuild new file mode 100644 index 000..1bd542ff827 --- /dev/null +++ b/app-shells/dash/dash-0.5.11.ebuild @@ -0,0 +1,51 @@ +# 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] ) )" + +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[@]}" +}
[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 beha
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: e50c7ff490f4f737ec171c06817dd932fc1db7dc Author: Sergei Trofimovich gentoo org> AuthorDate: Fri May 8 09:32:45 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri May 8 09:32:45 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50c7ff4 app-shells/dash: stable 0.5.10.2-r1 for hppa, bug #720882 Package-Manager: Portage-2.3.99, Repoman-2.3.22 RepoMan-Options: --include-arches="hppa" Signed-off-by: Sergei Trofimovich gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 d8ede8554cd..cb4780554ab 100644 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 5e69dea357c8460d8095755008db1dd01bc2ef90 Author: Sam James (sam_c) cmpct info> AuthorDate: Thu May 21 11:58:11 2020 + Commit: Mart Raudsepp gentoo org> CommitDate: Fri May 8 06:23:41 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e69dea3 app-shells/dash: arm64 stable (bug #720882) Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Sam James (sam_c) cmpct.info> Signed-off-by: Mart Raudsepp gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 78b309f9680..d8ede8554cd 100644 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 793f5b620721a52965b29343388ab888b60154f4 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed May 6 06:30:44 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed May 6 06:30:44 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793f5b62 app-shells/dash: x86 stable wrt bug #720882 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 ffac9fedac5..78b309f9680 100644 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 6d7b9136e4008426e78ae0e7863ccffc2cad459c Author: Agostino Sarubbo gentoo org> AuthorDate: Wed May 6 06:30:19 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed May 6 06:30:19 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d7b9136 app-shells/dash: sparc stable wrt bug #720882 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 b2f94c86a1d..ffac9fedac5 100644 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: d4e82eb2e59affc6b945d124c2acb0b24a287b5b Author: Agostino Sarubbo gentoo org> AuthorDate: Wed May 6 06:28:34 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed May 6 06:28:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e82eb2 app-shells/dash: ppc64 stable wrt bug #720882 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 62b4957d272..b2f94c86a1d 100644 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 44b14c4fea1d3695bd86abf42a0efd885a99c4c5 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed May 6 06:26:50 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed May 6 06:26:50 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44b14c4f app-shells/dash: arm stable wrt bug #720882 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="arm" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 8ac7bdd1171..cdfffd9a50a 100644 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: cfb151918433be2541593f4cc3f3a8470428cd7a Author: Agostino Sarubbo gentoo org> AuthorDate: Wed May 6 06:27:25 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed May 6 06:27:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfb15191 app-shells/dash: ppc stable wrt bug #720882 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 cdfffd9a50a..62b4957d272 100644 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 1b5bfe365ad4a74bf819e813664d8fc74f580521 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed May 6 06:25:56 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed May 6 06:25:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b5bfe36 app-shells/dash: amd64 stable wrt bug #720882 Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 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 a552c0f62f0..8ac7bdd1171 100644 --- a/app-shells/dash/dash-0.5.10.2-r1.ebuild +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -11,7 +11,7 @@ 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" +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"
[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 = &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 +
[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 toolchain-
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 808dded4f103becf7929562b1ed58046aa63f3f6 Author: Michael Orlitzky gentoo org> AuthorDate: Sun Mar 15 15:34:34 2020 + Commit: Michael Orlitzky gentoo org> CommitDate: Sun Mar 15 15:56:02 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808dded4 app-shells/dash: new revision that more-closely matches upstream. Our dash ebuilds differed from upstream in two ways in the past: we disabled LINENO support with --disable-lineno, and we patched the "echo" command to ignore certain arguments and escape sequences. Disabling LINENO tricks configure scripts into re-executing themselves with bash, which can hide errors for users (good?), but also hides them from developers (bad). The LINENO variable is covered by POSIX, and it's counterintuitive to silently force bash on users who have explicitly set /bin/sh to dash. This new revision therefore re-enables LINENO. This same change (in the context of Debian) was discussed on the autoconf mailing list. The "dumb echo" patch reflects a similar situation. Dash's upstream "echo" implementation differs from the bash implementation, but is correct according to POSIX. This can shed light upon some portability bugs, particularly in autoconf scripts, and the "dumb echo" patch hides some of those bugs from end users. But again, it hides them from the authors as well and thereby perpetuates the portability issues. Since this patch is Gentoo-specific, and hides problems that are better addressed elsewhere, this new revision eliminates it. Closes: https://bugs.gentoo.org/687002 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Orlitzky gentoo.org> app-shells/dash/dash-0.5.10.2-r1.ebuild | 53 + 1 file changed, 53 insertions(+) diff --git a/app-shells/dash/dash-0.5.10.2-r1.ebuild b/app-shells/dash/dash-0.5.10.2-r1.ebuild new file mode 100644 index 000..877c0771557 --- /dev/null +++ b/app-shells/dash/dash-0.5.10.2-r1.ebuild @@ -0,0 +1,53 @@ +# 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 ~sh ~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}/${PN}-0.5.9.1-format-security.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[@]}" +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: e9b10da8ccfcff1583c63c83b3762d4fe51a2812 Author: Fabian Groffen gentoo org> AuthorDate: Sun Jun 17 14:24:29 2018 + Commit: Fabian Groffen gentoo org> CommitDate: Sun Jun 17 14:24:39 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9b10da8 app-shells/dash: fix compilation on Solaris <=10, bug #657990 Closes: https://bugs.gentoo.org/657990 Package-Manager: Portage-2.3.40, Repoman-2.3.9 app-shells/dash/dash-0.5.10.2.ebuild | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app-shells/dash/dash-0.5.10.2.ebuild b/app-shells/dash/dash-0.5.10.2.ebuild index d51383e2eb1..4935f47043a 100644 --- a/app-shells/dash/dash-0.5.10.2.ebuild +++ b/app-shells/dash/dash-0.5.10.2.ebuild @@ -55,6 +55,9 @@ 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
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 41be65b0a1909090de5df0bf30247d52a9dbb4b4 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun May 20 00:07:07 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun May 20 00:19:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41be65b0 app-shells/dash: Bump to v0.5.10.2 Package-Manager: Portage-2.3.38, Repoman-2.3.9 app-shells/dash/Manifest | 1 + app-shells/dash/dash-0.5.10.2.ebuild | 78 2 files changed, 79 insertions(+) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 28e096423d1..0ee0aee331e 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.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.2.ebuild b/app-shells/dash/dash-0.5.10.2.ebuild new file mode 100644 index 000..d51383e2eb1 --- /dev/null +++ b/app-shells/dash/dash-0.5.10.2.ebuild @@ -0,0 +1,78 @@ +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/
commit: 2d1ae12644c7a9d32152385178906610eb7c3e7f Author: Lars Wendler gentoo org> AuthorDate: Wed May 16 09:45:14 2018 + Commit: Lars Wendler gentoo org> CommitDate: Wed May 16 09:45:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1ae126 app-shells/dash: Use official upstream patch. Package-Manager: Portage-2.3.36, Repoman-2.3.9 app-shells/dash/files/dash-0.5.10.1-parser.patch | 37 +++- 1 file changed, 30 insertions(+), 7 deletions(-) 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 index 485fc7e6772..0939b7cb722 100644 --- a/app-shells/dash/files/dash-0.5.10.1-parser.patch +++ b/app-shells/dash/files/dash-0.5.10.1-parser.patch @@ -1,8 +1,28 @@ -https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html +From 469c5fd4f57622b1a6571172898ab29430319d4a Mon Sep 17 00:00:00 2001 +From: Herbert Xu +Date: Fri, 11 May 2018 23:41:25 +0800 +Subject: parser: Fix incorrect eating of backslash newlines dash-0.5.10.1/src/parser.c -+++ dash-0.5.10.1/src/parser.c -@@ -853,6 +853,11 @@ +With the introduction of synstack->syntax, a number of references +to the syntax variable was missed during the conversion. This +causes backslash newlines to be incorrectly removed in single +quote context. + +This patch also combines these calls into a new helper function +pgetc_top. + +Fixes: ab1cecb40478 ("parser: Add syntax stack for recursive...") +Reported-by: Leah Neukirchen +Signed-off-by: Herbert Xu +--- + src/parser.c | 11 --- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/parser.c b/src/parser.c +index 8e40781..8bd3db4 100644 +--- a/src/parser.c b/src/parser.c +@@ -853,6 +853,11 @@ static int pgetc_eatbnl(void) return c; } @@ -14,7 +34,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html static void synstack_push(struct synstack **stack, struct synstack *next, const char *syntax) { -@@ -915,7 +920,7 @@ +@@ -915,7 +920,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) attyline(); if (synstack->syntax == BASESYNTAX) return readtoken(); @@ -23,7 +43,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html goto loop; } #endif -@@ -929,7 +934,7 @@ +@@ -929,7 +934,7 @@ readtoken1(int firstc, char const *syntax, char *eofmark, int striptabs) goto endword; /* exit outer loop */ USTPUTC(c, out); nlprompt(); @@ -32,7 +52,7 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html goto loop; /* continue outer loop */ case CWORD: USTPUTC(c, out); -@@ -1056,7 +1061,7 @@ +@@ -1056,7 +1061,7 @@ toggledq: USTPUTC(c, out); } } @@ -41,3 +61,6 @@ https://www.mail-archive.com/dash@vger.kernel.org/msg01620.html } } endword: +-- +cgit v1.1 +
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
commit: 6be2c5a6ab0b465e2591435715bae6db830e2356 Author: Lars Wendler gentoo org> AuthorDate: Mon May 14 09:51:21 2018 + Commit: Lars Wendler gentoo org> CommitDate: Mon May 14 09:53:54 2018 + 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 000..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:
[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/files/, app-shells/dash/
commit: 48803d38b5a42e55608b1606469de1cda353b05e Author: Lars Wendler gentoo org> AuthorDate: Mon May 14 08:04:00 2018 + Commit: Lars Wendler gentoo org> CommitDate: Mon May 14 08:04:00 2018 + 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..000 --- 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..000 --- 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
[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)); -- while ((jp && jp->state == JOBRUNNING) || gotsigchld) --
[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; + } + listsetvar(varlist.list, VEXPOR
[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 @@ +ht
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
commit: 3fc79e80f4844cd86efe37912340e8e127e24cae Author: Lars Wendler gentoo org> AuthorDate: Tue May 8 11:33:59 2018 + Commit: Lars Wendler gentoo org> CommitDate: Tue May 8 11:33:59 2018 + 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..000 --- 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..000 --- 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.a
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: a9b5414c0bf7151231ebcc492ba57f51b7821365 Author: Rolf Eike Beer sf-mail de> AuthorDate: Fri Apr 20 10:47:36 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Apr 20 19:00:53 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b5414c app-shells/dash: stable 0.5.9.1-r3 for sparc Bug: https://bugs.gentoo.org/631572 Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --include-arches="sparc" app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index bc87d2fecc0..44c8851d7e4 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 6d98e97b51c536ba9b80c8e5c997b85969840353 Author: Mart Raudsepp gentoo org> AuthorDate: Sat Apr 14 20:31:38 2018 + Commit: Mart Raudsepp gentoo org> CommitDate: Sat Apr 14 20:31:38 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d98e97b app-shells/dash-0.5.9.1-r3: arm64 stable (bug #631572) Package-Manager: Portage-2.3.28, Repoman-2.3.9 app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index fb1c4d4a5fe..bc87d2fecc0 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 84c484871d9b2b9fb704de0202a1cd369a5e3e8a Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Apr 11 22:04:27 2018 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Apr 11 22:04:27 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84c48487 app-shells/dash: stable 0.5.9.1-r3 for hppa, bug #631572 Package-Manager: Portage-2.3.28, Repoman-2.3.9 RepoMan-Options: --include-arches="hppa" app-shells/dash/dash-0.5.9.1-r3.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index fb0b070b5f1..fb1c4d4a5fe 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/
commit: 488872bd2a698af501f88470badb5a67bdb3b4b6 Author: Michael Mair-Keimberger gmail com> AuthorDate: Tue Oct 10 11:35:55 2017 + Commit: Patrice Clement gentoo org> CommitDate: Fri Oct 20 07:44:59 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=488872bd app-shells/dash: remove unused patch. Closes: https://github.com/gentoo/gentoo/pull/5905 app-shells/dash/files/dash-0.5.9-dumb-echo.patch | 93 1 file changed, 93 deletions(-) diff --git a/app-shells/dash/files/dash-0.5.9-dumb-echo.patch b/app-shells/dash/files/dash-0.5.9-dumb-echo.patch deleted file mode 100644 index 9bcf6e65a8a..000 --- a/app-shells/dash/files/dash-0.5.9-dumb-echo.patch +++ /dev/null @@ -1,93 +0,0 @@ -http://bugs.gentoo.org/337329 -http://bugs.gentoo.org/527848 - -there's no requirement for `echo` to support escape sequences. bash, by default, -does not, while dash always does. POSIX permits either behavior: -http://pubs.opengroup.org/onlinepubs/9699919799/utilities/echo.html - -however, since the behavior is not portable, no one should be relying on echo -having any specific behavior. they should use `printf` when they want an escape -sequence. it also makes dash smaller & faster to disable this logic entirely. - a/src/bltin/printf.c -+++ b/src/bltin/printf.c -@@ -442,21 +442,12 @@ - int - echocmd(int argc, char **argv) - { -- int nonl; -- -- nonl = *++argv ? equal(*argv, "-n") : 0; -- argv += nonl; -- -- do { -- int c; -- -- if (likely(*argv)) -- nonl += print_escape_str("%s", NULL, NULL, *argv++); -- if (nonl > 0) -- break; -- -- c = *argv ? ' ' : '\n'; -- out1c(c); -- } while (*argv); -+ int i; -+ for (i = 1; i < argc; ++i) { -+ outstr(argv[i], out1); -+ if (i < argc - 1) -+ outc(' ', out1); -+ } -+ outc('\n', out1); - return 0; - } a/src/dash.1 -+++ b/src/dash.1 -@@ -1182,43 +1182,15 @@ - option turns off the effect of any preceding - .Fl P - options. --.It Xo echo Op Fl n -+.It Xo echo - .Ar args... - .Xc - Print the arguments on the standard output, separated by spaces. --Unless the --.Fl n --option is present, a newline is output following the arguments. --.Pp --If any of the following sequences of characters is encountered during --output, the sequence is not output. Instead, the specified action is --performed: --.Bl -tag -width indent --.It Li \eb --A backspace character is output. --.It Li \ec --Subsequent output is suppressed. This is normally used at the end of the --last argument to suppress the trailing newline that --.Ic echo --would otherwise output. --.It Li \ef --Output a form feed. --.It Li \en --Output a newline character. --.It Li \er --Output a carriage return. --.It Li \et --Output a (horizontal) tab character. --.It Li \ev --Output a vertical tab. --.It Li \e0 Ns Ar digits --Output the character whose value is given by zero to three octal digits. --If there are zero digits, a nul character is output. --.It Li \e\e --Output a backslash. --.El - .Pp --All other backslash sequences elicit undefined behaviour. -+No arguments or backslash sequences are supported as they are not portable. -+They will be printed out exactly as passed in. -+.Pp -+You can replace `echo -n ...` with the portable `printf %s ...` construct. - .It eval Ar string ... - Concatenate all the arguments with spaces. - Then re-parse and execute the command.
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 9be5e8344795861e044164280dbd12c9c40dd7ce Author: Markus Meier gentoo org> AuthorDate: Thu Oct 19 04:58:45 2017 + Commit: Markus Meier gentoo org> CommitDate: Thu Oct 19 04:58:45 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9be5e834 app-shells/dash: arm stable, bug #631572 Package-Manager: Portage-2.3.8, Repoman-2.3.3 RepoMan-Options: --include-arches="arm" app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index 445e4265793..d0c39a8bc4a 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: ae9649f7f4162b3670fae4c31d752646a8de21b5 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Oct 4 08:08:49 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Oct 4 08:13:28 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae9649f7 app-shells/dash: stable 0.5.9.1-r3 for ppc64, bug #631572 Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --include-arches="ppc64" app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index 1928dd762ef..445e4265793 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: e58cc5b9b0aa2cb7793ae93be6b5e94381172061 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Oct 3 08:16:26 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Oct 3 08:16:26 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58cc5b9 app-shells/dash: stable 0.5.9.1-r3 for ppc, bug #631572 Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --include-arches="ppc" app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index 0bd2caa8f98..1928dd762ef 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: c0ebf0551e178f0ecefaa5fba4951a1233df42f4 Author: Manuel Rüger gentoo org> AuthorDate: Mon Oct 2 16:09:37 2017 + Commit: Manuel Rüger gentoo org> CommitDate: Mon Oct 2 16:09:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ebf055 app-shells/dash: Stable on amd64 Package-Manager: Portage-2.3.10, Repoman-2.3.3 app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index 5698bf503cb..0bd2caa8f98 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: ed931a5e16f7c6d91b245e628b177d21f613d5b8 Author: Sergei Trofimovich gentoo org> AuthorDate: Mon Oct 2 12:40:52 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Oct 2 13:24:46 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed931a5e app-shells/dash: stable 0.5.9.1-r3 for ia64, bug #631572 Package-Manager: Portage-2.3.10, Repoman-2.3.3 RepoMan-Options: --include-arches="ia64" app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index 7940e4779f5..5698bf503cb 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 15a3b068ef69b0044d6327a9eaa19df15d203848 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Sep 30 16:03:02 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sat Sep 30 16:05:54 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a3b068 app-shells/dash: x86 stable (bug #631572) Package-Manager: Portage-2.3.10, Repoman-2.3.3 app-shells/dash/dash-0.5.9.1-r3.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r3.ebuild b/app-shells/dash/dash-0.5.9.1-r3.ebuild index 2074bf271f9..7940e4779f5 100644 --- a/app-shells/dash/dash-0.5.9.1-r3.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r3.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )"
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
commit: 900e6203d4015711887137bcd03c913361dbf41f Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Sep 13 00:20:46 2017 + Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Sep 13 00:20:46 2017 + 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 000..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 000..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)");
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: f9d67c55b8d7adb4f7771328d0dee6f0c578f542 Author: Fabian Groffen gentoo org> AuthorDate: Tue Aug 22 12:50:47 2017 + Commit: Fabian Groffen gentoo org> CommitDate: Tue Aug 22 12:50:47 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d67c55 app-shells/dash: fix compilation on Solaris Package-Manager: Portage-2.3.6, Repoman-2.3.1 app-shells/dash/dash-0.5.9.1-r2.ebuild | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app-shells/dash/dash-0.5.9.1-r2.ebuild b/app-shells/dash/dash-0.5.9.1-r2.ebuild index d67690a06d6..d775db54f94 100644 --- a/app-shells/dash/dash-0.5.9.1-r2.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r2.ebuild @@ -19,7 +19,7 @@ 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" +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 ) )" @@ -47,6 +47,10 @@ src_prepare() { } 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.
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 341e343110b9987c3cd510aae73a77782ec246f3 Author: Lars Wendler gentoo org> AuthorDate: Tue Aug 22 12:23:11 2017 + Commit: Lars Wendler gentoo org> CommitDate: Tue Aug 22 12:23:29 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=341e3431 app-shells/dash: Removed old. Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-shells/dash/Manifest | 1 - app-shells/dash/dash-0.5.9.ebuild | 71 --- 2 files changed, 72 deletions(-) diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index b3907bf10b1..3ee7cc89d42 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,4 +1,3 @@ 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.ebuild b/app-shells/dash/dash-0.5.9.ebuild deleted file mode 100644 index 27bbc831ba9..000 --- a/app-shells/dash/dash-0.5.9.ebuild +++ /dev/null @@ -1,71 +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/${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 -}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: b469f19ca5eddefc9330b0913751b4d100dcdf8c Author: Lars Wendler gentoo org> AuthorDate: Tue Aug 22 12:22:44 2017 + Commit: Lars Wendler gentoo org> CommitDate: Tue Aug 22 12:23:27 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b469f19c app-shells/dash: Revbump to drop warnx patch (bug #628588). Package-Manager: Portage-2.3.8, Repoman-2.3.3 app-shells/dash/dash-0.5.9.1-r2.ebuild | 69 ++ 1 file changed, 69 insertions(+) diff --git a/app-shells/dash/dash-0.5.9.1-r2.ebuild b/app-shells/dash/dash-0.5.9.1-r2.ebuild new file mode 100644 index 000..d67690a06d6 --- /dev/null +++ b/app-shells/dash/dash-0.5.9.1-r2.ebuild @@ -0,0 +1,69 @@ +# 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" +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() { + 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 +}
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 1a2e3cf9241bb6fef01d8d5e065e790fc713aa86 Author: Mike Frysinger gentoo org> AuthorDate: Wed Dec 7 17:26:29 2016 + Commit: Mike Frysinger gentoo org> CommitDate: Wed Dec 7 17:26:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a2e3cf9 app-shells/dash: change USE=dumb-echo to USE=vanilla #590696 app-shells/dash/dash-0.5.9.1-r1.ebuild | 4 ++-- app-shells/dash/metadata.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app-shells/dash/dash-0.5.9.1-r1.ebuild b/app-shells/dash/dash-0.5.9.1-r1.ebuild index a4f7798..16467b4 100644 --- a/app-shells/dash/dash-0.5.9.1-r1.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r1.ebuild @@ -21,7 +21,7 @@ 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="dumb-echo libedit static" +IUSE="libedit static vanilla" RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" DEPEND="${RDEPEND} @@ -42,7 +42,7 @@ src_prepare() { epatch "${PATCHES[@]}" #337329 #527848 - use dumb-echo && epatch "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch + 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 diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml index 7e1b714..0d01a34 100644 --- a/app-shells/dash/metadata.xml +++ b/app-shells/dash/metadata.xml @@ -9,7 +9,7 @@ cpe:/a:dash:dash - Disable echo -n for added fun + Support echo -n, and enable echo -e all the time (unsupported) DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell)
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 53bcf576563b432b3dd35b0b46c9a30c3287e30c Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 31 14:41:56 2016 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Oct 31 14:41:56 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53bcf576 app-shells/dash: shorten DESCRIPTION Package-Manager: portage-2.3.2_p1 app-shells/dash/dash-0.5.8.2.ebuild| 4 ++-- app-shells/dash/dash-0.5.9.1-r1.ebuild | 2 +- app-shells/dash/dash-0.5.9.ebuild | 2 +- app-shells/dash/metadata.xml | 4 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app-shells/dash/dash-0.5.8.2.ebuild b/app-shells/dash/dash-0.5.8.2.ebuild index 8032179..a169d68 100644 --- a/app-shells/dash/dash-0.5.8.2.ebuild +++ b/app-shells/dash/dash-0.5.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ 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" +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" diff --git a/app-shells/dash/dash-0.5.9.1-r1.ebuild b/app-shells/dash/dash-0.5.9.1-r1.ebuild index 4942b9d..a4f7798 100644 --- a/app-shells/dash/dash-0.5.9.1-r1.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r1.ebuild @@ -10,7 +10,7 @@ inherit eutils flag-o-matic toolchain-funcs versionator 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" +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 diff --git a/app-shells/dash/dash-0.5.9.ebuild b/app-shells/dash/dash-0.5.9.ebuild index c602b3b..7006ea3 100644 --- a/app-shells/dash/dash-0.5.9.ebuild +++ b/app-shells/dash/dash-0.5.9.ebuild @@ -10,7 +10,7 @@ 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" +DESCRIPTION="Debian Almquist Shell" 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 diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml index 0a565e1..7e1b714 100644 --- a/app-shells/dash/metadata.xml +++ b/app-shells/dash/metadata.xml @@ -11,4 +11,8 @@ Disable echo -n for added fun + + DASH is a direct descendant of the NetBSD version of ash (the Almquist SHell) + and is POSIX compliant. +
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/
commit: 68b674d3521a1e08d57b51270de888bfff0beeac Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 31 14:36:48 2016 + Commit: Mike Gilbert gentoo org> CommitDate: Mon Oct 31 14:41:13 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b674d3 app-shells/dash: make dumb-echo patch optional ACKed by Lars (polynomial-c). Bug: https://bugs.gentoo.org/590696 Package-Manager: portage-2.3.2_p1 app-shells/dash/{dash-0.5.9.1.ebuild => dash-0.5.9.1-r1.ebuild} | 6 -- app-shells/dash/metadata.xml| 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app-shells/dash/dash-0.5.9.1.ebuild b/app-shells/dash/dash-0.5.9.1-r1.ebuild similarity index 94% rename from app-shells/dash/dash-0.5.9.1.ebuild rename to app-shells/dash/dash-0.5.9.1-r1.ebuild index 39d1f83..4942b9d 100644 --- a/app-shells/dash/dash-0.5.9.1.ebuild +++ b/app-shells/dash/dash-0.5.9.1-r1.ebuild @@ -21,7 +21,7 @@ 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" +IUSE="dumb-echo libedit static" RDEPEND="!static? ( libedit? ( dev-libs/libedit ) )" DEPEND="${RDEPEND} @@ -31,7 +31,6 @@ DEPEND="${RDEPEND} #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 ) @@ -42,6 +41,9 @@ src_prepare() { fi epatch "${PATCHES[@]}" + #337329 #527848 + use dumb-echo && 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 diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml index ce044cc..0a565e1 100644 --- a/app-shells/dash/metadata.xml +++ b/app-shells/dash/metadata.xml @@ -8,4 +8,7 @@ cpe:/a:dash:dash + + Disable echo -n for added fun +
[gentoo-commits] repo/gentoo:master commit in: app-shells/dash/files/, app-shells/dash/
commit: 5f0b322850dba9944fdb0f15b9e3e1587d38f929 Author: Lars Wendler gentoo org> AuthorDate: Wed Sep 28 08:07:17 2016 + Commit: Lars Wendler gentoo org> CommitDate: Wed Sep 28 08:40:08 2016 + 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 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 ..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.