Hello community,
here is the log from the commit of package kdebase3
checked in at Thu Nov 16 18:45:47 CET 2006.
--------
--- KDE/kdebase3/kdebase3.changes 2006-11-15 21:14:40.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2006-11-16 18:26:26.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 16 18:18:02 CET 2006 - llunak@suse.cz
+
+- add autostart utility to launch the right updater tool (#219390)
+- fix 3_5_BRANCH_kde_128648.diff to avoid KDE#137119
+- fix systray_order.diff to also immediately place properly
+ zen-updater or other XDG systray apps
+- require root password for shutdown by default (#220268)
+- fix shell insertion vulnerability in khelpcenter (#218764)
+
+-------------------------------------------------------------------
New:
----
runupdater.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.PLk4ub/_old 2006-11-16 18:45:20.000000000 +0100
+++ /var/tmp/diff_new_pack.PLk4ub/_new 2006-11-16 18:45:20.000000000 +0100
@@ -52,7 +52,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 54
+Release: 55
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -192,6 +192,7 @@
Patch186: khelpcenter_shellquote.diff
Patch187: 3_5_BRANCH_604894.diff
Patch188: 3_5_BRANCH_604930.diff
+Patch189: runupdater.patch
%description
This package contains kdebase, one of the basic packages of the K
@@ -377,7 +378,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 183
+Release: 184
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -543,6 +544,9 @@
%patch186
%patch187
%patch188
+%if %suse_version > 1010
+%patch189
+%endif
cp %SOURCE17 l10n/tw/flag.png
. /etc/opt/kde3/common_options
cd ../fileshareset2
@@ -888,6 +892,9 @@
/opt/kde3/bin/khc_htsearch.pl
/opt/kde3/bin/kapplymousetheme
/opt/kde3/bin/kio_system_documenthelper
+%if %suse_version > 1010
+/opt/kde3/bin/runupdater
+%endif
/opt/kde3/%_lib/kde3/c*
/opt/kde3/%_lib/kde3/dockbar_panelextension.*
/opt/kde3/%_lib/kde3/htmlthumbnail.*
@@ -973,6 +980,9 @@
/opt/kde3/%_lib/kde3/libkmanpart.*
/opt/kde3/%_lib/kde3/liblocaldomainurifilter.*
/opt/kde3/%_lib/kde3/sidebar_panelextension.*
+%if %suse_version > 1010
+/opt/kde3/%_lib/kde3/runupdater.*
+%endif
/opt/kde3/%_lib/kconf_update_bin/kwin_update_default_rules
/opt/kde3/%_lib/kconf_update_bin/kwin_update_window_settings
/opt/kde3/%_lib/libkateinterfaces.*
@@ -1503,6 +1513,13 @@
%endif
%changelog -n kdebase3
+* Thu Nov 16 2006 - llunak@suse.cz
+- add autostart utility to launch the right updater tool (#219390)
+- fix 3_5_BRANCH_kde_128648.diff to avoid KDE#137119
+- fix systray_order.diff to also immediately place properly
+ zen-updater or other XDG systray apps
+- require root password for shutdown by default (#220268)
+- fix shell insertion vulnerability in khelpcenter (#218764)
* Wed Nov 15 2006 - dmueller@suse.de
- permissions %%post for fileshareset (#221129)
* Tue Nov 14 2006 - dmueller@suse.de
++++++ 3_5_BRANCH_kde_128648.diff ++++++
--- /var/tmp/diff_new_pack.PLk4ub/_old 2006-11-16 18:45:20.000000000 +0100
+++ /var/tmp/diff_new_pack.PLk4ub/_new 2006-11-16 18:45:20.000000000 +0100
@@ -1,5 +1,69 @@
---- kwin/events.cpp.sav 2006-11-08 12:38:48.000000000 +0100
-+++ kwin/events.cpp 2006-11-08 14:33:33.000000000 +0100
+--- kwin/manage.cpp.sav 2006-11-16 17:57:27.000000000 +0100
++++ kwin/manage.cpp 2006-11-16 17:57:42.000000000 +0100
+@@ -565,8 +565,7 @@ void Client::embedClient( Window w, cons
+ FocusChangeMask |
+ ExposureMask |
+ PropertyChangeMask |
+- StructureNotifyMask | SubstructureRedirectMask |
+- VisibilityChangeMask );
++ StructureNotifyMask | SubstructureRedirectMask );
+ XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask );
+ XSelectInput( qt_xdisplay(), client,
+ FocusChangeMask |
+--- kwin/workspace.cpp.sav 2006-11-16 17:57:27.000000000 +0100
++++ kwin/workspace.cpp 2006-11-16 17:57:42.000000000 +0100
+@@ -2023,8 +2023,7 @@ void Workspace::createBorderWindows()
+ XSetWindowAttributes attributes;
+ unsigned long valuemask;
+ attributes.override_redirect = True;
+- attributes.event_mask = (EnterWindowMask | LeaveWindowMask |
+- VisibilityChangeMask);
++ attributes.event_mask = ( EnterWindowMask | LeaveWindowMask );
+ valuemask= (CWOverrideRedirect | CWEventMask | CWCursor );
+ attributes.cursor = XCreateFontCursor(qt_xdisplay(),
+ XC_sb_up_arrow);
+--- kwin/layers.cpp.sav 2006-11-16 17:57:27.000000000 +0100
++++ kwin/layers.cpp 2006-11-16 17:57:57.000000000 +0100
+@@ -117,7 +117,11 @@ void Workspace::updateStackingOrder( boo
+ }
+ #endif
+ if( changed || propagate_new_clients )
++ {
+ propagateClients( propagate_new_clients );
++ if( active_client )
++ active_client->updateMouseGrab();
++ }
+ }
+
+ /*!
+@@ -190,7 +194,7 @@ void Workspace::propagateClients( bool p
+ doesn't accept focus it's excluded.
+ */
+ // TODO misleading name for this method
+-Client* Workspace::topClientOnDesktop( int desktop, bool unconstrained ) const
++Client* Workspace::topClientOnDesktop( int desktop, bool unconstrained, bool only_normal ) const
+ {
+ // TODO Q_ASSERT( block_stacking_updates == 0 );
+ ClientList::ConstIterator begin, end;
+@@ -208,9 +212,13 @@ Client* Workspace::topClientOnDesktop( i
+ it != end;
+ --it )
+ {
+- if ( (*it)->isOnDesktop( desktop ) && !(*it)->isSpecialWindow()
+- && (*it)->isShown( false ) && (*it)->wantsTabFocus())
+- return *it;
++ if( (*it)->isOnDesktop( desktop ) && (*it)->isShown( false ))
++ {
++ if( !only_normal )
++ return *it;
++ if( (*it)->wantsTabFocus() && !(*it)->isSpecialWindow())
++ return *it;
++ }
+ }
+ return 0;
+ }
+--- kwin/events.cpp.sav 2006-11-16 17:57:27.000000000 +0100
++++ kwin/events.cpp 2006-11-16 17:57:57.000000000 +0100
@@ -631,9 +631,6 @@ bool Client::windowEvent( XEvent* e )
workspace()->updateColormap();
}
@@ -28,7 +92,7 @@
// is unobscured or if the user doesn't want click raise
+ // (it is unobscured if it the topmost in the unconstrained stacking order, i.e. it is
+ // the most recently raised window)
-+ bool not_obscured = workspace()->topClientOnDesktop( workspace()->currentDesktop(), true ) == this;
++ bool not_obscured = workspace()->topClientOnDesktop( workspace()->currentDesktop(), true, false ) == this;
if( !options->clickRaise || not_obscured )
ungrabButton( None );
else
@@ -50,8 +114,19 @@
// performs _NET_WM_MOVERESIZE
void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
{
---- kwin/client.h.sav 2006-11-08 12:38:48.000000000 +0100
-+++ kwin/client.h 2006-11-08 12:44:05.000000000 +0100
+--- kwin/workspace.h.sav 2006-11-16 17:57:15.000000000 +0100
++++ kwin/workspace.h 2006-11-16 17:57:57.000000000 +0100
+@@ -181,7 +181,7 @@ class Workspace : public QObject, public
+
+ ClientList ensureStackingOrder( const ClientList& clients ) const;
+
+- Client* topClientOnDesktop( int desktop, bool unconstrained = false ) const;
++ Client* topClientOnDesktop( int desktop, bool unconstrained = false, bool only_normal = true ) const;
+ Client* findDesktop( bool topmost, int desktop ) const;
+ void sendClientToDesktop( Client* c, int desktop, bool dont_activate );
+ void windowToPreviousDesktop( Client* c );
+--- kwin/client.h.sav 2006-11-16 17:57:27.000000000 +0100
++++ kwin/client.h 2006-11-16 17:57:42.000000000 +0100
@@ -336,7 +336,6 @@ class Client : public QObject, public KD
void clientMessageEvent( XClientMessageEvent* e );
void enterNotifyEvent( XCrossingEvent* e );
@@ -68,8 +143,8 @@
uint urgency : 1; // XWMHints, UrgencyHint
uint ignore_focus_stealing : 1; // don't apply focus stealing prevention to this client
uint demands_attention : 1;
---- kwin/client.cpp.sav 2006-11-08 12:38:48.000000000 +0100
-+++ kwin/client.cpp 2006-11-08 12:44:05.000000000 +0100
+--- kwin/client.cpp.sav 2006-11-16 17:57:27.000000000 +0100
++++ kwin/client.cpp 2006-11-16 17:57:42.000000000 +0100
@@ -128,7 +128,6 @@ Client::Client( Workspace *ws )
modal = false;
noborder = false;
@@ -78,41 +153,3 @@
urgency = false;
ignore_focus_stealing = false;
demands_attention = false;
---- kwin/manage.cpp.sav 2006-08-10 15:05:22.000000000 +0200
-+++ kwin/manage.cpp 2006-11-08 12:49:50.000000000 +0100
-@@ -565,8 +565,7 @@ void Client::embedClient( Window w, cons
- FocusChangeMask |
- ExposureMask |
- PropertyChangeMask |
-- StructureNotifyMask | SubstructureRedirectMask |
-- VisibilityChangeMask );
-+ StructureNotifyMask | SubstructureRedirectMask );
- XSelectInput( qt_xdisplay(), wrapper, ClientWinMask | SubstructureNotifyMask );
- XSelectInput( qt_xdisplay(), client,
- FocusChangeMask |
---- kwin/workspace.cpp.sav 2006-11-08 12:38:48.000000000 +0100
-+++ kwin/workspace.cpp 2006-11-08 12:50:52.000000000 +0100
-@@ -2022,8 +2022,7 @@ void Workspace::createBorderWindows()
- XSetWindowAttributes attributes;
- unsigned long valuemask;
- attributes.override_redirect = True;
-- attributes.event_mask = (EnterWindowMask | LeaveWindowMask |
-- VisibilityChangeMask);
-+ attributes.event_mask = ( EnterWindowMask | LeaveWindowMask );
- valuemask= (CWOverrideRedirect | CWEventMask | CWCursor );
- attributes.cursor = XCreateFontCursor(qt_xdisplay(),
- XC_sb_up_arrow);
---- kwin/layers.cpp.sav 2006-11-08 12:30:11.000000000 +0100
-+++ kwin/layers.cpp 2006-11-08 13:15:39.000000000 +0100
-@@ -117,7 +117,11 @@ void Workspace::updateStackingOrder( boo
- }
- #endif
- if( changed || propagate_new_clients )
-+ {
- propagateClients( propagate_new_clients );
-+ if( active_client )
-+ active_client->updateMouseGrab();
-+ }
- }
-
- /*!
++++++ kdm-sysconfig-values.diff ++++++
--- /var/tmp/diff_new_pack.PLk4ub/_old 2006-11-16 18:45:22.000000000 +0100
+++ /var/tmp/diff_new_pack.PLk4ub/_new 2006-11-16 18:45:22.000000000 +0100
@@ -226,6 +226,15 @@
Merge: xdm
Comment:
Allow to log in, when user has set an empty password?
+@@ -1775,7 +1775,7 @@
+ None/SHUT_NONE: no <guilabel>Shutdown...</guilabel> menu entry is shown at all
+ Root/SHUT_ROOT: the <systemitem class="username">root</systemitem> password must be entered to shut down
+ All/SHUT_ALL: everybody can shut down the machine
+-Default: All
++Default: Root
+ User: core
+ User: greeter
+ Instance: */Root
@@ -1779,8 +1791,9 @@ Default: All
User: core
User: greeter
++++++ khelpcenter-beagle.diff ++++++
--- /var/tmp/diff_new_pack.PLk4ub/_old 2006-11-16 18:45:22.000000000 +0100
+++ /var/tmp/diff_new_pack.PLk4ub/_new 2006-11-16 18:45:22.000000000 +0100
@@ -1,6 +1,8 @@
---- khelpcenter/searchhandlers/khc_beagle_search.py
-+++ khelpcenter/searchhandlers/khc_beagle_search.py
-@@ -0,0 +1,98 @@
+Index: khc_beagle_search.py
+===================================================================
+--- khelpcenter/searchhandlers/khc_beagle_search.py (.../KDE/3.5/kdebase/khelpcenter/searchhandlers) (revision 0)
++++ khelpcenter/searchhandlers/khc_beagle_search.py (.../work/suse_kickoff/khelpcenter/searchhandlers) (revision 605405)
+@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+
+import sys, os
@@ -38,7 +40,9 @@
+ '''
+ # Syntax: beagle-query --type DocbookEntry --max-hits=<maxnum> <words>
+ hits = []
-+ pipe = os.popen("beagle-query --type DocbookEntry --type File --max-hits %s %s ext:docbook" % (maxnum, words), "r")
++ cmdline = ["beagle-query", "--type DocbookEntry", "--type File", "--max-hits " + maxnum, words, "ext:docbook"]
++ import subprocess
++ pipe = subprocess.Popen(args=cmdline, shell=False, stdout=subprocess.PIPE).stdout
+
+ if pipe:
+ for line in pipe:
@@ -86,7 +90,7 @@
+ if o == "--maxnum":
+ maxnum = a
+ if args:
-+ words = args[0].replace('+', ' ') # replace + signs by spaces
++ words = urllib.unquote_plus(args[0])
+ else:
+ sys.exit("No search term specified")
+
@@ -105,8 +109,10 @@
Name: svn:executable
+ *
---- khelpcenter/searchhandlers/khc_beagle_index.py
-+++ khelpcenter/searchhandlers/khc_beagle_index.py
+Index: khc_beagle_index.py
+===================================================================
+--- khelpcenter/searchhandlers/khc_beagle_index.py (.../KDE/3.5/kdebase/khelpcenter/searchhandlers) (revision 0)
++++ khelpcenter/searchhandlers/khc_beagle_index.py (.../work/suse_kickoff/khelpcenter/searchhandlers) (revision 605405)
@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+
@@ -149,9 +155,10 @@
___________________________________________________________________
Name: svn:executable
+ *
-
---- khelpcenter/searchhandlers/docbook.desktop
-+++ khelpcenter/searchhandlers/docbook.desktop
+Index: docbook.desktop
+===================================================================
+--- khelpcenter/searchhandlers/docbook.desktop (.../KDE/3.5/kdebase/khelpcenter/searchhandlers) (revision 605405)
++++ khelpcenter/searchhandlers/docbook.desktop (.../work/suse_kickoff/khelpcenter/searchhandlers) (revision 605405)
@@ -2,5 +2,5 @@
DocumentTypes=text/docbook
@@ -160,8 +167,10 @@
-IndexCommand=khc_docbookdig.pl --indexdir=%d --docpath=%p --identifier=%i
+SearchCommand=khc_beagle_search.py --method=%o --maxnum=%m %w
+IndexCommand=khc_beagle_index.py %d %i
---- khelpcenter/searchhandlers/Makefile.am
-+++ khelpcenter/searchhandlers/Makefile.am
+Index: Makefile.am
+===================================================================
+--- khelpcenter/searchhandlers/Makefile.am (.../KDE/3.5/kdebase/khelpcenter/searchhandlers) (revision 605405)
++++ khelpcenter/searchhandlers/Makefile.am (.../work/suse_kickoff/khelpcenter/searchhandlers) (revision 605405)
@@ -3,7 +3,7 @@
searchhandlersdir = $(kde_datadir)/khelpcenter/searchhandlers
++++++ runupdater.patch ++++++
--- runupdater/runupdater.desktop.sav 2006-11-16 14:48:43.000000000 +0100
+++ runupdater/runupdater.desktop 2006-11-13 21:02:49.000000000 +0100
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Exec=runupdater
+Terminal=false
+Name=Run Updater Tool
+Icon=www
+
+X-KDE-StartupNotify=false
+OnlyShowIn=KDE;
--- runupdater/runupdater.cpp.sav 2006-11-16 14:48:44.000000000 +0100
+++ runupdater/runupdater.cpp 2006-11-16 14:57:06.000000000 +0100
@@ -0,0 +1,33 @@
+/*
+ Run either opensuseupdater or zen-updater but not both, prefer opensuseupdater.
+ For opensuseupdater its autostart condition is checked, for zen-updater
+ it's checked whether its autostart file is enabled.
+*/
+
+#include
participants (1)
-
root@suse.de