Patch added for CVE-2009-2369. Bug #277722.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 237 insertions, 2 deletions

diff --git a/x11-libs/wxGTK/ChangeLog b/x11-libs/wxGTK/ChangeLog
index 2af677b9bd82..3b585b3feada 100644
--- a/x11-libs/wxGTK/ChangeLog
+++ b/x11-libs/wxGTK/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/wxGTK
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.225 2009/07/19 17:51:45 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/ChangeLog,v 1.226 2009/07/20 04:14:57 dirtyepic Exp $
+
+*wxGTK-2.6.4.0-r5 (20 Jul 2009)
+
+  20 Jul 2009; Ryan Hill <dirtyepic@gentoo.org> +wxGTK-2.6.4.0-r5.ebuild:
+  Patch added for CVE-2009-2369. Bug #277722.
 
   19 Jul 2009; nixnut <nixnut@gentoo.org> wxGTK-2.8.10.1-r1.ebuild:
   ppc stable #277722
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index 740dc5499c53..727f31853a18 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wxGTK-2.6.3-unicode-odbc.patch 729 RMD160 cad7401a478ccf30a06c2b856d446804d068a1fa SHA1 3cdaf28a083316c20bbb2d72c4a1b606ce001d2c SHA256 195494cc97b99674f08f30f46322458a90cc146cf70749cdb0c7d255424ab00f
 AUX wxGTK-2.6.4-collision.patch 5778 RMD160 cbe029a606ec1f46ae7f29605631b8f05bd50cb4 SHA1 05a80154ad673b26a6e8dadc79c488ce5a0357b4 SHA256 0f7ac329ce24fbac7828a0b7c249ac0b376334da0f563456572172359ad78435
 AUX wxGTK-2.6.4-mmedia.patch 599 RMD160 e894dacc346d7c10f9582c2885df8c0b82962bb1 SHA1 d1da9fe158c5db80f8e65395b9d2c3383133352c SHA256 0f848e5985e404d89fbcc4820ca07069845dc8219e0a8679ff5ad3bf28dbc93f
@@ -16,9 +19,17 @@ DIST wxPython-src-2.8.9.1.tar.bz2 27969655 RMD160 2b193c867a028985f8ead4084a9c1f
 DIST wxPython-src-2.8.9.2.tar.bz2 29370216 RMD160 93a9bd35b59e16674375b1431e24d47b58a824d2 SHA1 a0d58d8b9606d04a35b9853da15eb7dfb08d5637 SHA256 0683ef245d7c121dea7f16f08f0d2cd77348d588e6831cc3bc88cf23dc6029b5
 DIST wxWidgets-2.6.4-HTML.tar.gz 1364468 RMD160 1330f83e821b5644043ca212f2991f6b55bb0e6f SHA1 4fa83af9d55de61a934961cb2e2f19f22930f592 SHA256 ec7c80be3cebc69e7fb63d56235cbd82f3cd943e422329d7e648ee745a07588c
 EBUILD wxGTK-2.6.4.0-r4.ebuild 4710 RMD160 08573f1b1e490e6d08ef282b08b4805653062757 SHA1 beebb30d9eadf9cd1938927adbdb2ebef734c6b4 SHA256 8c4fb921e21b30fb18ba73827939af2b84f148c7f945587f4a3839237789b068
+EBUILD wxGTK-2.6.4.0-r5.ebuild 4778 RMD160 37ef7a357eca8a188440196b217374b226d5bcf1 SHA1 33adda1d7153f4b5d55b142e28b024bb6ee8099d SHA256 e7fba2e0dbcb2ddedc6e6e9f8c332fe98c2d5f6dbedd4b51901f7044ea9f4e3b
 EBUILD wxGTK-2.8.10.1-r1.ebuild 3596 RMD160 4c33c43c9d829604f9047bb1e7a7e042824c0568 SHA1 f45c1afbcfaba96dce3a3e486c812138484b5dd0 SHA256 cd20083befcedb2853815fe827c7731aec7796113444812796991fab1427fa6d
 EBUILD wxGTK-2.8.10.1.ebuild 3502 RMD160 7b54c24e96ffdb868b9ac3250bfa7aa971a61bbf SHA1 adc06db875dbb597518f65d48ae8dfedbcf684c5 SHA256 1d926973f78bc5df6d5df6b6136c32ef8f90b294ad6a3e7c845e4c4ee80fed0b
 EBUILD wxGTK-2.8.9.1-r3.ebuild 3503 RMD160 1cf46a38c02ff151e695ba1cc52a7cf27e020977 SHA1 69e5b404de10168c7a8ff7060d0fdec947c63d0a SHA256 4eac832ee9ee321fbedb5b5096e807553115edf2eb37c9aa0616d732cd5b3c80
 EBUILD wxGTK-2.8.9.2-r1.ebuild 3631 RMD160 e2a708203df47021c89d934389a221378deb4e45 SHA1 156f00e2dbff86f81750938266beafc9d136d6d7 SHA256 9c6c499f711444780d0cddc5fdedbca70d2c1f3689bc549c9e758818e145760c
-MISC ChangeLog 35323 RMD160 49f222d66639d780c71d089c095bd52666868d68 SHA1 32a305686043041bf314331158ce01ecec2b35db SHA256 6f2cf553cc57c1c2e7bde86f9088276d09e83c9399448b231f97ad51af1ccea9
+MISC ChangeLog 35480 RMD160 5de361b2c31aba76a56f0df662315bddc8ec81b0 SHA1 c2af3484d4f035bc05d7fd30ffba72d581ecccc2 SHA256 f4c6c2aaf0f7d303c1690921f167ab2496ae50944419b799743599f2b2a944bf
 MISC metadata.xml 500 RMD160 d0f05c0d915928bc4c424ca00f20621805ddc7f0 SHA1 3ba77d570e4764cf377b3e63078b21f69232a1fc SHA256 2592b31d76fd0a79aa634bcbc9697d7ee8420b89cbead01a8db562a4d66be98c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpj73IACgkQiqiDRvmkBmKx2ACfRejPHyuyIC8ZfndBVp/dCL7W
+v68Ani1ygMo/3t5Qxj9hphuKEnCzUGKs
+=ayG9
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/wxGTK/wxGTK-2.6.4.0-r5.ebuild b/x11-libs/wxGTK/wxGTK-2.6.4.0-r5.ebuild
new file mode 100644
index 000000000000..4cfae1b372ff
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.6.4.0-r5.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/wxGTK/wxGTK-2.6.4.0-r5.ebuild,v 1.1 2009/07/20 04:14:57 dirtyepic Exp $
+
+inherit eutils versionator flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit."
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+		doc? ( mirror://sourceforge/wxwindows/wxWidgets-${BASE_PV}-HTML.tar.gz )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="X doc debug gnome odbc opengl pch sdl unicode"
+
+RDEPEND="
+	dev-libs/expat
+	odbc?	( dev-db/unixODBC )
+	sdl?	( media-libs/libsdl )
+	X?	(
+		>=x11-libs/gtk+-2.0
+		>=dev-libs/glib-2.0
+		media-libs/jpeg
+		media-libs/tiff
+		x11-libs/libSM
+		x11-libs/libXinerama
+		x11-libs/libXxf86vm
+		gnome?	( gnome-base/libgnomeprintui )
+		opengl?	( virtual/opengl )
+		)"
+
+DEPEND="${RDEPEND}
+		dev-util/pkgconfig
+		X?	(
+			x11-proto/xproto
+			x11-proto/xineramaproto
+			x11-proto/xf86vidmodeproto
+			)"
+
+PDEPEND=">=app-admin/eselect-wxwidgets-0.7"
+
+SLOT="2.6"
+LICENSE="wxWinLL-3
+		GPL-2
+		odbc? ( LGPL-2 )
+		doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+HTML_S="${WORKDIR}/wxWidgets-${BASE_PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# General Patches
+
+	epatch "${FILESDIR}"/${PN}-2.6.3-unicode-odbc.patch
+	epatch "${FILESDIR}"/${BASE_P}-collision.patch
+	epatch "${FILESDIR}"/${BASE_P}-mmedia.patch				# Bug #174874
+
+	# Patches Specific to this version
+
+	epatch "${FILESDIR}"/${P}-wxrc_link_fix.patch
+	epatch "${FILESDIR}"/${P}-g_free.patch
+	epatch "${FILESDIR}"/wxGTK-2.8.10.1-CVE-2009-2369.patch
+
+	# Reverse apply patch in wxPython tarball that breaks ABI
+	EPATCH_SINGLE_MSG="Reversing listctrl-ongetitemcolumnimage.patch ..." \
+		EPATCH_OPTS="-R" epatch "${S}"/patches/listctrl-ongetitemcolumnimage.patch
+
+	# wxBase has an automagic sdl dependency.  short circuit it here.
+	# http://bugs.gentoo.org/show_bug.cgi?id=91574
+	use sdl || sed -i -e 's:$wxUSE_LIBSDL" != "no":$wxUSE_LIBSDL" = "yes":' configure
+}
+
+src_compile() {
+	local myconf
+
+	append-flags -fno-strict-aliasing
+
+	# X independent options
+	myconf="--enable-shared
+			--enable-compat24
+			--with-regex=builtin
+			--with-zlib=sys
+			--with-expat
+			$(use_enable pch precomp-headers)
+			$(use_with sdl)
+			$(use_with odbc)"
+
+	# wxGTK only
+	use X && \
+		myconf="${myconf}
+			--enable-gui
+			--with-libpng
+			--with-libxpm
+			--with-libjpeg
+			--with-libtiff
+			$(use_enable opengl)
+			$(use_with opengl)
+			$(use_with gnome gnomeprint)"
+
+	# wxBase only
+	use X || \
+		myconf="${myconf}
+			--disable-gui"
+
+	# in 2.6 we always build ansi
+	# everything else is controlled by USE
+	if ! use debug; then
+		build_wx ansi
+	else
+		build_wx ansi-debug
+	fi
+
+	if use unicode; then
+		if ! use debug; then
+			build_wx unicode
+		else
+			build_wx unicode-debug
+		fi
+	fi
+}
+
+src_install() {
+	# Note - the last version to be installed becomes the default, so install
+	# ansi after unicode
+	install_wx unicode
+	install_wx unicode-debug
+	install_wx ansi
+	install_wx ansi-debug
+
+	dodoc "${S}"/docs/changes.txt
+	dodoc "${S}"/docs/gtk/readme.txt
+
+	if use doc; then
+		dohtml -r "${HTML_S}"/docs/html/*
+	fi
+
+	# We don't want this
+	rm "${D}"/usr/share/locale/it/LC_MESSAGES/wxmsw.mo
+}
+
+pkg_postinst() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+pkg_postrm() {
+	has_version app-admin/eselect-wxwidgets \
+		&& eselect wxwidgets update
+}
+
+build_wx() {
+	local build_wx_conf
+
+	case "$1" in
+		ansi)
+			build_wx_conf="${build_wx_conf}
+			--disable-unicode"
+		;;
+
+		ansi-debug)
+			build_wx_conf="${build_wx_conf}
+			--disable-unicode
+			--enable-debug_flag"
+		;;
+
+		unicode)
+			build_wx_conf="${build_wx_conf}
+			--enable-unicode"
+		;;
+
+		unicode-debug)
+			build_wx_conf="${build_wx_conf}
+			--enable-unicode
+			--enable-debug_flag"
+		;;
+
+		*)
+			eerror "wxlib.class: build_wx called with invalid argument(s)."
+			die "wxlib.class: build_wx called with invalid argument(s)."
+		;;
+	esac
+
+	mkdir -p build_$1
+	pushd build_$1
+
+	ECONF_SOURCE="${S}" econf \
+		${myconf} \
+		${build_wx_conf} \
+		|| die "Failed to configure $1."
+
+	emake || die "Failed to make $1."
+
+	if [[ -e contrib/src ]]; then
+		cd contrib/src
+		emake || die "Failed to make $1 contrib."
+	fi
+
+	popd
+}
+
+install_wx() {
+	if [[ -d build_$1 ]]; then
+		pushd build_$1
+		emake DESTDIR="${D}" install || die "Failed to install $1."
+		if [[ -e contrib/src ]]; then
+			cd contrib/src
+			emake DESTDIR="${D}" install || die "Failed to install $1 contrib."
+		fi
+		popd
+	fi
+}