From 1a66f03d2eb38a77201af07cf0e23e854db89530 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 23 May 2011 23:26:50 -0400 Subject: gnome-base/gdm-3.0.2 and sys-apps/accountsservice-0.6.12 bump * gdm-3.0.2 now requires >=accountsservice-0.6.12 * Our accountsservice patches have been merged upstream Signed-off-by: Nirbheek Chauhan --- sys-apps/accountsservice/Manifest | 16 +------ .../accountsservice/accountsservice-0.6.12.ebuild | 46 ++++++++++++++++++ .../accountsservice-0.6.6-r3.ebuild | 56 ---------------------- .../accountsservice-fix-nameless-users-crash.patch | 29 ----------- .../files/accountsservice-fix-useradd.patch | 23 --------- 5 files changed, 48 insertions(+), 122 deletions(-) create mode 100644 sys-apps/accountsservice/accountsservice-0.6.12.ebuild delete mode 100644 sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild delete mode 100644 sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch delete mode 100644 sys-apps/accountsservice/files/accountsservice-fix-useradd.patch (limited to 'sys-apps') diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest index 19db1481..957a4fa2 100644 --- a/sys-apps/accountsservice/Manifest +++ b/sys-apps/accountsservice/Manifest @@ -1,14 +1,2 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX accountsservice-fix-nameless-users-crash.patch 1275 RMD160 e435b073ace904e2e9edaa50a5e50c366b32f352 SHA1 46c19b0cf393561721ffaa838f24dc9b28ec1ca9 SHA256 5f95e4e2c7a38921957f31fd8d73d077d827b8cdb6b262bc6e9bb32621a0e0e6 -AUX accountsservice-fix-useradd.patch 825 RMD160 389061b5188afd4a54de160e83df21a0a04c7988 SHA1 bcf95dbd19b216c3b2bf881aeeaf747ee4ef36a1 SHA256 2cb0ae82821e7119edb3905cfb7067c7093351322adaff7b814c7e816291e7af -DIST accountsservice-0.6.6.tar.bz2 335056 RMD160 1627275908ac7a7eb0fca34e48c138a146254c9e SHA1 925b14d57dd3cdd70da300cf030dea3c5c875fdb SHA256 b620c4f6b453892410e4823634674c7c0bdd9735d96ff6fdc5d236cc1b814367 -EBUILD accountsservice-0.6.6-r3.ebuild 1319 RMD160 33fa13225537401cab6dcf2c266eacf045586efb SHA1 d8667504ae27c1115665d8f35da042baac18291d SHA256 03d0f173b84aa5087fc0a4fcccee9df885ee48ac0f90829e93fe81ce288efe47 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk3OuDQACgkQ1fmVwcYIWAb04gCdHLzPUyFwYyQ6oI+lCyh9R7Wq -FZQAoJ9uDpQh+o0YLcilnTGlVUJOw4hq -=maCT ------END PGP SIGNATURE----- +DIST accountsservice-0.6.12.tar.bz2 344686 RMD160 afd29e8a5be47bab1e715c7bd747a40236581fb7 SHA1 8bdf4134505a77c7088e8dfd4bff8b44aff35031 SHA256 1f5d983d0e1b643f7085e90991455c5920d067096e1122ad1784fb96e22e2c62 +EBUILD accountsservice-0.6.12.ebuild 1065 RMD160 d390fcc39774655b899af17dcc45e2d88683c2b4 SHA1 1354dcbd5c279884faa64fbabd41a7b7f512fca9 SHA256 d439a5aa9e40b216741a89c76d1057e3b09382e1ffc3d6b32ab998fcbe0bb11f diff --git a/sys-apps/accountsservice/accountsservice-0.6.12.ebuild b/sys-apps/accountsservice/accountsservice-0.6.12.ebuild new file mode 100644 index 00000000..3f2b469a --- /dev/null +++ b/sys-apps/accountsservice/accountsservice-0.6.12.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="3" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit gnome2 systemd + +DESCRIPTION="D-Bus interfaces for querying and manipulating user account information" +HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog" +SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+introspection" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/dbus-glib + sys-auth/polkit + + introspection? ( >=dev-libs/gobject-introspection-0.9.12 )" +DEPEND="${RDEPEND} + dev-libs/libxslt + dev-util/pkgconfig + sys-devel/gettext + >=dev-util/intltool-0.40" + +# Documentaton doesn't validate +RESTRICT="test" + +pkg_setup() { + # docbook docs don't validate, disable doc rebuild + G2CONF="${G2CONF} + --disable-static + --localstatedir=/var + --disable-docbook-docs + --disable-maintainer-mode + --disable-more-warnings + $(systemd_with_unitdir) + $(use_enable introspection)" + DOCS="AUTHORS NEWS README TODO" +} diff --git a/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild b/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild deleted file mode 100644 index dfa66afb..00000000 --- a/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="3" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit gnome2 systemd - -DESCRIPTION="D-Bus interfaces for querying and manipulating user account information" -HOMEPAGE="http://www.fedoraproject.org/wiki/Features/UserAccountDialog" -SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+introspection" - -RDEPEND=" - dev-libs/glib:2 - dev-libs/dbus-glib - sys-auth/polkit - - introspection? ( >=dev-libs/gobject-introspection-0.9.12 )" -DEPEND="${RDEPEND} - dev-libs/libxslt - dev-util/pkgconfig - sys-devel/gettext - >=dev-util/intltool-0.40" - -# Documentaton doesn't validate -RESTRICT="test" - -pkg_setup() { - # docbook docs don't validate, disable doc rebuild - G2CONF="${G2CONF} - --disable-static - --localstatedir=/var - --disable-docbook-docs - --disable-maintainer-mode - --disable-more-warnings - $(systemd_with_unitdir) - $(use_enable introspection)" - DOCS="AUTHORS NEWS README TODO" -} - -src_prepare() { - # Taken from upstream trunk, remove for next release - epatch "${FILESDIR}/${PN}-fix-useradd.patch" - - # Taken from upstream trunk, remove for next release - epatch "${FILESDIR}/${PN}-fix-nameless-users-crash.patch" - - gnome2_src_prepare -} diff --git a/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch b/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch deleted file mode 100644 index 28e3f029..00000000 --- a/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 74c01ff9e3a3b00810ae69db2f2d089b68c5220a Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Fri, 15 Apr 2011 16:24:51 +0000 -Subject: Don't crash when removing nameless users - -Every person had in the beginning one only proper name, except the savages -of Mount Atlas in Barbary, which were reported to be both nameless and -dreamless. - -https://bugs.freedesktop.org/show_bug.cgi?id=35872 ---- -diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c -index 4e25bf9..7202b07 100644 ---- a/src/libaccountsservice/act-user-manager.c -+++ b/src/libaccountsservice/act-user-manager.c -@@ -732,7 +732,10 @@ remove_user (ActUserManager *manager, - if (act_user_get_object_path (user) != NULL) { - g_hash_table_remove (manager->priv->users_by_object_path, act_user_get_object_path (user)); - } -- g_hash_table_remove (manager->priv->users_by_name, act_user_get_user_name (user)); -+ if (act_user_get_user_name (user) != NULL) { -+ g_hash_table_remove (manager->priv->users_by_name, act_user_get_user_name (user)); -+ -+ } - - if (manager->priv->is_loaded) { - g_signal_emit (manager, signals[USER_REMOVED], 0, user); --- -cgit v0.8.3-6-g21f6 diff --git a/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch b/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch deleted file mode 100644 index 7022125e..00000000 --- a/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch +++ /dev/null @@ -1,23 +0,0 @@ -From f30ba8c977d35c2c74b61c3ae14c492e28e02175 Mon Sep 17 00:00:00 2001 -From: Frédéric Péters -Date: Fri, 18 Mar 2011 13:16:34 +0000 -Subject: daemon: fix call to useradd for normal users - ---- -diff --git a/src/daemon.c b/src/daemon.c -index 32e9c97..755ada5 100644 ---- a/src/daemon.c -+++ b/src/daemon.c -@@ -1111,8 +1111,8 @@ daemon_create_user_authorized_cb (Daemon *daemon, - argv[7] = NULL; - } - else if (cd->account_type == ACCOUNT_TYPE_STANDARD) { -- argv[6] = cd->user_name; -- argv[7] = NULL; -+ argv[4] = cd->user_name; -+ argv[5] = NULL; - } - else { - throw_error (context, ERROR_FAILED, "Don't know how to add user of type %d", cd->account_type); --- -cgit v0.8.3-6-g21f6 -- cgit v1.2.3-65-gdbad