Version bumped, bug #208464.

(Portage version: 2.1.4.4)

6 files changed, 13 insertions, 304 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index db892e9dcdad..8939ee537c36 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.102 2008/02/04 16:28:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.103 2008/02/16 04:43:31 matsuu Exp $
+
+*tk-8.5.1 (16 Feb 2008)
+*tk-8.4.18 (16 Feb 2008)
+
+  16 Feb 2008; MATSUU Takuto <matsuu@gentoo.org>
+  -files/tk-CVE-2006-4484.patch, -tk-8.4.9.ebuild, -tk-8.4.15-r2.ebuild,
+  -tk-8.4.17.ebuild, +tk-8.4.18.ebuild, -tk-8.5.0-r2.ebuild,
+  +tk-8.5.1.ebuild:
+  Version bumped, bug #208464.
+  Removed old versions.
 
 *tk-8.5.0-r2 (04 Feb 2008)
 *tk-8.4.17 (04 Feb 2008)
diff --git a/dev-lang/tk/files/tk-CVE-2006-4484.patch b/dev-lang/tk/files/tk-CVE-2006-4484.patch
deleted file mode 100644
index e8a81f384f28..000000000000
--- a/dev-lang/tk/files/tk-CVE-2006-4484.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Index: generic/tkImgGIF.c
-===================================================================
-RCS file: /cvsroot/tktoolkit/tk/generic/tkImgGIF.c,v
-retrieving revision 1.24.2.5
-diff -u -r1.24.2.5 tkImgGIF.c
---- generic/tkImgGIF.c	11 Sep 2007 18:01:45 -0000	1.24.2.5
-+++ generic/tkImgGIF.c	25 Jan 2008 19:23:01 -0000
-@@ -826,6 +826,12 @@
- 		Tcl_PosixError(interp), (char *) NULL);
- 	return TCL_ERROR;
-     }
-+
-+    if (initialCodeSize > MAX_LWZ_BITS) {
-+	Tcl_SetResult(interp, "malformed image", TCL_STATIC);
-+	return TCL_ERROR;
-+    }
-+
-     if (transparent != -1) {
- 	cmap[transparent][CM_RED] = 0;
- 	cmap[transparent][CM_GREEN] = 0;
-Index: tests/imgPhoto.test
-===================================================================
-RCS file: /cvsroot/tktoolkit/tk/tests/imgPhoto.test,v
-retrieving revision 1.15.2.5
-diff -u -r1.15.2.5 imgPhoto.test
---- tests/imgPhoto.test	11 Sep 2007 18:01:46 -0000	1.15.2.5
-+++ tests/imgPhoto.test	25 Jan 2008 19:23:01 -0000
-@@ -681,6 +681,35 @@
-     image delete $i
- }
- 
-+test imgPhoto-14.4 {GIF buffer overflow} -setup {
-+    set i [image create photo]
-+} -body {
-+    # This crashes Tk up to 8.4.17 and 8.5.0
-+    $i configure -data {
-+	R0lGODlhCgAKAPcAAAAAAIAAAACAAICAAAAAgIAAgACAgICAgMDAwP8AAAD/
-+	AP//AAAA//8A/wD//////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-+	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-+	AAAAMwAAZgAAmQAAzAAA/wAzAAAzMwAzZgAzmQAzzAAz/wBmAABmMwBmZgBm
-+	mQBmzABm/wCZAACZMwCZZgCZmQCZzACZ/wDMAADMMwDMZgDMmQDMzADM/wD/
-+	AAD/MwD/ZgD/mQD/zAD//zMAADMAMzMAZjMAmTMAzDMA/zMzADMzMzMzZjMz
-+	mTMzzDMz/zNmADNmMzNmZjNmmTNmzDNm/zOZADOZMzOZZjOZmTOZzDOZ/zPM
-+	ADPMMzPMZjPMmTPMzDPM/zP/ADP/MzP/ZjP/mTP/zDP//2YAAGYAM2YAZmYA
-+	mWYAzGYA/2YzAGYzM2YzZmYzmWYzzGYz/2ZmAGZmM2ZmZmZmmWZmzGZm/2aZ
-+	AGaZM2aZZmaZmWaZzGaZ/2bMAGbMM2bMZmbMmWbMzGbM/2b/AGb/M2b/Zmb/
-+	mWb/zGb//5kAAJkAM5kAZpkAmZkAzJkA/5kzAJkzM5kzZpkzmZkzzJkz/5lm
-+	AJlmM5lmZplmmZlmzJlm/5mZAJmZM5mZZpmZmZmZzJmZ/5nMAJnMM5nMZpnM
-+	mZnMzJnM/5n/AJn/M5n/Zpn/mZn/zJn//8wAAMwAM8wAZswAmcwAzMwA/8wz
-+	AMwzM8wzZswzmcwzzMwz/8xmAMxmM8xmZsxmmcxmzMxm/8yZAMyZM8yZZsyZ
-+	mcyZzMyZ/8zMAMzMM8zMZszMmczMzMzM/8z/AMz/M8z/Zsz/mcz/zMz///8A
-+	AP8AM/8AZv8Amf8AzP8A//8zAP8zM/8zZv8zmf8zzP8z//9mAP9mM/9mZv9m
-+	mf9mzP9m//+ZAP+ZM/+ZZv+Zmf+ZzP+Z///MAP/MM//MZv/Mmf/MzP/M////
-+	AP//M///Zv//mf//zP///yH5BAEAABAALAAAAAAKAAoAABUSAAD/HEiwoMGD
-+	CBMqXMiwYcKAADs=
-+    } 
-+} -cleanup {
-+    image delete $i
-+} -returnCodes error -result {malformed image}
-+
- test imgPhoto-15.1 {photo images can fail to allocate memory gracefully} \
- 	{nonPortable} {
-     # This is not portable to very large machines with more around
diff --git a/dev-lang/tk/tk-8.4.15-r2.ebuild b/dev-lang/tk/tk-8.4.15-r2.ebuild
deleted file mode 100644
index 7daa07327f1f..000000000000
--- a/dev-lang/tk/tk-8.4.15-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.15-r2.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $
-
-WANT_AUTOCONF=latest
-WANT_AUTOMAKE=latest
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug threads"
-
-RDEPEND="x11-libs/libX11
-	~dev-lang/tcl-${PV}"
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	x11-proto/xproto"
-
-S=${WORKDIR}/${PN}${PV}
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/remove-control-v-8.4.9.diff
-	epatch "${FILESDIR}"/${PN}-8.4.9-man.patch
-	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
-
-	# Bug 125971
-	epatch "${FILESDIR}"/${P}-tclm4-soname.patch
-
-	# Bug 192539
-	epatch "${FILESDIR}"/${PN}-CVE-2007-4851.patch
-
-	# Bug 208464
-	epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch
-
-	local d
-	for d in */configure ; do
-		cd "${S}"/${d%%/*}
-		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
-		epatch "${FILESDIR}"/tk-configure-LANG.patch
-	done
-
-	cd "${S}"/unix
-	eautoreconf
-}
-
-src_compile() {
-	tc-export CC
-	cd "${S}"/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-
-	econf \
-		--with-tcl=/usr/${mylibdir} \
-		$(use_enable threads) \
-		$(use_enable debug symbols) || die
-
-	emake || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd "${S}"/unix
-	make DESTDIR="${D}" install || die
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		"${D}"/usr/${mylibdir}/tkConfig.sh || die
-
-	# install private headers
-	insinto /usr/${mylibdir}/tk${v1}/include/unix
-	doins "${S}"/unix/*.h || die
-	insinto /usr/${mylibdir}/tk${v1}/include/generic
-	doins "${S}"/generic/*.h || die
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f "${D}"/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym libtk${v1}.a /usr/${mylibdir}/libtk.a
-	if use debug ; then
-		dosym libtk${v1}g.so /usr/${mylibdir}/libtk${v1}.so
-		dosym libtkstub${v1}g.a /usr/${mylibdir}/libtkstub${v1}.a
-		dosym ../tk${v1}g/pkgIndex.tcl /usr/${mylibdir}/tk${v1}/pkgIndex.tcl
-	fi
-	dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
-	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	dosym wish${v1} /usr/bin/wish
-
-	cd "${S}"
-	dodoc ChangeLog README changes license.terms
-}
diff --git a/dev-lang/tk/tk-8.4.17.ebuild b/dev-lang/tk/tk-8.4.18.ebuild
index 3651ec371e19..236feb8f517c 100644
--- a/dev-lang/tk/tk-8.4.17.ebuild
+++ b/dev-lang/tk/tk-8.4.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.17.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.18.ebuild,v 1.1 2008/02/16 04:43:31 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -47,9 +47,6 @@ src_unpack() {
 	# Bug 125971
 	epatch "${FILESDIR}"/${PN}-8.4.15-tclm4-soname.patch
 
-	# Bug 208464
-	epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch
-
 	local d
 	for d in */configure ; do
 		cd "${S}"/${d%%/*}
diff --git a/dev-lang/tk/tk-8.4.9.ebuild b/dev-lang/tk/tk-8.4.9.ebuild
deleted file mode 100644
index bf1ef9beecd7..000000000000
--- a/dev-lang/tk/tk-8.4.9.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.9.ebuild,v 1.19 2007/07/23 20:12:39 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sh sparc x86"
-IUSE="threads"
-
-RDEPEND="x11-libs/libX11
-	=dev-lang/tcl-${PV}*"
-DEPEND="${RDEPEND}
-	x11-libs/libXt
-	x11-proto/xproto"
-
-S=${WORKDIR}/${PN}${PV}
-
-pkg_setup() {
-	if use threads ; then
-		ewarn ""
-		ewarn "PLEASE NOTE: You are compiling ${P} with"
-		ewarn "threading enabled."
-		ewarn "Threading is not supported by all applications"
-		ewarn "that compile against tcl. You use threading at"
-		ewarn "your own discretion."
-		ewarn ""
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/remove-control-v-${PV}.diff || die
-	epatch ${FILESDIR}/${P}-man.patch || die
-
-	# bug 117982
-	sed -i -e "s/relid'/relid/" "${S}"/unix/{configure,tcl.m4} || die
-
-	local d
-	for d in */configure ; do
-		cd "${S}"/${d%%/*}
-		EPATCH_SINGLE_MSG="Patching nls cruft in ${d}" \
-		epatch "${FILESDIR}"/tk-configure-LANG.patch
-	done
-}
-
-src_compile() {
-	cd ${S}/unix
-
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	local local_config_use=""
-
-	if use threads ; then
-		local_config_use="--enable-threads"
-	fi
-
-	econf \
-		--with-tcl=/usr/${mylibdir} \
-		${local_config_use} || die
-
-	emake CFLAGS="${CFLAGS}" || die
-}
-
-src_install() {
-	#short version number
-	local v1
-	v1=${PV%.*}
-
-	cd ${S}/unix
-	#make INSTALL_ROOT=${D} MAN_INSTALL_DIR=${D}/usr/share/man install || die
-	make INSTALL_ROOT=${D} install || die
-
-	# fix the tkConfig.sh to eliminate refs to the build directory
-	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
-	sed -i \
-		-e "s,^\(TK_BUILD_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_SRC_DIR='\)${S}',\1/usr/${mylibdir}/tk${v1}/include'," \
-		-e "s,^\(TK_BUILD_STUB_LIB_SPEC='-L\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_BUILD_STUB_LIB_PATH='\)${S}/unix,\1/usr/${mylibdir}," \
-		-e "s,^\(TK_CC_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		-e "s,^\(TK_LD_SEARCH_FLAGS='.*\)',\1:/usr/${mylibdir}'," \
-		${D}/usr/${mylibdir}/tkConfig.sh
-
-	# install private headers
-	dodir /usr/${mylibdir}/tk${v1}/include/unix
-	install -c -m0644 ${S}/unix/*.h ${D}/usr/${mylibdir}/tk${v1}/include/unix
-	dodir /usr/${mylibdir}/tk${v1}/include/generic
-	install -c -m0644 ${S}/generic/*.h ${D}/usr/${mylibdir}/tk${v1}/include/generic
-	rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tk.h
-	rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkDecls.h
-	rm -f ${D}/usr/${mylibdir}/tk${v1}/include/generic/tkPlatDecls.h
-
-	# install symlink for libraries
-	#dosym /usr/${mylibdir}/libtk${v1}.a /usr/${mylibdir}/libtk.a
-	dosym /usr/${mylibdir}/libtk${v1}.so /usr/${mylibdir}/libtk.so
-	dosym /usr/${mylibdir}/libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
-
-	ln -sf wish${v1} ${D}/usr/bin/wish
-
-	cd ${S}
-	dodoc README changes license.terms
-}
diff --git a/dev-lang/tk/tk-8.5.0-r2.ebuild b/dev-lang/tk/tk-8.5.1.ebuild
index 1d490774fcca..a680a481252f 100644
--- a/dev-lang/tk/tk-8.5.0-r2.ebuild
+++ b/dev-lang/tk/tk-8.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.0-r2.ebuild,v 1.1 2008/02/04 16:28:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5.1.ebuild,v 1.1 2008/02/16 04:43:32 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -47,9 +47,6 @@ src_unpack() {
 	# Bug 125971
 	epatch "${FILESDIR}"/${PN}-8.5_alpha6-tclm4-soname.patch
 
-	# Bug 208464
-	epatch "${FILESDIR}"/${PN}-CVE-2006-4484.patch
-
 	cd "${S}"/unix
 	eautoreconf
 }