[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD kdm krunner_lock.patch)

[Pierre Schmitz]

    Date: Saturday, February 13, 2010 @ 11:08:00
  Author: pierre
Revision: 68588

add (security; crash) fix; fix kdm deamon

Added:
  kdebase-workspace/trunk/krunner_lock.patch
Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdebase-workspace/trunk/kdm

--------------------+
 PKGBUILD           |   10 ++++++---
 kdm                |    4 +--
 krunner_lock.patch |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-02-13 15:39:42 UTC (rev 68587)
+++ PKGBUILD	2010-02-13 16:08:00 UTC (rev 68588)
@@ -3,7 +3,7 @@
 
 pkgname=kdebase-workspace
 pkgver=4.4.0
-pkgrel=3
+pkgrel=4
 pkgdesc="KDE Base Workspace"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -27,7 +27,7 @@
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
         'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
         'fixpath.patch' 'terminate-server.patch'
-        'kickoff.patch')
+        'kickoff.patch' 'krunner_lock.patch')
 md5sums=('08179cba422038d4bb6537d63186bb23'
          '721e97031b62aee8914e8617e86f9235'
          '5d80164932e0d44d8b802d3929a004ab'
@@ -36,7 +36,8 @@
          '367a3538f54db71f108b34cfa31088ac'
          '47a1f12673f66e62e2463efd7037a26a'
          '814350c52c135d6f7bdada1e29223d38'
-         '5744a1c543d392c65a6fded1fee03cef')
+         '5744a1c543d392c65a6fded1fee03cef'
+         'd7bd22d5ab6228804046f1e0e9e78ba1')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
@@ -46,6 +47,9 @@
 	# this patch will be in KDE 4.4.1
 	# see http://websvn.kde.org/?view=revision&sortby=date&revision=1087230
 	patch -p0 -i ${srcdir}/kickoff.patch || return 1
+	# this patch will be in KDE 4.4.1
+	# see http://bugs.kde.org/show_bug.cgi?id=217882
+	patch -p0 -i ${srcdir}/krunner_lock.patch || return 1
 
 	cd ${srcdir}
 	mkdir build

Modified: kdm
===================================================================
--- kdm	2010-02-13 15:39:42 UTC (rev 68587)
+++ kdm	2010-02-13 16:08:00 UTC (rev 68588)
@@ -11,7 +11,7 @@
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      echo $PID > /var/run/kdm.pid
+      echo $PID > /var/run/daemons/kdm.pid
       add_daemon kdm
       stat_done
     fi
@@ -32,6 +32,6 @@
     $0 start
     ;;
   *)
-    echo "usage: $0 {start|stop|restart}"  
+    echo "usage: $0 {start|stop|restart}"
 esac
 exit 0

Added: krunner_lock.patch
===================================================================
--- krunner_lock.patch	                        (rev 0)
+++ krunner_lock.patch	2010-02-13 16:08:00 UTC (rev 68588)
@@ -0,0 +1,55 @@
+Index: krunner/lock/lockdlg.cc
+===================================================================
+--- krunner/lock/lockdlg.cc	(Revision 1089240)
++++ krunner/lock/lockdlg.cc	(Revision 1089241)
+@@ -85,7 +85,8 @@
+     : KDialog(parent, Qt::X11BypassWindowManagerHint),
+       mPlugin( plugin ),
+       mCapsLocked(-1),
+-      mUnlockingFailed(false)
++      mUnlockingFailed(false),
++      sNot(0)
+ {
+     QWidget* w = mainWidget();
+ 
+@@ -431,6 +432,8 @@
+ //
+ void PasswordDlg::gplugStart()
+ {
++    if (sNot)
++        return;
+     int sfd[2];
+     char fdbuf[16];
+ 
+@@ -461,6 +464,7 @@
+     sFd = sfd[0];
+     sNot = new QSocketNotifier(sFd, QSocketNotifier::Read, this);
+     connect(sNot, SIGNAL(activated(int)), SLOT(handleVerify()));
++    connect(sNot, SIGNAL(destroyed()), SLOT(slotNotifierDestroyed()));
+ }
+ 
+ void PasswordDlg::gplugChanged()
+@@ -647,6 +651,11 @@
+         KDisplayManager().switchVT( itm->vt );
+ }
+ 
++void PasswordDlg::slotNotifierDestroyed()
++{
++    sNot = 0;
++}
++
+ void PasswordDlg::capsLocked()
+ {
+     unsigned int lmask;
+Index: krunner/lock/lockdlg.h
+===================================================================
+--- krunner/lock/lockdlg.h	(Revision 1089240)
++++ krunner/lock/lockdlg.h	(Revision 1089241)
+@@ -63,6 +63,7 @@
+     void slotOK();
+     void slotActivity();
+     void handleVerify();
++    void slotNotifierDestroyed();
+ 
+ private:
+     void capsLocked();