pool/accountsservice
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 514491 from home:yfjiang:branches:GNOME:Factory

Browse Source 
- Drop accountsservice-933083-load-root-setting.patch:
  fixed upstream (177509 edac45).

OBS-URL: https://build.opensuse.org/request/show/514491
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=103
This commit is contained in:
Bjørn Lie 2017-08-05 11:46:55 +00:00 committed by Git OBS Bridge
parent 143e06606c
commit 67bf20b4b1
3 changed files with 4 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
accountsservice-933083-load-root-setting.patch
View File

@ -1,40 +0,0 @@
Index: accountsservice-0.6.43/src/daemon.c
===================================================================
--- accountsservice-0.6.43.orig/src/daemon.c
+++ accountsservice-0.6.43/src/daemon.c
@@ -309,7 +309,8 @@ entry_generator_cachedir (GHashTable *
static void
load_entries (Daemon *daemon,
GHashTable *users,
- EntryGeneratorFunc entry_generator)
+ EntryGeneratorFunc entry_generator,
+ gboolean force_load)
{
gpointer generator_state = NULL;
struct passwd *pwent;
@@ -325,7 +326,7 @@ load_entries (Daemon *daemon
break;
/* Skip system users... */
- if (!user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
+ if (!force_load && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
g_debug ("skipping user: %s", pwent->pw_name);
continue;
}
@@ -383,14 +384,14 @@ reload_users (Daemon *daemon)
*/
/* Load the local users into our hash table */
- load_entries (daemon, users, entry_generator_fgetpwent);
+ load_entries (daemon, users, entry_generator_fgetpwent, FALSE);
local = g_hash_table_new (g_str_hash, g_str_equal);
g_hash_table_iter_init (&iter, users);
while (g_hash_table_iter_next (&iter, &name, NULL))
g_hash_table_add (local, name);
/* Now add/update users from other sources, possibly non-local */
- load_entries (daemon, users, entry_generator_cachedir);
+ load_entries (daemon, users, entry_generator_cachedir, TRUE);
wtmp_helper_update_login_frequencies (users);

2
accountsservice.changes
View File

@ -12,6 +12,8 @@ Tue Apr 25 08:45:58 UTC 2017 - dimstar@opensuse.org
+ Export password expiration info from shadow file.
+ Fix user classification logic.
+ Don't lose track of users when /etc/passwd is reloaded.
- Drop accountsservice-933083-load-root-setting.patch:
fixed upstream (177509 edac45).
-------------------------------------------------------------------
Wed Nov 30 15:42:14 UTC 2016 - dimstar@opensuse.org

9
accountsservice.spec
View File

@ -29,10 +29,8 @@ Source: http://www.freedesktop.org/software/accountsservice/%{name}-%{ve
Patch0: accountsservice-sysconfig.patch
# PATCH-FIX-OPENSUSE accountsservice-filter-suse-accounts.patch vuntz@opensuse.org -- Filter out some system users that are specific to openSUSE
Patch1: accountsservice-filter-suse-accounts.patch
# PATCH-FIX-SLE accountsservice-933083-load-root-setting.patch bnc#933083 dliang@suse.com -- load the root setting
Patch2: accountsservice-933083-load-root-setting.patch
# PATCH-FEATURE-SLE as-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
Patch3: as-fate318433-prevent-same-account-multi-logins.patch
Patch2: as-fate318433-prevent-same-account-multi-logins.patch
# needed for patch0
BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel
@ -92,11 +90,8 @@ querying and manipulating user account information.
%setup -q
%patch0 -p1
%patch1 -p1
%if ! 0%{?is_opensuse}
%patch2 -p1
%endif
%if 0%{suse_version} == 1315
%patch3 -p1
%patch2 -p1
%endif
%build