From d302a5d7fc9caafba5c8a404f2891bb6ccdec311 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 May 2018 13:19:56 +0100 Subject: gentoo resync : 15.05.2018 --- app-shells/Manifest.gz | Bin 7292 -> 7296 bytes app-shells/dash/Manifest | 10 +-- app-shells/dash/dash-0.5.10-r1.ebuild | 79 ------------------- app-shells/dash/dash-0.5.10-r2.ebuild | 79 ------------------- app-shells/dash/dash-0.5.10.1-r2.ebuild | 79 +++++++++++++++++++ app-shells/dash/files/dash-0.5.10-dumb-echo.patch | 2 +- app-shells/dash/files/dash-0.5.10-jobs.patch | 88 ---------------------- app-shells/dash/files/dash-0.5.10-subshells.patch | 16 ---- app-shells/dash/files/dash-0.5.10.1-parser.patch | 43 +++++++++++ app-shells/hstr/Manifest | 2 + app-shells/hstr/hstr-1.25.ebuild | 32 ++++++++ 11 files changed, 161 insertions(+), 269 deletions(-) delete mode 100644 app-shells/dash/dash-0.5.10-r1.ebuild delete mode 100644 app-shells/dash/dash-0.5.10-r2.ebuild create mode 100644 app-shells/dash/dash-0.5.10.1-r2.ebuild delete mode 100644 app-shells/dash/files/dash-0.5.10-jobs.patch delete mode 100644 app-shells/dash/files/dash-0.5.10-subshells.patch create mode 100644 app-shells/dash/files/dash-0.5.10.1-parser.patch create mode 100644 app-shells/hstr/hstr-1.25.ebuild (limited to 'app-shells') diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz index ebed13d8c127..e6ad767b5e59 100644 Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index bfcffe16e241..fd6d4fe0bed2 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,11 +1,9 @@ -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.10-dumb-echo.patch 2612 BLAKE2B dd5fef2307ebc988b01f558373a5fb2be6bfa4e4d3abd72b179ce3d06a326769c5843416324971d00f363db92bcc691e6a555f7bac05544f2d9d21ac64026f4a SHA512 7f583e17f5b8df244575c0d08e7be8f213933d647168b85e19cc56378f1bb02f7fb83b8c87337c556b1436aaaca7d7367cb8566edaa43e3e7a4aaa7d87401323 +AUX dash-0.5.10.1-parser.patch 1028 BLAKE2B 69ef8f066752925c6f4fcbe6b7dde09a0547c11b60a3adab6f7e0f7ad27230a9101c79d9334e7a567b18d7b63d37fc882ff8ac53013e1d94a8ac748426ed0f5f SHA512 cddbe04b76acc413bddcb3fbb53538eca243d27ab8dc02b2cdd58a89c0dbebcba6c777482f755b8e97cbb54c352c9e8ea980646c1cd0196a6747d8fbc24d61f8 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.10.1.tar.gz 225253 BLAKE2B 55dbdca7f01d19656e002d6e210bcae920619e2e88d4d174a3e08cbbc40bf867ece3f24ce9690ec64f95b1f0995ab35cabc08381ac031a33b55282cec0b09e73 SHA512 7ca3bbcf8bac84d359cde710a9ab393f05cf8522e969a2c110d2e71620e53f349387128045e68738dc621afe0b48f43ae3d32851187f2ae02d49b3e2575ffa6b 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.10.1-r2.ebuild 2144 BLAKE2B 993dd53a287bab6a660331ab88dc369688f1d70db9fb39749ade1b4d943916e484627e8ef746841e4aa5bb16795924ecf3286903be28423fbc3b24ed6bf91b59 SHA512 1193f962824e9255bc178bfacbee52fa8631b52903d667e8f3c904b26ced1c596a522450a6dd5dc9f1025e16ca4f6f952f81e96cbf81613ab30589e06b5192f6 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-r1.ebuild b/app-shells/dash/dash-0.5.10-r1.ebuild deleted file mode 100644 index 97e4202bc4d1..000000000000 --- 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/dash-0.5.10-r2.ebuild b/app-shells/dash/dash-0.5.10-r2.ebuild deleted file mode 100644 index b268b07aea01..000000000000 --- a/app-shells/dash/dash-0.5.10-r2.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}-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/dash-0.5.10.1-r2.ebuild b/app-shells/dash/dash-0.5.10.1-r2.ebuild new file mode 100644 index 000000000000..09d6f32c73f1 --- /dev/null +++ b/app-shells/dash/dash-0.5.10.1-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}-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/files/dash-0.5.10-dumb-echo.patch b/app-shells/dash/files/dash-0.5.10-dumb-echo.patch index 6b19b5b59f70..35d324609302 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); } - 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 a4c83d88dcb8..000000000000 --- 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) -- 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/dash/files/dash-0.5.10-subshells.patch b/app-shells/dash/files/dash-0.5.10-subshells.patch deleted file mode 100644 index 5943db11e697..000000000000 --- a/app-shells/dash/files/dash-0.5.10-subshells.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/655320 -https://patchwork.kernel.org/patch/10382199/ - ---- dash-0.5.10/src/jobs.c -+++ dash-0.5.10/src/jobs.c -@@ -975,8 +975,8 @@ - int st; - - TRACE(("waitforjob(%%%d) called\n", jp ? jobno(jp) : 0)); -- while ((jp && jp->state == JOBRUNNING) || gotsigchld) -- dowait(DOWAIT_BLOCK, jp); -+ while (jp ? jp->state == JOBRUNNING : gotsigchld) -+ dowait(jp ? DOWAIT_BLOCK : DOWAIT_NORMAL, jp); - if (!jp) - return exitstatus; - st = getstatus(jp); 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 000000000000..485fc7e6772a --- /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: diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest index 388ae8737fed..da978d567381 100644 --- a/app-shells/hstr/Manifest +++ b/app-shells/hstr/Manifest @@ -1,6 +1,8 @@ AUX hstr-1.23-tinfo.patch 481 BLAKE2B 3279671caf216d810c3fef490c5ae219906e59430dc15a850118bbafe49140f46fb1645be1c0a8a8977c795af018164027f928d4fcb0a664186c97f2b968edfb SHA512 64c1e0a5b2ee28354f85563472dd301a9e45eb568fe74c0d601765ee25095650320b8f853c95280f294f323eec6b7f9a155c2a09a5fde2e52568d2c9809c1e91 DIST hstr-1.23.tar.gz 47239 BLAKE2B dec630f1e8161edc40544561dd85ea1c128a6704eeeaeb39eb6987bdc096a070c9e242b938bed01b80e208aadf08606518a007919d353f76ff1c36e7906aeabb SHA512 234c72587d0492d788b1c001b5e53f74820790a9ebe670e8abd28cd82fc7db65996d54160e675055be54cab110686838fe6e36dbefe0fbef9175613633bc5910 DIST hstr-1.24.tar.gz 47523 BLAKE2B 6e84ea6bd26cb0745f48e5f8701d4d956ae4b83ed825398fdc401fd0b7f13eb9874de62d438e71a57fa048a535a538504e7fabd7b4a698665a10a901e0a570e6 SHA512 fe522374e33150007c0bbe5d11d38e63c355519350f5777c8787aae62826553b61a358185994d196d015590649fb3accf75948e340233459409d594e51874658 +DIST hstr-1.25.tar.gz 48926 BLAKE2B ee27adaabcf8c28d10c2188d9570e92609192712e54e73a7904dc32e02805e564d4abcad60d506a961c0d9266c62a4fe1b4ef42171efd8f60d1234bbc9f4921d SHA512 83c6250b1627bf185a572a7278a23f1e779d8f926f62fe341644f0d26b4f9daac8d904a5fe5af63e963a2ec15b7d98ee229bd5f812ee0d167bd2a12ee2e57467 EBUILD hstr-1.23.ebuild 637 BLAKE2B f1af596ccaa3c5460acc5b8f49e5b38f529e7a86393ed5929ee67efaf67aed9ce2bc0242ef2696d58c88360a31ae56a046289e0978b2b61f1498d88947f2d917 SHA512 890b59a4e75d3bb1d11a586c9b8e840bc4303ea14520d4a9f7b877c7eb39661ff86bd38a81b2900f12ee05439ea0535595983021cfe4f12a5d38ec84b54a98c3 EBUILD hstr-1.24.ebuild 639 BLAKE2B d8dd06c98a24245775915829f378a8561f97dfb11c076bf74cdae5d765ad7f66cc9119ba8ce7472102ee269b4d919c6320137a9df11ea2308ef5602fd43ef13c SHA512 a5ef7818c2e7f77e34d8f3c8612d626609cea02bf9f8d30da00a2a2dfa390cd782ef89feb0517ab7a08360782351436502510a45131baf39df5171521b418bff +EBUILD hstr-1.25.ebuild 641 BLAKE2B 2256e2b6b9ace003039db68afde3e1e049dc6835e52318ca61bcd016caa5ad6e4b7e164f31e18948cc743d8e314b7d02cdea528c617fcb44a03c6ee7abe6b88f SHA512 122c90303b6ae74bec9d10af6f0e6b9c5dd9d1ddedb4791a934a8ba45eb853419a03f095c7ed6870d9869d13555f6aff4b14339a3af09a6a306e783f111cd97d MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e diff --git a/app-shells/hstr/hstr-1.25.ebuild b/app-shells/hstr/hstr-1.25.ebuild new file mode 100644 index 000000000000..dbe778861aab --- /dev/null +++ b/app-shells/hstr/hstr-1.25.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Shell history suggest box" +HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com" +SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz" + +SLOT="0" +LICENSE="Apache-2.0" +KEYWORDS="~amd64 ~x86 ~amd64-fbsd" + +RDEPEND=" + sys-libs/ncurses:0=" + +DEPEND=" + ${RDEPEND} + virtual/pkgconfig" + +DOCS=( CONFIGURATION.md README.md ) +PATCHES=( "${FILESDIR}/${PN}-1.23-tinfo.patch" ) + +src_prepare() { + default + sed \ + -e 's:-O2::g' \ + -i src/Makefile.am || die + eautoreconf +} -- cgit v1.2.3