Add patch from upstream to fix behavior in new pid namespaces.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 236 insertions, 9 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index ff5a02e802c8..5faa83e98a11 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.248 2014/11/21 09:58:51 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.249 2014/12/31 08:06:48 vapier Exp $
+
+*zsh-5.0.7-r2 (31 Dec 2014)
+
+  31 Dec 2014; Mike Frysinger <vapier@gentoo.org> +files/zsh-5.0.7-pid-ns.patch,
+  +zsh-5.0.7-r2.ebuild:
+  Add patch from upstream to fix behavior in new pid namespaces.
 
   21 Nov 2014; Tim Harder <radhermit@gentoo.org> zsh-5.0.5.ebuild,
   zsh-5.0.7-r1.ebuild, zsh-9999.ebuild:
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 53fb51ea5071..19b73de367e8 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX prompt_gentoo_setup-1 820 SHA256 818aede5695c1406bd2e720ab114bef13d373e48ee5a1f2cda7d36a9c26e30e1 SHA512 262ad91d7536c11c3b1db176217e9a9bf21df5d25d72ddfc7dece6eafceb74a252212939c8cbe5bee1ccc0e25fc4e6e906660877747f5224e862d4d22d1200a0 WHIRLPOOL 228d48c52ad48e97bb6e83e2a8c9970c49d7c10f61d9fe597ed7882a07aff5ab68d6997e81ae23b1588589c0ab3e19f452b791dda0ab9f3213ac0b751a8e82c2
 AUX zprofile-1 1767 SHA256 947d4dc9357dac9a1a16ebc7404e686d1a3b31fb1dfed9c3e3eb806d93ccfff8 SHA512 b91712ecb491ae01c58d30b1791257cf2714523dc956d2f59a6875c390157f0492644d0bc00323b84a130e6c0fd73a6f4bd06c38707f31abbe156a2c950a7cd7 WHIRLPOOL 22820e886b459596c8c3149f77d72dfe56ca8a08d134e4c0a96f0b74ea04190d10a38f46bd009f7cf09a606a7b1cbddee9ea4800d382ccaadb96ff11e14f8e39
 AUX zsh-5.0.7-fix-cvs-completion.patch 557 SHA256 35405c1d39da5274f0f0b0be5b9b6f95856687fae3dff61d33f90c3878896270 SHA512 10e5d65d71cf372cc97ff10d9a81db2c000c59f70c2cbc5c518e2bf5efab52e57abc0298bd628606e94c856f0801c5d0ce41da7d18a542b2019aa2011b59c659 WHIRLPOOL d3bb47333719fdb7de573b09f5f8e43c75c45198bcf1b44a43f5b90d1e806fd79b69c5825cf76db064d70392ce4775c91e99aca66f74d3682f593695964b55dd
+AUX zsh-5.0.7-pid-ns.patch 1265 SHA256 cd77b9eb62e088e59d0dac5594e28bc3c3fd15bffefa39b2ee92db57614d9575 SHA512 10b3baa00e716a6502d22e8e41f1f403567d72b519e84616f70c111f323b01bc4956e31418c77473a03f6aac042b2351164f424fdfa3ad61cb12208d967ddea4 WHIRLPOOL 53137ce96cf265e6bdc3d9f9297e66511985c2b998759e9fcba896a544d2d19fedce324c26e46874c953bf0fed887d711b5a0bb76de12159d5c0624b1ed0cc0b
 AUX zsh-init.d-gentoo-r1.diff 987 SHA256 2fd1981c9a230c624250d6056aaeb65bc57df8d082abf42f4060260a1c8663f6 SHA512 56ed616177c0167d1819d9749539c035907f4524a3e145b152ca7ac6236c96f0110eb23479794f35fbf86c9ea72286ab832f1a9e3e658b676353bc78e1b06a38 WHIRLPOOL 9680ac95c216d42774f6ebe5f3b28574110e82560c71b0a3dcd4d8ab90f746b3515b0119dda74038b89c457b1d9274e9f14f6923c47c7877ca64938bf24b1983
 DIST zsh-5.0.5-doc.tar.bz2 2940018 SHA256 e4f22bafaa8410bbc2d83f2d748ca4764365752c46f7e1099be54f2a62c492f2 SHA512 341e4a62c7c2367d17c54c5133b7c0a74e6c0becfaddd3c1f5dbe782300bbd74b0fc2066e892776cb52ce11cd0600739bfd5a7dd067eaae8a1d11b1b2aa0c3b0 WHIRLPOOL 48e021bc2caf840d048888faf5cafea5ce698968479e1c8791f33dc36f9b0f60db16ff481e88ce8c903480d905b728eb9ff9dfc8fbcb066d3698cc0cc3a02d8a
 DIST zsh-5.0.5.tar.bz2 3104375 SHA256 6624d2fb6c8fa4e044d2b009f86ed1617fe8583c83acfceba7ec82826cfa8eaf SHA512 34d69bed190cbc476bcdaa4b703fee1caaeae7e011fe7ea595b29bbd31df57bbe4d19b5940618e0c89a0a4b6c476f9ef03ce9829b4fb3735c1aedf309b0225a5 WHIRLPOOL bf02ca194261e15e88a9e26212644aa7be1afcc8e73cd6bb18ffb8e1c1d46a8742fee109d92a3b455c418258df9ae74dece21a05ff0e54e8c370af094512af16
@@ -11,17 +12,24 @@ DIST zsh-5.0.7-doc.tar.bz2 3005587 SHA256 43e8665ba9d9eca8370c64e2d4846e84f9111c
 DIST zsh-5.0.7.tar.bz2 3181030 SHA256 544e27de81740286b916d1d77c9f48ad7c26ad7943ed96d278abee67cf6704b3 SHA512 e309863b41c9f92996fb9301d96d1aa43270ef8a04626c946703675b16a0a2ac9fddc959184cd8c639bd061fc2dd21902b21515550f639faacccdabd59e256e5 WHIRLPOOL f7cfbc41a2c990f702fee4ee158db79ebaad794479a62ff0ccd1d466077556e93b5e563575f9fd25dde1cb5e3c3610a14c997155ea76d86293d0a08168a3a418
 EBUILD zsh-5.0.5.ebuild 5178 SHA256 6b70bd81fad4ef5095c56ee069ebace35b2848601dd70ad976988f113a45ec87 SHA512 ebeb64c9f721bce97ac9380cacc61438f6c2e40e85e254a9d0536cbd30f744407bd69273a396531bfa2bc8bea212b1592c02492ecbcaa27ebd2380aef598d41b WHIRLPOOL e1a8a68985f093d8bd9353ae685a4b715c75a63261ea9c02282fac352587eff1f55442cf8531f18c9c704c69144633e6bfcba7f7a191b7636ebbacb9390ebc1a
 EBUILD zsh-5.0.7-r1.ebuild 5270 SHA256 80248f7bf83a21221bc5c86c6292b720c830407a06bc91b04d3eeb4735717520 SHA512 5fd993d447025435c497e2562bc7f1dfb3a61571d9dba409867ce45c399df0dc70dcf3d71c582275450afd3aea003d385d7c30ffe5bd1790d969e85387f3cd31 WHIRLPOOL 26588cc94a20b955f969b5dc83e843b7379d013558d3cba69cc6601a66d238d059d9b243aa5c3233c58f0865bceeac07afd9512036efcf0730b4e42b629e4ddf
+EBUILD zsh-5.0.7-r2.ebuild 5307 SHA256 ea649d2f5b89e76cc5bb5f020d439d4ebf97e58091191aece8980bc4aa2b913b SHA512 f2d3cd8fe8450f0729b6784c3cae0d5b68f8f576def1b7c3ac2e5528742c95bacae43d5128be1fc61b417a4cd24c695069fa5f1134fd5afae40f5e6467c248bb WHIRLPOOL 41c87b731f53b29eb6fc5b628b4cdce04ca1e570fd9df19024697dad735446cc665e0ab9a3f68f3ade7e3b9fa5e2b994cb50844a86f7a3927a79e4be88764f9c
 EBUILD zsh-9999.ebuild 5659 SHA256 e957cc4e0ab79e180092e2ba0c5259e50c8e31deb18a9f74e6d5b398baddfbfb SHA512 224be683e9a3a4778ce12a09c06b8b946684982b7559899d5e4cff33b62894048c5904b76e49d874e6d1fb958ac7d8d123b4b0aa25d6355d8f7bacba90d01543 WHIRLPOOL e2875ac8caec134559006a610b7c3107d81e06901e316ca4359c3206fac39615d6a401916a947c6a176278068975950fcbf16fa8010c3d22fe1a2990d0c190be
-MISC ChangeLog 34414 SHA256 75a2411aa16a43900ee89fb52b0beb59b7b60d2d53c5b9443d76089075c74254 SHA512 23e54ddd87008fc6a9a5c65b21f74e5fd80cb48123f963fd8664186bd63b03b90fbd287a14756cad19e330595d3ba9db444061256c78757ea3be7626a2a8ab1a WHIRLPOOL e8ba42d4dd0da7a18d6bea5d9e5cbfa729378f1318bed7f52bbe8290fd8d17c10faff8cf3f224236f1e54ed347f1461efbc7c8b799f59421519ddafc4e7826d2
+MISC ChangeLog 34611 SHA256 821f7fca911f8f6c886ea2f75d3995aa6735e8eb31c3860931dea796b7d14697 SHA512 d1b1039c2387ac12c67ee3f4d7d3c1840035802f9ed13f971ff0518520e333f08377e2d324e59f626e8b09d62a5759a66642d6c4d545eed74b93647362d0cdb3 WHIRLPOOL 6bb63f575355a606b4a2aed5811f8dc0d1e36b162c9b5e703ff100d291823aba28e48380b666777f48d835e387ceb0bb115416ca8f66af336a35a6dce3506655
 MISC metadata.xml 485 SHA256 84d741251360af7179bf3a275080446750e3e360b4f48937b8a623ccd7602c12 SHA512 e702b9c921b24b7303e0936fe6370f901173e1bfa9bc91bacc747c69dda8205ab785f77088e6d9ea357b4863bb56b17bbe787ddc33290c1b7561764b0856cf6e WHIRLPOOL 3abceaebe3c2ec65bcfccfe040bb7693a5100d604d247bb252ce8d670fd5eb4229ea1ae24ae3b4d3ef8d1cd4eb5d8e64063ebb019b83a021c20f47283c039a94
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJUbwziAAoJEEqz6FtPBkyjKG0H/0hTzC0/Lb/blLgDPBAPBk8k
-CT5EPjefjaFcBY54nhsjld5LD+bNDl0Yrilmqh9wP64JHSKiWqu100yN6CFV1rcB
-Zm0OiQMidWsClyyh37lYxttEhXAWHRgRtui97aC+MbbfUL9ffq8GlDhbFzf+ONys
-/DAzWj9M7GML68/1S3HvuH1JCOydg4IuJVBZsbD2VIv7V6uGyJIhtcx/q9BvQiPq
-HynoM/wFZu636AnWVmvHVXAhpe1+sJ/wob73lW03ZqWrFoGsUQwZRekSSVRaggib
-f142wROV4rb+IscUmleRXbUAiszEwx7ji5U57o5D2/JldxmKT+8+MJqCfG33Wt0=
-=oEmx
+iQIcBAEBCAAGBQJUo66aAAoJEPGu1DbS6WIANLIP/0hqrJd8pwqjW6tFy1L3xrBs
+RRA3kYxnrbEjJ3YQjeh5NzAeY8EAKV4sa8sE7J3PDonZCIAFA52B3G1807Y3aScF
+ovYvLa7vZpBH/VM8kf3LruIvT7DdT2BVSmr1gb64JgBolQgPlOaKkNc2c74ogFNb
+9pWEQlqqqCqzgdBaYYv71x2FCD4OhjKL07hacPXDsxdQWrctxXkFPKITP1EF5E10
+GaU/2see8Pdgn4bR6pP4YuJBSu054P9h7CzIma7D9q/8jfQ2u8in8v0Hs+vnBY39
+tC2MZlDx5B371YKKOg5BHrnUzdO4c72w/mqCeyL6VnY26857RtBLoHYqpUKAjdTO
+kMhsurFy7q+bPxVkDOtqUukqZx3m9x24KALRP3Ed8l7yxFbzbJ9FurnUF4+2WSJ3
+6+9Htt8SqPfmltiwx51tWkQPKmOZtZQbYxTs/Wy/tmISPT6QEzigaZr/8m53cN1z
+1AaHt7h7mcsxUdxxtCv3ABbxHEd/dP4MEUQhMaSBEUTQdSPxTF6kgETloT1+W+3R
+kow4uMr9l5eNpAnfuCi0y/xEbEp22JuXxMseHSOD11n0cCrmv5qYQ3RtawyLFkZJ
+dFMy5AEPg4mXJ5R8qXE9RMB+igGkYgiMseFVVtKOrwr6b34iUcGRspWg+75mWbvK
+N9t6yaOnPkbYGxw2OBpP
+=BKJQ
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/zsh-5.0.7-pid-ns.patch b/app-shells/zsh/files/zsh-5.0.7-pid-ns.patch
new file mode 100644
index 000000000000..928ce48b4617
--- /dev/null
+++ b/app-shells/zsh/files/zsh-5.0.7-pid-ns.patch
@@ -0,0 +1,39 @@
+zsh and pid namespaces don't play very well together.  Specifically, when zsh is
+launched inside a new pid namespace, it doesn't take ownership of the process
+group, causing things like SIGINT to be sent to the parent process.  Upstream
+bug report here: http://www.zsh.org/mla/workers/2014/msg01769.html.
+
+The first chunk of this diff fixes this problem and has already been applied
+upstream:
+http://sourceforge.net/p/zsh/code/ci/0c4cb0cc1b527f4341f1a39a10f4120aa7c7d594/.
+
+The second chunk is a suggested fix for the warning that zsh prints when
+exiting: http://www.zsh.org/mla/workers/2014/msg01779.html.
+
+diff --git a/Src/jobs.c b/Src/jobs.c
+index a668b07..c6e1bce 100644
+--- a/Src/jobs.c
++++ b/Src/jobs.c
+@@ -2734,7 +2734,7 @@ acquire_pgrp(void)
+     long ttpgrp;
+     sigset_t blockset, oldset;
+ 
+-    if ((mypgrp = GETPGRP()) > 0) {
++    if ((mypgrp = GETPGRP()) >= 0) {
+ 	long lastpgrp = mypgrp;
+ 	sigemptyset(&blockset);
+ 	sigaddset(&blockset, SIGTTIN);
+@@ -2779,8 +2779,11 @@ void
+ release_pgrp(void)
+ {
+     if (origpgrp != mypgrp) {
+-	attachtty(origpgrp);
+-	setpgrp(0, origpgrp);
++	/* in linux pid namespaces, origpgrp may never have been set */
++	if (origpgrp) {
++	    attachtty(origpgrp);
++	    setpgrp(0, origpgrp);
++	}
+ 	mypgrp = origpgrp;
+     }
+ }
diff --git a/app-shells/zsh/zsh-5.0.7-r2.ebuild b/app-shells/zsh/zsh-5.0.7-r2.ebuild
new file mode 100644
index 000000000000..0f1a45f2b8d3
--- /dev/null
+++ b/app-shells/zsh/zsh-5.0.7-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-5.0.7-r2.ebuild,v 1.1 2014/12/31 08:06:48 vapier Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic multilib prefix
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2
+	doc? ( http://www.zsh.org/pub/${P}-doc.tar.bz2 )"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND="
+	>=sys-libs/ncurses-5.1
+	static? ( >=sys-libs/ncurses-5.7-r4[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? ( >=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] ) )
+	gdbm? ( sys-libs/gdbm )
+"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+
+src_prepare() {
+	# fix zshall problem with soelim
+	ln -s Doc man1
+	mv Doc/zshall.1 Doc/zshall.1.soelim
+	soelim Doc/zshall.1.soelim > Doc/zshall.1
+
+	epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff
+	epatch "${FILESDIR}"/${P}-pid-ns.patch
+
+	cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die
+	eprefixify "${T}"/zprofile || die
+	if use prefix ; then
+		sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die
+	else
+		sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die
+	fi
+
+	# fix cvs completion
+	epatch "${FILESDIR}"/${P}-fix-cvs-completion.patch
+}
+
+src_configure() {
+	local myconf=
+
+	if use static ; then
+		myconf+=" --disable-dynamic"
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=" \
+			--enable-zsh-debug \
+			--enable-zsh-mem-debug \
+			--enable-zsh-mem-warning \
+			--enable-zsh-secure-free \
+			--enable-zsh-hash-debug"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=" --enable-libs=-liconv"
+		append-ldflags -Wl,-x
+	fi
+
+	econf \
+		--bindir="${EPREFIX}"/bin \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--enable-etcdir="${EPREFIX}"/etc/zsh \
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--with-tcsetpgrp \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps cap) \
+		$(use_enable unicode multibyte) \
+		$(use_enable gdbm ) \
+		${myconf}
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -i \
+			-e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			"${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_test() {
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.info
+
+	insinto /etc/zsh
+	doins "${T}"/zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	# install miscellaneous scripts; bug #54520
+	local i
+	sed -i -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" "${S}"/{Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/${PV%_*}/${i}
+		doins ${i}/*
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dohtml -r Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		# should link to http://www.gentoo.org/doc/en/zsh.xml
+		echo
+		elog "If you want to enable Portage completions and Gentoo prompt,"
+		elog "emerge app-shells/gentoo-zsh-completions and add"
+		elog "	autoload -U compinit promptinit"
+		elog "	compinit"
+		elog "	promptinit; prompt gentoo"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Also, if you want to enable cache for the completions, add"
+		elog "	zstyle ':completion::complete:*' use-cache 1"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Note that a system zprofile startup file is installed. This will override"
+		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
+		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
+		elog "or other user startup files that are sourced after the system zprofile."
+		echo
+		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
+		elog "one method is to use a separate path-setting file that is conditionally sourced"
+		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
+		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
+		echo
+	fi
+}