rev 5919 - in trunk/packages/kdelibs/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-04-18 13:02:47 +0000 (Wed, 18 Apr 2007)
New Revision: 5919

Added:
   trunk/packages/kdelibs/debian/patches/44_sync_kwallet_changes.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
kdelibs 3.5.6 to unstable.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2007-04-18 11:59:19 UTC (rev 5918)
+++ trunk/packages/kdelibs/debian/changelog	2007-04-18 13:02:47 UTC (rev 5919)
@@ -1,13 +1,19 @@
 kdelibs (4:3.5.6.r1.dfsg.1-3) unstable; urgency=low
 
-  +++ Changes by Sune Vuorela
+  +++ Changes by Sune Vuorela:
 
   * Take the patches from branches/etch to fix two security issues
     46_CVE-2007-1564-kdelibs-3.5.6.diff and 47_kdelibs-kjs-utf8-parsing.diff
-    Fixes CVE-2007-1564 and CVE-2007-0242 (Closes: #417394, #416318)
+    Fixes CVE-2007-1564 and CVE-2007-0242. (Closes: #417394, #416318)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon,  9 Apr 2007 13:23:25 +0200
+  +++ Changes by Ana Beatriz Guerrero Lopez:
 
+  * Add 44_sync_kwallet_changes to make kwallet write changes to disk
+    immediately, avoiding losing passwords if kwallet doesn't shutdown
+    cleanly. Patch by Josh Metzler. (Closes: #407272)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 18 Apr 2007 14:45:54 +0100
+
 kdelibs (4:3.5.6.r1.dfsg.1-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:

Added: trunk/packages/kdelibs/debian/patches/44_sync_kwallet_changes.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/44_sync_kwallet_changes.diff	2007-04-18 11:59:19 UTC (rev 5918)
+++ trunk/packages/kdelibs/debian/patches/44_sync_kwallet_changes.diff	2007-04-18 13:02:47 UTC (rev 5919)
@@ -0,0 +1,106 @@
+--- kdelibs-3.5.5a.dfsg.1/kio/misc/kwalletd/kwalletd.cpp	2006-10-01 13:33:33.000000000 -0400
++++ kdelibs-3.5.5a.dfsg.1/kio/misc/kwalletd/kwalletd.cpp	2007-01-17 09:50:00.000000000 -0500
+@@ -829,6 +829,12 @@
+ 
+ 	if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
+ 		bool rc = b->removeFolder(f);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		QByteArray data;
+ 		QDataStream ds(data, IO_WriteOnly);
+ 		ds << b->walletName();
+@@ -845,6 +851,12 @@
+ 
+ 	if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
+ 		bool rc = b->createFolder(f);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		QByteArray data;
+ 		QDataStream ds(data, IO_WriteOnly);
+ 		ds << b->walletName();
+@@ -987,6 +999,12 @@
+ 		e.setValue(value);
+ 		e.setType(KWallet::Wallet::Map);
+ 		b->writeEntry(&e);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return 0;
+ 	}
+@@ -1005,6 +1023,12 @@
+ 		e.setValue(value);
+ 		e.setType(KWallet::Wallet::EntryType(entryType));
+ 		b->writeEntry(&e);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return 0;
+ 	}
+@@ -1023,6 +1047,12 @@
+ 		e.setValue(value);
+ 		e.setType(KWallet::Wallet::Stream);
+ 		b->writeEntry(&e);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return 0;
+ 	}
+@@ -1041,6 +1071,12 @@
+ 		e.setValue(value);
+ 		e.setType(KWallet::Wallet::Password);
+ 		b->writeEntry(&e);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return 0;
+ 	}
+@@ -1090,6 +1126,12 @@
+ 		}
+ 		b->setFolder(folder);
+ 		bool rc = b->removeEntry(key);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return rc ? 0 : -3;
+ 	}
+@@ -1183,6 +1225,12 @@
+ 	if ((b = getWallet(friendlyDCOPPeerName(), handle))) {
+ 		b->setFolder(folder);
+ 		int rc = b->renameEntry(oldName, newName);
++		// write changes to disk immediately
++		QByteArray p;
++		QString wallet = b->walletName();
++		p.duplicate(_passwords[wallet].data(), _passwords[wallet].length());
++		b->sync(p);
++		p.fill(0);
+ 		emitFolderUpdated(b->walletName(), folder);
+ 		return rc;
+ 	}