Fixed CVE-2007-4851, bug #192539.

(Portage version: 2.1.2.12)

9 files changed, 47 insertions, 39 deletions

diff --git a/dev-lang/tk/ChangeLog b/dev-lang/tk/ChangeLog
index 576b65d07a5f..c4ced81153d0 100644
--- a/dev-lang/tk/ChangeLog
+++ b/dev-lang/tk/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-lang/tk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.89 2007/08/21 19:10:34 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/ChangeLog,v 1.90 2007/09/16 02:23:57 matsuu Exp $
+
+*tk-8.5_alpha6-r1 (16 Sep 2007)
+*tk-8.4.15-r1 (16 Sep 2007)
+
+  16 Sep 2007; MATSUU Takuto <matsuu@gentoo.org>
+  -files/tk-8.3.5-tclm4-soname.patch, +files/tk-CVE-2007-4851.patch,
+  -tk-8.4.14.ebuild, -tk-8.4.14-r1.ebuild, +tk-8.4.15-r1.ebuild,
+  +tk-8.5_alpha6-r1.ebuild:
+  Fixed CVE-2007-4851, bug #192539.
+  Removed old versions.
 
   21 Aug 2007; Christoph Mende <angelos@gentoo.org> tk-8.4.15.ebuild:
   Stable on amd64 wrt bug #178320
diff --git a/dev-lang/tk/files/digest-tk-8.4.14 b/dev-lang/tk/files/digest-tk-8.4.14
deleted file mode 100644
index 62a817b12831..000000000000
--- a/dev-lang/tk/files/digest-tk-8.4.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d12f591f5689f95c82bfb9c1015407bb tk8.4.14-src.tar.gz 3268223
-RMD160 055ea75b91fe0e33ac9d96bd3b9099622008820e tk8.4.14-src.tar.gz 3268223
-SHA256 01676aaff0c7d387adb3f549ea7b4222f7173c0395e773b23402637106be3b0d tk8.4.14-src.tar.gz 3268223
diff --git a/dev-lang/tk/files/digest-tk-8.4.14-r1 b/dev-lang/tk/files/digest-tk-8.4.14-r1
deleted file mode 100644
index 62a817b12831..000000000000
--- a/dev-lang/tk/files/digest-tk-8.4.14-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d12f591f5689f95c82bfb9c1015407bb tk8.4.14-src.tar.gz 3268223
-RMD160 055ea75b91fe0e33ac9d96bd3b9099622008820e tk8.4.14-src.tar.gz 3268223
-SHA256 01676aaff0c7d387adb3f549ea7b4222f7173c0395e773b23402637106be3b0d tk8.4.14-src.tar.gz 3268223
diff --git a/dev-lang/tk/files/digest-tk-8.4.15-r1 b/dev-lang/tk/files/digest-tk-8.4.15-r1
new file mode 100644
index 000000000000..3a75c3b23a2f
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.4.15-r1
@@ -0,0 +1,3 @@
+MD5 68777568d818e1980dda4b6b02b92f1a tk8.4.15-src.tar.gz 3340313
+RMD160 8facb8033ce811097a3568373581687a749dda2d tk8.4.15-src.tar.gz 3340313
+SHA256 2205bb0b0172f5553565f9f323ccf4bc122875084abc21a46f86ac560b9cd935 tk8.4.15-src.tar.gz 3340313
diff --git a/dev-lang/tk/files/digest-tk-8.5_alpha6-r1 b/dev-lang/tk/files/digest-tk-8.5_alpha6-r1
new file mode 100644
index 000000000000..62c129565319
--- /dev/null
+++ b/dev-lang/tk/files/digest-tk-8.5_alpha6-r1
@@ -0,0 +1,3 @@
+MD5 3903199e8c5ee921f747a5d59174ed68 tk8.5a6-src.tar.gz 3682249
+RMD160 9cb6f2c7665eee8269a69805a3c9b45edd806cda tk8.5a6-src.tar.gz 3682249
+SHA256 67f5022f31d7a8adea7d150caa5c7de56ea0051e287f67fcb15b82f7fd5b8fd6 tk8.5a6-src.tar.gz 3682249
diff --git a/dev-lang/tk/files/tk-8.3.5-tclm4-soname.patch b/dev-lang/tk/files/tk-8.3.5-tclm4-soname.patch
deleted file mode 100644
index 9cf21b89cae6..000000000000
--- a/dev-lang/tk/files/tk-8.3.5-tclm4-soname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u tk8.3.5/unix/tcl.m4~ tk8.3.5/unix/tcl.m4
---- tk8.3.5/unix/tcl.m4~	2003-01-14 21:22:12.000000000 +0900
-+++ tk8.3.5/unix/tcl.m4	2003-01-14 21:22:12.000000000 +0900
-@@ -949,7 +949,7 @@
- 	    CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
- 
- 	    if test "$have_dl" = yes; then
--		SHLIB_LD="${CC} -shared"
-+		SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS="-ldl"
- 		LDFLAGS="-rdynamic"
diff --git a/dev-lang/tk/files/tk-CVE-2007-4851.patch b/dev-lang/tk/files/tk-CVE-2007-4851.patch
new file mode 100644
index 000000000000..f461031091ae
--- /dev/null
+++ b/dev-lang/tk/files/tk-CVE-2007-4851.patch
@@ -0,0 +1,12 @@
+diff -Naur tk8.4.15.orig/generic/tkImgGIF.c tk8.4.15/generic/tkImgGIF.c
+--- tk8.4.15.orig/generic/tkImgGIF.c	2006-03-27 21:13:56.000000000 +0900
++++ tk8.4.15/generic/tkImgGIF.c	2007-09-16 09:56:25.000000000 +0900
+@@ -995,7 +995,7 @@
+ 	 */
+ 	if (interlace) {
+ 	    ypos += interlaceStep[pass];
+-	    while (ypos >= height) {
++	    while (ypos >= rows) {
+ 		pass++;
+ 		if (pass > 3) {
+ 		    return TCL_OK;
diff --git a/dev-lang/tk/tk-8.4.14-r1.ebuild b/dev-lang/tk/tk-8.4.15-r1.ebuild
index d62cac03b396..5ecf5ff1fd22 100644
--- a/dev-lang/tk/tk-8.4.14-r1.ebuild
+++ b/dev-lang/tk/tk-8.4.15-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.14-r1.ebuild,v 1.1 2007/07/12 18:06:22 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.4.15-r1.ebuild,v 1.1 2007/09/16 02:23:57 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
@@ -45,7 +45,10 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-8.4.11-multilib.patch
 
 	# Bug 125971
-	epatch "${FILESDIR}"/${PN}-8.3.5-tclm4-soname.patch
+	epatch "${FILESDIR}"/${P}-tclm4-soname.patch
+
+	# Bug 192539
+	epatch "${FILESDIR}"/${PN}-CVE-2007-4851.patch
 
 	local d
 	for d in */configure ; do
diff --git a/dev-lang/tk/tk-8.4.14.ebuild b/dev-lang/tk/tk-8.5_alpha6-r1.ebuild
index 5dad9a64028f..2a30d761f2b3 100644
--- a/dev-lang/tk/tk-8.4.14.ebuild
+++ b/dev-lang/tk/tk-8.5_alpha6-r1.ebuild
@@ -1,19 +1,20 @@
 # 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.14.ebuild,v 1.11 2007/07/22 08:39:45 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/tk/tk-8.5_alpha6-r1.ebuild,v 1.1 2007/09/16 02:23:57 matsuu Exp $
 
 WANT_AUTOCONF=latest
 WANT_AUTOMAKE=latest
 
 inherit autotools eutils multilib toolchain-funcs
 
+MY_P="${PN}${PV/_alpha/a}"
 DESCRIPTION="Tk Widget Set"
-HOMEPAGE="http://dev.scriptics.com/software/tcltk/"
-SRC_URI="mirror://sourceforge/tcl/${PN}${PV}-src.tar.gz"
+HOMEPAGE="http://www.tcl.tk/"
+SRC_URI="mirror://sourceforge/tcl/${MY_P}-src.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="debug threads"
 
 RDEPEND="x11-libs/libX11
@@ -22,7 +23,7 @@ DEPEND="${RDEPEND}
 	x11-libs/libXt
 	x11-proto/xproto"
 
-S=${WORKDIR}/${PN}${PV}
+S="${WORKDIR}/${MY_P}"
 
 pkg_setup() {
 	if use threads ; then
@@ -40,19 +41,13 @@ pkg_setup() {
 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}"/${PN}-8.3.5-tclm4-soname.patch
+	epatch "${FILESDIR}"/${P}-tclm4-soname.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
+	# Bug 192539
+	epatch "${FILESDIR}"/${PN}-CVE-2007-4851.patch
 
 	cd "${S}"/unix
 	eautoreconf
@@ -75,10 +70,10 @@ src_compile() {
 src_install() {
 	#short version number
 	local v1
-	v1=${PV%.*}
+	v1=${PV%_*}
 
 	cd "${S}"/unix
-	make DESTDIR="${D}" install || die
+	S= emake DESTDIR="${D}" install || die
 
 	# fix the tkConfig.sh to eliminate refs to the build directory
 	local mylibdir=$(get_libdir) ; mylibdir=${mylibdir//\/}
@@ -105,8 +100,8 @@ src_install() {
 	dosym libtk${v1}.so /usr/${mylibdir}/libtk.so
 	dosym libtkstub${v1}.a /usr/${mylibdir}/libtkstub.a
 
-	ln -sf wish${v1} "${D}"/usr/bin/wish
+	dosym wish${v1} /usr/bin/wish
 
 	cd "${S}"
-	dodoc ChangeLog README changes license.terms
+	dodoc ChangeLog* README changes
 }