Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8f6de163d869f33b24a09fbd31537a24c3be147f)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8f6de163d869f33b24a09fbd31537a24c3be147f)
  • Date: Thu, 18 Feb 2010 11:05:00 -0600

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

kde4/kdebase-workspace4/DETAILS | 2 -
kde4/kdebase-workspace4/HISTORY | 7 ++++
kde4/kdebase-workspace4/PRE_BUILD | 4 ++
kde4/kdebase-workspace4/lockdlg.diff | 51
+++++++++++++++++++++++++++++++++++
4 files changed, 62 insertions(+), 2 deletions(-)

New commits:
commit c418626629ecca01a1bdc71acd9a8ac63156ef45
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kdebase-workspace4 - fix security bug #15584

diff --git a/kde4/kdebase-workspace4/DETAILS b/kde4/kdebase-workspace4/DETAILS
index 8466196..a93468d 100644
--- a/kde4/kdebase-workspace4/DETAILS
+++ b/kde4/kdebase-workspace4/DETAILS
@@ -7,7 +7,7 @@
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
WEB_SITE=http://www.kde.org
ENTERED=20070803
-# SECURITY_PATCH=1
+ SECURITY_PATCH=1
LICENSE[0]=GPL
KEYWORDS="kde4"
SHORT="workspace for all KDE desktop applications"
diff --git a/kde4/kdebase-workspace4/HISTORY b/kde4/kdebase-workspace4/HISTORY
index ce2f432..919b843 100644
--- a/kde4/kdebase-workspace4/HISTORY
+++ b/kde4/kdebase-workspace4/HISTORY
@@ -1,3 +1,10 @@
+2010-02-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH=1
+ * PRE_BUILD: apply patch
+ * lockdlg.diff: added
+ see http://www.kde.org/info/security/advisory-20100217-1.txt
+ fixes bug #15584
+
2010-02-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 4.4.0 (stable)

diff --git a/kde4/kdebase-workspace4/PRE_BUILD
b/kde4/kdebase-workspace4/PRE_BUILD
index 2a8ec76..6f99fb9 100755
--- a/kde4/kdebase-workspace4/PRE_BUILD
+++ b/kde4/kdebase-workspace4/PRE_BUILD
@@ -1,2 +1,4 @@
create_group kde4 &&
-default_pre_build
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p5 < $SPELL_DIRECTORY/lockdlg.diff
diff --git a/kde4/kdebase-workspace4/lockdlg.diff
b/kde4/kdebase-workspace4/lockdlg.diff
new file mode 100644
index 0000000..ad34cd7
--- /dev/null
+++ b/kde4/kdebase-workspace4/lockdlg.diff
@@ -0,0 +1,51 @@
+--- branches/KDE/4.4/kdebase/workspace/krunner/lock/lockdlg.cc 2010/02/12
19:10:17 1089240
++++ branches/KDE/4.4/kdebase/workspace/krunner/lock/lockdlg.cc 2010/02/12
19:11:02 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;
+--- branches/KDE/4.4/kdebase/workspace/krunner/lock/lockdlg.h 2010/02/12
19:10:17 1089240
++++ branches/KDE/4.4/kdebase/workspace/krunner/lock/lockdlg.h 2010/02/12
19:11:02 1089241
+@@ -63,6 +63,7 @@
+ void slotOK();
+ void slotActivity();
+ void handleVerify();
++ void slotNotifierDestroyed();
+
+ private:
+ void capsLocked();



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8f6de163d869f33b24a09fbd31537a24c3be147f), Treeve Jelbert, 02/18/2010

Archive powered by MHonArc 2.6.24.

Top of Page