Fix crash with ${:0:} (#352056). Thanks to Christian Ruppert

Package-Manager: portage-2.2.0_alpha15/cvs/Linux x86_64

4 files changed, 240 insertions, 6 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index e21cf276357f..ed2e7faacbb9 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.159 2011/01/03 09:36:11 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.160 2011/01/18 18:36:54 tove Exp $
+
+*zsh-4.3.11-r1 (18 Jan 2011)
+
+  18 Jan 2011; Torsten Veller <tove@gentoo.org> +files/4.3.11-subst.patch,
+  +zsh-4.3.11-r1.ebuild:
+  Fix crash with ${:0:} (#352056). Thanks to Christian Ruppert
 
   03 Jan 2011; Torsten Veller <tove@gentoo.org> -zsh-4.3.4-r1.ebuild,
   -files/zsh-4.3.4-configure-changequote.patch,
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 3c07d5a64099..06f508aa5de6 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 4.3.11-subst.patch 633 RMD160 d10c5d960580463b7f787686d221409dbba487ed SHA1 9766b7eb6456409c9e7c5b2e562cb9db0a1950b2 SHA256 69c35bbe84763d8ba75cfd1d9bf3916e0591c72c25d5c778bfd26605b13260d9
 AUX prompt_gentoo_setup-1 745 RMD160 7235736c59ee02ea2c6cdc3c31f2af788d3ed34d SHA1 f740b6c37c55affabe3a66f1ceb45b2a1484f28f SHA256 c04da5152712fcd2eb2b83a1967f892f31cc087e1245b28e4806ab5099ac16e7
 AUX zprofile-1 1767 RMD160 a4fa4c3dea9cdf6d6a875ab494552c7464fb3e83 SHA1 fb409dd1e2000b1eeb386f8dec2b0dbe09035d9f SHA256 947d4dc9357dac9a1a16ebc7404e686d1a3b31fb1dfed9c3e3eb806d93ccfff8
 AUX zsh-init.d-gentoo-r1.diff 987 RMD160 1b8c5227426d6332d30639749b000c213dbb0ed7 SHA1 839dbf7890d1ccdb16c1cdd692ea69866d178b3a SHA256 2fd1981c9a230c624250d6056aaeb65bc57df8d082abf42f4060260a1c8663f6
@@ -11,13 +12,14 @@ DIST zsh-4.3.11-doc.tar.bz2 2687527 RMD160 b6ef6fef121b49f7060163b5b1493987af6df
 DIST zsh-4.3.11.tar.bz2 2868429 RMD160 e5e0d79231cdb95e6b6edac0e1b81db6c0018c37 SHA1 25cf0daadc4543d147f6241573d6730b60f16016 SHA256 30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05
 DIST zsh-lovers_0.8.3.tar.gz 875976 RMD160 f8482d61d700cc79530b4839de5a86aed6783e99 SHA1 f4905d8825c982371e72053a58cb9679329249a8 SHA256 c786724ac9526e2504142c6d607bc6f3703a35b3db804123f0ffe4214b399ea9
 EBUILD zsh-4.3.10-r2.ebuild 5905 RMD160 df5410f570dc6d54b17acf5300b6119e14f5d7ea SHA1 933f1c70bdb88a98aa062231f5eb092e35824ad3 SHA256 94f70b6f56ad16b508bc3f3a7807ed5b033b3da5a628fc6ebef6d7bafecdbd72
+EBUILD zsh-4.3.11-r1.ebuild 5898 RMD160 a775d341f582c3dc6ecacede439a2e7a99709176 SHA1 2b228ac307849a077c46b63691df0db0f6e2d74a SHA256 c6bbe39b0c07948dd6c0933d17cfbaf4d0d484b3ce223ce2a475f2dcfc94dfef
 EBUILD zsh-4.3.11.ebuild 5858 RMD160 798f63c69ae09932601297c60c1a57c014297b8c SHA1 668daaa8ee2014a1204e9c56dcfb521079356b2f SHA256 8d8107a5f4d7864f4e1652b8d6700856c00baf719a5bc86289807836bae96133
-MISC ChangeLog 23817 RMD160 ba3bc6a27f57e36296686f68fc6286cd378948e7 SHA1 a98ef33fe4faebf80ccde59428daa6eb9598f1a0 SHA256 190547fce59e803da56bbd4a577442ce4ca83d11a875d496c9849d5b0b1d9b15
+MISC ChangeLog 24011 RMD160 1aa84a0ba6267065134cc789e26cd9f5191c27aa SHA1 5f6d5e8f662a6ef7d05c9dd47fd67ee1c11a8502 SHA256 589664bcec6d936556e9d249ecbb6ca7733a044a7f8b3e7d7421769e40eb3552
 MISC metadata.xml 687 RMD160 e94628d9ba29a25d88ddee955c07f9b3b2f5493c SHA1 70a129986b433b75b3058da59b80f2d6a6e24c1d SHA256 88e44fba71b8f1eef862b2fdda513ee28c1c3fbbce6e3ddc7e13408bbfcab3d7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0hmJAACgkQV3J2n04Eauy7mACg0uBmnPempzxgdKj5ER16Ikoj
-AioAn1V3wCbPgRlp7KyY8jQHR0k+FWKx
-=ziqE
+iEYEARECAAYFAk013csACgkQV3J2n04EauwT/gCeKH931MAndIFe5jqw/aISdvgZ
+DX4AoKNHklFtY4Azthk6UUpJ6Ipo5Evc
+=X/sj
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/4.3.11-subst.patch b/app-shells/zsh/files/4.3.11-subst.patch
new file mode 100644
index 000000000000..d9544cc445bb
--- /dev/null
+++ b/app-shells/zsh/files/4.3.11-subst.patch
@@ -0,0 +1,24 @@
+Bugs-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=352056
+--- a/Src/subst.c
++++ b/Src/subst.c
+@@ -2814,12 +2814,14 @@
+ 			zerr("invalid length: %s", check_offset);
+ 			return NULL;
+ 		    }
+-		    length = mathevali(check_offset);
+-		    if (errflag)
+-			return NULL;
+-		    if (length < (zlong)0) {
+-			zerr("invalid length: %s", check_offset);
+-			return NULL;
++                    if (check_offset) {
++			length = mathevali(check_offset);
++			if (errflag)
++			    return NULL;
++			if (length < (zlong)0) {
++			    zerr("invalid length: %s", check_offset);
++			    return NULL;
++			}
+ 		    }
+ 		}
+ 		if (horrible_offset_hack) {
diff --git a/app-shells/zsh/zsh-4.3.11-r1.ebuild b/app-shells/zsh/zsh-4.3.11-r1.ebuild
new file mode 100644
index 000000000000..d631e93fc64a
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.11-r1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.11-r1.ebuild,v 1.1 2011/01/18 18:36:54 tove Exp $
+
+EAPI=3
+
+# doc package for -dev version exists?
+doc_available=true
+
+inherit eutils flag-o-matic multilib prefix
+
+MY_PV=${PV/_p/-dev-}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+zsh_ftp="ftp://ftp.zsh.org/pub"
+
+if [[ ${PV} != "${MY_PV}" ]] ; then
+	ZSH_URI="${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2"
+	if ${doc_available} ; then
+		ZSH_DOC_URI="${zsh_ftp}/development/${PN}-${MY_PV}-doc.tar.bz2"
+	else
+		ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
+	fi
+else
+	ZSH_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
+		${zsh_ftp}/${P}.tar.bz2"
+	ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2"
+fi
+
+LOVERS_PV=0.8.3
+LOVERS_P=zsh-lovers
+LOVERS_URI="http://deb.grml.org/pool/main/z/zsh-lovers"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="${ZSH_URI}
+	examples? ( ${LOVERS_URI}/${LOVERS_P}_${LOVERS_PV}.tar.gz )
+	doc? ( ${ZSH_DOC_URI} )"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~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] <sys-libs/ncurses-5.7-r4 ) )
+	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 app-doc/heirloom-doctools )
+	examples? ( app-text/asciidoc )
+	${RDEPEND}"
+
+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 \
+		"${FILESDIR}"/4.3.11-subst.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
+}
+
+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-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--with-term-lib="ncursesw ncurses" \
+		--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
+#	else
+#		sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Makefile
+	fi
+}
+
+src_test() {
+	local i
+	addpredict /dev/ptmx
+	for i in C02cond.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	make check || die "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.info || die
+
+	insinto /etc/zsh
+	doins "${T}"/zprofile || die
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup || die
+
+	# 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}/* || die
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dohtml -r Doc/* || die
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf} || die
+		popd >/dev/null
+	fi
+
+	if use examples ; then
+		pushd "${WORKDIR}/${LOVERS_P/.orig/}" >/dev/null
+		asciidoc zsh-lovers.1.txt
+		mv zsh-lovers.1.html zsh-lovers.html || die
+		a2x -f manpage zsh-lovers.1.txt || die
+		#a2x -f pdf zsh-lovers.1.txt || die
+		#mv zsh-lovers.1.pdf zsh-lovers.pdf || die
+
+		doman  zsh-lovers.1    || die "doman zsh-lovers failed"
+		dohtml zsh-lovers.html || die "dohtml zsh-lovers failed"
+		docinto zsh-lovers
+		dodoc zsh.vim README   || die
+		insinto /usr/share/doc/${PF}/zsh-lovers
+		doins refcard.pdf || die
+#		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
+		doins -r zsh_people || die "doins zsh_people failed"
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	# should link to http://www.gentoo.org/doc/en/zsh.xml
+	elog
+	elog "If you want to enable Portage completions and Gentoo prompt,"
+	elog "emerge app-shells/zsh-completion and add"
+	elog "	autoload -U compinit promptinit"
+	elog "	compinit"
+	elog "	promptinit; prompt gentoo"
+	elog "to your ~/.zshrc"
+	elog
+	elog "Also, if you want to enable cache for the completions, add"
+	elog "	zstyle ':completion::complete:*' use-cache 1"
+	elog "to your ~/.zshrc"
+	elog
+}