Adding patch to fix khtml crashes, bug #219970

Package-Manager: portage-2.1.5_rc6

4 files changed, 317 insertions, 5 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index a29a7118ad59..a8778dd70fdc 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.525 2008/04/28 14:10:31 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.526 2008/05/05 15:11:45 keytoaster Exp $
+
+*kdelibs-3.5.9-r4 (05 May 2008)
+
+  05 May 2008; Tobias Heinlein <keytoaster@gentoo.org>
+  +files/kdelibs-3.5.9-bug_219970_khtml.patch, +kdelibs-3.5.9-r4.ebuild:
+  Adding patch to fix khtml crashes, bug #219970
 
 *kdelibs-4.0.3-r1 (28 Apr 2008)
 
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index fcc0f24c1c46..7aa377981063 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -5,6 +5,7 @@ AUX FindXine.cmake 2627 RMD160 e680a4c0998dd0354e429c9e755a00e0ab83c6c0 SHA1 e63
 AUX e-tempdir.patch 1413 RMD160 f0a369f929c18770d66a54b605dad8c99d03367c SHA1 779714956d94366a3b05514df19e21b4b3434f5c SHA256 1a7e888cd5173b68039717030119e3ab479675fed8f9df4b5e1d98869d89235a
 AUX kdelibs-3.5.8-kinit-CVE-2008-1671.patch 3964 RMD160 e5e7dc462c88ad45ac7051261aaec5b83c64d59e SHA1 35147db4d6791e4c98d7cec5e72509547813dd98 SHA256 6f7d54983c950300621918259511cb4de1efffcebe9c588607b529e27b462c5c
 AUX kdelibs-3.5.9-bug_203433_khtml.patch 874 RMD160 2d69661af5beb4ef0a1ff685ae38b7c543bb2229 SHA1 149386170b51e38d88c373f9407ca2c2240121b4 SHA256 23c48898e80b0497b6b8c1fe4af40c83b51d229e0f194560290bb42242f9c203
+AUX kdelibs-3.5.9-bug_219970_khtml.patch 3436 RMD160 9533c738889b0905c9fd2b37e3520acf4ab3c7a5 SHA1 2d8234df65b15dad55422a9413f01dc8b43f0c2f SHA256 3532281b95ff66d06ed17612f245ed4c93e497c4505811ea97c1a2424e6d17ba
 AUX kdelibs-3.5.9-cursor.patch 427 RMD160 e0d7d41196cdbbb7cfd15c6b4ce94d88142e8ad8 SHA1 6f58f95e642522062ba6f2aaf564b0a8c363e3f0 SHA256 4daac960ff06601fc3d67948983266e27ce5204e37bd1c71f5389c1db8c2088c
 AUX kdelibs-4.0.2-X11-optional.patch 6103 RMD160 ff7c315d65204253cc3ed2fa90e45b5dbef709d8 SHA1 2093a73b17246d39b0518a8ccb1162caed263aee SHA256 398bde6b24e7fb3bf7325ef1f4409f02839baee52ac20bb041f623acd1900b5e
 AUX kdelibs-4.0.2-alsa-optional.patch 1742 RMD160 ea660d1148488fdac27970587535ec29acd3878f SHA1 53a3d7658ca700a7e8b642e7f66b69b8d25774c8 SHA256 b9107dd43916c015a9392ada81bdfebeff91d2c136eeaa01fb1c89ddd89fd914
@@ -21,15 +22,16 @@ EBUILD kdelibs-3.5.8-r4.ebuild 6084 RMD160 e886087056af7691551e7f754b3733114dbe2
 EBUILD kdelibs-3.5.9-r1.ebuild 6129 RMD160 5c3374dc64c90656d6cf8f30c7bcf8a95f5f3eeb SHA1 1d307fac7d9a6644d275cd0ccb8be566f01ddc1b SHA256 2f2d844853ed90df74a4c90ebf5f9cdc3e7c4aaf8f906437b09bfa84cf7f6e41
 EBUILD kdelibs-3.5.9-r2.ebuild 6205 RMD160 a751f94f3026c1233e3ed10a110d950e60620f12 SHA1 886b2e2ac989d6f5934f28d7a7accb4bef5e5a35 SHA256 0fab24586d56dc98b53a4cbe934f2ac565b3a55580c206db4c28b19c3076f594
 EBUILD kdelibs-3.5.9-r3.ebuild 6285 RMD160 0946a13cebba7c34600acaee2cb1b9be6341c797 SHA1 55f98208b2c6304f7e9126bb8e695987037fe934 SHA256 654c8b45e36dde370d9c6609a36f45f5eec216a204c3b6048fcc8d44d8658652
+EBUILD kdelibs-3.5.9-r4.ebuild 6382 RMD160 7c196a0e373e789b094337f5e5736d736b0be00c SHA1 35a70bee9109bb9dd7a22b21f6ea790e0da98890 SHA256 0800b6518b7805fb8411a2848837d15da754c8530dba8f8520ea64f0d3ac3fef
 EBUILD kdelibs-3.5.9.ebuild 6042 RMD160 5402e42899c0e55787f8b7f5650143dcbc4410d7 SHA1 721388ab5fa4ee455bdadb189afa021bd336fc16 SHA256 f7acb5abb483ebeeaee7a8636073b85d4ea0b7e9badcd8f8073d5ac8dcd2167b
 EBUILD kdelibs-4.0.2.ebuild 6415 RMD160 4087b7d5424bd5539ee69d0617b468a89ede652a SHA1 d73664b265158430a1c5cc2a0411ec37d4239ea9 SHA256 39906b1d60e336f13d29e5fb345080aa9f4c100d5b42bbcd6264203eef8c9725
 EBUILD kdelibs-4.0.3-r1.ebuild 6465 RMD160 0ac12e1a74dcc94a3b055dee75a9492f708e6c32 SHA1 cd445c3914c7a42e0d7d3f06245d297a69b72b44 SHA256 f93a53c1d116b16a455330ebf9b9fa1711f033a5e1398e99abb6ce1605339fff
-MISC ChangeLog 86732 RMD160 5255a131b9397f8fbadc828e827c9400f5261af7 SHA1 08611bcbf8d54a753249d56024ac54fc5840a091 SHA256 675dbe4eeb4e9080089ef3388f283bdb2c9bd591eabb33c3336ec3dd905476e8
+MISC ChangeLog 86947 RMD160 3e1e9b9ab3bdcbf60fb8ef4cd10c8265184df8fd SHA1 110fed2de18e81f84e3bba5d35427301f02b5fd1 SHA256 8a475b16b327360233bcca6d3caa53c1b24d4d7fd70ce3a48fe79cbb678c958b
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgV2r0ACgkQB18eXLOpYdnr0gCgm3F/lTkSfu57m5CFBcnmf2bA
-0YAAoJCxCX/gQuOJ8Q4wwNG+332iBZ5R
-=pA3m
+iEYEARECAAYFAkgfI9AACgkQKfQzuokD2IqoGACfaWI2XsLm65z4xDEz0S7dCGeb
+2i4AoLkQ76Vwhe9nTROHB0dnrxx5xiUX
+=4S6A
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdelibs/files/kdelibs-3.5.9-bug_219970_khtml.patch b/kde-base/kdelibs/files/kdelibs-3.5.9-bug_219970_khtml.patch
new file mode 100644
index 000000000000..003446d595ee
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.5.9-bug_219970_khtml.patch
@@ -0,0 +1,90 @@
+--- khtml/rendering/render_container.cpp.orig	2008-05-03 09:22:01.000000000 +0200
++++ khtml/rendering/render_container.cpp	2008-05-03 09:22:47.000000000 +0200
+@@ -79,6 +79,8 @@
+     kdDebug( 6040 ) << this << ": " <<  renderName() << "(RenderObject)::addChild( " << newChild << ": " <<
+         newChild->renderName() << ", " << (beforeChild ? beforeChild->renderName() : "0") << " )" << endl;
+ #endif
++    // protect ourselves from deletion
++    setDoNotDelete(true);
+ 
+     bool needsTable = false;
+ 
+@@ -159,6 +161,8 @@
+             static_cast<RenderText*>(newChild)->setText(textToTransform, true);
+     }
+     newChild->attach();
++    
++    setDoNotDelete(false);
+ }
+ 
+ RenderObject* RenderContainer::removeChildNode(RenderObject* oldChild)
+@@ -545,7 +549,7 @@
+ 	RenderObject *next = child->nextSibling();
+ 
+ 	if ( child->isRenderBlock() && child->isAnonymousBlock() && !child->continuation() &&
+-             !child->childrenInline() && !child->isTableCell() ) {
++             !child->childrenInline() && !child->isTableCell() && !child->doNotDelete()) {
+ 	    RenderObject *firstAnChild = child->firstChild();
+ 	    RenderObject *lastAnChild = child->lastChild();
+ 	    if ( firstAnChild ) {
+@@ -560,17 +564,21 @@
+ 		    child->previousSibling()->setNextSibling( firstAnChild );
+ 		if ( child->nextSibling() )
+ 		    child->nextSibling()->setPreviousSibling( lastAnChild );
++                if ( child == firstChild() )
++                    m_first = firstAnChild;
++                if ( child == lastChild() )
++                    m_last = lastAnChild;
+ 	    } else {
+ 		if ( child->previousSibling() )
+ 		    child->previousSibling()->setNextSibling( child->nextSibling() );
+ 		if ( child->nextSibling() )
+ 		    child->nextSibling()->setPreviousSibling( child->previousSibling() );
+-
+-	    }
+ 	    if ( child == firstChild() )
+-		m_first = firstAnChild;
++                    m_first = child->nextSibling();
+ 	    if ( child == lastChild() )
+-		m_last = lastAnChild;
++                    m_last = child->previousSibling();
++            }
++
+ 	    child->setParent( 0 );
+ 	    child->setPreviousSibling( 0 );
+ 	    child->setNextSibling( 0 );
+--- khtml/rendering/render_object.cpp.orig	2008-05-03 09:22:40.000000000 +0200
++++ khtml/rendering/render_object.cpp	2008-05-03 09:22:47.000000000 +0200
+@@ -178,7 +178,8 @@
+       m_isRoot( false ),
+       m_afterPageBreak( false ),
+       m_needsPageClear( false ),
+-      m_containsPageBreak( false )
++      m_containsPageBreak( false ),
++      m_doNotDelete(false)
+ {
+   assert( node );
+   if (node->getDocument()->documentElement() == node) setIsRoot(true);
+--- khtml/rendering/render_object.h.orig	2008-05-03 09:22:04.000000000 +0200
++++ khtml/rendering/render_object.h	2008-05-03 09:22:47.000000000 +0200
+@@ -754,6 +754,9 @@
+     virtual void deleteInlineBoxes(RenderArena* arena=0) {(void)arena;}
+     virtual void detach( );
+ 
++    void setDoNotDelete(bool b) { m_doNotDelete = b; }
++    bool doNotDelete() const { return m_doNotDelete; }
++
+     const QFont &font(bool firstLine) const {
+ 	return style( firstLine )->font();
+     }
+@@ -835,7 +838,9 @@
+     bool m_needsPageClear            : 1;
+     bool m_containsPageBreak         : 1;
+ 
+-    // ### we have 16 + 24 bits. Cut 8 and save 32
++    bool m_doNotDelete               : 1; // This object should not be auto-deleted
++
++    // ### we have 16 + 27 bits.
+ 
+ 
+     void arenaDelete(RenderArena *arena, void *objectBase);
diff --git a/kde-base/kdelibs/kdelibs-3.5.9-r4.ebuild b/kde-base/kdelibs/kdelibs-3.5.9-r4.ebuild
new file mode 100644
index 000000000000..1bf7a6aed4e7
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.5.9-r4.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.5.9-r4.ebuild,v 1.1 2008/05/05 15:11:45 keytoaster Exp $
+
+EAPI="1"
+inherit kde flag-o-matic eutils multilib
+set-kdedir 3.5
+
+DESCRIPTION="KDE libraries needed by all KDE programs."
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2
+	mirror://gentoo/kdelibs-3.5-patchset-14.tar.bz2
+	mirror://gentoo/kde-3.5.9-seli-xinerama.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.5"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="acl alsa arts bindist branding cups doc jpeg2k kerberos legacyssl utempter openexr spell tiff
+	avahi kernel_linux fam lua kdehiddenvisibility"
+
+# Added aspell-en as dependency to work around bug 131512.
+# Made openssl and zeroconf mandatory dependencies, see bug #172972 and #175984
+RDEPEND="
+	arts? ( >=kde-base/arts-3.5.5 )
+	app-arch/bzip2
+	>=dev-libs/openssl-0.9.7d
+	>=dev-libs/libxslt-1.1.16
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-6.6
+	media-libs/fontconfig
+	>=media-libs/freetype-2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	>=x11-libs/qt-3.3.3:3
+	acl? ( kernel_linux? ( sys-apps/acl ) )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( >=net-print/cups-1.1.19 )
+	tiff? ( media-libs/tiff )
+	kerberos? ( virtual/krb5 )
+	jpeg2k? ( media-libs/jasper )
+	openexr? ( >=media-libs/openexr-1.2.2-r2 )
+	!avahi? ( !bindist? ( net-misc/mDNSResponder !kde-misc/kdnssd-avahi ) )
+	fam? ( virtual/fam )
+	virtual/ghostscript
+	utempter? ( sys-libs/libutempter )
+	!kde-base/kde-env
+	lua? ( dev-lang/lua )
+	spell? ( >=app-text/aspell-0.60.5 >=app-dicts/aspell-en-6.0.0 )
+	>=sys-apps/portage-2.1.2.11
+	!kde-base/ksync"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext"
+
+RDEPEND="${RDEPEND}
+	x11-apps/rgb
+	x11-apps/iceauth"
+
+PDEPEND="avahi? ( kde-misc/kdnssd-avahi )
+	bindist? ( kde-misc/kdnssd-avahi )"
+
+# Testing code is rather broken and merely for developer purposes, so disable it.
+RESTRICT="test"
+
+pkg_setup() {
+	if use legacyssl ; then
+		echo ""
+		elog "You have the legacyssl use flag enabled, which fixes issues with some broken"
+		elog "sites, but breaks others instead. It is strongly discouraged to use it."
+		elog "For more information, see bug #128922."
+		echo ""
+	fi
+
+	if ! use utempter ; then
+		echo ""
+		elog "On some setups, which rely on the correct update of utmp records, not using"
+		elog "utempter might not update them correctly. If you experience unexpected"
+		elog "behaviour, try to rebuild kde-base/kdelibs with utempter use-flag enabled."
+		echo ""
+	fi
+
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror "The alsa USE flag in this package enables ALSA support"
+		eerror "for libkmid, KDE midi library."
+		eerror "For this reason, you have to merge media-libs/alsa-lib"
+		eerror "with the midi USE flag enabled, or disable alsa USE flag"
+		eerror "for this package."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_unpack() {
+	kde_src_unpack
+
+	if use legacyssl ; then
+		# This patch won't be included upstream, see bug #128922.
+		epatch "${WORKDIR}/patches/kdelibs_3.5.4-kssl-3des.patch"
+	fi
+
+	if use utempter ; then
+		# Bug #135818 is the eternal reference.
+		epatch "${WORKDIR}/patches/kdelibs-3.5_libutempter.patch"
+	fi
+
+	if use branding ; then
+		# Add "(Gentoo)" to khtml user agent.
+		epatch "${WORKDIR}/patches/kdelibs_3.5-cattlebrand.diff"
+	fi
+
+	# Xinerama patch by Lubos Lunak.
+	# http://ktown.kde.org/~seli/xinerama/
+	epatch "${WORKDIR}/${PN}-xinerama.patch"
+
+	# Fixes bug 212749 (upstream bug 158069)
+	epatch "${FILESDIR}/${P}-cursor.patch"
+
+	# Fixes bug 203433 (upstream bug 125206)
+	epatch "${FILESDIR}/${P}-bug_203433_khtml.patch"
+
+	# Security bug 218933
+	epatch "${FILESDIR}/${PN}-3.5.8-kinit-CVE-2008-1671.patch"
+
+	# Fixes bug 219970 (upstream bug 150006)
+	epatch "${FILESDIR}/${P}-bug_219970_khtml.patch"
+}
+
+src_compile() {
+	rm -f "${S}/configure"
+
+	myconf="--with-distribution=Gentoo --disable-fast-malloc
+			--with-libart --with-libidn --with-ssl
+			--without-hspell
+			$(use_enable fam libfam) $(use_enable kernel_linux dnotify)
+			$(use_with acl) $(use_with alsa)
+			$(use_with arts) $(use_enable cups)
+			$(use_with kerberos gssapi) $(use_with tiff)
+			$(use_with jpeg2k jasper) $(use_with openexr)
+			$(use_with utempter) $(use_with lua)
+			$(use_enable kernel_linux sendfile) --enable-mitshm
+			$(use_with spell aspell)"
+
+	if use avahi || use bindist ; then
+		myconf="${myconf} --disable-dnssd"
+	else
+		myconf="${myconf} --enable-dnssd"
+	fi
+
+	if has_version x11-apps/rgb; then
+		myconf="${myconf} --with-rgbfile=/usr/share/X11/rgb.txt"
+	fi
+
+	# fix bug 58179, bug 85593
+	# kdelibs-3.4.0 needed -fno-gcse; 3.4.1 needs -mminimal-toc; this needs a
+	# closer look... - corsair
+	use ppc64 && append-flags "-mminimal-toc"
+
+	# work around bug #120858, gcc 3.4.x -Os miscompilation
+	use x86 && replace-flags "-Os" "-O2" # see bug #120858
+
+	replace-flags "-O3" "-O2" # see bug #148180
+
+	kde_src_compile
+
+	if use doc; then
+		emake apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+
+	if use doc; then
+		emake DESTDIR="${D}" install-apidox || die
+	fi
+
+	# Needed to create lib -> lib64 symlink for amd64 2005.0 profile
+	if [ "${SYMLINK_LIB}" = "yes" ]; then
+		dosym $(get_abi_LIBDIR ${DEFAULT_ABI}) ${KDEDIR}/lib
+	fi
+
+	# Get rid of the disabled version of the kdnsd libraries
+	if use avahi || use bindist ; then
+		rm -rf "${D}/${PREFIX}"/$(get_libdir)/libkdnssd.*
+	fi
+
+	dodir /etc/env.d
+
+	# List all the multilib libdirs
+	local libdirs
+	for libdir in $(get_all_libdirs); do
+		libdirs="${libdirs}:${PREFIX}/${libdir}"
+	done
+
+	# Please note that the KDE install path has to be the last value in KDEDIRS.
+	cat <<EOF > "${D}"/etc/env.d/45kdepaths-${SLOT} # number goes down with version upgrade
+PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+MANPATH=${PREFIX}/share/man
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown /usr/share/config"
+KDEDIRS="/usr:/usr/local:${PREFIX}"
+#KDE_IS_PRELINKED=1
+XDG_DATA_DIRS="/usr/share:${PREFIX}/share:/usr/local/share"
+COLON_SEPARATED="XDG_DATA_DIRS"
+EOF
+
+	# Make sure the target for the revdep-rebuild stuff exists. Fixes bug 184441.
+	dodir /etc/revdep-rebuild
+
+cat <<EOF > "${D}"/etc/revdep-rebuild/50-kde3
+SEARCH_DIRS="${PREFIX}/bin ${PREFIX}/lib*"
+EOF
+}