rev 9151 - in branches/etch/packages/kdeutils/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2008-01-26 14:13:41 +0000 (Sat, 26 Jan 2008)
New Revision: 9151

Added:
   branches/etch/packages/kdeutils/debian/patches/17_klaptopdaemon_lock_and_hibernate.diff
Modified:
   branches/etch/packages/kdeutils/debian/changelog
   branches/etch/packages/kdeutils/debian/control
Log:
Prepare next stable release update:
* Add patch 17_klaptopdaemon_lock_and_hibernate to avoid unauthorised access
  when the system is supposed to be locked and hibernated. (Closes: #416824)


Modified: branches/etch/packages/kdeutils/debian/changelog
===================================================================
--- branches/etch/packages/kdeutils/debian/changelog	2008-01-26 11:24:12 UTC (rev 9150)
+++ branches/etch/packages/kdeutils/debian/changelog	2008-01-26 14:13:41 UTC (rev 9151)
@@ -1,3 +1,10 @@
+kdeutils (4:3.5.5-3etch1) stable; urgency=low
+
+  * Add patch 17_klaptopdaemon_lock_and_hibernate to avoid unauthorised access
+    when the system is supposed to be locked and hibernated. (Closes: #416824)
+
+ -- Fathi Boudra <fabo at debian.org>  Sat, 26 Jan 2008 14:55:07 +0100
+
 kdeutils (4:3.5.5-3) unstable; urgency=low
 
   * Make kdeutils-dbg depend on kdelibs-dbg to get useful backtraces when

Modified: branches/etch/packages/kdeutils/debian/control
===================================================================
--- branches/etch/packages/kdeutils/debian/control	2008-01-26 11:24:12 UTC (rev 9150)
+++ branches/etch/packages/kdeutils/debian/control	2008-01-26 14:13:41 UTC (rev 9151)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Josh Metzler <joshdeb at metzlers.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Josh Metzler <joshdeb at metzlers.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.5), kdebase-dev (>= 4:3.5.5), libkonq4-dev (>= 4:3.5.5), libgmp3-dev, libsnmp9-dev, libxpm-dev, python-dev, xmms-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
 Standards-Version: 3.7.2

Added: branches/etch/packages/kdeutils/debian/patches/17_klaptopdaemon_lock_and_hibernate.diff
===================================================================
--- branches/etch/packages/kdeutils/debian/patches/17_klaptopdaemon_lock_and_hibernate.diff	                        (rev 0)
+++ branches/etch/packages/kdeutils/debian/patches/17_klaptopdaemon_lock_and_hibernate.diff	2008-01-26 14:13:41 UTC (rev 9151)
@@ -0,0 +1,23 @@
+diff -Nur kdeutils-3.5.5/klaptopdaemon/daemondock.cpp kdeutils-3.5.5.new/klaptopdaemon/daemondock.cpp
+--- kdeutils-3.5.5/klaptopdaemon/daemondock.cpp	2006-01-19 17:49:17.000000000 +0100
++++ kdeutils-3.5.5.new/klaptopdaemon/daemondock.cpp	2008-01-26 15:02:05.000000000 +0100
+@@ -29,6 +29,7 @@
+ #include <klocale.h>
+ #include <kpopupmenu.h>
+ #include <dcopclient.h>
++#include <dcopref.h>
+ #include "kpcmciainfo.h"
+ #include "daemondock.h"
+ #include "portable.h"
+@@ -496,9 +497,8 @@
+ 
+ void laptop_dock::invokeLockHibernation()
+ {
+-  DCOPClient* client = kapp->dcopClient();
+-  if (client)
+-      client->send("kdesktop", "KScreensaverIface", "lock()", "");
++  DCOPRef dr("kdesktop", "KScreensaverIface");
++  DCOPReply reply=dr.call("lock");
+   laptop_portable::invoke_hibernation();
+ }
+ void laptop_dock::invokeStandby()