Applied patch to prevent URI address bar spoofing, should solve bug 185603.

(Portage version: 2.1.3_rc8)

4 files changed, 84 insertions, 1 deletions

diff --git a/kde-base/konqueror/ChangeLog b/kde-base/konqueror/ChangeLog
index 43e064b73914..c419303d8512 100644
--- a/kde-base/konqueror/ChangeLog
+++ b/kde-base/konqueror/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/konqueror
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.79 2007/06/23 18:08:23 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/ChangeLog,v 1.80 2007/07/20 19:50:06 cryos Exp $
+
+*konqueror-3.5.7-r1 (20 Jul 2007)
+
+  20 Jul 2007; Marcus D. Hanwell <cryos@gentoo.org>
+  +files/konqueror-3.5.7-location.patch, +konqueror-3.5.7-r1.ebuild:
+  Applied patch to prevent URI address bar spoofing, should solve bug 185603.
 
   23 Jun 2007; Wulf C. Krueger <philantrop@gentoo.org>
   +files/Gentoo_Bugzilla.desktop, +files/Gentoo_Forums.desktop,
diff --git a/kde-base/konqueror/files/digest-konqueror-3.5.7-r1 b/kde-base/konqueror/files/digest-konqueror-3.5.7-r1
new file mode 100644
index 000000000000..3ecf739e6d3b
--- /dev/null
+++ b/kde-base/konqueror/files/digest-konqueror-3.5.7-r1
@@ -0,0 +1,3 @@
+MD5 b421e01b3ee712549ee967f58ed24de0 kdebase-3.5.7.tar.bz2 24395088
+RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 kdebase-3.5.7.tar.bz2 24395088
+SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d kdebase-3.5.7.tar.bz2 24395088
diff --git a/kde-base/konqueror/files/konqueror-3.5.7-location.patch b/kde-base/konqueror/files/konqueror-3.5.7-location.patch
new file mode 100644
index 000000000000..7061e6a1b940
--- /dev/null
+++ b/kde-base/konqueror/files/konqueror-3.5.7-location.patch
@@ -0,0 +1,12 @@
+Index: konqueror/konq_combo.cc
+===================================================================
+--- konqueror/konq_combo.cc	(revision 643782)
++++ konqueror/konq_combo.cc	(working copy)
+@@ -158,6 +158,7 @@
+         kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+                                   "addToCombo(QString,QCString)", data);
+     }
++    lineEdit()->setCursorPosition( 0 );
+ }
+
+ void KonqCombo::setTemporary( const QString& text )
diff --git a/kde-base/konqueror/konqueror-3.5.7-r1.ebuild b/kde-base/konqueror/konqueror-3.5.7-r1.ebuild
new file mode 100644
index 000000000000..354331843cb4
--- /dev/null
+++ b/kde-base/konqueror/konqueror-3.5.7-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/konqueror/konqueror-3.5.7-r1.ebuild,v 1.1 2007/07/20 19:50:06 cryos Exp $
+
+KMNAME=kdebase
+# Note: we need >=kdelibs-3.3.2-r1, but we don't want 3.3.3!
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+DESCRIPTION="KDE: Web browser, file manager, ..."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="java kdehiddenvisibility"
+
+DEPEND="
+$(deprange $PV $MAXKDEVER kde-base/libkonq)"
+
+RDEPEND="${DEPEND}
+$(deprange $PV $MAXKDEVER kde-base/kcontrol)
+$(deprange $PV $MAXKDEVER kde-base/kdebase-kioslaves)
+$(deprange $PV $MAXKDEVER kde-base/kfind)
+java? ( >=virtual/jre-1.4 )"
+
+PATCHES="${FILESDIR}/${P}-location.patch"
+
+KMCOPYLIB="libkonq libkonq"
+KMEXTRACTONLY=kdesktop/KDesktopIface.h
+
+pkg_preinst() {
+	kde_pkg_preinst
+
+	# We need to symlink here, as kfmclient freaks out completely,
+	# if it does not find konqueror.desktop in the legacy path.
+	dodir ${PREFIX}/share/applications/kde
+	dosym ../../applnk/konqueror.desktop ${PREFIX}/share/applications/kde/konqueror.desktop
+}
+
+src_install() {
+	kde_src_install
+
+	dodir ${PREFIX}/share/services/searchproviders
+	insinto ${PREFIX}/share/services/searchproviders
+	doins ${FILESDIR}/*.desktop
+}
+
+pkg_postinst() {
+	kde_pkg_postinst
+
+	echo
+	elog "We've added three Gentoo-related web shortcuts:"
+	elog "- gb           Gentoo Bugzilla searching"
+	elog "- gf           Gentoo Forums searching"
+	elog "- gp           Gentoo Package searching"
+	echo
+	elog "You'll have to activate them in 'Configure Konqueror...'."
+	echo
+	elog "If you can't open new ${PN} windows and get something like"
+	elog "'WARNING: Outdated database found' when starting ${PN} in a console, run"
+	elog "kbuildsycoca as the user you're running KDE under."
+	elog "This is NOT a bug."
+	echo
+}