From 88ebe56470c37b02a044e1091cad6b2df0f3be8f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 May 2018 16:02:49 +0100 Subject: gentoo resync : 11.05.2018 --- app-shells/dash/Manifest | 3 +- app-shells/dash/dash-0.5.10-r1.ebuild | 79 +++++++++++++++++++++++ app-shells/dash/dash-0.5.10.ebuild | 76 ---------------------- app-shells/dash/files/dash-0.5.10-subshells.patch | 16 +++++ 4 files changed, 97 insertions(+), 77 deletions(-) create mode 100644 app-shells/dash/dash-0.5.10-r1.ebuild delete mode 100644 app-shells/dash/dash-0.5.10.ebuild create mode 100644 app-shells/dash/files/dash-0.5.10-subshells.patch (limited to 'app-shells/dash') diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest index 8e8e5b842827..723ca8982eed 100644 --- a/app-shells/dash/Manifest +++ b/app-shells/dash/Manifest @@ -1,8 +1,9 @@ AUX dash-0.5.10-dumb-echo.patch 2612 BLAKE2B 8a303b8515b41786fdeaf0fe5ee28e2f04f377fedf8761bb76dd6c9219040b7cb44509587cddcf8282e77237f1089abee5483868ea8410a1000bc4baac76347c SHA512 2ac6d6a22a7adbb8248c73665c198146606293dbdc35e680a2376d721f34132a87d3b57848348af1e048ba6db478df8e5324728eb844ac9d63be0be7b0465170 +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.ebuild 2110 BLAKE2B 7d7f133841bf2628eae1c7c86326ba3cc380c44587915eec6b3234a4e1ca78ecaf32a325643b00f38d1fb71b6048340e7d8466e4b5df88d81b76c6ae49c539b0 SHA512 078ca37ab0b5f8da550f176bfb234d84bf187a95bb3bc541ca36e2c0a27616373b609fefe3b7899f5899e1a9cc073719db95ba2bb52f2ac31c7c42b0acd02477 +EBUILD dash-0.5.10-r1.ebuild 2147 BLAKE2B 382c8bfd6eca89b738b477178f5f853b2078671b5801224063c1712ab1fbbc59fb04a1a0c6a50959db34e00fa0d26afc7c6a38fd5ed9c368c0468fdd4a81fb18 SHA512 b32a4e91fa56f07eccc251cbe64c70c202aff5a96a95effd86b1deb3875a973ebaf9d285194eac4e49cbcfaf88a17fc67df4131002615c426fbdfd21fcae1672 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 new file mode 100644 index 000000000000..97e4202bc4d1 --- /dev/null +++ b/app-shells/dash/dash-0.5.10-r1.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}-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.ebuild b/app-shells/dash/dash-0.5.10.ebuild deleted file mode 100644 index 72821681d9b7..000000000000 --- a/app-shells/dash/dash-0.5.10.ebuild +++ /dev/null @@ -1,76 +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 ) - -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 new file mode 100644 index 000000000000..5943db11e697 --- /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); -- cgit v1.2.3