fix ntlm authentication, #98285 and konqueror crashes

Package-Manager: portage-2.0.51.22-r1

6 files changed, 250 insertions, 30 deletions

diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index aa092493a7fc..89838ef02bec 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdelibs
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.253 2005/07/08 20:35:36 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.254 2005/07/10 20:16:34 carlo Exp $
+
+*kdelibs-3.4.1-r2 (10 Jul 2005)
+
+  10 Jul 2005; Carsten Lohrke <carlo@gentoo.org>
+  +files/kdelibs-3.4.1-kntlm.patch,
+  +files/kdelibs-3.4.1-ktoolbar-crash.patch, +kdelibs-3.4.1-r2.ebuild:
+  fix ntlm authentication, #98285 and konqueror crashes
 
   08 Jul 2005; Dan Armak <danarmak@gentoo.org>
   -files/post-3.2.3-kdelibs-dcop.patch,
diff --git a/kde-base/kdelibs/Manifest b/kde-base/kdelibs/Manifest
index 26cfb83a28ac..ab310555d036 100644
--- a/kde-base/kdelibs/Manifest
+++ b/kde-base/kdelibs/Manifest
@@ -1,34 +1,28 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 cf29e8e943bcefda1ca3e2fbd605f18c ChangeLog 40939
+MD5 8e1d36b147176964ed4710f3d2c640a6 kdelibs-3.4.1-r1.ebuild 3361
+MD5 a22f453221b250479669277a770541f5 kdelibs-3.3.2-r9.ebuild 4238
+MD5 32fa38e337bdc93fc7fef176e76c18d6 kdelibs-3.2.3-r7.ebuild 3565
+MD5 02f2da44089df832481a6066c2a71fb3 kdelibs-3.4.1-r2.ebuild 3358
+MD5 5f037b266d49d92331b2b449e8b10fab kdelibs-3.2.3-r9.ebuild 3830
+MD5 296558c0a92fc5587977dd050326579e ChangeLog 41182
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 35642afad936bc4714ea938c1152c7ee kdelibs-3.4.0-r2.ebuild 3471
+MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
+MD5 b291a4a134cac9072ad1140a78eee9ce files/kdelibs-3.4.1-kntlm.patch 1323
+MD5 b93484486086ff60f9633f48ed311877 files/post-3.2.3-kdelibs-kimgio.diff 39789
+MD5 4d3faaf48564cde79aac52957f7e6278 files/kdelibs-3.4.1-ktoolbar-crash.patch 2215
+MD5 998641088387e630d4ab9e9013caa539 files/kdelibs-3.4.0-imagemap.patch 546
+MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
+MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
+MD5 296419fbb169c4d87ace85d1e1645652 files/kdelibs-3.4.0-form-freeze.patch 660
+MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
+MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
+MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558
+MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
+MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
+MD5 b174d4e6ed2d0fd78fa43a40654f9ea4 files/post-3.2.3-kdelibs-idn.patch 2337
 MD5 02c4482bb15fc1a504621c2627a4deee files/digest-kdelibs-3.2.3-r7 529
 MD5 99b6a0719a376a17b6edea6555e3e5ae files/digest-kdelibs-3.2.3-r9 601
 MD5 e8b51d92930950619b2139c22d4e1407 files/digest-kdelibs-3.3.2-r9 517
 MD5 2f2e57269ffc653aa3c0884c9492fb16 files/digest-kdelibs-3.4.0-r2 148
 MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r1 68
-MD5 a5d3cb18c9572d8ca3dd06cbe5d226f1 files/kde3-dcopidlng.patch 681
-MD5 25ab050b323a8efb2049fd770f50058b files/kdelibs-3.3.2-anchor-fix.patch 5947
-MD5 d3df6d042148fd884422822aaf4ffbab files/kdelibs-3.3.2-aspell-dir.patch 467
-MD5 40783b984dcb127c8852246f7eb0a1e8 files/kdelibs-3.3.2-ppc64.patch 957
-MD5 296419fbb169c4d87ace85d1e1645652 files/kdelibs-3.4.0-form-freeze.patch 660
-MD5 998641088387e630d4ab9e9013caa539 files/kdelibs-3.4.0-imagemap.patch 546
-MD5 581be8df4ecfd3cf649bb36b6f57e35a files/kdelibs-3.4.1-configure.patch 4558
-MD5 119cc73926dceafff9107b5f916277ee files/post-3.2.3-kdelibs-htmlframes.patch 15435
-MD5 b174d4e6ed2d0fd78fa43a40654f9ea4 files/post-3.2.3-kdelibs-idn.patch 2337
-MD5 5e9c627e4e9e367ce88ed62a0a9ac162 files/post-3.2.3-kdelibs-khtml.diff 2411
-MD5 b93484486086ff60f9633f48ed311877 files/post-3.2.3-kdelibs-kimgio.diff 39789
-MD5 7e082af5fd71b9b01d01a86f31646499 files/post-3.3.2-kdelibs-htmlframes2.patch 989
-MD5 32fa38e337bdc93fc7fef176e76c18d6 kdelibs-3.2.3-r7.ebuild 3565
-MD5 5f037b266d49d92331b2b449e8b10fab kdelibs-3.2.3-r9.ebuild 3830
-MD5 a22f453221b250479669277a770541f5 kdelibs-3.3.2-r9.ebuild 4238
-MD5 35642afad936bc4714ea938c1152c7ee kdelibs-3.4.0-r2.ebuild 3471
-MD5 8e1d36b147176964ed4710f3d2c640a6 kdelibs-3.4.1-r1.ebuild 3361
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzwpiI1lqEGTUzyQRAtacAJ9GeMKUpqV9jFs5KDsVsON3gWNDZQCdFM2G
-v+/+/eF1MnuKXixpgZrgzW8=
-=u5Zk
------END PGP SIGNATURE-----
+MD5 b6eeb54c84f336414abfd45f4fa6a156 files/digest-kdelibs-3.4.1-r2 68
diff --git a/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r2 b/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r2
new file mode 100644
index 000000000000..2752395bb81a
--- /dev/null
+++ b/kde-base/kdelibs/files/digest-kdelibs-3.4.1-r2
@@ -0,0 +1 @@
+MD5 67224e6b55856c23b0a162cab17dd1b4 kdelibs-3.4.1.tar.bz2 16853777
diff --git a/kde-base/kdelibs/files/kdelibs-3.4.1-kntlm.patch b/kde-base/kdelibs/files/kdelibs-3.4.1-kntlm.patch
new file mode 100644
index 000000000000..2d9c6859fba5
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.4.1-kntlm.patch
@@ -0,0 +1,31 @@
+--- kio/misc/kntlm/kntlm.cpp	2005/05/04 06:07:06	409205
++++ kio/misc/kntlm/kntlm.cpp	2005/06/15 15:33:51	425786
+@@ -1,5 +1,5 @@
+ /* This file is part of the KDE libraries
+-   Copyright (c) 2004 Szombathelyi György <gyurco@freemail.hu>
++   Copyright (c) 2004 Szombathelyi Gy�gy <gyurco@freemail.hu>
+ 
+    The implementation is based on the documentation and sample code
+    at http://davenport.sourceforge.net/ntlm.html
+@@ -77,10 +77,10 @@
+ 
+ void KNTLM::addBuf( QByteArray &buf, SecBuf &secbuf, QByteArray &data )
+ {
+-  secbuf.offset = buf.size();
++  secbuf.offset = (buf.size() + 1) & 0xfffffffe;
+   secbuf.len = data.size();
+   secbuf.maxlen = data.size();
+-  buf.resize( buf.size() + data.size() );
++  buf.resize( secbuf.offset + data.size() );
+   memcpy( buf.data() + secbuf.offset, data.data(), data.size() );
+ }
+ 
+@@ -130,7 +130,7 @@
+   ((Auth*) rbuf.data())->flags = ch->flags;
+   QByteArray targetInfo = getBuf( challenge, ch->targetInfo );
+ 
+-  if ( forceNTLMv2 || !targetInfo.isEmpty() /* may support NTLMv2 */ ) {
++  if ( forceNTLMv2 || (!targetInfo.isEmpty() && (ch->flags & Negotiate_Target_Info)) /* may support NTLMv2 */ ) {
+     if ( ch->flags & Negotiate_NTLM ) {
+       if ( targetInfo.isEmpty() ) return false;
+       response = getNTLMv2Response( dom, user, password, targetInfo, ch->challengeData );
diff --git a/kde-base/kdelibs/files/kdelibs-3.4.1-ktoolbar-crash.patch b/kde-base/kdelibs/files/kdelibs-3.4.1-ktoolbar-crash.patch
new file mode 100644
index 000000000000..a2ee9ec7be00
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-3.4.1-ktoolbar-crash.patch
@@ -0,0 +1,65 @@
+--- kdeui/ktoolbar.cpp	2005/05/04 06:07:06	409205
++++ kdeui/ktoolbar.cpp	2005/06/14 19:54:36	425455
+@@ -664,6 +664,11 @@
+ 
+ void KToolBar::clear ()
+ {
++    /* Delete any idle buttons, so QToolBar doesn't delete them itself, making a mess */
++    for(QWidget *w=d->idleButtons.first(); w; w=d->idleButtons.next())
++       w->blockSignals(false);    
++    d->idleButtons.clear();
++     
+     QToolBar::clear();
+     widget2id.clear();
+     id2widget.clear();
+Index: kdeui/ktoolbarbutton.h
+===================================================================
+--- kdeui/ktoolbarbutton.h	(revision 419598)
++++ kdeui/ktoolbarbutton.h	(working copy)
+@@ -311,6 +311,8 @@
+ protected:
+   virtual void virtual_hook( int id, void* data );
+ private:
++  friend class KToolBar;
++  void forceIconLoad();
+   KToolBarButtonPrivate *d;
+ };
+ 
+Index: kdeui/ktoolbar.cpp
+===================================================================
+--- kdeui/ktoolbar.cpp	(revision 425455)
++++ kdeui/ktoolbar.cpp	(working copy)
+@@ -704,6 +704,13 @@
+     widget2id.remove( w );
+     widgets.removeRef( w );
+ 
+     w->blockSignals(true);
++    /**
++     Ensure that the lazily removed buttons do not hang on to lazy icon loaders,
++     since their KInstance/KIconLoader may be destroyed
++    */
++    if (KToolBarButton* button = ::qt_cast<KToolBarButton*>(w))
++        button->forceIconLoad();
++
+     d->idleButtons.append(w);
+     layoutTimer->start( 50, true );
+Index: kdeui/ktoolbarbutton.cpp
+===================================================================
+--- kdeui/ktoolbarbutton.cpp	(revision 419598)
++++ kdeui/ktoolbarbutton.cpp	(working copy)
+@@ -290,6 +290,15 @@
+         d->m_iconName, KIcon::Toolbar, d->m_iconSize ));
+ }
+ 
++/* Internal hook for KToolBar's delayed removal anti-flicker hack -- force instantiation of the icon*/
++void KToolBarButton::forceIconLoad()
++{
++  bool wasLazyLoading = d->m_instance->iconLoader()->isDelayedIconSetLoadingEnabled();
++  d->m_instance->iconLoader()->enableDelayedIconSetLoading(false);
++  setIcon(d->m_iconName);
++  d->m_instance->iconLoader()->enableDelayedIconSetLoading(wasLazyLoading);
++}
++
+ void KToolBarButton::setIconSet( const QIconSet &iconset )
+ {
+   QToolButton::setIconSet( iconset );
diff --git a/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild b/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild
new file mode 100644
index 000000000000..af1bdfc47fee
--- /dev/null
+++ b/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/kdelibs-3.4.1-r2.ebuild,v 1.1 2005/07/10 20:16:35 carlo Exp $
+
+inherit kde flag-o-matic eutils multilib
+set-qtdir 3
+set-kdedir 3.4
+
+DESCRIPTION="KDE libraries needed by all kde programs"
+HOMEPAGE="http://www.kde.org/"
+SRC_URI="mirror://kde/stable/${PV}/src/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="3.4"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa arts cups doc jpeg2k kerberos openexr spell ssl tiff zeroconf"
+
+# kde.eclass has kdelibs in DEPEND, and we can't have that in here.
+# so we recreate the entire DEPEND from scratch.
+RDEPEND="arts? ( ~kde-base/arts-${PV} )
+	>=x11-libs/qt-3.3.3
+	app-arch/bzip2
+	>=dev-libs/libxslt-1.1.4
+	>=dev-libs/libxml2-2.6.6
+	>=dev-libs/libpcre-4.2
+	media-libs/libart_lgpl
+	net-dns/libidn
+	virtual/utempter
+	ssl? ( >=dev-libs/openssl-0.9.7d )
+	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 )
+	spell? ( || ( app-text/aspell
+	              app-text/ispell ) )
+	zeroconf? ( net-misc/mDNSResponder )
+	virtual/fam
+	virtual/ghostscript"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.58
+	>=sys-devel/automake-1.8
+	doc? ( app-doc/doxygen )
+	sys-devel/gettext
+	dev-util/pkgconfig"
+
+src_unpack() {
+	kde_src_unpack
+
+	epatch "${FILESDIR}/${P}-configure.patch"
+	# fix ntlm authentication
+	epatch "${FILESDIR}/${P}-kntlm.patch"
+	# fix some annoying konqueror crashes
+	epatch "${FILESDIR}/${P}-ktoolbar-crash.patch"
+	# for the configure patch
+	make -f admin/Makefile.common || die
+}
+
+src_compile() {
+	myconf="--with-distribution=Gentoo
+	        --enable-libfam $(use_enable kernel_linux dnotify)
+	        --with-libart --with-libidn --with-utempter
+	        $(use_with alsa) $(use_with arts) $(use_with ssl)
+	        $(use_with kerberos gssapi) $(use_with tiff)
+	        $(use_with jpeg2k jasper) $(use_with openexr)
+	        $(use_enable cups) $(use_enable zeroconf dnssd)"
+
+	if use spell && has_version app-text/aspell; then
+		myconf="${myconf} --with-aspell"
+	else
+		myconf="${myconf} --without-aspell"
+	fi
+
+	use x86 && myconf="${myconf} --enable-fast-malloc=full"
+
+	# 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"
+
+	kde_src_compile
+
+	if use doc; then
+		make apidox || die
+	fi
+}
+
+src_install() {
+	kde_src_install
+
+	if use doc; then
+		make DESTDIR="${D}" install-apidox || die
+	fi
+
+	# needed to fix lib64 issues on amd64, see bug #45669
+	use amd64 && ln -s ${KDEDIR}/lib ${D}/${KDEDIR}/lib64
+
+	# 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
+
+	if ! use arts ; then
+		dodir /etc/env.d
+
+		# List all the multilib libdirs
+		local libdirs
+		for libdir in $(get_all_libdirs); do
+			libdirs="${libdirs}:${PREFIX}/${libdir}"
+		done
+
+		cat <<EOF > ${D}/etc/env.d/46kdepaths-${SLOT} # number goes down with version upgrade
+PATH=${PREFIX}/bin
+ROOTPATH=${PREFIX}/sbin:${PREFIX}/bin
+LDPATH=${libdirs:1}
+CONFIG_PROTECT="${PREFIX}/share/config ${PREFIX}/env ${PREFIX}/shutdown"
+EOF
+	fi
+
+}