Fix hang with gcc-5 (bug #545176).

Signed-off-by: Ryan Hill <rhill@gentoo.org>
Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x957A8463

4 files changed, 150 insertions, 16 deletions

diff --git a/app-shells/tcsh/ChangeLog b/app-shells/tcsh/ChangeLog
index 2ed5376716ee..66c2efdbed3a 100644
--- a/app-shells/tcsh/ChangeLog
+++ b/app-shells/tcsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/tcsh
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.136 2015/02/17 15:03:26 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/ChangeLog,v 1.137 2015/07/19 10:14:06 rhill Exp $
+
+*tcsh-6.18.01-r3 (19 Jul 2015)
+
+  19 Jul 2015; Ryan Hill <rhill@gentoo.org> +tcsh-6.18.01-r3.ebuild,
+  +files/tcsh-6.18.01-gcc5.patch:
+  Fix hang with gcc-5 (bug #545176).
 
   17 Feb 2015; Michael Haubenwallner <haubi@gentoo.org> tcsh-6.18.01-r2.ebuild,
   +files/tcsh-6.18.01-aix.patch:
diff --git a/app-shells/tcsh/Manifest b/app-shells/tcsh/Manifest
index 1f5e6fded6c9..9f23a9949ca7 100644
--- a/app-shells/tcsh/Manifest
+++ b/app-shells/tcsh/Manifest
@@ -6,6 +6,7 @@ AUX tcsh-6.14-use-ncurses.patch 365 SHA256 8c335f04db220b01235a7a2c8158231d3295e
 AUX tcsh-6.14.00-debian-dircolors.patch 444 SHA256 a9568a2a474ef662a665c87c52983fea7999e5cf2bc4920d45baa2558c9dc32a SHA512 acbfd2a6d90c812f5729ce491dbc01b966bd99f65dcd56e7129f2250b5e2097268e3451a6beb1561c1df3d2376b2ef63192faf68521f1105b6ebdd28cea59cbd WHIRLPOOL 894bbd8269467963167b9769cdee6824d6de7bf754ee724c62fbb0b59af3093a3be91c220ea60fd191ace8ecabcd2dd17ef403294a774602a7edf52fb98bdf87
 AUX tcsh-6.15.00-normalize-command-fix.patch 399 SHA256 e22acf90d146927b261c00bbeb6f7f9ca86ff8c77d017027308ca2a54aeb1b04 SHA512 07f5c91961a7e818b1734078ac4e4575892e8e257ec92d949369a16af0a33929edfd291aa81096b37bddce226fe9eebc4ff45ed522a42d6150b95c68f36aa1c9 WHIRLPOOL 726f0a0795e94050d52e615de9bb897e9e8e828655cb96ce0e3a858f4e40c5907502cfab54952c8644b879d796cb4e932e7e791a3d77c22aa23bd32ec0edd24f
 AUX tcsh-6.18.01-aix.patch 474 SHA256 fe21dd7ea7783e199374f6c97f07b9f95b805c0194bf63d4325f3d318c2f52a3 SHA512 ae5dd2f5aee7c14734e775b55f780aa430dd2efc8407b671308215c69e3b97ad37a3b54ad2bc7fabe84b1806997a78ccd15b06ac59491c93dcad14bb14032bd5 WHIRLPOOL 1871f62a3718a340d5f85844654d41f7eb4e42c9e2232c55803b2f0e03689562aa8131b00a4c92f0b15bb9ca6c9956fccb203b2f41ccce236e183d0d27374136
+AUX tcsh-6.18.01-gcc5.patch 806 SHA256 8ec1c2d57395dc8512a091b131fb4276dd14d22147a804da2932c645580ce433 SHA512 9085601b3081f45f8ff6606b5200430a43e4f7aab336ed3a53ea98c1003b5a2ecf7478435fd0161e77f88e79c141f9e76485dc5e84aeded22f30b5c5506112c6 WHIRLPOOL ab8233bb22a018929d0629e6115e2dc48aecf24dcce4494903c5ffe1c080206938f4ab4b0bc5076bdce072c2d53695bfb3be074edec0ebd8094fe6c431950e63
 DIST tcsh-6.17.00.tar.gz 890084 SHA256 575266122bc2bc351c84a7f858020c0e6b6f95a64ad4de3ce95e340f57e4a9a9 SHA512 7bb1504ea3aed7d67943c9a642b12982621c79325ef223bfed43c01ea6f9aca44cab7c5c949a7fac910fd5140dac154c2ac125362a7a0bb4c1992ef2fdd76fe3 WHIRLPOOL 2f9350c378b4a6aa757bd7168fb38ababe4e89e842ab43335d43b222af73ff27bdeef558ad9c83d54a5b8a22be18e8be86e4da218fa1fdc91e903476104c94cb
 DIST tcsh-6.17.06.tar.gz 919999 SHA256 c9eff6aa782ecec5c6719954b529fadac97c32f3ba4c56fa07c40d425c2d91df SHA512 77105b6d42ae2924acee5cf9caf759fb713292e89a0a651056e2e89839ee2a3d85286e5b54b570eefce8fdee6742745a12276b448bb891b860a89cc11b42592b WHIRLPOOL 625f718b89ffd53a9f07211c4d1b06c2468ee190afebb032dd519cb3acb57515cdbd5392bc1130885702653561ac3e30e3b562ab10fef37b163b8ae02f089f84
 DIST tcsh-6.18.01.tar.gz 926872 SHA256 d81ca27851f3e8545666399b4bcf25433e602a195113b3f7c73886fef84c9fa8 SHA512 2791709f6db19b70652259f7dd5ee5c5d7943e814b3904cac5a3e890ff3b144401ed8552bd4f82ec789378d85c3f785438446c4d97d229c46bd0a08970d34628 WHIRLPOOL 3a77a207fb53e81ccedec821dc20c55cdd60f0ea290b3042e0858dc479a9a208d515c065521118e85dba839f0ff765b435c42118849d5159e12cab52fdbfc001
@@ -14,23 +15,18 @@ DIST tcsh-gentoo-patches-r1.9.tar.bz2 2488 SHA256 6375f48d78b64fd97fc2cb07e8117e
 EBUILD tcsh-6.17-r1.ebuild 2672 SHA256 12edb6822d2fe4e60dfd6f6f2a2d3fe6dd436dbb953a52bb5efd3acf53761b63 SHA512 519b50c9d058a17fe3038567b16feee39e449c02bdc0b1caf11edf6c6b5d3cd4f7e901addc9736008a440c6284b2ef7aced900240c1c21c46d906c97a1e7d0b3 WHIRLPOOL 452fc6734c5ee7fee583b03855fd7689b2a5c137f40d6aba0d25c852fd7664bf395b82a9e9450efd18901faf5485fe1e556e55de864b8396994c3611e2459abb
 EBUILD tcsh-6.17.06.ebuild 2625 SHA256 e15163a06c72b6f6376d6fa5e4d439adccb4b7df690931cb093bc30c152327cb SHA512 039f4c1ae1eda8e9d65e2ecd72749ffefb09959a0d593bc240bdd2e2917da26e2a240d7ef9818e79f6ce4fd0b0e496c291f463e01561bce85921ea08f7e2527e WHIRLPOOL c757fa7c8b29177d740c0c9b9a665c17108124eda6c2378911349890817aa2e551ee54b34c593407338965fd00902f359cddbd27c7f897e1b8f27aa0f50b1b79
 EBUILD tcsh-6.18.01-r2.ebuild 2900 SHA256 957d803185c6f79c390bbb88c501fda733528209d99e76a28331dc533b79e7a4 SHA512 9679b9113015481b6e3110b493030d592eff0595164e7521bb37ef87733c01ad01ca707ff8699eae2e92b6c0e63f37545a51dfbfd43f5a6bc8fd67d30a994e2e WHIRLPOOL 297c4e2110ce738299de90fdadddd9b38e004b4ff453a57d290b8295b492f6c30e350ce5ab18c171db3f15ee2f71a58b81d17b5a2c573fdf56643710f89e4a89
+EBUILD tcsh-6.18.01-r3.ebuild 2955 SHA256 3bd1ca9e63085ef6c5de30a6b720ffee11393c5baa95071a38124e9c8e73563e SHA512 b4e52fe1f8a55866af8e2c7738725efa6bff3fae666ef3844f83e16a2d30075b2cb778ba8e513871855cc96179712313f17a2f89b184cd3c0b6338423377ae4b WHIRLPOOL 8e3754a206cb99a3ccd2e66d1427de2f15841b11bf447932e01110378ad3bac9ae45a4ea5c8b9617c32ab8a7bef0ca6961f131f812445086212e688956de9297
 EBUILD tcsh-6.18.01.ebuild 2621 SHA256 00832dc53f3d98fb118bf896c5fc72a687aeb029d9ab36011fcd222a1a0daf22 SHA512 c20e9f60ec3a233d6eba5b4538a76e3e7e8d327b1157a08edd3f15a14b04a9a37a34d6d096c5296dfdb41177a1498066044cd0d2af86afaaa8f37c8ec58e36bd WHIRLPOOL 128ba8461e78d73156d36951a92478ac6c8696c8135052b7c3b9923852953e6025db39a4845e32908d0ac34ecacfd409e49be1e0569810fa184cdc2ecefea365
-MISC ChangeLog 19326 SHA256 58db2652989dd0befcfb388bdf0f3ce9bc2abc5264c6ab6ef0a04d2fe7cc85cb SHA512 e45d2fd952768fdfa3e4c1ce4bbb1a251f51430ae458d86f07ff63d4236c003c0aa9d65062585bfa9320524cda2eb02fefc01e004919af11d3a19d995f06d1a1 WHIRLPOOL 809621998af702a9135a4800de9dc2d85fcbfb7a02339402861a4e480c3feea53c56198f4f23e938040ffd816072f23c3eca2731fdd1c2019f773ef6db17b150
+MISC ChangeLog 19499 SHA256 315cc3d9a126704dc65869a471caf4256f21e435299889dd75a0bd9f6c0c2f9c SHA512 5fd83ece138bc3171e706a27071301729ebd97f920478d3c659711b3d0921d6975f59519cae135de8f2d4a072a6a76a55e5ebd0aad0f7d7d61439fb5c82d1510 WHIRLPOOL e875020a9abbf5e2fb2961c1f00b7a87cd1e3a089429fc3f42ec088a199d896288113793225acc175467d550643182f4d1189a3c2075c29b39008c5d8026c943
 MISC metadata.xml 717 SHA256 9d0cda37351e289f0195b3ddea895e675a0075c244f3fe17ca4add04c1640dc0 SHA512 5ddf72e138e6e44c47656eac2ea0ed176a3590a4089f034462415b30eb2da3a66372f06d66acf7e5ffcdac5cfd4a5d03925c8c476bfcc2c01ded0ae76766e4bd WHIRLPOOL a580ad33dd832a5ca7f33240cef4d685517bcde4738280ca4797e6f9206f822b3dc9e40d490f22bf80f5a715f722d2a786f7aa2f0e1759a6181a7dc378f5ca9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJU41hHAAoJECn7Dp7HGe4gtyUP/0Zh8JUJPuQOOqI4U2CPYS8L
-IzKFaFvyWm/JCuYttFWpfh/6ZtfKbEq7yu3MjkIzx8hI/SjXt/YW5+BiLzlOMOW2
-ueO9jW3e4l+8TzqGSNjcJtpuVFcKme+xmXVDRPB28t2BUh6gsUU2FSpdQtdJplcg
-l9si1qOFG6A/jpCagMDuJ66+BByDOXjhpQopARbPEBhaN79bEIhktVKz0gKbFrvE
-VTUo1hPrIgwEiM7+/HcG6xWumPR4QZStQvLEOU9fTqEh0GabzpU7nutCPk43dDBF
-udiW/uyMnFQ39P4AISnBKeI01rPkeFemGjEVlV2o0rHpodEQBXqM+huZ3T0zbpTN
-oJmax0nFHCvIeGDrVzOE8zCEDu/kdkvD18eWnEEfo5arWroFwKMGWFfixNB8Fo+o
-BDqi5XLP+BV6/ziRN6+EeQkeuo8tzzRQET5BX0K8GeocHXOUmLiViY/mNh/4zZMt
-Gj6FjhmjB/9kLIV4QZrC5beHHC8AROw3KoFjJWyr4AF2rXgdBq7iPfYWABNXDAlO
-YafzjoxGmxx5+N3D+cYlqUGrh5EAukqn3Fbn745qTWh9NW77HuUBSt9vFkFQjV9+
-P5ZBxTN/8yTvvmfChFWATZ1pisTVRy/0GPdBE9RChVoF4TwlQ6malaaW9wmEaauA
-62qy23c+w5c30GLbKuan
-=NnEf
+iQEcBAEBCAAGBQJVq3kgAAoJEO04vUmVeoRjiMMH/0jEtVc+Wu3o142Y8OUI4qkM
+PK5h5lPH3clW1WgUMDiLbCnm5xvXAu2Vex1Bugi5IgGdvhGT7WqDvU6ru61kAuXd
+dLBj4IYgb6SBkK+nOqaOpEsKHcaqg9qZ6Ka+z2zsFDyQKdKNfd/mGWsC2AyEfoIQ
+gj62ZVKZa5cYrZP58Rg0IMfjhu55ACsLHVIzVYoeBMluOfpJxl3iFf/KOhFei86R
+gZEZvMiL6xvZulve9YAo69r8g+j9GRrmxyr3KaE+QWlMpZjxVitbD+yquwGcUpIl
+5UA/4QWg7Z4PgTAGxrLD6GHL06zvUtQu5AHRPws30sUWBAdRWZmKv+zJVVvlqlw=
+=IHhe
 -----END PGP SIGNATURE-----
diff --git a/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch b/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch
new file mode 100644
index 000000000000..d9501572fe57
--- /dev/null
+++ b/app-shells/tcsh/files/tcsh-6.18.01-gcc5.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/545176
+http://mx.gw.com/pipermail/tcsh-bugs/2015-May/000945.html
+https://github.com/tcsh-org/tcsh/commit/624d3aebb6e6afadb4f35e894d11b5ebe290cd87
+
+From 624d3aebb6e6afadb4f35e894d11b5ebe290cd87 Mon Sep 17 00:00:00 2001
+From: christos <christos>
+Date: Thu, 28 May 2015 11:47:03 +0000
+Subject: [PATCH] avoid gcc-5 optimization malloc + memset = calloc (Fridolin
+ Pokorny)
+
+---
+ tc.alloc.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/tc.alloc.c
++++ b/tc.alloc.c
+@@ -348,10 +348,13 @@ calloc(size_t i, size_t j)
+ {
+ #ifndef lint
+     char *cp;
++    volatile size_t k;
+ 
+     i *= j;
+     cp = xmalloc(i);
+-    memset(cp, 0, i);
++    /* Stop gcc 5.x from optimizing malloc+memset = calloc */
++    k = i;
++    memset(cp, 0, k);
+ 
+     return ((memalign_t) cp);
+ #else
diff --git a/app-shells/tcsh/tcsh-6.18.01-r3.ebuild b/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
new file mode 100644
index 000000000000..019720337482
--- /dev/null
+++ b/app-shells/tcsh/tcsh-6.18.01-r3.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/tcsh/tcsh-6.18.01-r3.ebuild,v 1.1 2015/07/19 10:14:06 rhill Exp $
+
+EAPI="3"
+
+inherit eutils flag-o-matic autotools prefix
+
+CONFVER="1.9"
+
+DESCRIPTION="Enhanced version of the Berkeley C shell (csh)"
+HOMEPAGE="http://www.tcsh.org/"
+SRC_URI="ftp://ftp.astron.com/pub/tcsh/${P}.tar.gz
+	http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r${CONFVER}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="nls doc"
+RESTRICT="test"
+
+# we need gettext because we run autoconf (AM_ICONV)
+RDEPEND=">=sys-libs/ncurses-5.1
+	virtual/libiconv"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-lang/perl )"
+
+CONFDIR=${WORKDIR}/tcsh-gentoo-patches-r${CONFVER}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-6.14.00-debian-dircolors.patch # bug #120792
+	epatch "${FILESDIR}"/${PN}-6.14-makefile.patch # bug #151951
+	epatch "${FILESDIR}"/${PN}-6.14-use-ncurses.patch
+	epatch "${FILESDIR}"/${PN}-6.18.01-aix.patch
+	epatch "${FILESDIR}"/${PN}-6.18.01-gcc5.patch
+
+	# fix dependency on ncurses[tinfo], #459484
+	sed \
+		-e "s:\(ncurses\):\1 tinfo:g" \
+		-i configure.in || die
+
+	eautoreconf
+
+	# fix gencat usage
+	sed -i -e 's/cat \$\^ \$> | \$(GENCAT) \$@/rm -f $@; $(GENCAT) $@ $> $^/' \
+		nls/Makefile.in || die
+
+	# use sysmalloc (for larger alloc sets) on Darwin also
+	sed -i -e 's/__MACHTEN__/__MACH__/' config_f.h || die
+
+	# unify ECHO behaviour
+	echo "#undef ECHO_STYLE" >> config_f.h
+	echo "#define ECHO_STYLE      BOTH_ECHO" >> config_f.h
+
+	eprefixify "${CONFDIR}"/*
+	# activate the right default PATH
+	if [[ -z ${EPREFIX} ]] ; then
+		sed -i \
+			-e 's/^#MAIN//' -e '/^#PREFIX/d' \
+			"${CONFDIR}"/csh.login || die
+	else
+		sed -i \
+			-e 's/^#PREFIX//' -e '/^#MAIN/d' \
+			"${CONFDIR}"/csh.login || die
+	fi
+}
+
+src_configure() {
+	# make tcsh look and live along the lines of the prefix
+	append-cppflags -D_PATH_DOTCSHRC="'"'"${EPREFIX}/etc/csh.cshrc"'"'"
+	append-cppflags -D_PATH_DOTLOGIN="'"'"${EPREFIX}/etc/csh.login"'"'"
+	append-cppflags -D_PATH_DOTLOGOUT="'"'"${EPREFIX}/etc/csh.logout"'"'"
+	append-cppflags -D_PATH_USRBIN="'"'"${EPREFIX}/usr/bin"'"'"
+	append-cppflags -D_PATH_BIN="'"'"${EPREFIX}/bin"'"'"
+
+	econf \
+		--prefix="${EPREFIX:-/}" \
+		--datarootdir='${prefix}/usr/share' \
+		$(use_enable nls) \
+		|| die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man || die
+
+	if use doc ; then
+		perl tcsh.man2html tcsh.man || die
+		dohtml tcsh.html/*.html
+	fi
+
+	insinto /etc
+	doins \
+		"${CONFDIR}"/csh.cshrc \
+		"${CONFDIR}"/csh.login
+
+	dodoc FAQ Fixes NewThings Ported README WishList Y2K
+
+	# bug #119703: add csh -> tcsh symlink
+	dosym /bin/tcsh /bin/csh
+}