Accepting request 706414 from GNOME:Next

- Update to version 0.6.55: + Memory leak fix. + Improved heuristics for identifying user session. + Export interfaces directory to pkgconfig. + Lock down state directory from prying eyes to be more friendly to accountsservice extensions that require privacy. + Misc fixes. + Updated translations. - Drop accountsservice-upstream-fixes.patch: Fixed upstream. - Refresh patches with refresh_patches osc service. OBS-URL: https://build.opensuse.org/request/show/706414 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=134
2019-05-31 15:12:31 +00:00 · 2019-05-31 15:12:31 +00:00 · ed99d8f9dc
commit ed99d8f9dc
parent ef38ba9694
7 changed files with 40 additions and 228 deletions
--- a/accountsservice-0.6.54.tar.xz
+++ b/accountsservice-0.6.54.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26e9062c84797e9604182d0efdb2231cb01c98c3c9b0fea601ca79a2802d21ac
-size 93048
--- a/accountsservice-0.6.55.tar.xz
+++ b/accountsservice-0.6.55.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b
+size 97972
--- a/accountsservice-read-root-user-cache.patch
+++ b/accountsservice-read-root-user-cache.patch
@ -15,11 +15,11 @@ Closes: https://gitlab.freedesktop.org/accountsservice/accountsservice/issues/65
 src/daemon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-diff --git a/src/daemon.c b/src/daemon.c
-index c52bda3..d7c4437 100644
--- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -485,7 +485,7 @@ reload_users (Daemon *daemon)
+Index: accountsservice-0.6.55/src/daemon.c
+===================================================================
+--- accountsservice-0.6.55.orig/src/daemon.c	2019-05-30 00:12:49.993056439 +0200
+++ accountsservice-0.6.55/src/daemon.c	2019-05-30 00:12:50.289059484 +0200
+@@ -486,7 +486,7 @@ reload_users (Daemon *daemon)
         load_entries (daemon, users, TRUE, entry_generator_requested_users);
 
         /* Now add/update users from other sources, possibly non-local */
@ -28,6 +28,3 @@ index c52bda3..d7c4437 100644
 
         wtmp_helper_update_login_frequencies (users);
 
-- 
-2.16.4
-
--- a/accountsservice-sysconfig.patch
+++ b/accountsservice-sysconfig.patch
@ -4,10 +4,10 @@ Date:   Wed Jul 20 16:48:41 2011 +0200

    Use autologin configuration from sysconfig (SUSE-ism)

-Index: accountsservice-0.6.54/src/daemon.c
+Index: accountsservice-0.6.55/src/daemon.c
 ===================================================================
--- accountsservice-0.6.54.orig/src/daemon.c
-+++ accountsservice-0.6.54/src/daemon.c
+--- accountsservice-0.6.55.orig/src/daemon.c	2019-04-23 17:16:09.000000000 +0200
+++ accountsservice-0.6.55/src/daemon.c	2019-05-30 00:12:49.993056439 +0200
@@ -47,6 +47,7 @@
 #include "wtmp-helper.h"
 #include "daemon.h"
@ -16,7 +16,7 @@ Index: accountsservice-0.6.54/src/daemon.c
 
 #define PATH_PASSWD "/etc/passwd"
 #define PATH_SHADOW "/etc/shadow"
-@@ -567,7 +568,7 @@ reload_autologin_timeout (Daemon *daemon
+@@ -582,7 +583,7 @@ reload_autologin_timeout (Daemon *daemon
         priv->autologin_id = 0;
 
         if (!load_autologin (daemon, &name, &enabled, &error)) {
@ -25,7 +25,7 @@ Index: accountsservice-0.6.54/src/daemon.c
                 return FALSE;
         }
 
-@@ -1463,6 +1464,43 @@ daemon_local_check_auth (Daemon
+@@ -1474,6 +1475,43 @@ daemon_local_check_auth (Daemon
         g_object_unref (subject);
 }
 
@ -69,7 +69,7 @@ Index: accountsservice-0.6.54/src/daemon.c
 gboolean
 load_autologin (Daemon      *daemon,
                 gchar      **name,
-@@ -1473,6 +1511,8 @@ load_autologin (Daemon      *daemon,
+@@ -1484,6 +1522,8 @@ load_autologin (Daemon      *daemon,
         GError *local_error = NULL;
         g_autofree gchar *string = NULL;
 
@ -78,7 +78,7 @@ Index: accountsservice-0.6.54/src/daemon.c
         keyfile = g_key_file_new ();
         if (!g_key_file_load_from_file (keyfile,
                                         PATH_GDM_CUSTOM,
-@@ -1512,6 +1552,8 @@ save_autologin (Daemon      *daemon,
+@@ -1523,6 +1563,8 @@ save_autologin (Daemon      *daemon,
         g_autofree gchar *data = NULL;
         gboolean result;
 
@ -87,10 +87,10 @@ Index: accountsservice-0.6.54/src/daemon.c
         keyfile = g_key_file_new ();
         if (!g_key_file_load_from_file (keyfile,
                                         PATH_GDM_CUSTOM,
-Index: accountsservice-0.6.54/src/gdm-sysconfig.c
+Index: accountsservice-0.6.55/src/gdm-sysconfig.c
 ===================================================================
--- /dev/null
-+++ accountsservice-0.6.54/src/gdm-sysconfig.c
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ accountsservice-0.6.55/src/gdm-sysconfig.c	2019-05-30 00:12:49.993056439 +0200
@@ -0,0 +1,484 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@ -576,10 +576,10 @@ Index: accountsservice-0.6.54/src/gdm-sysconfig.c
 +        g_strfreev (lines);
 +        return result;
 +}
-Index: accountsservice-0.6.54/src/gdm-sysconfig.h
+Index: accountsservice-0.6.55/src/gdm-sysconfig.h
 ===================================================================
--- /dev/null
-+++ accountsservice-0.6.54/src/gdm-sysconfig.h
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ accountsservice-0.6.55/src/gdm-sysconfig.h	2019-05-30 00:12:49.993056439 +0200
@@ -0,0 +1,43 @@
 +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
 + *
@ -624,10 +624,10 @@ Index: accountsservice-0.6.54/src/gdm-sysconfig.h
 +G_END_DECLS
 +
 +#endif /* __GDM_SYSCONFIG_H */
-Index: accountsservice-0.6.54/src/meson.build
+Index: accountsservice-0.6.55/src/meson.build
 ===================================================================
--- accountsservice-0.6.54.orig/src/meson.build
-+++ accountsservice-0.6.54/src/meson.build
+--- accountsservice-0.6.55.orig/src/meson.build	2019-04-23 17:16:09.000000000 +0200
+++ accountsservice-0.6.55/src/meson.build	2019-05-30 00:12:49.993056439 +0200
@@ -46,6 +46,8 @@ libaccounts_generated_dep = declare_depe
 )
 
--- a/accountsservice-upstream-fixes.patch
+++ b/accountsservice-upstream-fixes.patch
@ -1,196 +0,0 @@
-From a8f368c34e826f76d1244fed5095a1615c986b59 Mon Sep 17 00:00:00 2001
-From: Alexey Shabalin <shaba@altlinux.org>
-Date: Mon, 1 Oct 2018 18:46:26 +0300
-Subject: fix option type for minimum uid
-
---
- meson.build       | 2 +-
- meson_options.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 1f75a5b..57f30a5 100644
--- a/meson.build
-+++ b/meson.build
-@@ -161,7 +161,7 @@ config_h.set_quoted('ADMIN_GROUP', admin_group)
- config_h.set_quoted('EXTRA_ADMIN_GROUPS', extra_admin_groups)
- 
- config_h.set('ENABLE_USER_HEURISTICS', get_option('user_heuristics'))
-config_h.set_quoted('MINIMUM_UID', get_option('minimum_uid'))
-+config_h.set('MINIMUM_UID', get_option('minimum_uid'))
- 
- # GDM
- gdm_conf_file = get_option('gdmconffile')
-diff --git a/meson_options.txt b/meson_options.txt
-index 878bdd7..12e2f6b 100644
--- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -4,7 +4,7 @@ option('gdmconffile', type: 'string', value: '/etc/gdm/custom.conf', description
- option('admin_group', type: 'string', value: '', description: 'Set group for administrative accounts')
- option('user_heuristics', type: 'boolean', value: true, description: 'Enable heuristics for guessing system vs. human users in the range 500-minimum-uid')
- option('extra_admin_groups', type: 'array', value: [], description: 'Comma-separated list of extra groups that administrator users are part of')
-option('minimum_uid', type: 'string', value: '1000', description: 'Set minimum uid for human users')
-+option('minimum_uid', type: 'integer', value: 1000, description: 'Set minimum uid for human users')
- 
- option('systemd', type: 'boolean', value: false, description: 'Use systemd')
- option('elogind', type: 'boolean', value: false, description: 'Use elogind')
-- 
-cgit v1.1
-
-
-From 204a4abe68eefac52ca05dda2096db0e0fde0bb7 Mon Sep 17 00:00:00 2001
-From: Philip Withnall <withnall@endlessm.com>
-Date: Tue, 2 Oct 2018 15:36:29 +0100
-Subject: libaccountsservice: Expose interfaces directory in pkg-config file
-
-Just like the D-Bus interfaces directory is exposed in dbus-1.pc for the
-use of any package which needs to install a D-Bus interface file; the
-accounts-service interfaces directory should be exposed in its
-pkg-config file.
-
-Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
- src/libaccountsservice/meson.build | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/libaccountsservice/meson.build b/src/libaccountsservice/meson.build
-index 0b611d2..4e134db 100644
--- a/src/libaccountsservice/meson.build
-+++ b/src/libaccountsservice/meson.build
-@@ -87,7 +87,11 @@ pkg.generate(
-   description: 'Client Library for communicating with accounts service',
-   filebase: act_name,
-   subdirs: act_api_name,
-  variables: 'exec_prefix=${prefix}',
-+  variables: [
-+    'exec_prefix=${prefix}',
-+    'datadir=${prefix}/' + get_option('datadir'),
-+    'interfacesdir=${datadir}/accountsservice/interfaces',
-+  ],
- )
- 
- if get_option('introspection')
-- 
-cgit v1.1
-
-
-From 11c9bd6226cda64cfb8e48193be1ff2e7fb92cc1 Mon Sep 17 00:00:00 2001
-From: Akira Nakajima <argebam2a@yahoo.co.jp>
-Date: Wed, 19 Dec 2018 22:12:43 +0000
-Subject: forgot to add g_autoptr(GError) in
- _act_user_update_from_object_path()
-
---
- src/libaccountsservice/act-user.c |  2 +-
- src/user.c                        | 60 ++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 60 insertions(+), 2 deletions(-)
-
-diff --git a/src/libaccountsservice/act-user.c b/src/libaccountsservice/act-user.c
-index 540ffe7..e66acb1 100644
--- a/src/libaccountsservice/act-user.c
-+++ b/src/libaccountsservice/act-user.c
-@@ -1167,7 +1167,7 @@ _act_user_update_from_object_path (ActUser    *user,
-                                    const char *object_path)
- {
-         AccountsUser    *accounts_proxy;
-        GError          *error = NULL;
-+        g_autoptr(GError) error = NULL;
- 
-         g_return_if_fail (ACT_IS_USER (user));
-         g_return_if_fail (object_path != NULL);
-diff --git a/src/user.c b/src/user.c
-index 93afadc..2672436 100644
--- a/src/user.c
-+++ b/src/user.c
-@@ -48,6 +48,33 @@
- #include "accounts-user-generated.h"
- #include "util.h"
- 
-+enum {
-+        PROP_0,
-+        PROP_UID,
-+        PROP_USER_NAME,
-+        PROP_REAL_NAME,
-+        PROP_ACCOUNT_TYPE,
-+        PROP_HOME_DIR,
-+        PROP_SHELL,
-+        PROP_EMAIL,
-+        PROP_LANGUAGE,
-+        PROP_SESSION,
-+        PROP_SESSION_TYPE,
-+        PROP_X_SESSION,
-+        PROP_LOCATION,
-+        PROP_LOGIN_FREQUENCY,
-+        PROP_LOGIN_TIME,
-+        PROP_LOGIN_HISTORY,
-+        PROP_ICON_FILE,
-+        PROP_SAVED,
-+        PROP_LOCKED,
-+        PROP_PASSWORD_MODE,
-+        PROP_PASSWORD_HINT,
-+        PROP_AUTOMATIC_LOGIN,
-+        PROP_SYSTEM_ACCOUNT,
-+        PROP_LOCAL_ACCOUNT,
-+};
-+
- struct User {
-         AccountsUserSkeleton parent;
- 
-@@ -2075,6 +2102,32 @@ user_set_automatic_login (AccountsUser          *auser,
- }
- 
- static void
-+user_set_property (GObject      *object,
-+                   guint         param_id,
-+                   const GValue *value,
-+                   GParamSpec   *pspec)
-+{
-+        User *user = USER (object);
-+
-+        if (param_id == PROP_LOGIN_HISTORY) {
-+            g_clear_pointer (&user->login_history, g_variant_unref);
-+            user->login_history = g_variant_ref (g_value_get_variant (value));
-+        }
-+}
-+
-+static void
-+user_get_property (GObject    *object,
-+                   guint       param_id,
-+                   GValue     *value,
-+                   GParamSpec *pspec)
-+{
-+        User *user = USER (object);
-+
-+        if (param_id == PROP_LOGIN_HISTORY)
-+            g_value_set_variant (value, user->login_history);
-+}
-+
-+static void
- user_finalize (GObject *object)
- {
-         User *user;
-@@ -2088,7 +2141,7 @@ user_finalize (GObject *object)
- 
-         g_free (user->default_icon_file);
- 
-	g_clear_pointer (&user->login_history, g_variant_unref);
-+        g_clear_pointer (&user->login_history, g_variant_unref);
- 
-         if (G_OBJECT_CLASS (user_parent_class)->finalize)
-                 (*G_OBJECT_CLASS (user_parent_class)->finalize) (object);
-@@ -2101,7 +2154,12 @@ user_class_init (UserClass *class)
- 
-         gobject_class = G_OBJECT_CLASS (class);
- 
-+        gobject_class->get_property = user_get_property;
-+        gobject_class->set_property = user_set_property;
-+
-         gobject_class->finalize = user_finalize;
-+
-+        g_object_class_override_property (gobject_class, PROP_LOGIN_HISTORY, "login-history");
- }
- 
- static void
-- 
-cgit v1.1
-
--- a/accountsservice.changes
+++ b/accountsservice.changes
@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed May 29 21:28:30 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 0.6.55:
+  + Memory leak fix.
+  + Improved heuristics for identifying user session.
+  + Export interfaces directory to pkgconfig.
+  + Lock down state directory from prying eyes to be more friendly to
+    accountsservice extensions that require privacy.
+  + Misc fixes.
+  + Updated translations.
+- Drop accountsservice-upstream-fixes.patch: Fixed upstream.
+- Refresh patches with refresh_patches osc service.
+
 -------------------------------------------------------------------
 Wed May  8 01:25:32 UTC 2019 - xwang@suse.com

--- a/accountsservice.spec
+++ b/accountsservice.spec
@ -17,7 +17,7 @@


 Name:           accountsservice
-Version:        0.6.54
+Version:        0.6.55
 Release:        0
 Summary:        D-Bus Service to Manipulate User Account Information
 License:        GPL-3.0-or-later
@ -32,13 +32,10 @@ Patch0:         accountsservice-sysconfig.patch
 Patch1:         accountsservice-filter-suse-accounts.patch
 # PATCH-FIX-UPSTREAM accountsservice-read-root-user-cache.patch bsc#1114292 glfo#accountsservice/accountsservice#65 xwang@suse.com-- read root user cache file WAS PATCH-FIX-UPSTREAM
 Patch2:         accountsservice-read-root-user-cache.patch
-# PATCH-FIX-UPSTREAM accountsservice-upstream-fixes.patch -- Add 3 upstream commits to fix build
-Patch3:         accountsservice-upstream-fixes.patch

 ## SLE-only patches start at 1000
 # PATCH-FEATURE-SLE as-fate318433-prevent-same-account-multi-logins.patch fate#318433 cxiong@suse.com -- prevent multiple simultaneous login.
 Patch1000:      as-fate318433-prevent-same-account-multi-logins.patch
-# needed for patch0

 BuildRequires:  gtk-doc
 BuildRequires:  meson
@ -101,7 +98,7 @@ querying and manipulating user account information.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
+
 # Sle-only patches start at 1000
 %if !0%{?is_opensuse}
 %patch1000 -p1