Revision bump adds backported Plasma 5 upstream patch by Michael Palimaka <kensington@gentoo.org>, which uses sys-apps/accountsservice at runtime, fixes bug #380899.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 134 insertions, 17 deletions

diff --git a/kde-base/kdepasswd/ChangeLog b/kde-base/kdepasswd/ChangeLog
index abd1c1de6ff8..6ca74b7cce43 100644
--- a/kde-base/kdepasswd/ChangeLog
+++ b/kde-base/kdepasswd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kdepasswd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.326 2014/07/23 16:53:06 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/ChangeLog,v 1.327 2014/07/24 18:20:33 johu Exp $
+
+*kdepasswd-4.13.3-r1 (24 Jul 2014)
+
+  24 Jul 2014; Johannes Huber <johu@gentoo.org>
+  +files/kdepasswd-4.13.3-use-accountsservice.patch,
+  +kdepasswd-4.13.3-r1.ebuild, -kdepasswd-4.13.3.ebuild:
+  Revision bump adds backported Plasma 5 upstream patch by Michael Palimaka
+  <kensington@gentoo.org>, which uses sys-apps/accountsservice at runtime, fixes
+  bug #380899.
 
   23 Jul 2014; Johannes Huber <johu@gentoo.org> -kdepasswd-4.13.2.ebuild:
   Remove KDE SC 4.13.2
diff --git a/kde-base/kdepasswd/Manifest b/kde-base/kdepasswd/Manifest
index 642108965442..72d0e5a052da 100644
--- a/kde-base/kdepasswd/Manifest
+++ b/kde-base/kdepasswd/Manifest
@@ -1,26 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kdepasswd-4.13.3-use-accountsservice.patch 3436 SHA256 fa1de0d28136d1cb47fff77a67837e0c8278478ea8755177303aaf8bf09105ea SHA512 b0071e6dff074f3d7b44c0f0088ae20803ba780227f09b0700e2e15973dd385bba86336eaf071b67d3a0b9e7c338af27a0bd1a1ffff2413e2c008c8c222fedb6 WHIRLPOOL 35aeb274dbb3ff057fd96862e2cc26a949b30066b9696ac65657ff392fb80869247590cc8cc5a48725ba18e0cd01b1ea6bca2b732e31fe1779ebfbf149f14bd1
 DIST kde-baseapps-4.12.5.tar.xz 2533496 SHA256 577f89eb4a0301f6e1e4efb6ee9f983c5b940e9effd0e540e58bc820fd36d078 SHA512 700dd91196d9c8a0e20e8890d71e163fbe2cb06bd0d0afea1cb4a9565ea63660fd6284c049d19d3de874f22009cf8be72def53b4ec97d5314b9ae5f97ea37d94 WHIRLPOOL f28190d028f9c47b5fdadffb2a421f3dd527de1227493b585e623cedee5777a8059b15464aa0c0dbabd073b130fd7de5cdc41cb6f80fbe93dbf368c1afbd99bf
 DIST kde-baseapps-4.13.3.tar.xz 2535180 SHA256 427164598d3a33ce18056af11073e46510e093eb30f8ce4854c4fa0abc303804 SHA512 c6d54a17abf00f414d1f2b932796ca400327ad2b5e8c17838bdddda2550c81725d0f7aa6fff1ffdbe0d3e07af6ec7fafb6a62085a26a03e76bcf0ec016690eed WHIRLPOOL 8d642a5f5b4f0727ddbbffdbdd9f0a55e2aab1fe6cb84f6d949c5b398f02c4061b70741e01d3794ab87dcf2f149a101875c0c0da76be8b3daf81613ae5d3683b
 EBUILD kdepasswd-4.12.5.ebuild 489 SHA256 4e6a4077b4d860da25f7852b97479fbf7dbb5d935d0bf864ef1e64632586d7bb SHA512 25244b8bc9089fa518c9fcc444a64434ba0297bc50147668646bb7184c53e9de3b21b46a126cd5772c5187224ad38a999a0c488b8065c2c23b894d9d7a72b62d WHIRLPOOL a11e052142c97b146474aee746d6845034b23a70591674e64dcd3f86c69a8788f7b62fd19a50ec4f2f74b5c5af01d82da6b1121209c27fd9b8053f59f8940d2e
-EBUILD kdepasswd-4.13.3.ebuild 494 SHA256 f5f4b7d84ff2cd04b0782ffa9fe8b07eb62f1a206e816468ecdec92645065021 SHA512 a1537be562c172a2ee67d7f42a10398bd544f14de04294b2e85deb8f746527db28251e2e3575965440d487b20312122314de36a84651d802e060e67eb91c590c WHIRLPOOL c2d46188af3bb504864c4e44964aaacd5198159972667c8984c287bc1bf2fec0beb80818bc52313f113aefaa315d43bcb81424f666ffb33ae2a48649cfd184bc
-MISC ChangeLog 39106 SHA256 70a6391adec2c96dbbf9e3f326bcf5429571807249e20998234a9da8f8c0cbc5 SHA512 dc3e8415dcc829a86e12bace6375129448a69e2b64936c6685378001a8a2a4541b5eaa7ce03ebbab9dfd6393aeddb20d9a7284056c0110f9e5ce7ba8994ed229 WHIRLPOOL 87cc00f4b90d092bc593768db64f378e7d6a4138acb0e0453e2520c3deb84b79a3411cbc1664debcd91c365a9b554b3accb56f611765fb973eb16a4cc095c431
+EBUILD kdepasswd-4.13.3-r1.ebuild 581 SHA256 af5a1966c988b0cb838c8458f0fe77b8cd1a6572d8671933c915f02b75943a5f SHA512 f13d50935915c6d1a9bddeda709bd49a61016bd60fe8db3067e757b3455081b63b68837d5dc3a61c39659d2845d7042341f5fabd40842fe9dd4470ab235d1dd0 WHIRLPOOL d7e0c337cb3c93f5f5b3122de4765c2e7d3b9c2eb11f8165da1aabc10f74a8c17022b190751a01d83575a5939810409df83de1bc60e93bfdd3018cfcc0bab313
+MISC ChangeLog 39473 SHA256 eb9aafc0173103ad4f10a2f23d8b8a5b64b73e066c49a337f03fa0f020d93985 SHA512 50249324edc721d96eb0a8a146b0932837acab76624739341a2ff3c1a88778c9b62c968d03849b567e62fac6b47bc9ae5c43df66b7e23751205df21727934d96 WHIRLPOOL cee3888ff260efa8b96502823c55a4529914eaf0c2fcf86cab2760773f34b200527d55a91c4320f471428fab24f887ee585d1e451bc553bb44d651548c34c1e7
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz+iRAAoJEGVpnaTzz9K9M0oP/2+J7CFl3DVeigj5klfXArIR
-tkXE2TV/p7vWb29w3UWuo/dKr4o0QW97W4Lx/wdVLVhu4MpA1Uvq6qIofQBKPxNF
-w4GE+fuGHDoBjQDXVhVaAmcmkqOZ8gUAexPMoRme6MkNEZ3/imEp7IAaFPB3YzZM
-oU82L9lLdnoBM6UKhQ1xHmDHbOw1cTkHcueXbU8dMfKexrLigRBqsz9rmY1pdbmb
-OxXQmBuj72ew8MbQZdM0xrsR+eN1ho2QU+qBfwZ/Jc99zHIIc/RMrwVURgxicCmw
-jNiJqgjS3hNIusu+Z9W6iu+LaqISQxqzFVzQgclikZ0BwrVFP9Ym+qphB3H9FhWc
-Vl5dh29zpYcZsHjETogdD9U17AqXuOxJLeAbBBbCL0sZblBdmUnY62yh4/leA6k/
-iWQcmCDbbBkcNpk+DYM9xJLCOJU33Ftle3849N6tCKC3nvjFZCGYOImwJHQAa6cH
-Wrhp6TVOGg7fM/24SHjBwPV82Xws4g8fyb8r62zRNJ442UAxV1m95FwBbmpJMC5X
-uCLo+Cu97/9kl0kjZxLNeqd5Wdh5SUwt6I2Os5n12sWp8jFuJnV9MY5iFoPppocO
-EG9E+s1LZO6MIe7HPBidBFixspBF6OucvQJE6czHfZw/KFHf6ACMek1poZ7ZwoIg
-tpjtfp5i7jHMZpOFJ1Rb
-=J6ne
+iQIcBAEBCAAGBQJT0U5yAAoJEGVpnaTzz9K9GwMP/iibqUfL9FRlAu1f8oMZhCtL
+NhTzNZ21skj+rqNODQa8jc7tFQBWb9MAvpCqJU9w8nvCiFS7Ct354b4vzaElutTu
+azNgFtWn4P06JEtm7yXSZMW0lwjabPSV3ZXD2of0dEAUYjcCPWrH77LnAdOkGK6A
+Z20+vYA445YkF9kZR/TUO8m+aJcgmgfEC8FbJBuT1pcg/c/zavMMzy0gxlaY8+pn
+9FrutP6Kzf23Xz9zLs7TnEC//Ri4g2/gyW8jFd//arYlN/WYl2MHqY2Q5qhAgiA1
+I0FDPDgafSOViocsKC4XYkdD+ACvnYY+SRaVKrs5Pg61i7CuvgO55iwaRusyTMz1
+A9iD5CMG22nlLKoNS0eFR1fCH+Mo1OhyHnpUZ35A6wO0NegsRmfZ4zX6PuF4J8MC
+6bQBuFPN64SB4PbIfqTz2lVnJHsyUTz3klwGtcIQJURz9Ep1guPVd0xjEpulc4q5
+kVYWJBEb95dhOXwVV7Q8Wj8f4S8gmKxuRbwizJ+UmFMTc/zTniDt979P72dtlCa0
+qIpWGweBht+G81vmxf+AFlv14XCQOhIV9NnJtV+VbN5RI+fEsCcTudDBXyQTLTzr
+oLAhmgAJN5e74KOJIAJh3mUpJwOi3hb5p9GPdtBk3JSpIiPIGp21O13yfXBJwOf3
+/DAcG+E7/LsfIbUNRoLF
+=fPIy
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdepasswd/files/kdepasswd-4.13.3-use-accountsservice.patch b/kde-base/kdepasswd/files/kdepasswd-4.13.3-use-accountsservice.patch
new file mode 100644
index 000000000000..5a89d4d809db
--- /dev/null
+++ b/kde-base/kdepasswd/files/kdepasswd-4.13.3-use-accountsservice.patch
@@ -0,0 +1,104 @@
+Use accountsservice instead of calling chfn directly.
+
+This avoids a potential error or crash when changing user account information.
+Backported 77275f50241eb2f4e38051152074c379fa96fe84 and 
+23bbe79912ec21ded8fdfc595935f48a6d2298ea from Plasma 5.
+
+Gentoo bug #380899
+KDE bug #156396
+
+--- a/kdepasswd/kcm/CMakeLists.txt
++++ b/kdepasswd/kcm/CMakeLists.txt
+@@ -1,7 +1,6 @@
+ add_subdirectory(pics)
+ 
+ set(kcm_useraccount_PART_SRCS
+-    chfnprocess.cpp
+     main.cpp
+     chfacedlg.cpp)
+ 
+--- a/kdepasswd/kcm/main.cpp
++++ b/kdepasswd/kcm/main.cpp
+@@ -49,7 +49,6 @@
+ 
+ #include "settings.h"
+ #include "pass.h"
+-#include "chfnprocess.h"
+ #include <KPluginFactory>
+ #include <KPluginLoader>
+ 
+@@ -181,36 +180,27 @@ void KCMUserAccount::save()
+ 	/* Save realname to /etc/passwd */
+ 	if ( _mw->leRealname->isModified() )
+ 	{
+-		KPasswordDialog dlg( _mw );
+-		dlg.setPrompt(i18n("Please enter your password in order to save your settings:"));
+-		if ( !dlg.exec() )
+-		{
+-			KMessageBox::sorry( this, i18n("You must enter "
+-				"your password in order to change your information."));
+-			return;
+-		}
+-
+-		ChfnProcess *proc = new ChfnProcess();
+-		int ret = proc->exec(dlg.password().toLocal8Bit() , _mw->leRealname->text().toLocal8Bit() );
+-		if ( ret )
+-		{
+-			if ( ret == ChfnProcess::PasswordError )
+-				KMessageBox::sorry( this, i18n("You must enter a correct password."));
+-
+-			else
+-			{
+-				KMessageBox::sorry( this, i18n("An error occurred and your name has "
+-							"probably not been changed. The error "
+-							"message was:\n%1", QString::fromLocal8Bit(proc->error())));
+-				kDebug() << "ChfnProcess->exec() failed. Error code: " << ret
+-					<< "\nOutput:" << proc->error() << endl;
+-			}
+-
+-			delete proc;
+-			return;
+-		}
+-
+-		delete proc;
++        // save icon file also with accountsservice
++        QDBusInterface ainterface("org.freedesktop.Accounts",
++            "/org/freedesktop/Accounts",
++            "org.freedesktop.Accounts",
++            QDBusConnection::systemBus());
++        QDBusReply<QDBusObjectPath> reply = ainterface.call("FindUserById", qlonglong(_ku->uid()));
++        if (reply.isValid() && !reply.error().isValid()) {
++            QDBusInterface uinterface("org.freedesktop.Accounts",
++                reply.value().path(),
++                "org.freedesktop.Accounts.User",
++                QDBusConnection::systemBus(),
++                this);
++
++            QString name = _mw->leRealname->text();
++            QDBusReply<void> ureply = uinterface.call("SetRealName", name);
++            if (!ureply.isValid() || ureply.error().isValid()) {
++                kDebug() << ureply.error().message();
++                KMessageBox::error( this, i18n("There was an error setting the name: %1" ,
++                    name) );
++            }
++        }
+ 	}
+ #endif
+ 
+@@ -243,10 +233,12 @@ void KCMUserAccount::save()
+ 		}
+ 	}
+ 	else { // delete existing image
+-		if ( !KIO::NetAccess::del(KCFGUserAccount::faceFile(), this) ) {
+-			KMessageBox::error( this, i18n("There was an error deleting the image: %1" ,
+-				KCFGUserAccount::faceFile()) );
+-		}
++        if (QFile::exists(KCFGUserAccount::faceFile())) {
++            if ( !KIO::NetAccess::del(KCFGUserAccount::faceFile(), this) ) {
++                KMessageBox::error( this, i18n("There was an error deleting the image: %1" ,
++                    KCFGUserAccount::faceFile()) );
++            }
++        }
+ 	}
+ 
+ 	/* Save KDE's homebrewn settings */
\ No newline at end of file
diff --git a/kde-base/kdepasswd/kdepasswd-4.13.3.ebuild b/kde-base/kdepasswd/kdepasswd-4.13.3-r1.ebuild
index 6172dafd7fa6..997f46a6bc51 100644
--- a/kde-base/kdepasswd/kdepasswd-4.13.3.ebuild
+++ b/kde-base/kdepasswd/kdepasswd-4.13.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.13.3.ebuild,v 1.1 2014/07/16 17:40:10 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepasswd/kdepasswd-4.13.3-r1.ebuild,v 1.1 2014/07/24 18:20:33 johu Exp $
 
 EAPI=5
 
@@ -17,4 +17,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdesu)
+	sys-apps/accountsservice
 "
+
+PATCHES=( "${FILESDIR}/${P}-use-accountsservice.patch" )