diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /app-shells/dash | |
parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) |
gentoo resync : 22.01.2021
Diffstat (limited to 'app-shells/dash')
-rw-r--r-- | app-shells/dash/Manifest | 5 | ||||
-rw-r--r-- | app-shells/dash/dash-0.5.11.3-r1.ebuild (renamed from app-shells/dash/dash-0.5.11.2.ebuild) | 4 | ||||
-rw-r--r-- | app-shells/dash/dash-0.5.11.3.ebuild | 57 | ||||
-rw-r--r-- | app-shells/dash/files/dash-0.5.11.3-check_nflag_in_evaltree.patch | 46 |
4 files changed, 52 insertions, 60 deletions
diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 865161ad5e7e..42f303068015 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,5 +1,4 @@ -DIST dash-0.5.11.2.tar.gz 244475 BLAKE2B 4edc85a70af62684b29fec7fd9c599aaade38ffcfb62b873dd149c4ada9e750f24cddf9a390c512313bc7dde67cab3d7b57776c92fe5f8e08bf8bdc164a4e5ec SHA512 2f846c26f3722ea3315aae73461f9c21a0a8a9ac712e1caf8dd9993e34729227c7648bf6f72fad8488247986e560298f95aa2411bd4e395410565c0b527b9db4 +AUX dash-0.5.11.3-check_nflag_in_evaltree.patch 1195 BLAKE2B 9624038cf627e68f65126cbac7499c34928827057656f35ac53132b697e886f4995b55361bad82fa76c9364a376f1c0056075da2eac8f82d2c77d544e5d103c2 SHA512 1b826edc306c109b3595ec38b07657df81bf6dc380e2390c482d668f97acbaeef670d22cbf04b88e005b49ebf1969169afbc6c1a51ae7d148ad2abc118158bc4 DIST dash-0.5.11.3.tar.gz 244507 BLAKE2B 06d4bd9f4c93e76ddf895f5a0ebca0c18d9554f5d4fd30a948eafc862db0f4cd523f623dad75969ddb5f510ac85d174f3b3aac3726f9d3ca8fbdb4377715b244 SHA512 ffe69b8de3586aba298d936168c329524e385252e12979aa1db28761e882048eb5a80673e93a2a2227f61b52fd8b56546b78c5db9c21a022072f536267f8bc20 -EBUILD dash-0.5.11.2.ebuild 1721 BLAKE2B 03b88984516aa5b8e2df9923903c6d76d73845ef950d0b3bb4ae2e84ac0effd516293deef1e84ad9cd12de615675dc61ea94bab32e7203daaa9a6bb4b710b70c SHA512 9c91c6955bb6a6e0710f036fbdebfbd8d09dbbdc2d688efe5db6c19cca9410beb493b701c7201670ff89f96c4fdf4d87d1360ecfa8037ebba16cc59e13f4c5ef -EBUILD dash-0.5.11.3.ebuild 1728 BLAKE2B fb40e4a3dfe315f5179c698c177a14240b0814f961d04d3be77d2bc1717567e14e1141c03da60ee5a90b86bc88949801610ff7d98411ae1bb69b3f55ca1b67c3 SHA512 fc00abcec3712ba989b1923cdbc52d116a7438b9c807d500b5dae4ae616c5700d54a8e6dc5a3d3751981a5c24c5e518db1b8cc4c078ff6de526c0b3fbabe6de7 +EBUILD dash-0.5.11.3-r1.ebuild 1802 BLAKE2B b4ed4b396ad07bc350e2eb78db47167051ac38a305b8c80fdfa3ba12677498c83840dd7d5b453e5c14a59f9666e463f3a2a89c716704ca684b3371e3fc09cbc1 SHA512 6062ceecdef0bd6b9042d36b2e77958477a499bf563eeb5e0cfdfc1dc0944d9f5e946bb2ff6d54c1a0d63a3f3081cdcfd4958dcbd8d129b858478d19af5f2847 MISC metadata.xml 490 BLAKE2B f6f682adcb15a93d01eb38876463816daf7fe89133a20995343a9692511b7cfc60c3deb9efa0603ca3abe667ba56407e3c501a6698e7946ae48ddea6a5bc12db SHA512 95ba5f3a7a4f45b722b082ab015d7cc922a0b7d8e3c641a3f83c42527720cedf9647e5fc143ce530b686e830321bbaecd7e7a240b8096d636e61ccd40f3063dd diff --git a/app-shells/dash/dash-0.5.11.2.ebuild b/app-shells/dash/dash-0.5.11.3-r1.ebuild index 0b87dea2b6c6..d0227a4ecae0 100644 --- a/app-shells/dash/dash-0.5.11.2.ebuild +++ b/app-shells/dash/dash-0.5.11.3-r1.ebuild @@ -19,6 +19,10 @@ 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 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 7f5b894786bc..000000000000 --- 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 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 000000000000..94740223fc8e --- /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 <herbert@gondor.apana.org.au> +Date: Thu, 4 Jun 2020 21:53:55 +1000 +Subject: eval: Check nflag in evaltree instead of cmdloop + +This patch moves the nflag check from cmdloop into evaltree. This +is so that nflag will be in force even if we enter the shell via a +path other than cmdloop, e.g., through sh -c. + +Reported-by: Joey Hess <id@joeyh.name> +Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +--- + src/eval.c | 3 +++ + src/main.c | 2 +- + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/eval.c b/src/eval.c +index d10be38..9476fbb 100644 +--- a/src/eval.c ++++ b/src/eval.c +@@ -213,6 +213,9 @@ evaltree(union node *n, int flags) + + setstackmark(&smark); + ++ if (nflag) ++ goto out; ++ + if (n == NULL) { + TRACE(("evaltree(NULL) called\n")); + goto out; +diff --git a/src/main.c b/src/main.c +index 7a28534..5c49fdc 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -233,7 +233,7 @@ cmdloop(int top) + out2str("\nUse \"exit\" to leave shell.\n"); + } + numeof++; +- } else if (nflag == 0) { ++ } else { + int i; + + job_warning = (job_warning == 2) ? 1 : 0; +-- +cgit 1.2.3-1.el7 + |