gentoo resync : 08.05.2018

6 files changed, 31 insertions, 191 deletions

diff --git a/app-shells/dash/Manifest b/app-shells/dash/Manifest
index be5e91d74349..8e8e5b842827 100644
--- a/app-shells/dash/Manifest
+++ b/app-shells/dash/Manifest
@@ -1,12 +1,8 @@
-AUX dash-0.5.8.1-dumb-echo.patch 2669 BLAKE2B da31b01145cebb3f3e0d90f976c8f49563c42955a158dadc68c6db92a983adfa3934b9a9c6c7c872fff8c3bcbd6fa25757f52472ff9d6020562bbe43242d6041 SHA512 5e849eae3022463832c247ac85f085893b068df1043d5a4df4c09c4f7eeb541c659f90b8f516eea09fc8a92828c723a156e08743b6405f0e21badc547823f3aa
-AUX dash-0.5.8.1-eval-warnx.patch 241 BLAKE2B c3f3109ef52ad53789c3906b83a11a5b2f5a33281f214d8875522b4b872cdfbc45e123b64029acea77b34b32bdda26e52d3636cb428becc518b35499cd336b89 SHA512 fc44b181f236927e3e15f79c8304f212a55d332acfe981a526e957ff27b8ee56f128e1a5c805045218918f7f6d32945ea2d5b099e988f34cf2f56ad061d654ce
+AUX dash-0.5.10-dumb-echo.patch 2612 BLAKE2B 8a303b8515b41786fdeaf0fe5ee28e2f04f377fedf8761bb76dd6c9219040b7cb44509587cddcf8282e77237f1089abee5483868ea8410a1000bc4baac76347c SHA512 2ac6d6a22a7adbb8248c73665c198146606293dbdc35e680a2376d721f34132a87d3b57848348af1e048ba6db478df8e5324728eb844ac9d63be0be7b0465170
 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.8.tar.gz 223028 BLAKE2B f1db15fc23e089c2f2efe1c86e3f027c454b02d31528527040b51f28f22ba969ac35c2b88430e44c5f822c2607bdb5a35ec3d6b026dd32afcce2c0444eda31d2 SHA512 3dc42d3503b33c50b62c0f9104c0e41c4e8fa7490ba72bc09213fcc894d6fd92b9688c58389acf8b538b08f8e9cc179f0bf5572e22175d1960f04554594237b8
+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
-DIST dash_0.5.8-2.diff.gz 41715 BLAKE2B d396eab85bd86b18cc532da192c8034da990e9e4a822840635042e2810e32164502ec44c9a1b4f52701e9bc2acd1859a446a36383805527121dd1ef2e14c8010 SHA512 f067ca162cc463a60b5bcd7926bd6ab1f6cb1757e9cd7894cbf7ba5849b6d9af5381b8ec7264c503db544242690db067b6c034041e262ff93d237f1c06e50e56
-EBUILD dash-0.5.8.2.ebuild 1696 BLAKE2B a5c998a035ceff8fe02e2c1a9898d2fc2a54c702718cc36e06e5ef2e90569809785a8e2bcbecc7bf17d406db9ab227a46e48569bd7040c54b10f0e12bbf6e31f SHA512 66d84df096ffdce607a3f4bc4e857d807955d945245f96db6e9a33640306ccd3418c79691f2f7e08efef7a877c3e79902c39340ec68d5bab9b0cc657554fbbd7
-EBUILD dash-0.5.9.1-r1.ebuild 1949 BLAKE2B b79feb6f265498cdf75993bc976092ed9687e67e3d653b800b45de4be45ffc52b290200e260ab0ef44cb67e4838a7c7830c0d220ce9b1060918e573b6fd1243a SHA512 37324ad3e7fdb9f23924191ab0ae841e6f1948e7b9a9149af55314ee13b1577965c1f3fa5b464536928adb5045a2b5573eb8785316dd60f5008aeae8efe7e199
-EBUILD dash-0.5.9.1-r2.ebuild 2048 BLAKE2B 55bef5c38c04b070e6e6f3df022fbd240abdf1ef16e91b82c5defa92bf28f54af6ec350d9d15f3750fc561d0e204d7d649f1c26868a8e61a72bd514eeba7e523 SHA512 59341ffefbc51e667f45412a518ae5264b2192657d201a2852e446445e243e8da2f1ddc0ade395616ec5359037ee38bbaa6804b68e809e30f106796964b8bc5d
+EBUILD dash-0.5.10.ebuild 2110 BLAKE2B 7d7f133841bf2628eae1c7c86326ba3cc380c44587915eec6b3234a4e1ca78ecaf32a325643b00f38d1fb71b6048340e7d8466e4b5df88d81b76c6ae49c539b0 SHA512 078ca37ab0b5f8da550f176bfb234d84bf187a95bb3bc541ca36e2c0a27616373b609fefe3b7899f5899e1a9cc073719db95ba2bb52f2ac31c7c42b0acd02477
 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.9.1-r2.ebuild b/app-shells/dash/dash-0.5.10.ebuild
index d775db54f946..72821681d9b7 100644
--- a/app-shells/dash/dash-0.5.9.1-r2.ebuild
+++ b/app-shells/dash/dash-0.5.10.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
@@ -27,15 +27,18 @@ 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
-	default
 
 	#337329 #527848
-	use vanilla ||  eapply "${FILESDIR}"/${PN}-0.5.9.1-dumb-echo.patch
+	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
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 31bc5f3be813..000000000000
--- 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 d2edb4b7565e..000000000000
--- 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.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] ) )"
-
-#S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${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[@]}"
-
-	#337329 #527848
-	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
-
-	# 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.8.1-dumb-echo.patch b/app-shells/dash/files/dash-0.5.10-dumb-echo.patch
index 4059a80e3301..6b19b5b59f70 100644
--- a/app-shells/dash/files/dash-0.5.8.1-dumb-echo.patch
+++ b/app-shells/dash/files/dash-0.5.10-dumb-echo.patch
@@ -9,52 +9,40 @@ 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
-@@ -439,34 +444,12 @@
+--- dash-0.5.10/src/bltin/printf.c
++++ dash-0.5.10/src/bltin/printf.c
+@@ -457,22 +457,13 @@
  int
  echocmd(int argc, char **argv)
  {
--	int nonl = 0;
--	struct output *outs = out1;
--
--	if (!*++argv)
--		goto end;
--	if (equal(*argv, "-n")) {
--		nonl = ~nonl;
--		if (!*++argv)
--			goto end;
+-	const char *lastfmt = snlfmt;
+-	int nonl;
 +	int i;
+ 
+-	if (*++argv && equal(*argv, "-n")) {
+-		argv++;
+-		lastfmt = "%s";
 +	for (i = 1; i < argc; ++i) {
 +		outstr(argv[i], out1);
-+		if (i < argc - 1)
++		if (1 < argc - 1)
 +			outc(' ', out1);
  	}
 -
 -	do {
--		int c;
+-		const char *fmt = "%s ";
+-		char *s = *argv;
 -
--		nonl += conv_escape_str(*argv);
--		outstr(stackblock(), outs);
--		if (nonl > 0)
--			break;
+-		if (!s || !*++argv)
+-			fmt = lastfmt;
 -
--		c = ' ';
--		if (!*++argv) {
--end:
--			if (nonl) {
--				break;
--			}
--			c = '\n';
--		}
--		outc(c, outs);
--	} while (*argv);
+-		nonl = print_escape_str(fmt, NULL, NULL, s ?: nullstr);
+-	} while (!nonl && *argv);
 +	outc('\n', out1);
  	return 0;
  }
---- a/src/dash.1
-+++ b/src/dash.1
-@@ -1180,43 +1180,15 @@
+--- dash-0.5.10/src/dash.1
++++ dash-0.5.10/src/dash.1
+@@ -1182,43 +1182,15 @@
  option turns off the effect of any preceding
  .Fl P
  options.
@@ -66,7 +54,7 @@ sequence.  it also makes dash smaller & faster to disable this logic entirely.
 -Unless the
 -.Fl n
 -option is present, a newline is output following the arguments.
--.Pp
+ .Pp
 -If any of the following sequences of characters is encountered during
 -output, the sequence is not output.  Instead, the specified action is
 -performed:
@@ -94,11 +82,10 @@ sequence.  it also makes dash smaller & faster to disable this logic entirely.
 -.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
+ .Pp
+-All other backslash sequences elicit undefined behaviour.
 +You can replace `echo -n ...` with the portable `printf %s ...` construct.
  .It eval Ar string ...
  Concatenate all the arguments with spaces.
diff --git a/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch b/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch
deleted file mode 100644
index 51530bfdaf53..000000000000
--- a/app-shells/dash/files/dash-0.5.8.1-eval-warnx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-fix one of the Debian patches -- it uses warnx but doesn't include err.h.
-
---- a/src/eval.c
-+++ b/src/eval.c
-@@ -36,6 +36,7 @@
- #include <signal.h>
- #include <unistd.h>
- #include <sys/types.h>
-+#include <err.h>
- 
- /*
-  * Evaluate a command.