Include coverity fixes from upstream.

Package-Manager: portage-2.1.2.3

4 files changed, 178 insertions, 8 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index 9cf0d5d10ea5..7dc64b382b76 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.131 2007/02/21 06:52:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.132 2007/04/08 06:57:18 vapier Exp $
+
+*ncurses-5.6-r1 (08 Apr 2007)
+
+  08 Apr 2007; Mike Frysinger <vapier@gentoo.org> +ncurses-5.6-r1.ebuild:
+  Include coverity fixes from upstream.
 
   21 Feb 2007; Mike Frysinger <vapier@gentoo.org> ncurses-5.4-r6.ebuild,
   ncurses-5.5-r3.ebuild, ncurses-5.6.ebuild:
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 3f50e0945588..4cbcc9ef6ee2 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -27,6 +27,7 @@ RMD160 2d5a96174730a93320e391cb057880df4996854e files/ncurses-5.6-gfbsd.patch 81
 SHA256 d9e94c5068a22d32f52c5db6aadc3793af11bb0c08b006e375921726931e0065 files/ncurses-5.6-gfbsd.patch 817
 DIST ncurses-5.4.tar.gz 2154022 RMD160 36369f4e2c76c396de51809deb8a671d8ca3d19e SHA1 c0dfaf2c4d383915f898a97c8caeace8a0a2c8b7 SHA256 5abce063cf431790f4e6a801a96c7eea0b33a41ecd0970f6312f52575c083b36
 DIST ncurses-5.5.tar.gz 2314030 RMD160 aac34d2530519fbb0fde7af87a365205339ba230 SHA1 46414a72e91a62f63a8c9af00f0d65497f5ecc5a SHA256 27a63f3a2ac9d13c1ed9a0a33ee4497c19a6b5810b8f9738e7654a0e12225b93
+DIST ncurses-5.6-coverity.patch.gz 6196 RMD160 b11682ae9e043be8d6c50f040d8531f80fc26ce8 SHA1 fee27bdd55c1c316248643e168865b55235d79c7 SHA256 3deeef017c739116c17574e7fd235b1b05053f5c50c7bfeeee2e3f8e4332380e
 DIST ncurses-5.6.tar.gz 2402592 RMD160 1a878819c43e6426500fd74ccedf0a032ef399d8 SHA1 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d SHA256 f9cac2b31683a37d65bc37119599752198a0691e462d0d1a252cf9815f5724d5
 EBUILD ncurses-5.4-r6.ebuild 4805 RMD160 a95e26ae1629a3d3fc52ce3d940c51f4e87e3c3e SHA1 42c07ed6c0c5283f63e092ba4605c8e9873617f3 SHA256 29242bba0360463d371ca9f6e3466dc05f8cd3d6be4bed9eb651d9f417d458c3
 MD5 8c5bea4fec93dc5e03824b86a6cc8fbb ncurses-5.4-r6.ebuild 4805
@@ -36,14 +37,18 @@ EBUILD ncurses-5.5-r3.ebuild 4863 RMD160 75f6f79cc7f299f7bb7960108437b1698286d06
 MD5 508732d8c2625adc50c62c9a9b59bd44 ncurses-5.5-r3.ebuild 4863
 RMD160 75f6f79cc7f299f7bb7960108437b1698286d061 ncurses-5.5-r3.ebuild 4863
 SHA256 070029894fc3117ea12f89f63f8ea42b36c95484593b1bde9f646e7aea286dd3 ncurses-5.5-r3.ebuild 4863
+EBUILD ncurses-5.6-r1.ebuild 4660 RMD160 12ea58e048025e9725ab1d597017a0a3d3c9dd7f SHA1 78402b44dc98ae1fbb634f342c4a0b8147b7f79b SHA256 cc047ac63a7a208148c6a52e34e5d8d31b0d40f473e31ce4568648f090d9ed91
+MD5 4c09f9175241790c130680a5971a5b29 ncurses-5.6-r1.ebuild 4660
+RMD160 12ea58e048025e9725ab1d597017a0a3d3c9dd7f ncurses-5.6-r1.ebuild 4660
+SHA256 cc047ac63a7a208148c6a52e34e5d8d31b0d40f473e31ce4568648f090d9ed91 ncurses-5.6-r1.ebuild 4660
 EBUILD ncurses-5.6.ebuild 4584 RMD160 4bd4c9092ed58d348a76d3870aa07bc687f937b7 SHA1 ce9aa98999ef5cb05aa09408c5f5de2bc5a6aca8 SHA256 8566300ec66c8e65a641bf1126b65876dc719dbecbcdf16c5080af2d1068125e
 MD5 57b11cca2609906851138d286a79912a ncurses-5.6.ebuild 4584
 RMD160 4bd4c9092ed58d348a76d3870aa07bc687f937b7 ncurses-5.6.ebuild 4584
 SHA256 8566300ec66c8e65a641bf1126b65876dc719dbecbcdf16c5080af2d1068125e ncurses-5.6.ebuild 4584
-MISC ChangeLog 19572 RMD160 4cdf2275e55a305a104911a3e6d35b7f4ce31b2c SHA1 b5b863dd0b5dc309cc60767a9749de3e36df92da SHA256 eefc17978971543df894f06373815b6f0b6652bf6a3e526121f150bb863a9cca
-MD5 0cd67f4928165c1a0a7c6aea0fabe3a9 ChangeLog 19572
-RMD160 4cdf2275e55a305a104911a3e6d35b7f4ce31b2c ChangeLog 19572
-SHA256 eefc17978971543df894f06373815b6f0b6652bf6a3e526121f150bb863a9cca ChangeLog 19572
+MISC ChangeLog 19718 RMD160 4927c2da01bdfebb2ffcefdfb5c3bd860d644110 SHA1 1b1d4b4c14ebc9b606bc6598c3718a0f20a3cd6f SHA256 3018a2474406da4aa03948d983ee14bd82272b86eb20b2612a7a5a42e9384436
+MD5 0e8f28397fb391dc5296787d44f3fd4a ChangeLog 19718
+RMD160 4927c2da01bdfebb2ffcefdfb5c3bd860d644110 ChangeLog 19718
+SHA256 3018a2474406da4aa03948d983ee14bd82272b86eb20b2612a7a5a42e9384436 ChangeLog 19718
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -57,10 +62,13 @@ SHA256 f86ecfaaa7faef60ffbc739f005574acbd940ee20502129d8d6c6aa433e1ecee files/di
 MD5 815d6657066cf2f88061b6542dc5bfe0 files/digest-ncurses-5.6 238
 RMD160 dbf4e20e60f6247945ffbefcf00a455920d0c1b1 files/digest-ncurses-5.6 238
 SHA256 aeae266804b5463f9acb8a7ece8f88dfcb520a6b7705011e727b1c0cbe83632d files/digest-ncurses-5.6 238
+MD5 4113e58a2761a788de58821d1058f534 files/digest-ncurses-5.6-r1 500
+RMD160 467579d539f83f3e670698737d5c1a5a2b78a05b files/digest-ncurses-5.6-r1 500
+SHA256 0ebdcdfd302a82613b796db3a2cfce0c7a6319992f7fc9ec80c1301444766042 files/digest-ncurses-5.6-r1 500
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGGH5p8bi6rjpTunYRAnm4AJ9Vvi66VvicSsJOJmB8gTOMNPpSSACgnONm
-Yqm7xnPxduV0TpQMeeQ2cc4=
-=x77o
+iD8DBQFGGJJq8bi6rjpTunYRAiXHAJ4pSF+eGK3EsKfYoEGs8XUXDNh5iwCfbWZQ
+DTOeC6QUVBvhhwAeohi8PPc=
+=2hlO
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/ncurses/files/digest-ncurses-5.6-r1 b/sys-libs/ncurses/files/digest-ncurses-5.6-r1
new file mode 100644
index 000000000000..93a3482eb6c2
--- /dev/null
+++ b/sys-libs/ncurses/files/digest-ncurses-5.6-r1
@@ -0,0 +1,6 @@
+MD5 27607b10fef869740cbcc408d86695b1 ncurses-5.6-coverity.patch.gz 6196
+RMD160 b11682ae9e043be8d6c50f040d8531f80fc26ce8 ncurses-5.6-coverity.patch.gz 6196
+SHA256 3deeef017c739116c17574e7fd235b1b05053f5c50c7bfeeee2e3f8e4332380e ncurses-5.6-coverity.patch.gz 6196
+MD5 b6593abe1089d6aab1551c105c9300e3 ncurses-5.6.tar.gz 2402592
+RMD160 1a878819c43e6426500fd74ccedf0a032ef399d8 ncurses-5.6.tar.gz 2402592
+SHA256 f9cac2b31683a37d65bc37119599752198a0691e462d0d1a252cf9815f5724d5 ncurses-5.6.tar.gz 2402592
diff --git a/sys-libs/ncurses/ncurses-5.6-r1.ebuild b/sys-libs/ncurses/ncurses-5.6-r1.ebuild
new file mode 100644
index 000000000000..1ec5ec73faad
--- /dev/null
+++ b/sys-libs/ncurses/ncurses-5.6-r1.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6-r1.ebuild,v 1.1 2007/04/08 06:57:18 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+MY_PV=${PV:0:3}
+PV_SNAP=${PV:4}
+MY_P=${PN}-${MY_PV}
+DESCRIPTION="console display library"
+HOMEPAGE="http://www.gnu.org/software/ncurses/ http://dickey.his.com/ncurses/"
+SRC_URI="mirror://gnu/ncurses/${MY_P}.tar.gz
+	ftp://invisible-island.net/ncurses/${PV}/${P}-coverity.patch.gz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="bootstrap build debug doc gpm minimal nocxx trace unicode"
+
+DEPEND="gpm? ( sys-libs/gpm )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	[[ -n ${PV_SNAP} ]] && epatch "${WORKDIR}"/${MY_P}-${PV_SNAP}-patch.sh
+	epatch "${WORKDIR}"/${P}-coverity.patch
+	epatch "${FILESDIR}"/${PN}-5.6-gfbsd.patch
+}
+
+src_compile() {
+	tc-export BUILD_CC
+
+	# Protect the user from themselves #115036
+	unset TERMINFO
+
+	# From version 5.3, ncurses also build c++ bindings, and as
+	# we do not have a c++ compiler during bootstrap, disable
+	# building it.  We will rebuild ncurses after gcc's second
+	# build in bootstrap.sh.
+	local myconf=""
+	( use build || use bootstrap || use nocxx ) \
+		&& myconf="${myconf} --without-cxx --without-cxx-binding --without-ada"
+
+	# First we build the regular ncurses ...
+	mkdir "${WORKDIR}"/narrowc
+	cd "${WORKDIR}"/narrowc
+	do_compile ${myconf}
+
+	# Then we build the UTF-8 version
+	if use unicode ; then
+		mkdir "${WORKDIR}"/widec
+		cd "${WORKDIR}"/widec
+		do_compile ${myconf} --enable-widec --includedir=/usr/include/ncursesw
+	fi
+}
+do_compile() {
+	ECONF_SOURCE=${S}
+
+	local mylibprefix=""
+	[[ ${CHOST} == *-darwin* ]] && mylibprefix="/usr"
+
+	# We need the basic terminfo files in /etc, bug #37026.  We will
+	# add '--with-terminfo-dirs' and then populate /etc/terminfo in
+	# src_install() ...
+	# The chtype/mmask-t settings below are to retain ABI compat
+	# with ncurses-5.4 so dont change em !
+	econf \
+		--libdir=${mylibprefix}/$(get_libdir) \
+		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
+		--disable-termcap \
+		--with-shared \
+		--with-rcs-ids \
+		--enable-symlinks \
+		--enable-const \
+		--with-chtype='long' \
+		--with-mmask-t='long' \
+		--with-manpage-format=normal \
+		$(use_with debug) \
+		$(use_with gpm) \
+		$(use_with trace) \
+		"$@" \
+		|| die "configure failed"
+
+	# A little hack to fix parallel builds ... they break when
+	# generating sources so if we generate the sources first (in
+	# non-parallel), we can then build the rest of the package
+	# in parallel.  This is not really a perf hit since the source
+	# generation is quite small.  -vapier
+	emake -j1 sources || die "make sources failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	# install unicode version second so that the binaries in /usr/bin
+	# support both wide and narrow
+	cd "${WORKDIR}"/narrowc
+	emake DESTDIR="${D}" install || die "make narrowc install failed"
+	if use unicode ; then
+		cd "${WORKDIR}"/widec
+		emake DESTDIR="${D}" install || die "make widec install failed"
+	fi
+
+	if [[ ${CHOST} != *-darwin* ]] ; then
+		# Move static and extraneous ncurses libraries out of /lib
+		dodir /usr/$(get_libdir)
+		cd "${D}"/$(get_libdir)
+		mv lib{form,menu,panel}.so* *.a "${D}"/usr/$(get_libdir)/
+		gen_usr_ldscript lib{,n}curses.so
+		if use unicode ; then
+			mv lib{form,menu,panel}w.so* "${D}"/usr/$(get_libdir)/
+			gen_usr_ldscript lib{,n}cursesw.so
+		fi
+	fi
+
+	# We need the basic terminfo files in /etc, bug #37026
+	einfo "Installing basic terminfo files in /etc..."
+	for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} \
+	         xterm xterm-color xterm-xfree86
+	do
+		local termfile=$(find "${D}"/usr/share/terminfo/ -name "${x}" 2>/dev/null)
+		local basedir=$(basename $(dirname "${termfile}"))
+
+		if [[ -n ${termfile} ]] ; then
+			dodir /etc/terminfo/${basedir}
+			mv ${termfile} "${D}"/etc/terminfo/${basedir}/
+			dosym ../../../../etc/terminfo/${basedir}/${x} \
+				/usr/share/terminfo/${basedir}/${x}
+		fi
+	done
+
+	# Build fails to create this ...
+	dosym ../share/terminfo /usr/$(get_libdir)/terminfo
+
+	echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses
+	doenvd "${T}"/50ncurses
+
+	use minimal && rm -r "${D}"/usr/share/terminfo
+	cd "${S}"
+	dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc
+	use doc && dohtml -r doc/html/
+}
+
+pkg_preinst() {
+	use unicode || preserve_old_lib /$(get_libdir)/libncursesw.so.5
+}
+
+pkg_postinst() {
+	use unicode || preserve_old_lib_notify /$(get_libdir)/libncursesw.so.5
+}