diff options
Diffstat (limited to 'app-shells')
| -rw-r--r-- | app-shells/Manifest.gz | bin | 7288 -> 7292 bytes | |||
| -rw-r--r-- | app-shells/bash/Manifest | 2 | ||||
| -rw-r--r-- | app-shells/bash/bash-4.4_p12.ebuild | 2 | ||||
| -rw-r--r-- | app-shells/dash/Manifest | 2 | ||||
| -rw-r--r-- | app-shells/dash/dash-0.5.10-r2.ebuild | 79 | ||||
| -rw-r--r-- | app-shells/dash/files/dash-0.5.10-jobs.patch | 88 | ||||
| -rw-r--r-- | app-shells/pdsh/Manifest | 1 | ||||
| -rw-r--r-- | app-shells/pdsh/pdsh-2.26-r1.ebuild | 55 |
8 files changed, 227 insertions, 2 deletions
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz Binary files differindex 556fd17565ae..ebed13d8c127 100644 --- a/app-shells/Manifest.gz +++ b/app-shells/Manifest.gz diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest index 2cc8b68598af..60a9b466d949 100644 --- a/app-shells/bash/Manifest +++ b/app-shells/bash/Manifest @@ -367,7 +367,7 @@ EBUILD bash-4.2_p53.ebuild 4344 BLAKE2B 5565a97a0aa9465fd8eef2de0b78434c04096d84 EBUILD bash-4.3_p39_pre0.ebuild 3581 BLAKE2B 51c88610e9a35420efa938d7bcedc09005a7c86cf5fe45a671607a89e517442f8316667f7883ef87bc5671ed1898097bbc4fd3d5e2d4baa515601cddf8abc8b3 SHA512 f41cf7c82dc1316f61e132a2b29a2e4ac5b7a20f3856b69d51d39a18723c7e4713fec3654331d8bf4425f84d8d43408834d4e63934f7369232d87ce12156d2a2 EBUILD bash-4.3_p48-r1.ebuild 7248 BLAKE2B 3a8e835dd559ddb5495ce716ee869e279276502f8f0128732e59ab14e89f3860cf65dd68e5d1125ecdbbcaf3fc6d128f24a78a0fcf7e98b1bdfbd73757c420f6 SHA512 b60301a8e2d14f4f7ecc85d12e17d62f0b5ee8b1b8753a4dd17dc2b818eb424521f34cd48bd5335b6108392ac56aa62cd12e8d65070ae8bb5ca6b090000ad13a EBUILD bash-4.4_p12-r1.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c -EBUILD bash-4.4_p12.ebuild 7163 BLAKE2B 97760ff134ad2368c51f66c1c91ed598c8cb34e0e5157ca97071bf17d8713995f500a825f9e1fd1b3469a4d7df7e8cecde2e97b0a36869419e2d7748177ce458 SHA512 bd0b9ea8b698b738f4f961b9383bf33e06d27c2b1af06ca10ef9665b6cde2bf785bffe1b3e168c17b8305908cb7205ca8c621f69da3beee1d792dc7e9471bd34 +EBUILD bash-4.4_p12.ebuild 7161 BLAKE2B a91c473aed8cc403559edb09eecb315ea1cc72d408411190c64f9ccf76b6c841ab4a41d317534bc9cecd13f85a881afe9880b1e83e1ccb28ea82c2e63faa160a SHA512 fbbe64caa19d373008b9bbced1d2b3578e4d3515f5e4e8b05e43ffa167470544af3dd11076876a7dbee299e9948c8a956565cd0e6f38dcdf42bbd5b56fbd1c13 EBUILD bash-4.4_p18.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c EBUILD bash-4.4_p19.ebuild 7222 BLAKE2B dbea2f6145b913878f4ddbb549e1735f71f59f58bec7378164029c767243b695e85486782c24f752473754115d2be77a8416496b5c3552cff97e218b3acaff4b SHA512 7399a4bb123edce35bd9e8614cf0ac738906c47d7679d50e01d1712c1b8324d7cc2c680a7ff57ea1dcbe6d2e988aa01f318d9d8a8fb5f0f50428bc4ac9d2dc7c MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1 diff --git a/app-shells/bash/bash-4.4_p12.ebuild b/app-shells/bash/bash-4.4_p12.ebuild index d7f00ca7cc75..603ce2f2b443 100644 --- a/app-shells/bash/bash-4.4_p12.ebuild +++ b/app-shells/bash/bash-4.4_p12.ebuild @@ -46,7 +46,7 @@ fi LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline" DEPEND=">=sys-libs/ncurses-5.2-r2:0= diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 723ca8982eed..bfcffe16e241 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,9 +1,11 @@ AUX dash-0.5.10-dumb-echo.patch 2612 BLAKE2B 8a303b8515b41786fdeaf0fe5ee28e2f04f377fedf8761bb76dd6c9219040b7cb44509587cddcf8282e77237f1089abee5483868ea8410a1000bc4baac76347c SHA512 2ac6d6a22a7adbb8248c73665c198146606293dbdc35e680a2376d721f34132a87d3b57848348af1e048ba6db478df8e5324728eb844ac9d63be0be7b0465170 +AUX dash-0.5.10-jobs.patch 2325 BLAKE2B 7b5754210c29fd3e3c994a88b35b697d714de448e9f44e992228dd411030c00ce32837e791e6853973a62a532902604a7e4577582f94f5778a42d9a932a1e20a SHA512 1151095ea163c14cfda3f796c22393183dbb2fbd9163ffdcfb53f99f32341d6e0733195ff455513d90c9b6ef735e79c124dac0915dca1997b2c2a1ac09012684 AUX dash-0.5.10-subshells.patch 465 BLAKE2B ce3ea3870ad088d61d0df9ca00619b77ab42035c62967c853ef9ad003b69b032a8007dc31ff7d5a11fe01c945afbb098f4963876abfae3ebeaf445a7473b225f SHA512 12f4d4447569feda2ec839ebdc480a85a915c8f0cab068ca289630e369575bc0f5ca59509af928df951d74e7a9a73d8b5a52890f3a53cd4535b9dc9260edef0d AUX dash-0.5.9.1-dumb-echo.patch 2592 BLAKE2B 95e79281e579d0d40e320f0433fa94185f22e971a2e5c6b8a7686e96479a490c2d7820545875de2bdb81f52f7ce0b7ea0811a207c41601d7e2272c0829f07d14 SHA512 8dcbee6a53b46b78986c17860f84f47c94b3137b84cf46cd521ec9e4f0b5b4f5a2afbc9e7faa8130b591b3a0f9d2c9dc7853803c8b092c4ec1b5c5b7411fecbf AUX dash-0.5.9.1-format-security.patch 374 BLAKE2B 63a9128f8a396e9c9808867ffdff90f1a176a99108db02d4ff03395d74c9eb69039604d3921cb26c42aced4411caa27cf20eafced3febbb4b175a7d118b66ca0 SHA512 4726d96ad1a86e47374c129f1cbd13bf5f2b6c77faa4e3e85be65978222cc040175313218fe29da176af2bbc2546c432d84247ea342d261a284b64b42ce138c6 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 EBUILD dash-0.5.10-r1.ebuild 2147 BLAKE2B 382c8bfd6eca89b738b477178f5f853b2078671b5801224063c1712ab1fbbc59fb04a1a0c6a50959db34e00fa0d26afc7c6a38fd5ed9c368c0468fdd4a81fb18 SHA512 b32a4e91fa56f07eccc251cbe64c70c202aff5a96a95effd86b1deb3875a973ebaf9d285194eac4e49cbcfaf88a17fc67df4131002615c426fbdfd21fcae1672 +EBUILD dash-0.5.10-r2.ebuild 2142 BLAKE2B 9c9beed694a6f22b653d330e7c6ddd38680e4b7522e164e1f4433907d46b0e12013595f7e1ac0f8ba48e05351117fc2fb36458d91477ee34c2b38df406f00f1c SHA512 67ae9d1e724feef805fafa55dcca0487b7dc590fe698b53562f358b54a01701c4ed87d3396f9dbeb0bafe3eceb342ad6a614e576467521d235b01c0301ad7100 EBUILD dash-0.5.9.1-r3.ebuild 2102 BLAKE2B 4afafb3ed350dead0d0383877b612b8891d4241f742fbf7bac0f28f7c42bf0e29a59f5f512fbdc9914197cc930241b789e74239a33757f4383527cfe6b563b98 SHA512 9145720f7d1e33a8c6c60f265ba7574bed868893bb8190726afdd9ffb09a18f4c624f761ffe08746f2ec9f68f69611f8751684a04827bd480bb783056a9928ef MISC metadata.xml 598 BLAKE2B 0ec9bc56758f158bfce29ffcbbb84c45abe17cd477014fa428240a9af5a4a9f8740c5a66f4aa4828795135d7464426c65410702e81aea81befec5e11a07ec3fa SHA512 a477ff729919625c910ef9a0b95ea85e683122383c4026c1c51f163d8faca06749ec05eef8b4f01ed9eede68b49e637f24f94202b8a00e67bb01bc21294610e6 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 000000000000..b268b07aea01 --- /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 000000000000..a4c83d88dcb8 --- /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 <herbert@gondor.apana.org.au> +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 <herbert@gondor.apana.org.au> +--- + 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) +- dowait(DOWAIT_BLOCK, jp); +- if (!jp) ++ if (!jp) { ++ int pid = gotsigchld; ++ ++ while (pid > 0) ++ pid = dowait(DOWAIT_NORMAL, NULL); ++ + return exitstatus; ++ } ++ ++ while (jp->state == JOBRUNNING) ++ dowait(DOWAIT_BLOCK, jp); + st = getstatus(jp); + #if JOBS + if (jp->jobctl) { +-- +cgit v1.1 + diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest index f2d07d7f69da..3b6e767d40e8 100644 --- a/app-shells/pdsh/Manifest +++ b/app-shells/pdsh/Manifest @@ -2,5 +2,6 @@ AUX pdsh-2.18-unbundle-libtool.patch 1738 BLAKE2B dff39459032013b770cfab19407475 DIST pdsh-2.18.tar.bz2 453729 BLAKE2B 1907bd8a368d062a356b513ac50696f5f9fbe52253470005f9690d886ae3b93e76cb66f517a40a4c5f1aa01190624da078d132a82a5285b66b3e9bc8f528b5f4 SHA512 20cd9be5fc38add69f61620f528dd952296615ef099d6288be2ce908ab04cc7a9585387d93936462a1fb577aa6495789ae201f838131623d8f4f01bf904f7b5a DIST pdsh-2.26.tar.bz2 490732 BLAKE2B 809a7ee0a1026e0cdaea8bf97c046a3a6e2994199dbbdb2cebe56de0393e8422a07e86f1ff60d6e750bf7279ccb43c03ea3aa4529b6fa6a34e3d77d90f0c3597 SHA512 3f15b3bb4fc2cff27a3b5d68de3e6cb74bb4001288a787763358a0641d0cc77c840b2c6641213ef31bc9d9d69cfe9531b25d7a9375630a5b008b1bcffbe95c0a EBUILD pdsh-2.18-r1.ebuild 1609 BLAKE2B 5c5f0b9c57bae957a771330b3012e8e274ee7039ed8c691cefc197c81cf2318bee27813da5d71e769dc2774259a533fd0ff193689337500762c68be2db431501 SHA512 0c114901331e290ce61c60a7519672d62a572ee804573b702c2869a3972ad57842fbd5ac2ce12113aec1f8555346b21a8ae953f55cc3ae45ef58e9cbad64204c +EBUILD pdsh-2.26-r1.ebuild 1289 BLAKE2B da484e8208f7f5ff2846f796e4594fc5080d46bef9b8acad5a044a173bc9cd0df98cc68a224baa2efdf28260f3631fe6d0d30dd6a931b2c3ba0e22edaa67091d SHA512 8bd15e08c9839a647311db418fbc2cdd47551bac3527fb42e7a63cb1ff8f681c45885c98f5c47341bf10c10bd6778c2e5877e51f1671b7c81e5c4eae7c264bc5 EBUILD pdsh-2.26.ebuild 1333 BLAKE2B 9a1895cd15d2d25f2d210883a5d40a0c70fdcb37f962a1b2d0817b0e123bfef5c4f0758e8a46133c3c1a84c030c14b37acc3daf370bb1fbcb12231411c37fc29 SHA512 3d22d6c74c7e505af153f0c44b92515f7d2f4fa1b21f436ddf97fbae599a61b9cdd3a891277a9a68216595a88de6b6547f616c33b9eac2456a03dd1f6c62b938 MISC metadata.xml 1204 BLAKE2B db664f8622eaf0976ab1899583abab0268758d2edcdf0dd038ef59f54f1cf86c30956aa9cac35fa1a28a6760196050da01cfdbfcb56742aa233075aaa77a4eed SHA512 abaa972d578e11c47d16497fecbf7d72a07915b0b57c7f6458f82b0a36b55575b2d94a43f6f6a71a925a0e4ed56346056f9bc1d939a4190f2c899fcf58c9c752 diff --git a/app-shells/pdsh/pdsh-2.26-r1.ebuild b/app-shells/pdsh/pdsh-2.26-r1.ebuild new file mode 100644 index 000000000000..f9e973342634 --- /dev/null +++ b/app-shells/pdsh/pdsh-2.26-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="A high-performance, parallel remote shell utility" +HOMEPAGE="https://computing.llnl.gov/linux/pdsh.html" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="crypt readline rsh static-libs test" + +RDEPEND=" + crypt? ( net-misc/openssh ) + rsh? ( net-misc/netkit-rsh ) + readline? ( sys-libs/readline:0= )" + +DEPEND=" + ${RDEPEND} + test? ( dev-util/dejagnu )" + +pkg_setup() { + PDSH_MODULE_LIST="${PDSH_MODULE_LIST:-netgroup}" + MODULE_CONFIG="" + + local m + local valid_modules=":xcpu:ssh:exec:qshell:genders:nodeupdown:mrsh:mqshell:dshgroups:netgroup:" + + for m in ${PDSH_MODULE_LIST}; do + if [[ "${valid_modules}" == *:${m}:* ]]; then + MODULE_CONFIG="${MODULE_CONFIG} --with-${m}" + fi + done + + elog "Building ${PF} with the following modules:" + elog " ${PDSH_MODULE_LIST}" + elog "This list can be changed in /etc/portage/make.conf by setting" + elog "PDSH_MODULE_LIST=\"module1 module2...\"" +} + +src_configure() { + econf ${MODULE_CONFIG} \ + --with-machines \ + --enable-shared \ + $(use_with crypt ssh) \ + $(use_with rsh) \ + $(use_with readline) \ + $(use_enable static-libs static) +} + +src_install() { + default +} |