Fix crash on 32-bit systems (bug #445894, thanks to Denny Reeh).

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 50 insertions, 7 deletions

diff --git a/sys-apps/accountsservice/ChangeLog b/sys-apps/accountsservice/ChangeLog
index 583a250e4b4b..fe193e405780 100644
--- a/sys-apps/accountsservice/ChangeLog
+++ b/sys-apps/accountsservice/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/accountsservice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.21 2012/11/30 22:38:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/ChangeLog,v 1.22 2012/12/04 08:14:58 tetromino Exp $
+
+*accountsservice-0.6.29-r1 (04 Dec 2012)
+
+  04 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -accountsservice-0.6.29.ebuild, +accountsservice-0.6.29-r1.ebuild,
+  +files/accountsservice-0.6.29-32bit-crash.patch:
+  Fix crash on 32-bit systems (bug #445894, thanks to Denny Reeh).
 
 *accountsservice-0.6.29 (30 Nov 2012)
 
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index 30f745c48655..1c9ab296e510 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -3,18 +3,23 @@ Hash: SHA256
 
 AUX accountsservice-0.6.21-gentoo-system-users.patch 1320 SHA256 c8b8961cf9825c46c320237e0c48af5f253007de6499c4ac7da454c3f87ecf15 SHA512 3fe8c974bb036add475e8245ba9a3da595f167206bd504d64c4730de22a1c324bba171819719eb1a9d78e24210b3789f8467d20bfe40694a903ddc2ede6d06a7 WHIRLPOOL 45d95a97037c769cc77f456cea412e6a69b2e7604e890403686ae6457914312c250288fcc825ed8c812db67dfbc1d5a678d7a389f762d9c0d9b8a84b9f8ee56b
 AUX accountsservice-0.6.24-dont-delete-root.patch 1273 SHA256 e55bef968ccf438a196453220d52b2d53b4c53d5810fdc678914163f64b55045 SHA512 bbcbbddd1257f04f541754f140d17c6df215990928cb23fed8a4a651e29c5382f39b7d3f79dc044ae6bf60fa8266ef56291d58c0015ff417d89645f3dac6d861 WHIRLPOOL 4109dd90387889428720ec32545f80eca69a8dc15a24165ab4b89ac7dae6a52cf139c8cb335a590905eefbd400ee0ddc546a8329df03789452f4e697762b88cb
+AUX accountsservice-0.6.29-32bit-crash.patch 908 SHA256 f85673a60fb6fb20d015c4a5b09aebd739d2554965e02861488691b8e3fd762e SHA512 0defd98b741e64507e152977bc57a4cf8b689fe9cfc3e69725d8e24c77562951eccbd73c24ed481f1855237b60bf35d2cd105262a1d355e198930b98d416bcd5 WHIRLPOOL aa4722e7472a2a0e7f7b479e3c8692f88ae09c818dcab70c6cd9267c348d0f9458788a36104c395fb7c76c3529a600070ee8000ccff29e0aee3c329ac2bce51c
 DIST accountsservice-0.6.22.tar.xz 331028 SHA256 851e05aa593cd8e3ed5c635a7fee3ffc0f418d3db2f28c5ebd6b7503294e3bdd SHA512 984f5180310683af0320d0294e97556a87658dc773e64d3105825ce7111d82e4370d8cf5172c6a6074eeca96aa158e8120d2a1092040313f482d051fa1e8ab1f WHIRLPOOL 68c1255131a7e4e03f2a6fa763ac89f53feb6697a3e8481a68ef77976bb694a296f18cd9df9828351fe201f4842369d40518093d78e47cd1c91e166061866c0e
 DIST accountsservice-0.6.25.tar.xz 334628 SHA256 5600a8ffe946d5cef63988767f221bc338b79f3012188d9dff6caa5f7b25fe6c SHA512 7cca2a0e773b68b5a5daefbf540dde02b29b6647c278a3411a501cef366a05ad5e64bbe713175ecb28352ba5052b7897536735cdc5790ee49a8499e84a56ba73 WHIRLPOOL fb99df6c16d87cbc3d21019c90bc0875319a4aa26b7aedbc8c2f386ab2044adc8e319dda0db8be02bc692d2026b316a6fa51d693b74f65a940855948ce4942f1
 DIST accountsservice-0.6.29.tar.xz 355024 SHA256 67d97e05a4c3c6f2f44a6d6cd3391ae6decce1296eb9ab918ac2899fab7f62cc SHA512 07ac2fb40db7f6a2855a1305d5956133445f0760268c2b1b71add96f9bd8fe98388428872822bdfc8b2f755583897054e55051ecac3e69c77a59fc4551f2c763 WHIRLPOOL 27bbda33edd76d1f685a9ca50a0763d131c5182a5cd3b869437fd4d4407bb59fd0c5e942d82c7f19b3e2e90fb292a794cdc2133108a3074108b69f41799af08a
 EBUILD accountsservice-0.6.22.ebuild 1921 SHA256 faf7b4b1df83c01043720ae1763d9dc9f903fcf6fbbe960048324d043c18d57e SHA512 9524c878545d8f9cb90800c320548bbca75126cd682d69486647f702f4aec82263073da3f6d0d2c776933353ca65b46e198a1ab0eb036fe2a4abd459136caf29 WHIRLPOOL b75394dca979809a9edc4ec7776d4ea86906cd06fea4759b23e3094624bbc8e6a7abec7b9edf4a0e9011ce1ac4ec70ef2211b6d966c8fb64285471159c46e288
 EBUILD accountsservice-0.6.25.ebuild 1656 SHA256 68609964e605071c6d5ec9771bf70ef0a37cadae5278d4973c2e329d79ac2923 SHA512 83d10a9cf429cafc75755476e9a099b2308a12318d59117d0ac0129628ded9969b1ec1354aa0f27ed0d2aa7f5b8c44a373ce7d309f6b2340284d62dfe5df5871 WHIRLPOOL ca5517c42a34e532ba0a02c8718cadd2fa8b07a7b15aca4b5b770dfe00d5e54cd36b1fbd599908f8c9531582711b8b3ca2d1564591432142cdcae0b1ec6e2a0e
-EBUILD accountsservice-0.6.29.ebuild 1709 SHA256 dfd8c24ccf12ba324c3caf7e25b2d5cfc381994d5f4b77a28ceb061b4cf6c0dd SHA512 cd4340f3ee9c63422fc67c607186796e2c09a9277c92436bbe739472465bdd93c37cc2d53e455f60d9c5f9ee8e7cf7739747505a1d20401823de830ebcfc2c2e WHIRLPOOL 52b18e205b0072c1e87f38423ad104a543ab784e6222c27b02397f5b28d82abb2931f9793b5342d9ab850c3dc3489868afe381556f1e678ccd15dbf213942fa1
-MISC ChangeLog 4442 SHA256 1917110c9ffc47b766388b04727fc4401f5141d0cf605b84bd03934063175608 SHA512 640efb76cc1d42b2c2280b54d47b948b12ceb8749df44cb5cb53ee7f67fb4b46d82d9fbfde4bd121d3d20166f2b1c9425c8a14f396d64667c714b522e575b4fd WHIRLPOOL 9bf8ea6f15554052dd2c35c21dfb40b8aadf3668f9e231fd68bb029161d7038e1939b0ad1b5d9d8be43da2bd6d2e3782e5b252641f4e9b0395b0d08f164fe0fb
+EBUILD accountsservice-0.6.29-r1.ebuild 1794 SHA256 7a237839fabd9093212c7377ab3f7af4cd99eab1be31b39b98f76a81b530328e SHA512 5b963ad2aaba97aff8d83f019f03716f7d746a9cf0e534957e1ad46a11a69b3b50867bae924a9acd9bddfd070269c49879a526ba2e331960fc89069036892608 WHIRLPOOL 44b4ec8962f69a269752541d538692e214feb38b97ddf0991b8a98ec0b16189af5c00f18aff1ddfe4fb49cb82776502f0c364bc804aa5281b56596588c8d63ce
+MISC ChangeLog 4737 SHA256 56dc1c908cb9cba12ed98a891e25241acf551ae819bb482f5d250c4dbd4d8725 SHA512 3f0b0fc25609cd8009d2d188ef5c80e8f92c67a444d38cfe6c60ff3f5dea88048db797916f8f0a8979872c0c904f8894f1b2e6cb9c5d769bc380db1ebbc783ce WHIRLPOOL fe7fe22c44e7a42237ef354e15910f7cacc56437049e951c920cc04b7187fc170ddf11a104819a39f235eb5235fed9f01a075e4634dbc84793156f1b4ec46504
 MISC metadata.xml 477 SHA256 cfe68d08f14d29166ff46c0e1187002e7c895307deab521b2b78637cbe45e8ac SHA512 d60228f73ebf1a56d604b152d928ebfe5f81d7d777f471f4808a07aa9c6fc3460d7c7d71d183c4566def28a2b1319da4e9dfd71886d8a8d85ddf3c57e4de2b13 WHIRLPOOL 6562e107ed6dd93aac173cb28a532cd1ee06a2d1378a8d552234d41e615ff8f9c0d219aa016a85cb776cb2c3c0ebbad84de2331e809157e64f96604eef863e86
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlC5NVUACgkQ1fmVwcYIWAaZ1wCePwkneea4kmcjqrGp6sepQfKi
-VMsAn34hTqhDUI1tt7QCuKGruoxNbZAC
-=NeUU
+iQEcBAEBCAAGBQJQvbEDAAoJEJ0WA1zPCt1ho9kH/0lyEXIT5LCE4vgJSI4AM/fF
+x5jAwvlV4zRgHvn81DbymPXXPOrIyK/BM/g9wvngcmrcgIcLt1kch2ZcoDgnrwMa
+ngr0k0uWZfv+xvJnALWwUryDCj3aM+O73kCSq0urHDhopC8+CvAE15n5rpuJddiA
+5dOGtWVa+whx/wDMKlViLkKF2v3hRFKABrGY8wkNYCd06Ora9LF8jUerOx/TxwEO
+fX0nKh6Y3iV8DHuvKCzIXvFynzRht1aPpxzxJNRretXt5j19zvliErkyNaQPw1Pn
+5dJUkaXB/RQqyBfEX4NGTEzEAp4ovu/1gLq+W93iKXKbjew6S3OY5Zg5Z5vWJDI=
+=57UW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/accountsservice/accountsservice-0.6.29.ebuild b/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild
index efb84d76e160..7c3d067993d5 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.29.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.29.ebuild,v 1.1 2012/11/30 22:38:12 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/accountsservice/accountsservice-0.6.29-r1.ebuild,v 1.1 2012/12/04 08:14:58 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -42,6 +42,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-0.6.21-gentoo-system-users.patch"
+	epatch "${FILESDIR}/${P}-32bit-crash.patch" # bug #445894, fixed in 0.6.30
 	use vala && vala_src_prepare
 	gnome2_src_prepare
 }
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.29-32bit-crash.patch b/sys-apps/accountsservice/files/accountsservice-0.6.29-32bit-crash.patch
new file mode 100644
index 000000000000..1015072ef709
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.29-32bit-crash.patch
@@ -0,0 +1,30 @@
+From 4d5166d1833e42d81b854374aa6e73f83a67a70e Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 27 Nov 2012 18:30:45 -0500
+Subject: [PATCH] Fix a crash on 32bit systems
+
+The login-frequency property of the User interface is defined
+as uint64 type. Therefore, when setting it with g_object_set,
+a 64bit value is collected, and passing an int might lead to
+bad things.
+https://bugs.freedesktop.org/show_bug.cgi?id=57343
+---
+ src/daemon.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index ed3a114..4d6f3ab 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -207,7 +207,7 @@ daemon_local_user_is_excluded (Daemon *daemon, const gchar *username, const gcha
+ #ifdef HAVE_UTMPX_H
+ 
+ typedef struct {
+-        int frequency;
++        guint64 frequency;
+         gint64 time;
+         GList *previous_logins;
+ } UserAccounting;
+-- 
+1.8.0
+