* [gentoo-commits] proj/gnome:master commit in: sys-apps/accountsservice/files/, sys-apps/accountsservice/
@ 2011-03-23 9:05 Nirbheek Chauhan
0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan @ 2011-03-23 9:05 UTC (permalink / raw
To: gentoo-commits
commit: 02339014a7599c9f6d3098809d3fb77bcbb51b16
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 09:01:39 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 09:01:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=02339014
sys-apps/accountsservice: 0.6.6 → 0.6.6-r1
* Fix adding/deleting of users
---
....6.6.ebuild => accountsservice-0.6.6-r1.ebuild} | 7 +++++-
.../files/accountsservice-fix-useradd.patch | 23 ++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/sys-apps/accountsservice/accountsservice-0.6.6.ebuild b/sys-apps/accountsservice/accountsservice-0.6.6-r1.ebuild
similarity index 88%
rename from sys-apps/accountsservice/accountsservice-0.6.6.ebuild
rename to sys-apps/accountsservice/accountsservice-0.6.6-r1.ebuild
index d0f096a..6fef701 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.6.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.6-r1.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
# Documentaton doesn't validate
RESTRICT="test"
-pkg_setup() {
+src_prepare() {
# Can configure systemdsystemunitdir
# docbook docs don't validate, disable doc rebuild
G2CONF="${G2CONF}
@@ -43,4 +43,9 @@ pkg_setup() {
--without-systemdsystemunitdir
$(use_enable introspection)"
DOCS="AUTHORS NEWS README TODO"
+
+ # Taken from upstream trunk, remove for next release
+ epatch "${FILESDIR}/${PN}-fix-useradd.patch"
+
+ gnome2_src_prepare
}
diff --git a/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch b/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch
new file mode 100644
index 0000000..7022125
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-fix-useradd.patch
@@ -0,0 +1,23 @@
+From f30ba8c977d35c2c74b61c3ae14c492e28e02175 Mon Sep 17 00:00:00 2001
+From: Frédéric Péters <fpeters@0d.be>
+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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: sys-apps/accountsservice/files/, sys-apps/accountsservice/
@ 2011-04-15 20:40 Nirbheek Chauhan
0 siblings, 0 replies; 3+ messages in thread
From: Nirbheek Chauhan @ 2011-04-15 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 1bea6329472ece48360f39d2b9f365380dfeff97
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 20:37:59 2011 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 20:38:05 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1bea6329
sys-apps/accountsservice: fix crash with nameless user accounts
https://bugs.freedesktop.org/show_bug.cgi?id=35872
---
...6-r2.ebuild => accountsservice-0.6.6-r3.ebuild} | 10 ++-----
.../accountsservice-fix-nameless-users-crash.patch | 29 ++++++++++++++++++++
2 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/sys-apps/accountsservice/accountsservice-0.6.6-r2.ebuild b/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild
similarity index 89%
rename from sys-apps/accountsservice/accountsservice-0.6.6-r2.ebuild
rename to sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild
index db69a02..0230629 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.6-r2.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.6-r3.ebuild
@@ -50,12 +50,8 @@ src_prepare() {
# Taken from upstream trunk, remove for next release
epatch "${FILESDIR}/${PN}-fix-useradd.patch"
- gnome2_src_prepare
-}
-
-src_install() {
- gnome2_src_install
+ # Taken from upstream trunk, remove for next release
+ epatch "${FILESDIR}/${PN}-fix-nameless-users-crash.patch"
- # Install directories for icons/configuration, bug 360175
- #dodir /var/lib/AccountsService/{users,icons} || die
+ 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
new file mode 100644
index 0000000..28e3f02
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-fix-nameless-users-crash.patch
@@ -0,0 +1,29 @@
+From 74c01ff9e3a3b00810ae69db2f2d089b68c5220a Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: sys-apps/accountsservice/files/, sys-apps/accountsservice/
@ 2011-07-24 2:52 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-24 2:52 UTC (permalink / raw
To: gentoo-commits
commit: b0cb098bac1ffe0271cec5d4ae587e3d2438edcd
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Jul 24 02:38:55 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Jul 24 02:38:55 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b0cb098b
sys-apps/accountsservice: 0.6.12 → 0.6.13
Version bump, plugs a memory leak and fixes use of deprecated API. In
addition, add 4 useful patches from upstream git:
1. don't disable autologin for all accounts when trying to disable it
for just one account;
2. a small cleanup used by the next patch;
3. monitor /etc/gdm/custom.conf for autologin information;
4. don't call reload_users twice (after update to /etc/passwd and then
after update to /etc/shadow).
---
...0.6.12.ebuild => accountsservice-0.6.13.ebuild} | 14 ++-
.../accountsservice-0.6.13-PATH_GDM_CUSTOM.patch | 69 ++++++++++++
...ntsservice-0.6.13-SetAutomaticLogin-false.patch | 40 +++++++
...accountsservice-0.6.13-etc-passwd-timeout.patch | 52 +++++++++
...ervice-0.6.13-monitor-etc-gdm-custom.conf.patch | 115 ++++++++++++++++++++
5 files changed, 288 insertions(+), 2 deletions(-)
diff --git a/sys-apps/accountsservice/accountsservice-0.6.12.ebuild b/sys-apps/accountsservice/accountsservice-0.6.13.ebuild
similarity index 70%
rename from sys-apps/accountsservice/accountsservice-0.6.12.ebuild
rename to sys-apps/accountsservice/accountsservice-0.6.13.ebuild
index 3f2b469..455a342 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.12.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.13.ebuild
@@ -6,11 +6,11 @@ EAPI="3"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-inherit gnome2 systemd
+inherit eutils 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"
+SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz"
LICENSE="GPL-3"
SLOT="0"
@@ -44,3 +44,13 @@ pkg_setup() {
$(use_enable introspection)"
DOCS="AUTHORS NEWS README TODO"
}
+
+src_prepare() {
+ # Useful patches from upstream git, will be in next release
+ epatch "${FILESDIR}/${P}-SetAutomaticLogin-false.patch" \
+ "${FILESDIR}/${P}-PATH_GDM_CUSTOM.patch" \
+ "${FILESDIR}/${P}-monitor-etc-gdm-custom.conf.patch" \
+ "${FILESDIR}/${P}-etc-passwd-timeout.patch"
+
+ gnome2_src_prepare
+}
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-PATH_GDM_CUSTOM.patch b/sys-apps/accountsservice/files/accountsservice-0.6.13-PATH_GDM_CUSTOM.patch
new file mode 100644
index 0000000..8f57cf1
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.13-PATH_GDM_CUSTOM.patch
@@ -0,0 +1,69 @@
+From 0c32736980a4f02d4eacf90d145bf937bf29dea6 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Thu, 21 Jul 2011 16:04:13 -0400
+Subject: [PATCH 2/4] daemon: use PATH_GDM_CUSTOM instead of string literal
+
+It's better to consolidate references to file path in one
+place up top.
+---
+ src/daemon.c | 13 ++++---------
+ 1 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index f8753d6..eb9aa61 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -50,6 +50,7 @@
+ #define PATH_PASSWD "/etc/passwd"
+ #define PATH_SHADOW "/etc/shadow"
+ #define PATH_LOGIN_DEFS "/etc/login.defs"
++#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
+
+ #ifndef FALLBACK_MINIMAL_UID
+ #define FALLBACK_MINIMAL_UID 500
+@@ -1207,15 +1208,12 @@ load_autologin (Daemon *daemon,
+ GError **error)
+ {
+ GKeyFile *keyfile;
+- const gchar *filename;
+ GError *local_error;
+ gchar *string;
+
+- filename = "/etc/gdm/custom.conf";
+-
+ keyfile = g_key_file_new ();
+ if (!g_key_file_load_from_file (keyfile,
+- filename,
++ PATH_GDM_CUSTOM,
+ G_KEY_FILE_KEEP_COMMENTS,
+ error)) {
+ g_key_file_free (keyfile);
+@@ -1257,15 +1255,12 @@ save_autologin (Daemon *daemon,
+ GError **error)
+ {
+ GKeyFile *keyfile;
+- const gchar *filename;
+ gchar *data;
+ gboolean result;
+
+- filename = "/etc/gdm/custom.conf";
+-
+ keyfile = g_key_file_new ();
+ if (!g_key_file_load_from_file (keyfile,
+- filename,
++ PATH_GDM_CUSTOM,
+ G_KEY_FILE_KEEP_COMMENTS,
+ error)) {
+ g_key_file_free (keyfile);
+@@ -1276,7 +1271,7 @@ save_autologin (Daemon *daemon,
+ g_key_file_set_string (keyfile, "daemon", "AutomaticLogin", name);
+
+ data = g_key_file_to_data (keyfile, NULL, NULL);
+- result = g_file_set_contents (filename, data, -1, error);
++ result = g_file_set_contents (PATH_GDM_CUSTOM, data, -1, error);
+
+ g_key_file_free (keyfile);
+ g_free (data);
+--
+1.7.6
+
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-SetAutomaticLogin-false.patch b/sys-apps/accountsservice/files/accountsservice-0.6.13-SetAutomaticLogin-false.patch
new file mode 100644
index 0000000..9afafc2
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.13-SetAutomaticLogin-false.patch
@@ -0,0 +1,40 @@
+From df8e8831131663efc7ca42c4016e445362bee843 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 20 Jul 2011 10:54:35 -0400
+Subject: [PATCH 1/4] daemon: ignore extraneous SetAutomaticLogin(false) calls
+ for a user
+
+Right now, if a user is not configured for automatic login, and
+SetAutomaticLogin(false) is called for that user then we disable
+automatic login system wide even if someone else is configured
+for automatic login.
+
+This commit changes the semantics of the call such that
+SetAutomaticLogin(false) is a no op for users where automatic login
+isn't already enabled.
+
+Spotted by Vincent Untz <vuntz@gnome.org>
+
+https://bugs.freedesktop.org/show_bug.cgi?id=39402
+---
+ src/daemon.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index ec319a9..f8753d6 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -1294,6 +1294,10 @@ daemon_local_set_automatic_login (Daemon *daemon,
+ return TRUE;
+ }
+
++ if (daemon->priv->autologin != user && !enabled) {
++ return TRUE;
++ }
++
+ if (!save_autologin (daemon, user_local_get_user_name (user), enabled, error)) {
+ return FALSE;
+ }
+--
+1.7.6
+
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-etc-passwd-timeout.patch b/sys-apps/accountsservice/files/accountsservice-0.6.13-etc-passwd-timeout.patch
new file mode 100644
index 0000000..36e3f5a
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.13-etc-passwd-timeout.patch
@@ -0,0 +1,52 @@
+From 4e3fad33442dfd908561960921aad335fad6b5a8 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Thu, 21 Jul 2011 16:09:13 -0400
+Subject: [PATCH 4/4] daemon: call reload_users after timeout on passwd/shadow
+ changes
+
+Often the two files are changed in concert, so it makes sense to
+wait a bit before doing a heavy reload operation.
+
+Suggested by Vincent.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=39413
+---
+ src/daemon.c | 15 ++++++++++++++-
+ 1 files changed, 14 insertions(+), 1 deletions(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index 882fb2f..79915a7 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -492,6 +492,19 @@ reload_autologin_timeout (Daemon *daemon)
+ }
+
+ static void
++queue_reload_users_soon (Daemon *daemon)
++{
++ if (daemon->priv->reload_id > 0) {
++ return;
++ }
++
++ /* we wait half a second or so in case /etc/passwd and
++ * /etc/shadow are changed at the same time, or repeatedly.
++ */
++ daemon->priv->reload_id = g_timeout_add (500, (GSourceFunc)reload_users_timeout, daemon);
++}
++
++static void
+ queue_reload_users (Daemon *daemon)
+ {
+ if (daemon->priv->reload_id > 0) {
+@@ -523,7 +536,7 @@ on_passwd_monitor_changed (GFileMonitor *monitor,
+ return;
+ }
+
+- reload_users (daemon);
++ queue_reload_users_soon (daemon);
+ }
+
+ static void
+--
+1.7.6
+
diff --git a/sys-apps/accountsservice/files/accountsservice-0.6.13-monitor-etc-gdm-custom.conf.patch b/sys-apps/accountsservice/files/accountsservice-0.6.13-monitor-etc-gdm-custom.conf.patch
new file mode 100644
index 0000000..0389c7e
--- /dev/null
+++ b/sys-apps/accountsservice/files/accountsservice-0.6.13-monitor-etc-gdm-custom.conf.patch
@@ -0,0 +1,115 @@
+From 07ea415a5ea0fc5039c947f967c5683ef0e31201 Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz@gnome.org>
+Date: Thu, 21 Jul 2011 08:20:08 +0200
+Subject: [PATCH 3/4] daemon: Monitor /etc/gdm/custom.conf for changes in
+ autologin config
+
+We also emit relevant signals when loading the file.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=39413
+---
+ src/daemon.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
+ 1 files changed, 47 insertions(+), 4 deletions(-)
+
+diff --git a/src/daemon.c b/src/daemon.c
+index eb9aa61..882fb2f 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -107,6 +107,7 @@ struct DaemonPrivate {
+
+ GFileMonitor *passwd_monitor;
+ GFileMonitor *shadow_monitor;
++ GFileMonitor *gdm_monitor;
+
+ guint reload_id;
+ guint autologin_id;
+@@ -451,7 +452,7 @@ reload_autologin_timeout (Daemon *daemon)
+ gboolean enabled;
+ gchar *name = NULL;
+ GError *error = NULL;
+- User *user;
++ User *user = NULL;
+
+ daemon->priv->autologin_id = 0;
+
+@@ -463,11 +464,23 @@ reload_autologin_timeout (Daemon *daemon)
+ return FALSE;
+ }
+
++ if (enabled && name)
++ user = daemon_local_find_user_by_name (daemon, name);
++
++ if (daemon->priv->autologin != NULL && daemon->priv->autologin != user) {
++ g_object_set (daemon->priv->autologin, "automatic-login", FALSE, NULL);
++ g_signal_emit_by_name (daemon->priv->autologin, "changed", 0);
++ g_object_unref (daemon->priv->autologin);
++ daemon->priv->autologin = NULL;
++ }
++
+ if (enabled) {
+ g_debug ("automatic login is enabled for '%s'\n", name);
+- user = daemon_local_find_user_by_name (daemon, name);
+- g_object_set (user, "automatic-login", TRUE, NULL);
+- daemon->priv->autologin = g_object_ref (user);
++ if (daemon->priv->autologin != user) {
++ g_object_set (user, "automatic-login", TRUE, NULL);
++ daemon->priv->autologin = g_object_ref (user);
++ g_signal_emit_by_name (daemon->priv->autologin, "changed", 0);
++ }
+ }
+ else {
+ g_debug ("automatic login is disabled\n");
+@@ -513,6 +526,21 @@ on_passwd_monitor_changed (GFileMonitor *monitor,
+ reload_users (daemon);
+ }
+
++static void
++on_gdm_monitor_changed (GFileMonitor *monitor,
++ GFile *file,
++ GFile *other_file,
++ GFileMonitorEvent event_type,
++ Daemon *daemon)
++{
++ if (event_type != G_FILE_MONITOR_EVENT_CHANGED &&
++ event_type != G_FILE_MONITOR_EVENT_CREATED) {
++ return;
++ }
++
++ queue_reload_autologin (daemon);
++}
++
+ static uid_t
+ get_minimal_uid (void)
+ {
+@@ -603,6 +631,12 @@ daemon_init (Daemon *daemon)
+ NULL,
+ &error);
+ g_object_unref (file);
++ file = g_file_new_for_path (PATH_GDM_CUSTOM);
++ daemon->priv->gdm_monitor = g_file_monitor_file (file,
++ G_FILE_MONITOR_NONE,
++ NULL,
++ &error);
++ g_object_unref (file);
+
+ if (daemon->priv->passwd_monitor != NULL) {
+ g_signal_connect (daemon->priv->passwd_monitor,
+@@ -622,6 +656,15 @@ daemon_init (Daemon *daemon)
+ g_warning ("Unable to monitor %s: %s", PATH_SHADOW, error->message);
+ g_error_free (error);
+ }
++ if (daemon->priv->gdm_monitor != NULL) {
++ g_signal_connect (daemon->priv->gdm_monitor,
++ "changed",
++ G_CALLBACK (on_gdm_monitor_changed),
++ daemon);
++ } else {
++ g_warning ("Unable to monitor %s: %s", PATH_GDM_CUSTOM, error->message);
++ g_error_free (error);
++ }
+
+ queue_reload_users (daemon);
+ queue_reload_autologin (daemon);
+--
+1.7.6
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-07-24 2:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-24 2:52 [gentoo-commits] proj/gnome:master commit in: sys-apps/accountsservice/files/, sys-apps/accountsservice/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-04-15 20:40 Nirbheek Chauhan
2011-03-23 9:05 Nirbheek Chauhan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox