File accountsservice-upstream-fixes.patch of Package accountsservice

Overview Repositories Revisions Requests Users Attributes Meta

File accountsservice-upstream-fixes.patch of Package accountsservice (Revision 4c9621c10f0234155a8fea04adf473d6)

Currently displaying revision 4c9621c10f0234155a8fea04adf473d6 , Show latest

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

Places

File accountsservice-upstream-fixes.patch of Package accountsservice (Revision 4c9621c10f0234155a8fea04adf473d6)

Places