Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=66d16a1713b133c0046bd5f79a624ace2711acad
commit 66d16a1713b133c0046bd5f79a624ace2711acad
Author: VMiklos <[EMAIL PROTECTED]>
Date: Sun Sep 23 09:26:05 2007 +0200
kdebase-3.5.7-3-i686
added post-3.5.7-kdebase-kdm.diff
closes #2430
also added post-3.5.7-kdebase-konqueror.diff to git as the secfix seem to be no
longer on the kde ftp
diff --git a/source/kde/kdebase/FrugalBuild b/source/kde/kdebase/FrugalBuild
index 9c161b4..e88577c 100644
--- a/source/kde/kdebase/FrugalBuild
+++ b/source/kde/kdebase/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=kdebase
pkgver=3.5.7
-pkgrel=2
+pkgrel=3
pkgdesc="KDE Base Programs."
depends=('libxcomposite' 'libxscrnsaver' 'kdelibs>=3.5.7-3' 'libraw1394'
'hal>=0.5.7.1-3' 'mtools' 'libxdamage' \
'pmount' 'xscreensaver-data' 'bdftopcf' 'lmsensors' 'libxxf86misc' 'libfontenc'
\
@@ -17,7 +17,7 @@ options=('nodocs')
_F_kde_reconf=1
Finclude kde
source=([EMAIL PROTECTED] \
-
ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-konqueror.diff \
+ post-3.5.7-kdebase-konqueror.diff \
kde.desktop \
xinitrc.kde \
preloadkde \
@@ -33,7 +33,8 @@ source=([EMAIL PROTECTED] \
usb.ids.patch \
clock.patch \
media_ntfs3g.patch \
- kdebase-3.5.6-konsole_url.diff)
+ kdebase-3.5.6-konsole_url.diff \
+ ftp://ftp.kde.org/pub/kde/security_patches/post-3.5.7-kdebase-kdm.diff)
## NOTE: if someone change fw-default-dejavu-font.patch its _NEED_ be in sync
with
## fw-default-dejavu-font.patch from kdelibs and both pkgs _NEED_ be
recompiled!
## DO NOT REMOVE or CHANGE fw-default-startkde.patch without permission
from m8r! - crazy -
@@ -97,5 +98,6 @@ sha1sums=('833a35e4bbec2852f0f5267e680590be0c986594' \
'59b570e137fa6bb622eeb3da1237ca5ec6dbf5a3' \
'1233baad88df6a7a5347db7392a3afa7f21812fd' \
'afff70bdd816bfbff5fb3fd6e612c648ef901858' \
- '82367166851f1f95037cf00e767bc76135371358')
+ '82367166851f1f95037cf00e767bc76135371358' \
+ 'b270a1d5b3980f49a274308bec7fc649be1bd315')
# optimization OK
diff --git a/source/kde/kdebase/post-3.5.7-kdebase-konqueror.diff
b/source/kde/kdebase/post-3.5.7-kdebase-konqueror.diff
new file mode 100644
index 0000000..0d6e44e
--- /dev/null
+++ b/source/kde/kdebase/post-3.5.7-kdebase-konqueror.diff
@@ -0,0 +1,49 @@
+--- konqueror/konq_combo.cc
++++ konqueror/konq_combo.cc
+@@ -158,6 +158,9 @@ void KonqCombo::setURL( const QString& u
+ kapp->dcopClient()->send( "konqueror*", "KonquerorIface",
+ "addToCombo(QString,QCString)", data);
+ }
++ // important security consideration: always display the beginning
++ // of the url rather than its end to prevent spoofing attempts.
++ lineEdit()->setCursorPosition( 0 );
+ }
+
+ void KonqCombo::setTemporary( const QString& text )
+--- konqueror/konq_mainwindow.cc
++++ konqueror/konq_mainwindow.cc
+@@ -611,12 +611,11 @@ void KonqMainWindow::openURL( KonqView *
+ }
+ else // no known serviceType, use KonqRun
+ {
+- if ( ( view && view == m_currentView ) ||
+- ( !view && !req.newTab ) ) // startup with argument
++ if ( ( !view || view->url().isEmpty() ) && !req.newTab ) // startup
with argument
+ {
+ // Show it for now in the location bar, but we'll need to store it
in the view
+ // later on (can't do it yet since either view == 0 or
updateHistoryEntry will be called).
+- kdDebug(1202) << "setLocationBarURL : url = " << url << endl;
++ kdDebug(1202) << "setLocationBarURL (startup) : url = " << url <<
endl;
+ setLocationBarURL( url );
+ }
+
+@@ -819,8 +818,6 @@ bool KonqMainWindow::openView( QString s
+ if ( childView )
+ {
+ enableAllActions( true );
+-
+- m_pViewManager->setActivePart( childView->part() );
+ m_currentView = childView;
+ }
+ }
+--- konqueror/konq_viewmgr.cc
++++ konqueror/konq_viewmgr.cc
+@@ -1395,6 +1395,8 @@ void KonqViewManager::slotActivePartChan
+
+ void KonqViewManager::emitActivePartChanged()
+ {
++ // prevent unnecessary multiple calls to slotPartActivated:
++ m_activePartChangedTimer->stop();
+ m_pMainWindow->slotPartActivated( activePart() );
+ }
+
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
