Attachment #218068 for bug #249445

View | Details | Raw Unified | Return to bug 249445
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	accountsservice
PORTVERSION=	0.6.55
CATEGORIES=	sysutils devel
MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/


LICENSE=	GPLv3+
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	dbus>0:devel/dbus
LIB_DEPENDS=	libpolkit-gobject-1.so:sysutils/polkit

USE_GNOME=	glib20 intltool introspection:build libxslt
USES=		cpe gettext gnome localbase:ldflags meson \
		pkgconfig tar:xz
CPE_VENDOR=	ray_stode
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
MESON_ARGS=	-Dsystemdsystemunitdir=no \
		-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
		-Dsystemd=false \
		-Delogind=false \
		-Dlocalstatedir=/var

# XXX HACK! this file isn't present on the pristine jails of the builders
# and configure breaks without it. Beter solutions welcome.
.if defined(PACKAGE_BUILDING)
CONFIGURE_ENV+=	ac_cv_file__var_log_utx_log=yes
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|/etc/gdm/custom.conf|${LOCALBASE}/etc/gdm/custom.conf|g' \
		${WRKSRC}/src/daemon.c
	@${REINPLACE_CMD} -e 's|/lib/AccountsService|/db/AccountsService|g' \
		${WRKSRC}/src/user.c ${WRKSRC}/src/Makefile.in

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	TIMESTAMP = 1468052689	1	TIMESTAMP = 1600462353
2	SHA256 (accountsservice-0.6.42.tar.xz) = e56494c2f18627900b57234e5628923cc16a37bf8fd16b06c46118d6ae9c007e	2	SHA256 (accountsservice-0.6.55.tar.xz) = ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b
3	SIZE (accountsservice-0.6.42.tar.xz) = 380500	3	SIZE (accountsservice-0.6.55.tar.xz) = 97972




--- configure.orig	2014-03-15 15:02:28.000000000 +0100
+++ configure	2014-03-15 15:03:01.000000000 +0100
@@ -14527,6 +14527,18 @@
 done
 
 
+for ac_func in fgetpwent
+do :
+  ac_fn_c_check_func "$LINENO" "fgetpwent" "ac_cv_func_fgetpwent"
+if test "x$ac_cv_func_fgetpwent" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FGETPWENT 1
+_ACEOF
+
+fi
+done
+
+
 
 
 




--- meson.build.orig	2018-09-29 12:54:53 UTC
+++ meson.build
@@ -82,8 +82,11 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', p
 elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
   config_h.set('PATH_WTMP', '_PATH_WTMPX')
 else
-  assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes')
-  config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
+  # Ugly hack for jails builders!
+  _system = host_machine.system().to_lower()
+  if _system.contains('freebsd')
+    config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
+  endif
 endif
 
 # compiler flags




--- meson_post_install.py.orig	2019-04-23 15:16:09 UTC
+++ meson_post_install.py
@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sy
 # FIXME: meson will not track the creation of these directories
 #        https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
 dst_dirs = [
-  (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
-  (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
+  (os.path.join(localstatedir, 'db', 'AccountsService', 'icons'), 0o775),
+  (os.path.join(localstatedir, 'db', 'AccountsService', 'users'), 0o700),
 ]
 
 for (dst_dir, dst_dir_mode) in dst_dirs:




--- src/daemon.c.orig	2018-09-26 13:20:49 UTC
+++ src/daemon.c
@@ -79,7 +79,11 @@ typedef struct {
         GHashTable *extension_ifaces;
 } DaemonPrivate;
 #define PATH_GROUP "/etc/group"
-#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
+#define PATH_GDM_CUSTOM "/usr/local/etc/gdm/custom.conf"
 
+#ifdef HAVE_SHADOW_H
 typedef struct passwd * (* EntryGeneratorFunc) (Daemon *, GHashTable *, gpointer *, struct spwd **shadow_entry);
+#else
+typedef struct passwd * (* EntryGeneratorFunc) (Daemon *, GHashTable *, gpointer *);
+#endif
 
 static void daemon_accounts_accounts_iface_init (AccountsAccountsIface *iface);
 
@@ -154,17 +158,25 @@ remove_cache_files (const gchar *user_name)
 }
 
 static struct passwd *
+#ifdef HAVE_SHADOW_H
 entry_generator_fgetpwent (Daemon       *daemon,
                            GHashTable   *users,
                            gpointer     *state,
                            struct spwd **spent)
+#else
+entry_generator_fgetpwent (Daemon       *daemon,
+                           GHashTable   *users,
+                           gpointer     *state)
+#endif
 {
         struct passwd *pwent;
 
+#ifdef HAVE_SHADOW_H
         struct {
                 struct spwd spbuf;
                 char buf[1024];
         } *shadow_entry_buffers;
+#endif
 
         struct {
                 FILE *fp;
@@ -175,6 +187,7 @@ entry_generator_fgetpwent (Daemon       *daemon,
         if (*state == NULL) {
                 GHashTable *shadow_users = NULL;
                 FILE *fp;
+#ifdef HAVE_SHADOW_H
                 struct spwd *shadow_entry;
 
                 fp = fopen (PATH_SHADOW, "r");
@@ -208,6 +221,7 @@ entry_generator_fgetpwent (Daemon       *daemon,
                         g_clear_pointer (&shadow_users, g_hash_table_unref);
                         return NULL;
                 }
+#endif
 
                 fp = fopen (PATH_PASSWD, "r");
                 if (fp == NULL) {
@@ -229,12 +243,17 @@ entry_generator_fgetpwent (Daemon       *daemon,
         if (g_hash_table_size (users) < MAX_LOCAL_USERS) {
                 pwent = fgetpwent (generator_state->fp);
                 if (pwent != NULL) {
+#ifdef HAVE_SHADOW_H
                         shadow_entry_buffers = g_hash_table_lookup (generator_state->users, pwent->pw_name);
 
                         if (shadow_entry_buffers != NULL) {
                             *spent = &shadow_entry_buffers->spbuf;
                         }
                         return pwent;
+#else
+                        if (!generator_state->users || g_hash_table_lookup (generator_state->users, pwent->pw_name))
+                            return pwent;
+#endif
                 }
         }
 
@@ -248,10 +267,16 @@ entry_generator_fgetpwent (Daemon       *daemon,
 }
 
 static struct passwd *
+#ifdef HAVE_SHADOW_H
 entry_generator_cachedir (Daemon       *daemon,
                           GHashTable   *users,
                           gpointer     *state,
                           struct spwd **shadow_entry)
+#else
+entry_generator_cachedir (Daemon       *daemon,
+                          GHashTable   *users,
+                          gpointer     *state)
+#endif
 {
         struct passwd *pwent;
         g_autoptr(GError) error = NULL;
@@ -293,7 +318,9 @@ entry_generator_cachedir (Daemon       *daemon,
                         errno = 0;
                         pwent = getpwnam (name);
                         if (pwent != NULL) {
+#ifdef HAVE_SHADOW_H
                                 *shadow_entry = getspnam (pwent->pw_name);
+#endif
 
                                 return pwent;
                         } else if (errno == 0) {
@@ -329,10 +356,16 @@ entry_generator_cachedir (Daemon       *daemon,
 }
 
 static struct passwd *
+#ifdef HAVE_SHADOW_H
 entry_generator_requested_users (Daemon       *daemon,
                                  GHashTable   *users,
                                  gpointer     *state,
                                  struct spwd **shadow_entry)
+#else
+entry_generator_requested_users (Daemon       *daemon,
+                                 GHashTable   *users,
+                                 gpointer     *state)
+#endif
 {
         DaemonPrivate *priv = daemon_get_instance_private (daemon);
         struct passwd *pwent;
@@ -360,7 +393,9 @@ entry_generator_requested_users (Daemon       *daemon,
                                 if (pwent == NULL) {
                                         g_debug ("user '%s' requested previously but not present on system", name);
                                 } else {
+#ifdef HAVE_SHADOW_H
                                         *shadow_entry = getspnam (pwent->pw_name);
+#endif
 
                                         return pwent;
                                 }
@@ -383,19 +418,29 @@ load_entries (Daemon             *daemon,
         DaemonPrivate *priv = daemon_get_instance_private (daemon);
         gpointer generator_state = NULL;
         struct passwd *pwent;
+#ifdef HAVE_SHADOW_H
         struct spwd *spent = NULL;
+#endif
         User *user = NULL;
 
         g_assert (entry_generator != NULL);
 
         for (;;) {
+#ifdef HAVE_SHADOW_H
                 spent = NULL;
                 pwent = entry_generator (daemon, users, &generator_state, &spent);
+#else
+                pwent = entry_generator (daemon, users, &generator_state);
+#endif
                 if (pwent == NULL)
                         break;
 
                 /* Skip system users... */
+#ifdef HAVE_SHADOW_H
                 if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
+#else
+                if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, NULL)) {
+#endif
                         g_debug ("skipping user: %s", pwent->pw_name);
                         continue;
                 }
@@ -417,7 +462,11 @@ load_entries (Daemon             *daemon,
 
                         /* freeze & update users not already in the new list */
                         g_object_freeze_notify (G_OBJECT (user));
+#ifdef HAVE_SHADOW_H
                         user_update_from_pwent (user, pwent, spent);
+#else
+                        user_update_from_pwent (user, pwent);
+#endif
 
                         g_hash_table_insert (users, g_strdup (user_get_user_name (user)), user);
                         g_debug ("loaded user: %s", user_get_user_name (user));
@@ -823,15 +872,24 @@ throw_error (GDBusMethodInvocation *context,
 }
 
 static User *
+#ifdef HAVE_SHADOW_H
 add_new_user_for_pwent (Daemon        *daemon,
                         struct passwd *pwent,
                         struct spwd   *spent)
+#else
+add_new_user_for_pwent (Daemon        *daemon,
+                        struct passwd *pwent)
+#endif
 {
         DaemonPrivate *priv = daemon_get_instance_private (daemon);
         User *user;
 
         user = user_new (daemon, pwent->pw_uid);
+#ifdef HAVE_SHADOW_H
         user_update_from_pwent (user, pwent, spent);
+#else
+        user_update_from_pwent (user, pwent);
+#endif
         user_register (user);
 
         g_hash_table_insert (priv->users,
@@ -860,9 +918,13 @@ daemon_local_find_user_by_id (Daemon *daemon,
         user = g_hash_table_lookup (priv->users, pwent->pw_name);
 
         if (user == NULL) {
+#ifdef HAVE_SHADOW_H
                 struct spwd *spent;
                 spent = getspnam (pwent->pw_name);
                 user = add_new_user_for_pwent (daemon, pwent, spent);
+#else
+                user = add_new_user_for_pwent (daemon, pwent);
+#endif
 
                 priv->explicitly_requested_users = g_list_append (priv->explicitly_requested_users,
                                                                   g_strdup (pwent->pw_name));
@@ -888,9 +950,13 @@ daemon_local_find_user_by_name (Daemon      *daemon,
         user = g_hash_table_lookup (priv->users, pwent->pw_name);
 
         if (user == NULL) {
+#ifdef HAVE_SHADOW_H
                 struct spwd *spent;
                 spent = getspnam (pwent->pw_name);
                 user = add_new_user_for_pwent (daemon, pwent, spent);
+#else
+                user = add_new_user_for_pwent (daemon, pwent);
+#endif
 
                 priv->explicitly_requested_users = g_list_append (priv->explicitly_requested_users,
                                                                   g_strdup (pwent->pw_name));
@@ -1095,10 +1161,12 @@ daemon_create_user_authorized_cb (Daemon              
 
         sys_log (context, "create user '%s'", cd->user_name);
 
-        argv[0] = "/usr/sbin/useradd";

+        argv[4] = "-c";
+        argv[5] = cd->real_name;
         if (cd->account_type == ACCOUNT_TYPE_ADMINISTRATOR) {
                 if (EXTRA_ADMIN_GROUPS != NULL && EXTRA_ADMIN_GROUPS[0] != '\0')
                         admin_groups = g_strconcat (ADMIN_GROUP, ",",
@@ -1106,15 +1174,11 @@ daemon_create_user_authorized_cb (Daemon              
                 else
                         admin_groups = g_strdup (ADMIN_GROUP);
 
-                argv[4] = "-G";
-                argv[5] = admin_groups;
-                argv[6] = "--";
-                argv[7] = cd->user_name;
+                argv[6] = "-G";
+                argv[7] = admin_groups;
                 argv[8] = NULL;
         }
         else if (cd->account_type == ACCOUNT_TYPE_STANDARD) {

                 argv[6] = NULL;
         }
         else {
@@ -1281,7 +1345,7 @@ daemon_delete_user_authorized_cb (Daemon              
         DeleteUserData *ud = data;
         g_autoptr(GError) error = NULL;
         struct passwd *pwent;
-        const gchar *argv[6];
+        const gchar *argv[5];
         User *user;
 
         pwent = getpwuid (ud->uid);
@@ -1307,19 +1371,16 @@ daemon_delete_user_authorized_cb (Daemon              
 
         user_set_saved (user, FALSE);
 
-        argv[0] = "/usr/sbin/userdel";
+        argv[0] = "/usr/sbin/pw";
+        argv[1] = "userdel";
         if (ud->remove_files) {
-                argv[1] = "-f";
-                argv[2] = "-r";
-                argv[3] = "--";
-                argv[4] = pwent->pw_name;
-                argv[5] = NULL;
+                argv[2] = pwent->pw_name;
+                argv[3] = "-r";
+                argv[4] = NULL;
         }
         else {
-                argv[1] = "-f";
-                argv[2] = "--";
-                argv[3] = pwent->pw_name;
-                argv[4] = NULL;
+                argv[2] = pwent->pw_name;
+                argv[3] = NULL;
         }
 
         if (!spawn_with_login_uid (context, argv, &error)) {

Line 0 Link Here

(-)files/patch-src_libaccountsservice_act-user.c (+11 lines)
	1	--- src/libaccountsservice/act-user.c.orig 2018-04-04 13:59:42 UTC
	2	+++ src/libaccountsservice/act-user.c
	3	@@ -26,8 +26,6 @@
	4	#include <sys/stat.h>
	5	#include <unistd.h>
	6
	7	-#include <crypt.h>
	8	-
	9	#include <glib.h>
	10	#include <glib/gi18n.h>
	11	#include <gio/gio.h>




--- src/meson.build.orig	2018-09-29 12:54:53 UTC
+++ src/meson.build
@@ -26,8 +26,8 @@ deps = [
 cflags = [
   '-DLOCALSTATEDIR="@0@"'.format(act_localstatedir),
   '-DDATADIR="@0@"'.format(act_datadir),
-  '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'icons')),
-  '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'users')),
+  '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'db', 'AccountsService', 'icons')),
+  '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'db', 'AccountsService', 'users')),
 ]
 
 libaccounts_generated = static_library(




--- src/user.c.orig	2018-04-20 20:52:07 UTC
+++ src/user.c
@@ -138,9 +138,14 @@ user_reset_icon_file (User *user)
 }
                          user->user_name, user->uid, name);
 
 void
+#ifdef HAVE_SHADOW_H
 user_update_from_pwent (User          *user,
                         struct passwd *pwent,
                         struct spwd   *spent)
+#else
+user_update_from_pwent (User          *user,
+                        struct passwd *pwent)
+#endif
 {
         g_autofree gchar *real_name = NULL;
         gboolean is_system_account;
@@ -199,8 +204,10 @@ user_update_from_pwent (User          *user,
         accounts_user_set_shell (ACCOUNTS_USER (user), pwent->pw_shell);
 
         passwd = NULL;
+#ifdef HAVE_SHADOW_H
         if (spent)
                 passwd = spent->sp_pwdp;
+#endif
 
         if (passwd && passwd[0] == '!') {
                 locked = TRUE;
@@ -218,6 +225,7 @@ user_update_from_pwent (User          *user,
                 mode = PASSWORD_MODE_NONE;
         }
 
+#ifdef HAVE_SHADOW_H
         if (spent) {
                 if (spent->sp_lstchg == 0) {
                         mode = PASSWORD_MODE_SET_AT_LOGIN;
@@ -231,6 +239,9 @@ user_update_from_pwent (User          *user,
                 user->days_after_expiration_until_lock = spent->sp_inact;
                 user->account_expiration_policy_known = TRUE;
         }
+#else
+        user->expiration_time = pwent->pw_expire;
+#endif
 
         accounts_user_set_password_mode (ACCOUNTS_USER (user), mode);
         is_system_account = !user_classify_is_human (accounts_user_get_uid (ACCOUNTS_USER (user)),
@@ -813,11 +824,11 @@ user_change_real_name_authorized_cb (Daemon           
                          accounts_user_get_uid (ACCOUNTS_USER (user)),
                          name);
 
-                argv[0] = "/usr/sbin/usermod";
-                argv[1] = "-c";
-                argv[2] = name;
-                argv[3] = "--";
-                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[0] = "/usr/sbin/pw";
+                argv[1] = "usermod";
+                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[3] = "-c";
+                argv[4] = name;
                 argv[5] = NULL;
 
                 if (!spawn_with_login_uid (context, argv, &error)) {
@@ -882,11 +893,11 @@ user_change_user_name_authorized_cb (Daemon           
                          accounts_user_get_uid (ACCOUNTS_USER (user)),
                          name);
 
-                argv[0] = "/usr/sbin/usermod";
-                argv[1] = "-l";
-                argv[2] = name;
-                argv[3] = "--";
-                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[0] = "/usr/sbin/pw";
+                argv[1] = "usermod";
+                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[3] = "-n";
+                argv[4] = name;
                 argv[5] = NULL;
 
                 if (!spawn_with_login_uid (context, argv, &error)) {
@@ -1183,7 +1194,7 @@ user_change_home_dir_authorized_cb (Daemon            
 {
         gchar *home_dir = data;
         g_autoptr(GError) error = NULL;
-        const gchar *argv[7];
+        const gchar *argv[6];
 
         if (g_strcmp0 (accounts_user_get_home_directory (ACCOUNTS_USER (user)), home_dir) != 0) {
                 sys_log (context,
@@ -1192,13 +1203,12 @@ user_change_home_dir_authorized_cb (Daemon            
                          accounts_user_get_uid (ACCOUNTS_USER (user)),
                          home_dir);
 
-                argv[0] = "/usr/sbin/usermod";
-                argv[1] = "-m";
-                argv[2] = "-d";
-                argv[3] = home_dir;
-                argv[4] = "--";
-                argv[5] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-                argv[6] = NULL;
+                argv[0] = "/usr/sbin/pw";
+                argv[1] = "-d";
+                argv[2] = home_dir;
+                argv[3] = "-n";
+                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[5] = NULL;
 
                 error = NULL;
                 if (!spawn_with_login_uid (context, argv, &error)) {
                         throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
@@ -1249,11 +1259,11 @@ user_change_shell_authorized_cb (Daemon               
                          accounts_user_get_uid (ACCOUNTS_USER (user)),
                          shell);
 
-                argv[0] = "/usr/sbin/usermod";
-                argv[1] = "-s";
-                argv[2] = shell;
-                argv[3] = "--";
-                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[0] = "/usr/sbin/pw";
+                argv[1] = "usermod";
+                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[3] = "-s";
+                argv[4] = shell;
                 argv[5] = NULL;
 
                 if (!spawn_with_login_uid (context, argv, &error)) {
@@ -1456,7 +1466,7 @@ user_change_locked_authorized_cb (Daemon              
 {
         gboolean locked = GPOINTER_TO_INT (data);
         g_autoptr(GError) error = NULL;
-        const gchar *argv[5];
+        const gchar *argv[4];
 
         if (accounts_user_get_locked (ACCOUNTS_USER (user)) != locked) {
                 sys_log (context,
@@ -1464,11 +1474,10 @@ user_change_locked_authorized_cb (Daemon              
                          locked ? "locking" : "unlocking",
                          accounts_user_get_user_name (ACCOUNTS_USER (user)),
                          accounts_user_get_uid (ACCOUNTS_USER (user)));
-                argv[0] = "/usr/sbin/usermod";
-                argv[1] = locked ? "-L" : "-U";
-                argv[2] = "--";
-                argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-                argv[4] = NULL;
+                argv[0] = "/usr/sbin/pw";
+                argv[1] = locked ? "lock" : "unlock";
+                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[3] = NULL;
 
                 error = NULL;
                 if (!spawn_with_login_uid (context, argv, &error)) {
                         throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
@@ -1589,11 +1598,11 @@ user_change_account_type_authorized_cb (Daemon        
 
                 g_free (groups);
 

-                argv[1] = "-G";
-                argv[2] = str->str;
-                argv[3] = "--";
-                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[0] = "/usr/sbin/pw";
+                argv[1] = "usermod";
+                argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                argv[3] = "-G";
+                argv[4] = str->str;
                 argv[5] = NULL;
 
                 if (!spawn_with_login_uid (context, argv, &error)) {
@@ -1643,7 +1652,7 @@ user_change_password_mode_authorized_cb (Daemon       
 {
         PasswordMode mode = GPOINTER_TO_INT (data);
         g_autoptr(GError) error = NULL;
-        const gchar *argv[6];
+        const gchar *argv[5];
 
         if (((PasswordMode) accounts_user_get_password_mode (ACCOUNTS_USER (user))) != mode) {
                 sys_log (context,
@@ -1658,10 +1667,8 @@ user_change_password_mode_authorized_cb (Daemon       
                     mode == PASSWORD_MODE_NONE) {
 
                         argv[0] = "/usr/bin/passwd";
-                        argv[1] = "-d";
-                        argv[2] = "--";
-                        argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-                        argv[4] = NULL;
+                        argv[1] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                        argv[2] = NULL;
 
                         error = NULL;
                         if (!spawn_with_login_uid (context, argv, &error)) {
                                 throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
@@ -1669,12 +1676,11 @@ user_change_password_mode_authorized_cb (Daemon       
                         }
 
                         if (mode == PASSWORD_MODE_SET_AT_LOGIN) {

+                                argv[1] = "-e";
                                 argv[2] = "0";
-                                argv[3] = "--";
-                                argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-                                argv[5] = NULL;
+                                argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                                argv[4] = NULL;
 
                                 error = NULL;
                                 if (!spawn_with_login_uid (context, argv, &error)) {
                                         throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
@@ -1690,11 +1696,10 @@ user_change_password_mode_authorized_cb (Daemon       
                         accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
                 }
                 else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
-                        argv[0] = "/usr/sbin/usermod";
-                        argv[1] = "-U";
-                        argv[2] = "--";
-                        argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-                        argv[4] = NULL;
+                        argv[0] = "/usr/sbin/pw";
+                        argv[1] = "unlock";
+                        argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+                        argv[3] = NULL;
 
                         error = NULL;
                         if (!spawn_with_login_uid (context, argv, &error)) {
                                 throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
@@ -1759,7 +1764,7 @@ user_change_password_authorized_cb (Daemon            
 {
         gchar **strings = data;
         g_autoptr(GError) error = NULL;
-        const gchar *argv[6];
+        const gchar *argv[5];
 
         sys_log (context,
                  "set password and hint of user '%s' (%d)",
@@ -1768,12 +1773,11 @@ user_change_password_authorized_cb (Daemon            
 
         g_object_freeze_notify (G_OBJECT (user));
 
-        argv[0] = "/usr/sbin/usermod";
+        argv[0] = "/usr/sbin/chpass";
         argv[1] = "-p";
         argv[2] = strings[0];
-        argv[3] = "--";
-        argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
-        argv[5] = NULL;
+        argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
+        argv[4] = NULL;
 
         error = NULL;
         if (!spawn_with_login_uid (context, argv, &error)) {
                 throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);




--- src/user.h.orig	2016-09-06 17:31:50 UTC
+++ src/user.h
@@ -22,7 +22,9 @@
 
 #include <sys/types.h>
 #include <pwd.h>
+#ifdef HAVE_SHADOW_H
 #include <shadow.h>
+#endif
 
 #include <glib.h>
 #include <gio/gio.h>
@@ -54,9 +56,14 @@ GType          user_get_type                (void) G_G
 User *         user_new                     (Daemon        *daemon,
                                              uid_t          uid);
 
+#ifdef HAVE_SHADOW_H
 void           user_update_from_pwent       (User          *user,
                                              struct passwd *pwent,
                                              struct spwd   *spent);
+#else
+void           user_update_from_pwent       (User          *user,
+                                             struct passwd *pwent);
+#endif
 void           user_update_from_keyfile     (User          *user,
                                              GKeyFile      *keyfile);
 void           user_update_local_account_property (User          *user,

Line 0 Link Here

(-)files/patch-src_wtmp-helper.h (+10 lines)
	1	--- src/wtmp-helper.h.orig 2016-09-06 19:48:50 UTC
	2	+++ src/wtmp-helper.h
	3	@@ -23,7 +23,6 @@
	4
	5	#include <glib.h>
	6	#include <pwd.h>
	7	-#include <shadow.h>
	8
	9	const gchar * wtmp_helper_get_path_for_monitor (void);
	10	void wtmp_helper_update_login_frequencies (GHashTable *users);

Lines 3-9 Link Here

(-)pkg-descr (-3 / +3 lines)
3	o A set of D-Bus interfaces for querying and manipulating	3	o A set of D-Bus interfaces for querying and manipulating
4	user account information.	4	user account information.
5		5
6	o An implementation of these interfaces based on the usermod(8),	6	o An implementation of these interfaces based on the pw(8)
7	useradd(8) and userdel(8) commands.	7	command.
8		8
9	WWW: https://cgit.freedesktop.org/accountsservice/	9	WWW: https://gitlab.freedesktop.org/accountsservice/accountsservice

Lines 1-9 Link Here

(-)pkg-install (-9 lines)
1	#!/bin/sh
2
3	case $2 in
4	POST-INSTALL)
5	/bin/mkdir -p /var/db/AccountsService/users/
6	/bin/mkdir -p /var/db/AccountsService/icons/
7	exit 0
8	;;
9	esac




include/accountsservice-1.0/act/act-user.h
include/accountsservice-1.0/act/act.h
lib/girepository-1.0/AccountsService-1.0.typelib
lib/libaccountsservice.a
lib/libaccountsservice.so
lib/libaccountsservice.so.0
lib/libaccountsservice.so.0.0.0

share/dbus-1/interfaces/org.freedesktop.Accounts.xml
share/dbus-1/system-services/org.freedesktop.Accounts.service
share/gir-1.0/AccountsService-1.0.gir
share/locale/af/LC_MESSAGES/accounts-service.mo
share/gtk-doc/html/libaccountsservice/ActUserManager.html
share/gtk-doc/html/libaccountsservice/annotation-glossary.html
share/gtk-doc/html/libaccountsservice/api-index-full.html
share/gtk-doc/html/libaccountsservice/ch01.html
share/gtk-doc/html/libaccountsservice/home.png
share/gtk-doc/html/libaccountsservice/index.html
share/gtk-doc/html/libaccountsservice/left-insensitive.png
share/gtk-doc/html/libaccountsservice/left.png
share/gtk-doc/html/libaccountsservice/libaccountsservice.devhelp2
share/gtk-doc/html/libaccountsservice/right-insensitive.png
share/gtk-doc/html/libaccountsservice/right.png
share/gtk-doc/html/libaccountsservice/style.css
share/gtk-doc/html/libaccountsservice/up-insensitive.png
share/gtk-doc/html/libaccountsservice/up.png
share/locale/ar/LC_MESSAGES/accounts-service.mo
share/locale/as/LC_MESSAGES/accounts-service.mo
share/locale/ast/LC_MESSAGES/accounts-service.mo
share/locale/az/LC_MESSAGES/accounts-service.mo
share/locale/be/LC_MESSAGES/accounts-service.mo
share/locale/bg/LC_MESSAGES/accounts-service.mo
share/locale/bn_IN/LC_MESSAGES/accounts-service.mo
share/locale/ca/LC_MESSAGES/accounts-service.mo
share/locale/ca@valencia/LC_MESSAGES/accounts-service.mo
share/locale/cs/LC_MESSAGES/accounts-service.mo
share/locale/cy/LC_MESSAGES/accounts-service.mo
share/locale/da/LC_MESSAGES/accounts-service.mo
share/locale/de/LC_MESSAGES/accounts-service.mo
share/locale/el/LC_MESSAGES/accounts-service.mo
share/locale/en/LC_MESSAGES/accounts-service.mo
share/locale/en_GB/LC_MESSAGES/accounts-service.mo
share/locale/eo/LC_MESSAGES/accounts-service.mo
share/locale/es/LC_MESSAGES/accounts-service.mo
share/locale/et/LC_MESSAGES/accounts-service.mo
share/locale/eu/LC_MESSAGES/accounts-service.mo
share/locale/fa/LC_MESSAGES/accounts-service.mo
share/locale/fi/LC_MESSAGES/accounts-service.mo
share/locale/fo/LC_MESSAGES/accounts-service.mo
share/locale/fr/LC_MESSAGES/accounts-service.mo
share/locale/fur/LC_MESSAGES/accounts-service.mo
share/locale/ga/LC_MESSAGES/accounts-service.mo
share/locale/gl/LC_MESSAGES/accounts-service.mo
share/locale/gu/LC_MESSAGES/accounts-service.mo
share/locale/he/LC_MESSAGES/accounts-service.mo
share/locale/hi/LC_MESSAGES/accounts-service.mo
share/locale/hr/LC_MESSAGES/accounts-service.mo
share/locale/hu/LC_MESSAGES/accounts-service.mo
share/locale/ia/LC_MESSAGES/accounts-service.mo
share/locale/id/LC_MESSAGES/accounts-service.mo

share/locale/ja/LC_MESSAGES/accounts-service.mo
share/locale/ka/LC_MESSAGES/accounts-service.mo
share/locale/kk/LC_MESSAGES/accounts-service.mo
share/locale/kn/LC_MESSAGES/accounts-service.mo
share/locale/ko/LC_MESSAGES/accounts-service.mo
share/locale/ky/LC_MESSAGES/accounts-service.mo
share/locale/lt/LC_MESSAGES/accounts-service.mo
share/locale/lv/LC_MESSAGES/accounts-service.mo
share/locale/ml/LC_MESSAGES/accounts-service.mo
share/locale/mr/LC_MESSAGES/accounts-service.mo
share/locale/ms/LC_MESSAGES/accounts-service.mo
share/locale/nb/LC_MESSAGES/accounts-service.mo
share/locale/nl/LC_MESSAGES/accounts-service.mo
share/locale/nn/LC_MESSAGES/accounts-service.mo
share/locale/oc/LC_MESSAGES/accounts-service.mo
share/locale/or/LC_MESSAGES/accounts-service.mo
share/locale/pa/LC_MESSAGES/accounts-service.mo
share/locale/pl/LC_MESSAGES/accounts-service.mo
share/locale/pt/LC_MESSAGES/accounts-service.mo
share/locale/pt_BR/LC_MESSAGES/accounts-service.mo
share/locale/ro/LC_MESSAGES/accounts-service.mo
share/locale/ru/LC_MESSAGES/accounts-service.mo
share/locale/sk/LC_MESSAGES/accounts-service.mo
share/locale/sl/LC_MESSAGES/accounts-service.mo
share/locale/sq/LC_MESSAGES/accounts-service.mo
share/locale/sr/LC_MESSAGES/accounts-service.mo
share/locale/sr@latin/LC_MESSAGES/accounts-service.mo
share/locale/sv/LC_MESSAGES/accounts-service.mo
share/locale/ta/LC_MESSAGES/accounts-service.mo
share/locale/te/LC_MESSAGES/accounts-service.mo
share/locale/th/LC_MESSAGES/accounts-service.mo
share/locale/tr/LC_MESSAGES/accounts-service.mo
share/locale/uk/LC_MESSAGES/accounts-service.mo
share/locale/vi/LC_MESSAGES/accounts-service.mo
share/locale/wa/LC_MESSAGES/accounts-service.mo
share/locale/zh_CN/LC_MESSAGES/accounts-service.mo
share/locale/zh_HK/LC_MESSAGES/accounts-service.mo
share/locale/zh_TW/LC_MESSAGES/accounts-service.mo
share/polkit-1/actions/org.freedesktop.accounts.policy
@dir(,,0775) /var/db/AccountsService/icons
@dir(,,0700) /var/db/AccountsService/users
@dir /var/db/AccountsService

Return to bug 249445

Lines 2-8 Link Here

(-)Makefile (-20 / +10 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= accountsservice	4	PORTNAME= accountsservice
5	PORTVERSION= 0.6.42	5	PORTVERSION= 0.6.55
6	CATEGORIES= sysutils devel	6	CATEGORIES= sysutils devel
7	MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/	7	MASTER_SITES= http://www.freedesktop.org/software/${PORTNAME}/
8		8
Lines 12-39 Link Here
12	LICENSE= GPLv3+	12	LICENSE= GPLv3+
13	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
14		14
15	LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \	15	BUILD_DEPENDS= dbus>0:devel/dbus
16	libpolkit-gobject-1.so:sysutils/polkit	16	LIB_DEPENDS= libpolkit-gobject-1.so:sysutils/polkit
17		17
18	USE_GNOME= glib20 intlhack introspection:build libxslt	18	USE_GNOME= glib20 intltool introspection:build libxslt
19	USES= cpe gettext gmake gnome libtool localbase:ldflags pathfix \	19	USES= cpe gettext gnome localbase:ldflags meson \
20	pkgconfig tar:xz	20	pkgconfig tar:xz
21	CPE_VENDOR= ray_stode	21	CPE_VENDOR= ray_stode
22	GNU_CONFIGURE= yes
23	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
24	CONFIGURE_ARGS= --disable-systemd --localstatedir=/var/	23	MESON_ARGS= -Dsystemdsystemunitdir=no \
25	INSTALL_TARGET= install-strip	24	-Dgdmconffile=${LOCALBASE}/etc/gdm/custom.conf \
		25	-Dsystemd=false \
		26	-Delogind=false \
		27	-Dlocalstatedir=/var
26		28
27	# XXX HACK! this file isn't present on the pristine jails of the builders
28	# and configure breaks without it. Beter solutions welcome.
29	.if defined(PACKAGE_BUILDING)
30	CONFIGURE_ENV+= ac_cv_file__var_log_utx_log=yes
31	.endif
32
33	post-patch:
34	@${REINPLACE_CMD} -e 's\|/etc/gdm/custom.conf\|${LOCALBASE}/etc/gdm/custom.conf\|g' \
35	${WRKSRC}/src/daemon.c
36	@${REINPLACE_CMD} -e 's\|/lib/AccountsService\|/db/AccountsService\|g' \
37	${WRKSRC}/src/user.c ${WRKSRC}/src/Makefile.in
38
39	.include <bsd.port.mk>	29	.include <bsd.port.mk>

Lines 1-21 Link Here

(-)files/patch-configure (-21 lines)
1	--- configure.orig 2014-03-15 15:02:28.000000000 +0100
2	+++ configure 2014-03-15 15:03:01.000000000 +0100
3	@@ -14527,6 +14527,18 @@
4	done
5
6
7	+for ac_func in fgetpwent
8	+do :
9	+ ac_fn_c_check_func "$LINENO" "fgetpwent" "ac_cv_func_fgetpwent"
10	+if test "x$ac_cv_func_fgetpwent" = xyes; then :
11	+ cat >>confdefs.h <<_ACEOF
12	+#define HAVE_FGETPWENT 1
13	+_ACEOF
14	+
15	+fi
16	+done
17	+
18	+
19
20
21

Line 0 Link Here

(-)files/patch-meson.build (+16 lines)
	1	--- meson.build.orig 2018-09-29 12:54:53 UTC
	2	+++ meson.build
	3	@@ -82,8 +82,11 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', p
	4	elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
	5	config_h.set('PATH_WTMP', '_PATH_WTMPX')
	6	else
	7	- assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes')
	8	- config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
	9	+ # Ugly hack for jails builders!
	10	+ _system = host_machine.system().to_lower()
	11	+ if _system.contains('freebsd')
	12	+ config_h.set_quoted('PATH_WTMP', '/var/log/utx.log')
	13	+ endif
	14	endif
	15
	16	# compiler flags

Line 0 Link Here

(-)files/patch-meson__post__install.py (+13 lines)
	1	--- meson_post_install.py.orig 2019-04-23 15:16:09 UTC
	2	+++ meson_post_install.py
	3	@@ -9,8 +9,8 @@ localstatedir = os.path.normpath(destdir + os.sep + sy
	4	# FIXME: meson will not track the creation of these directories
	5	# https://github.com/mesonbuild/meson/blob/master/mesonbuild/scripts/uninstall.py#L39
	6	dst_dirs = [
	7	- (os.path.join(localstatedir, 'lib', 'AccountsService', 'icons'), 0o775),
	8	- (os.path.join(localstatedir, 'lib', 'AccountsService', 'users'), 0o700),
	9	+ (os.path.join(localstatedir, 'db', 'AccountsService', 'icons'), 0o775),
	10	+ (os.path.join(localstatedir, 'db', 'AccountsService', 'users'), 0o700),
	11	]
	12
	13	for (dst_dir, dst_dir_mode) in dst_dirs:

Lines 1-16 Link Here

(-)files/patch-src_daemon.c (-13 / +267 lines)
1	--- src/daemon.c.orig 2014-03-23 09:36:37.194365289 +0000	1	--- src/daemon.c.orig 2018-09-26 13:20:49 UTC
2	+++ src/daemon.c 2014-03-23 09:36:39.836364714 +0000	2	+++ src/daemon.c
3	@@ -48,7 +48,7 @@	3	@@ -79,7 +79,11 @@ typedef struct {
4	#define PATH_PASSWD "/etc/passwd"	4	GHashTable *extension_ifaces;
5	#define PATH_SHADOW "/etc/shadow"	5	} DaemonPrivate;
6	#define PATH_GROUP "/etc/group"
7	-#define PATH_GDM_CUSTOM "/etc/gdm/custom.conf"
8	+#define PATH_GDM_CUSTOM "/usr/local/etc/gdm/custom.conf"
9		6
10	enum {	7	+#ifdef HAVE_SHADOW_H
11	PROP_0,	8	typedef struct passwd * (* EntryGeneratorFunc) (Daemon , GHashTable , gpointer , struct spwd *shadow_entry);
12	@@ -892,20 +892,18 @@	9	+#else
		10	+typedef struct passwd * (* EntryGeneratorFunc) (Daemon , GHashTable , gpointer *);
		11	+#endif
13		12
		13	static void daemon_accounts_accounts_iface_init (AccountsAccountsIface *iface);
		14
		15	@@ -154,17 +158,25 @@ remove_cache_files (const gchar *user_name)
		16	}
		17
		18	static struct passwd *
		19	+#ifdef HAVE_SHADOW_H
		20	entry_generator_fgetpwent (Daemon *daemon,
		21	GHashTable *users,
		22	gpointer *state,
		23	struct spwd **spent)
		24	+#else
		25	+entry_generator_fgetpwent (Daemon *daemon,
		26	+ GHashTable *users,
		27	+ gpointer *state)
		28	+#endif
		29	{
		30	struct passwd *pwent;
		31
		32	+#ifdef HAVE_SHADOW_H
		33	struct {
		34	struct spwd spbuf;
		35	char buf[1024];
		36	} *shadow_entry_buffers;
		37	+#endif
		38
		39	struct {
		40	FILE *fp;
		41	@@ -175,6 +187,7 @@ entry_generator_fgetpwent (Daemon *daemon,
		42	if (*state == NULL) {
		43	GHashTable *shadow_users = NULL;
		44	FILE *fp;
		45	+#ifdef HAVE_SHADOW_H
		46	struct spwd *shadow_entry;
		47
		48	fp = fopen (PATH_SHADOW, "r");
		49	@@ -208,6 +221,7 @@ entry_generator_fgetpwent (Daemon *daemon,
		50	g_clear_pointer (&shadow_users, g_hash_table_unref);
		51	return NULL;
		52	}
		53	+#endif
		54
		55	fp = fopen (PATH_PASSWD, "r");
		56	if (fp == NULL) {
		57	@@ -229,12 +243,17 @@ entry_generator_fgetpwent (Daemon *daemon,
		58	if (g_hash_table_size (users) < MAX_LOCAL_USERS) {
		59	pwent = fgetpwent (generator_state->fp);
		60	if (pwent != NULL) {
		61	+#ifdef HAVE_SHADOW_H
		62	shadow_entry_buffers = g_hash_table_lookup (generator_state->users, pwent->pw_name);
		63
		64	if (shadow_entry_buffers != NULL) {
		65	*spent = &shadow_entry_buffers->spbuf;
		66	}
		67	return pwent;
		68	+#else
		69	+ if (!generator_state->users \|\| g_hash_table_lookup (generator_state->users, pwent->pw_name))
		70	+ return pwent;
		71	+#endif
		72	}
		73	}
		74
		75	@@ -248,10 +267,16 @@ entry_generator_fgetpwent (Daemon *daemon,
		76	}
77
78	static struct passwd *
79	+#ifdef HAVE_SHADOW_H
80	entry_generator_cachedir (Daemon *daemon,
81	GHashTable *users,
82	gpointer *state,
83	struct spwd **shadow_entry)
84	+#else
85	+entry_generator_cachedir (Daemon *daemon,
86	+ GHashTable *users,
87	+ gpointer *state)
88	+#endif
89	{
90	struct passwd *pwent;
91	g_autoptr(GError) error = NULL;
92	@@ -293,7 +318,9 @@ entry_generator_cachedir (Daemon *daemon,
93	errno = 0;
94	pwent = getpwnam (name);
95	if (pwent != NULL) {
96	+#ifdef HAVE_SHADOW_H
97	*shadow_entry = getspnam (pwent->pw_name);
98	+#endif
99
100	return pwent;
101	} else if (errno == 0) {
102	@@ -329,10 +356,16 @@ entry_generator_cachedir (Daemon *daemon,
103	}
104
105	static struct passwd *
106	+#ifdef HAVE_SHADOW_H
107	entry_generator_requested_users (Daemon *daemon,
108	GHashTable *users,
109	gpointer *state,
110	struct spwd **shadow_entry)
111	+#else
112	+entry_generator_requested_users (Daemon *daemon,
113	+ GHashTable *users,
114	+ gpointer *state)
115	+#endif
116	{
117	DaemonPrivate *priv = daemon_get_instance_private (daemon);
118	struct passwd *pwent;
119	@@ -360,7 +393,9 @@ entry_generator_requested_users (Daemon *daemon,
120	if (pwent == NULL) {
121	g_debug ("user '%s' requested previously but not present on system", name);
122	} else {
123	+#ifdef HAVE_SHADOW_H
124	*shadow_entry = getspnam (pwent->pw_name);
125	+#endif
126
127	return pwent;
128	}
129	@@ -383,19 +418,29 @@ load_entries (Daemon *daemon,
130	DaemonPrivate *priv = daemon_get_instance_private (daemon);
131	gpointer generator_state = NULL;
132	struct passwd *pwent;
133	+#ifdef HAVE_SHADOW_H
134	struct spwd *spent = NULL;
135	+#endif
136	User *user = NULL;
137
138	g_assert (entry_generator != NULL);
139
140	for (;;) {
141	+#ifdef HAVE_SHADOW_H
142	spent = NULL;
143	pwent = entry_generator (daemon, users, &generator_state, &spent);
144	+#else
145	+ pwent = entry_generator (daemon, users, &generator_state);
146	+#endif
147	if (pwent == NULL)
148	break;
149
150	/* Skip system users... */
151	+#ifdef HAVE_SHADOW_H
152	if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, spent? spent->sp_pwdp : NULL)) {
153	+#else
154	+ if (!explicitly_requested && !user_classify_is_human (pwent->pw_uid, pwent->pw_name, pwent->pw_shell, NULL)) {
155	+#endif
156	g_debug ("skipping user: %s", pwent->pw_name);
157	continue;
158	}
159	@@ -417,7 +462,11 @@ load_entries (Daemon *daemon,
160
161	/* freeze & update users not already in the new list */
162	g_object_freeze_notify (G_OBJECT (user));
163	+#ifdef HAVE_SHADOW_H
164	user_update_from_pwent (user, pwent, spent);
165	+#else
166	+ user_update_from_pwent (user, pwent);
167	+#endif
168
169	g_hash_table_insert (users, g_strdup (user_get_user_name (user)), user);
170	g_debug ("loaded user: %s", user_get_user_name (user));
171	@@ -823,15 +872,24 @@ throw_error (GDBusMethodInvocation *context,
172	}
173
174	static User *
175	+#ifdef HAVE_SHADOW_H
176	add_new_user_for_pwent (Daemon *daemon,
177	struct passwd *pwent,
178	struct spwd *spent)
179	+#else
180	+add_new_user_for_pwent (Daemon *daemon,
181	+ struct passwd *pwent)
182	+#endif
183	{
184	DaemonPrivate *priv = daemon_get_instance_private (daemon);
185	User *user;
186
187	user = user_new (daemon, pwent->pw_uid);
188	+#ifdef HAVE_SHADOW_H
189	user_update_from_pwent (user, pwent, spent);
190	+#else
191	+ user_update_from_pwent (user, pwent);
192	+#endif
193	user_register (user);
194
195	g_hash_table_insert (priv->users,
196	@@ -860,9 +918,13 @@ daemon_local_find_user_by_id (Daemon *daemon,
197	user = g_hash_table_lookup (priv->users, pwent->pw_name);
198
199	if (user == NULL) {
200	+#ifdef HAVE_SHADOW_H
201	struct spwd *spent;
202	spent = getspnam (pwent->pw_name);
203	user = add_new_user_for_pwent (daemon, pwent, spent);
204	+#else
205	+ user = add_new_user_for_pwent (daemon, pwent);
206	+#endif
207
208	priv->explicitly_requested_users = g_list_append (priv->explicitly_requested_users,
209	g_strdup (pwent->pw_name));
210	@@ -888,9 +950,13 @@ daemon_local_find_user_by_name (Daemon *daemon,
211	user = g_hash_table_lookup (priv->users, pwent->pw_name);
212
213	if (user == NULL) {
214	+#ifdef HAVE_SHADOW_H
215	struct spwd *spent;
216	spent = getspnam (pwent->pw_name);
217	user = add_new_user_for_pwent (daemon, pwent, spent);
218	+#else
219	+ user = add_new_user_for_pwent (daemon, pwent);
220	+#endif
221
222	priv->explicitly_requested_users = g_list_append (priv->explicitly_requested_users,
223	g_strdup (pwent->pw_name));
224	@@ -1095,10 +1161,12 @@ daemon_create_user_authorized_cb (Daemon
225
14	sys_log (context, "create user '%s'", cd->user_name);	226	sys_log (context, "create user '%s'", cd->user_name);
15		227
16	- argv[0] = "/usr/sbin/useradd";	228	- argv[0] = "/usr/sbin/useradd";
Lines 24-35 Link Here
24	+ argv[4] = "-c";	236	+ argv[4] = "-c";
25	+ argv[5] = cd->real_name;	237	+ argv[5] = cd->real_name;
26	if (cd->account_type == ACCOUNT_TYPE_ADMINISTRATOR) {	238	if (cd->account_type == ACCOUNT_TYPE_ADMINISTRATOR) {
		239	if (EXTRA_ADMIN_GROUPS != NULL && EXTRA_ADMIN_GROUPS[0] != '\0')
		240	admin_groups = g_strconcat (ADMIN_GROUP, ",",
		241	@@ -1106,15 +1174,11 @@ daemon_create_user_authorized_cb (Daemon
		242	else
		243	admin_groups = g_strdup (ADMIN_GROUP);
		244
27	- argv[4] = "-G";	245	- argv[4] = "-G";
28	- argv[5] = ADMIN_GROUP;	246	- argv[5] = admin_groups;
29	- argv[6] = "--";	247	- argv[6] = "--";
30	- argv[7] = cd->user_name;	248	- argv[7] = cd->user_name;
31	+ argv[6] = "-G";	249	+ argv[6] = "-G";
32	+ argv[7] = ADMIN_GROUP;	250	+ argv[7] = admin_groups;
33	argv[8] = NULL;	251	argv[8] = NULL;
34	}	252	}
35	else if (cd->account_type == ACCOUNT_TYPE_STANDARD) {	253	else if (cd->account_type == ACCOUNT_TYPE_STANDARD) {
Lines 38-40 Link Here
38	argv[6] = NULL;	256	argv[6] = NULL;
39	}	257	}
40	else {	258	else {
		259	@@ -1281,7 +1345,7 @@ daemon_delete_user_authorized_cb (Daemon
		260	DeleteUserData *ud = data;
		261	g_autoptr(GError) error = NULL;
		262	struct passwd *pwent;
		263	- const gchar *argv[6];
		264	+ const gchar *argv[5];
		265	User *user;
		266
		267	pwent = getpwuid (ud->uid);
		268	@@ -1307,19 +1371,16 @@ daemon_delete_user_authorized_cb (Daemon
		269
		270	user_set_saved (user, FALSE);
		271
		272	- argv[0] = "/usr/sbin/userdel";
		273	+ argv[0] = "/usr/sbin/pw";
		274	+ argv[1] = "userdel";
		275	if (ud->remove_files) {
		276	- argv[1] = "-f";
		277	- argv[2] = "-r";
		278	- argv[3] = "--";
		279	- argv[4] = pwent->pw_name;
		280	- argv[5] = NULL;
		281	+ argv[2] = pwent->pw_name;
		282	+ argv[3] = "-r";
		283	+ argv[4] = NULL;
		284	}
		285	else {
		286	- argv[1] = "-f";
		287	- argv[2] = "--";
		288	- argv[3] = pwent->pw_name;
		289	- argv[4] = NULL;
		290	+ argv[2] = pwent->pw_name;
		291	+ argv[3] = NULL;
		292	}
		293
		294	if (!spawn_with_login_uid (context, argv, &error)) {

Line 0 Link Here

(-)files/patch-src_meson.build (+13 lines)
	1	--- src/meson.build.orig 2018-09-29 12:54:53 UTC
	2	+++ src/meson.build
	3	@@ -26,8 +26,8 @@ deps = [
	4	cflags = [
	5	'-DLOCALSTATEDIR="@0@"'.format(act_localstatedir),
	6	'-DDATADIR="@0@"'.format(act_datadir),
	7	- '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'icons')),
	8	- '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'lib', 'AccountsService', 'users')),
	9	+ '-DICONDIR="@0@"'.format(join_paths(act_localstatedir, 'db', 'AccountsService', 'icons')),
	10	+ '-DUSERDIR="@0@"'.format(join_paths(act_localstatedir, 'db', 'AccountsService', 'users')),
	11	]
	12
	13	libaccounts_generated = static_library(

Lines 1-93 Link Here

(-)files/patch-src_user.c (-55 / +135 lines)
1	--- src/user.c.orig 2014-03-15 15:16:49.000000000 +0100	1	--- src/user.c.orig 2018-04-20 20:52:07 UTC
2	+++ src/user.c 2014-03-15 15:31:57.000000000 +0100	2	+++ src/user.c
3	@@ -873,11 +873,11 @@	3	@@ -138,9 +138,14 @@ user_reset_icon_file (User *user)
4	"change real name of user '%s' (%d) to '%s'",	4	}
5	user->user_name, user->uid, name);
6		5
		6	void
		7	+#ifdef HAVE_SHADOW_H
		8	user_update_from_pwent (User *user,
		9	struct passwd *pwent,
		10	struct spwd *spent)
		11	+#else
		12	+user_update_from_pwent (User *user,
		13	+ struct passwd *pwent)
		14	+#endif
		15	{
		16	g_autofree gchar *real_name = NULL;
		17	gboolean is_system_account;
		18	@@ -199,8 +204,10 @@ user_update_from_pwent (User *user,
		19	accounts_user_set_shell (ACCOUNTS_USER (user), pwent->pw_shell);
		20
		21	passwd = NULL;
		22	+#ifdef HAVE_SHADOW_H
		23	if (spent)
		24	passwd = spent->sp_pwdp;
		25	+#endif
		26
		27	if (passwd && passwd[0] == '!') {
		28	locked = TRUE;
		29	@@ -218,6 +225,7 @@ user_update_from_pwent (User *user,
		30	mode = PASSWORD_MODE_NONE;
		31	}
		32
		33	+#ifdef HAVE_SHADOW_H
		34	if (spent) {
		35	if (spent->sp_lstchg == 0) {
		36	mode = PASSWORD_MODE_SET_AT_LOGIN;
		37	@@ -231,6 +239,9 @@ user_update_from_pwent (User *user,
		38	user->days_after_expiration_until_lock = spent->sp_inact;
		39	user->account_expiration_policy_known = TRUE;
		40	}
		41	+#else
		42	+ user->expiration_time = pwent->pw_expire;
		43	+#endif
		44
		45	accounts_user_set_password_mode (ACCOUNTS_USER (user), mode);
		46	is_system_account = !user_classify_is_human (accounts_user_get_uid (ACCOUNTS_USER (user)),
		47	@@ -813,11 +824,11 @@ user_change_real_name_authorized_cb (Daemon
		48	accounts_user_get_uid (ACCOUNTS_USER (user)),
		49	name);
		50
7	- argv[0] = "/usr/sbin/usermod";	51	- argv[0] = "/usr/sbin/usermod";
8	- argv[1] = "-c";	52	- argv[1] = "-c";
9	- argv[2] = name;	53	- argv[2] = name;
10	- argv[3] = "--";	54	- argv[3] = "--";
11	- argv[4] = user->user_name;	55	- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
12	+ argv[0] = "/usr/sbin/pw";	56	+ argv[0] = "/usr/sbin/pw";
13	+ argv[1] = "usermod";	57	+ argv[1] = "usermod";
14	+ argv[2] = user->user_name;	58	+ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
15	+ argv[3] = "-c";	59	+ argv[3] = "-c";
16	+ argv[4] = name;	60	+ argv[4] = name;
17	argv[5] = NULL;	61	argv[5] = NULL;
18		62
19	error = NULL;	63	if (!spawn_with_login_uid (context, argv, &error)) {
20	@@ -947,11 +947,11 @@	64	@@ -882,11 +893,11 @@ user_change_user_name_authorized_cb (Daemon
21	"change name of user '%s' (%d) to '%s'",	65	accounts_user_get_uid (ACCOUNTS_USER (user)),
22	old_name, user->uid, name);	66	name);
23		67
24	- argv[0] = "/usr/sbin/usermod";	68	- argv[0] = "/usr/sbin/usermod";
25	- argv[1] = "-l";	69	- argv[1] = "-l";
26	- argv[2] = name;	70	- argv[2] = name;
27	- argv[3] = "--";	71	- argv[3] = "--";
28	- argv[4] = user->user_name;	72	- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
29	+ argv[0] = "/usr/sbin/pw";	73	+ argv[0] = "/usr/sbin/pw";
30	+ argv[1] = "usermod";	74	+ argv[1] = "usermod";
31	+ argv[2] = user->user_name;	75	+ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
32	+ argv[3] = "-n";	76	+ argv[3] = "-n";
33	+ argv[4] = name;	77	+ argv[4] = name;
34	argv[5] = NULL;	78	argv[5] = NULL;
35		79
36	error = NULL;	80	if (!spawn_with_login_uid (context, argv, &error)) {
37	@@ -1229,13 +1229,12 @@	81	@@ -1183,7 +1194,7 @@ user_change_home_dir_authorized_cb (Daemon
38	"change home directory of user '%s' (%d) to '%s'",	82	{
39	user->user_name, user->uid, home_dir);	83	gchar *home_dir = data;
		84	g_autoptr(GError) error = NULL;
		85	- const gchar *argv[7];
		86	+ const gchar *argv[6];
40		87
		88	if (g_strcmp0 (accounts_user_get_home_directory (ACCOUNTS_USER (user)), home_dir) != 0) {
		89	sys_log (context,
		90	@@ -1192,13 +1203,12 @@ user_change_home_dir_authorized_cb (Daemon
		91	accounts_user_get_uid (ACCOUNTS_USER (user)),
		92	home_dir);
		93
41	- argv[0] = "/usr/sbin/usermod";	94	- argv[0] = "/usr/sbin/usermod";
42	- argv[1] = "-m";	95	- argv[1] = "-m";
43	- argv[2] = "-d";	96	- argv[2] = "-d";
44	- argv[3] = home_dir;	97	- argv[3] = home_dir;
45	- argv[4] = "--";	98	- argv[4] = "--";
46	- argv[5] = user->user_name;	99	- argv[5] = accounts_user_get_user_name (ACCOUNTS_USER (user));
47	- argv[6] = NULL;	100	- argv[6] = NULL;
48	+ argv[0] = "/usr/sbin/pw";	101	+ argv[0] = "/usr/sbin/pw";
49	+ argv[1] = "-d";	102	+ argv[1] = "-d";
50	+ argv[2] = home_dir;	103	+ argv[2] = home_dir;
51	+ argv[3] = "-n";	104	+ argv[3] = "-n";
52	+ argv[4] = user->user_name;	105	+ argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
53	+ argv[5] = NULL;	106	+ argv[5] = NULL;
54		107
55	error = NULL;
56	if (!spawn_with_login_uid (context, argv, &error)) {	108	if (!spawn_with_login_uid (context, argv, &error)) {
57	@@ -1291,11 +1290,11 @@	109	throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
58	"change shell of user '%s' (%d) to '%s'",	110	@@ -1249,11 +1259,11 @@ user_change_shell_authorized_cb (Daemon
59	user->user_name, user->uid, shell);	111	accounts_user_get_uid (ACCOUNTS_USER (user)),
		112	shell);
60		113
61	- argv[0] = "/usr/sbin/usermod";	114	- argv[0] = "/usr/sbin/usermod";
62	- argv[1] = "-s";	115	- argv[1] = "-s";
63	- argv[2] = shell;	116	- argv[2] = shell;
64	- argv[3] = "--";	117	- argv[3] = "--";
65	- argv[4] = user->user_name;	118	- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
66	+ argv[0] = "/usr/sbin/pw";	119	+ argv[0] = "/usr/sbin/pw";
67	+ argv[1] = "usermod";	120	+ argv[1] = "usermod";
68	+ argv[2] = user->user_name;	121	+ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
69	+ argv[3] = "-s";	122	+ argv[3] = "-s";
70	+ argv[4] = shell;	123	+ argv[4] = shell;
71	argv[5] = NULL;	124	argv[5] = NULL;
72		125
73	error = NULL;	126	if (!spawn_with_login_uid (context, argv, &error)) {
74	@@ -1551,11 +1550,10 @@	127	@@ -1456,7 +1466,7 @@ user_change_locked_authorized_cb (Daemon
		128	{
		129	gboolean locked = GPOINTER_TO_INT (data);
		130	g_autoptr(GError) error = NULL;
		131	- const gchar *argv[5];
		132	+ const gchar *argv[4];
		133
		134	if (accounts_user_get_locked (ACCOUNTS_USER (user)) != locked) {
75	sys_log (context,	135	sys_log (context,
76	"%s account of user '%s' (%d)",	136	@@ -1464,11 +1474,10 @@ user_change_locked_authorized_cb (Daemon
77	locked ? "locking" : "unlocking", user->user_name, user->uid);	137	locked ? "locking" : "unlocking",
		138	accounts_user_get_user_name (ACCOUNTS_USER (user)),
		139	accounts_user_get_uid (ACCOUNTS_USER (user)));
78	- argv[0] = "/usr/sbin/usermod";	140	- argv[0] = "/usr/sbin/usermod";
79	- argv[1] = locked ? "-L" : "-U";	141	- argv[1] = locked ? "-L" : "-U";
80	- argv[2] = "--";	142	- argv[2] = "--";
81	- argv[3] = user->user_name;	143	- argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
82	- argv[4] = NULL;	144	- argv[4] = NULL;
83	+ argv[0] = "/usr/sbin/pw";	145	+ argv[0] = "/usr/sbin/pw";
84	+ argv[1] = locked ? "lock" : "unlock";	146	+ argv[1] = locked ? "lock" : "unlock";
85	+ argv[2] = user->user_name;	147	+ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
86	+ argv[3] = NULL;	148	+ argv[3] = NULL;
87		149
88	error = NULL;
89	if (!spawn_with_login_uid (context, argv, &error)) {	150	if (!spawn_with_login_uid (context, argv, &error)) {
90	@@ -1664,11 +1662,11 @@	151	throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
		152	@@ -1589,11 +1598,11 @@ user_change_account_type_authorized_cb (Daemon
91		153
92	g_free (groups);	154	g_free (groups);
93		155
Lines 95-123 Link Here
95	- argv[1] = "-G";	157	- argv[1] = "-G";
96	- argv[2] = str->str;	158	- argv[2] = str->str;
97	- argv[3] = "--";	159	- argv[3] = "--";
98	- argv[4] = user->user_name;	160	- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
99	+ argv[0] = "/usr/sbin/pw";	161	+ argv[0] = "/usr/sbin/pw";
100	+ argv[1] = "usermod";	162	+ argv[1] = "usermod";
101	+ argv[2] = user->user_name;	163	+ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
102	+ argv[3] = "-G";	164	+ argv[3] = "-G";
103	+ argv[4] = str->str;	165	+ argv[4] = str->str;
104	argv[5] = NULL;	166	argv[5] = NULL;
105		167
106	g_string_free (str, FALSE);	168	if (!spawn_with_login_uid (context, argv, &error)) {
107	@@ -1735,10 +1733,8 @@	169	@@ -1643,7 +1652,7 @@ user_change_password_mode_authorized_cb (Daemon
		170	{
		171	PasswordMode mode = GPOINTER_TO_INT (data);
		172	g_autoptr(GError) error = NULL;
		173	- const gchar *argv[6];
		174	+ const gchar *argv[5];
		175
		176	if (((PasswordMode) accounts_user_get_password_mode (ACCOUNTS_USER (user))) != mode) {
		177	sys_log (context,
		178	@@ -1658,10 +1667,8 @@ user_change_password_mode_authorized_cb (Daemon
108	mode == PASSWORD_MODE_NONE) {	179	mode == PASSWORD_MODE_NONE) {
109		180
110	argv[0] = "/usr/bin/passwd";	181	argv[0] = "/usr/bin/passwd";
111	- argv[1] = "-d";	182	- argv[1] = "-d";
112	- argv[2] = "--";	183	- argv[2] = "--";
113	- argv[3] = user->user_name;	184	- argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
114	- argv[4] = NULL;	185	- argv[4] = NULL;
115	+ argv[1] = user->user_name;	186	+ argv[1] = accounts_user_get_user_name (ACCOUNTS_USER (user));
116	+ argv[2] = NULL;	187	+ argv[2] = NULL;
117		188
118	error = NULL;
119	if (!spawn_with_login_uid (context, argv, &error)) {	189	if (!spawn_with_login_uid (context, argv, &error)) {
120	@@ -1748,12 +1744,11 @@	190	throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
		191	@@ -1669,12 +1676,11 @@ user_change_password_mode_authorized_cb (Daemon
121	}	192	}
122		193
123	if (mode == PASSWORD_MODE_SET_AT_LOGIN) {	194	if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
Lines 127-168 Link Here
127	+ argv[1] = "-e";	198	+ argv[1] = "-e";
128	argv[2] = "0";	199	argv[2] = "0";
129	- argv[3] = "--";	200	- argv[3] = "--";
130	- argv[4] = user->user_name;	201	- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
131	- argv[5] = NULL;	202	- argv[5] = NULL;
132	+ argv[3] = user->user_name;	203	+ argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
133	+ argv[4] = NULL;	204	+ argv[4] = NULL;
134		205
135	error = NULL;
136	if (!spawn_with_login_uid (context, argv, &error)) {	206	if (!spawn_with_login_uid (context, argv, &error)) {
137	@@ -1777,11 +1772,10 @@	207	throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
138	}	208	@@ -1690,11 +1696,10 @@ user_change_password_mode_authorized_cb (Daemon
		209	accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
139	}	210	}
140	else if (user->locked) {	211	else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
141	- argv[0] = "/usr/sbin/usermod";	212	- argv[0] = "/usr/sbin/usermod";
142	- argv[1] = "-U";	213	- argv[1] = "-U";
143	- argv[2] = "--";	214	- argv[2] = "--";
144	- argv[3] = user->user_name;	215	- argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
145	- argv[4] = NULL;	216	- argv[4] = NULL;
146	+ argv[0] = "/usr/sbin/pw";	217	+ argv[0] = "/usr/sbin/pw";
147	+ argv[1] = "unlock";	218	+ argv[1] = "unlock";
148	+ argv[2] = user->user_name;	219	+ argv[2] = accounts_user_get_user_name (ACCOUNTS_USER (user));
149	+ argv[3] = NULL;	220	+ argv[3] = NULL;
150		221
151	error = NULL;
152	if (!spawn_with_login_uid (context, argv, &error)) {	222	if (!spawn_with_login_uid (context, argv, &error)) {
153	@@ -1852,12 +1846,11 @@	223	throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);
		224	@@ -1759,7 +1764,7 @@ user_change_password_authorized_cb (Daemon
		225	{
		226	gchar **strings = data;
		227	g_autoptr(GError) error = NULL;
		228	- const gchar *argv[6];
		229	+ const gchar *argv[5];
154		230
		231	sys_log (context,
		232	"set password and hint of user '%s' (%d)",
		233	@@ -1768,12 +1773,11 @@ user_change_password_authorized_cb (Daemon
		234
155	g_object_freeze_notify (G_OBJECT (user));	235	g_object_freeze_notify (G_OBJECT (user));
156		236
157	- argv[0] = "/usr/sbin/usermod";	237	- argv[0] = "/usr/sbin/usermod";
158	+ argv[0] = "/usr/bin/chpass";	238	+ argv[0] = "/usr/sbin/chpass";
159	argv[1] = "-p";	239	argv[1] = "-p";
160	argv[2] = strings[0];	240	argv[2] = strings[0];
161	- argv[3] = "--";	241	- argv[3] = "--";
162	- argv[4] = user->user_name;	242	- argv[4] = accounts_user_get_user_name (ACCOUNTS_USER (user));
163	- argv[5] = NULL;	243	- argv[5] = NULL;
164	+ argv[3] = user->user_name;	244	+ argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
165	+ argv[4] = NULL;	245	+ argv[4] = NULL;
166		246
167	error = NULL;
168	if (!spawn_with_login_uid (context, argv, &error)) {	247	if (!spawn_with_login_uid (context, argv, &error)) {
		248	throw_error (context, ERROR_FAILED, "running '%s' failed: %s", argv[0], error->message);

Line 0 Link Here

(-)files/patch-src_user.h (+27 lines)
	1	--- src/user.h.orig 2016-09-06 17:31:50 UTC
	2	+++ src/user.h
	3	@@ -22,7 +22,9 @@
	4
	5	#include <sys/types.h>
	6	#include <pwd.h>
	7	+#ifdef HAVE_SHADOW_H
	8	#include <shadow.h>
	9	+#endif
	10
	11	#include <glib.h>
	12	#include <gio/gio.h>
	13	@@ -54,9 +56,14 @@ GType user_get_type (void) G_G
	14	User * user_new (Daemon *daemon,
	15	uid_t uid);
	16
	17	+#ifdef HAVE_SHADOW_H
	18	void user_update_from_pwent (User *user,
	19	struct passwd *pwent,
	20	struct spwd *spent);
	21	+#else
	22	+void user_update_from_pwent (User *user,
	23	+ struct passwd *pwent);
	24	+#endif
	25	void user_update_from_keyfile (User *user,
	26	GKeyFile *keyfile);
	27	void user_update_local_account_property (User *user,

Lines 4-10 Link Here

(-)pkg-plist (-20 / +31 lines)
4	include/accountsservice-1.0/act/act-user.h	4	include/accountsservice-1.0/act/act-user.h
5	include/accountsservice-1.0/act/act.h	5	include/accountsservice-1.0/act/act.h
6	lib/girepository-1.0/AccountsService-1.0.typelib	6	lib/girepository-1.0/AccountsService-1.0.typelib
7	lib/libaccountsservice.a
8	lib/libaccountsservice.so	7	lib/libaccountsservice.so
9	lib/libaccountsservice.so.0	8	lib/libaccountsservice.so.0
10	lib/libaccountsservice.so.0.0.0	9	lib/libaccountsservice.so.0.0.0
Lines 14-53 Link Here
14	share/dbus-1/interfaces/org.freedesktop.Accounts.xml	13	share/dbus-1/interfaces/org.freedesktop.Accounts.xml
15	share/dbus-1/system-services/org.freedesktop.Accounts.service	14	share/dbus-1/system-services/org.freedesktop.Accounts.service
16	share/gir-1.0/AccountsService-1.0.gir	15	share/gir-1.0/AccountsService-1.0.gir
17	share/gtk-doc/html/libaccountsservice/ActUser.html	16	share/locale/af/LC_MESSAGES/accounts-service.mo
18	share/gtk-doc/html/libaccountsservice/ActUserManager.html
19	share/gtk-doc/html/libaccountsservice/annotation-glossary.html
20	share/gtk-doc/html/libaccountsservice/api-index-full.html
21	share/gtk-doc/html/libaccountsservice/ch01.html
22	share/gtk-doc/html/libaccountsservice/home.png
23	share/gtk-doc/html/libaccountsservice/index.html
24	share/gtk-doc/html/libaccountsservice/left-insensitive.png
25	share/gtk-doc/html/libaccountsservice/left.png
26	share/gtk-doc/html/libaccountsservice/libaccountsservice.devhelp2
27	share/gtk-doc/html/libaccountsservice/right-insensitive.png
28	share/gtk-doc/html/libaccountsservice/right.png
29	share/gtk-doc/html/libaccountsservice/style.css
30	share/gtk-doc/html/libaccountsservice/up-insensitive.png
31	share/gtk-doc/html/libaccountsservice/up.png
32	share/locale/ar/LC_MESSAGES/accounts-service.mo	17	share/locale/ar/LC_MESSAGES/accounts-service.mo
33	share/locale/bg_BG/LC_MESSAGES/accounts-service.mo	18	share/locale/as/LC_MESSAGES/accounts-service.mo
		19	share/locale/ast/LC_MESSAGES/accounts-service.mo
		20	share/locale/az/LC_MESSAGES/accounts-service.mo
		21	share/locale/be/LC_MESSAGES/accounts-service.mo
		22	share/locale/bg/LC_MESSAGES/accounts-service.mo
34	share/locale/bn_IN/LC_MESSAGES/accounts-service.mo	23	share/locale/bn_IN/LC_MESSAGES/accounts-service.mo
35	share/locale/ca/LC_MESSAGES/accounts-service.mo	24	share/locale/ca/LC_MESSAGES/accounts-service.mo
36	share/locale/ca@valencia/LC_MESSAGES/accounts-service.mo	25	share/locale/ca@valencia/LC_MESSAGES/accounts-service.mo
37	share/locale/cs/LC_MESSAGES/accounts-service.mo	26	share/locale/cs/LC_MESSAGES/accounts-service.mo
		27	share/locale/cy/LC_MESSAGES/accounts-service.mo
38	share/locale/da/LC_MESSAGES/accounts-service.mo	28	share/locale/da/LC_MESSAGES/accounts-service.mo
39	share/locale/de/LC_MESSAGES/accounts-service.mo	29	share/locale/de/LC_MESSAGES/accounts-service.mo
40	share/locale/el/LC_MESSAGES/accounts-service.mo	30	share/locale/el/LC_MESSAGES/accounts-service.mo
		31	share/locale/en/LC_MESSAGES/accounts-service.mo
41	share/locale/en_GB/LC_MESSAGES/accounts-service.mo	32	share/locale/en_GB/LC_MESSAGES/accounts-service.mo
42	share/locale/eo/LC_MESSAGES/accounts-service.mo	33	share/locale/eo/LC_MESSAGES/accounts-service.mo
43	share/locale/es/LC_MESSAGES/accounts-service.mo	34	share/locale/es/LC_MESSAGES/accounts-service.mo
44	share/locale/fa_IR/LC_MESSAGES/accounts-service.mo	35	share/locale/et/LC_MESSAGES/accounts-service.mo
		36	share/locale/eu/LC_MESSAGES/accounts-service.mo
		37	share/locale/fa/LC_MESSAGES/accounts-service.mo
45	share/locale/fi/LC_MESSAGES/accounts-service.mo	38	share/locale/fi/LC_MESSAGES/accounts-service.mo
		39	share/locale/fo/LC_MESSAGES/accounts-service.mo
46	share/locale/fr/LC_MESSAGES/accounts-service.mo	40	share/locale/fr/LC_MESSAGES/accounts-service.mo
		41	share/locale/fur/LC_MESSAGES/accounts-service.mo
47	share/locale/ga/LC_MESSAGES/accounts-service.mo	42	share/locale/ga/LC_MESSAGES/accounts-service.mo
48	share/locale/gl/LC_MESSAGES/accounts-service.mo	43	share/locale/gl/LC_MESSAGES/accounts-service.mo
		44	share/locale/gu/LC_MESSAGES/accounts-service.mo
49	share/locale/he/LC_MESSAGES/accounts-service.mo	45	share/locale/he/LC_MESSAGES/accounts-service.mo
50	share/locale/hi/LC_MESSAGES/accounts-service.mo	46	share/locale/hi/LC_MESSAGES/accounts-service.mo
		47	share/locale/hr/LC_MESSAGES/accounts-service.mo
51	share/locale/hu/LC_MESSAGES/accounts-service.mo	48	share/locale/hu/LC_MESSAGES/accounts-service.mo
52	share/locale/ia/LC_MESSAGES/accounts-service.mo	49	share/locale/ia/LC_MESSAGES/accounts-service.mo
53	share/locale/id/LC_MESSAGES/accounts-service.mo	50	share/locale/id/LC_MESSAGES/accounts-service.mo
Lines 55-82 Link Here
55	share/locale/ja/LC_MESSAGES/accounts-service.mo	52	share/locale/ja/LC_MESSAGES/accounts-service.mo
56	share/locale/ka/LC_MESSAGES/accounts-service.mo	53	share/locale/ka/LC_MESSAGES/accounts-service.mo
57	share/locale/kk/LC_MESSAGES/accounts-service.mo	54	share/locale/kk/LC_MESSAGES/accounts-service.mo
		55	share/locale/kn/LC_MESSAGES/accounts-service.mo
58	share/locale/ko/LC_MESSAGES/accounts-service.mo	56	share/locale/ko/LC_MESSAGES/accounts-service.mo
		57	share/locale/ky/LC_MESSAGES/accounts-service.mo
59	share/locale/lt/LC_MESSAGES/accounts-service.mo	58	share/locale/lt/LC_MESSAGES/accounts-service.mo
60	share/locale/lv/LC_MESSAGES/accounts-service.mo	59	share/locale/lv/LC_MESSAGES/accounts-service.mo
		60	share/locale/ml/LC_MESSAGES/accounts-service.mo
		61	share/locale/mr/LC_MESSAGES/accounts-service.mo
		62	share/locale/ms/LC_MESSAGES/accounts-service.mo
		63	share/locale/nb/LC_MESSAGES/accounts-service.mo
61	share/locale/nl/LC_MESSAGES/accounts-service.mo	64	share/locale/nl/LC_MESSAGES/accounts-service.mo
		65	share/locale/nn/LC_MESSAGES/accounts-service.mo
		66	share/locale/oc/LC_MESSAGES/accounts-service.mo
		67	share/locale/or/LC_MESSAGES/accounts-service.mo
62	share/locale/pa/LC_MESSAGES/accounts-service.mo	68	share/locale/pa/LC_MESSAGES/accounts-service.mo
63	share/locale/pl/LC_MESSAGES/accounts-service.mo	69	share/locale/pl/LC_MESSAGES/accounts-service.mo
		70	share/locale/pt/LC_MESSAGES/accounts-service.mo
64	share/locale/pt_BR/LC_MESSAGES/accounts-service.mo	71	share/locale/pt_BR/LC_MESSAGES/accounts-service.mo
65	share/locale/ro/LC_MESSAGES/accounts-service.mo	72	share/locale/ro/LC_MESSAGES/accounts-service.mo
66	share/locale/ru/LC_MESSAGES/accounts-service.mo	73	share/locale/ru/LC_MESSAGES/accounts-service.mo
67	share/locale/sk/LC_MESSAGES/accounts-service.mo	74	share/locale/sk/LC_MESSAGES/accounts-service.mo
68	share/locale/sl/LC_MESSAGES/accounts-service.mo	75	share/locale/sl/LC_MESSAGES/accounts-service.mo
		76	share/locale/sq/LC_MESSAGES/accounts-service.mo
69	share/locale/sr/LC_MESSAGES/accounts-service.mo	77	share/locale/sr/LC_MESSAGES/accounts-service.mo
70	share/locale/sr@latin/LC_MESSAGES/accounts-service.mo	78	share/locale/sr@latin/LC_MESSAGES/accounts-service.mo
71	share/locale/sv/LC_MESSAGES/accounts-service.mo	79	share/locale/sv/LC_MESSAGES/accounts-service.mo
		80	share/locale/ta/LC_MESSAGES/accounts-service.mo
72	share/locale/te/LC_MESSAGES/accounts-service.mo	81	share/locale/te/LC_MESSAGES/accounts-service.mo
		82	share/locale/th/LC_MESSAGES/accounts-service.mo
73	share/locale/tr/LC_MESSAGES/accounts-service.mo	83	share/locale/tr/LC_MESSAGES/accounts-service.mo
74	share/locale/uk/LC_MESSAGES/accounts-service.mo	84	share/locale/uk/LC_MESSAGES/accounts-service.mo
75	share/locale/vi/LC_MESSAGES/accounts-service.mo	85	share/locale/vi/LC_MESSAGES/accounts-service.mo
76	share/locale/wa/LC_MESSAGES/accounts-service.mo	86	share/locale/wa/LC_MESSAGES/accounts-service.mo
77	share/locale/zh_CN/LC_MESSAGES/accounts-service.mo	87	share/locale/zh_CN/LC_MESSAGES/accounts-service.mo
		88	share/locale/zh_HK/LC_MESSAGES/accounts-service.mo
78	share/locale/zh_TW/LC_MESSAGES/accounts-service.mo	89	share/locale/zh_TW/LC_MESSAGES/accounts-service.mo
79	share/polkit-1/actions/org.freedesktop.accounts.policy	90	share/polkit-1/actions/org.freedesktop.accounts.policy
80	@dir /var/db/AccountsService/icons	91	@dir(,,0775) /var/db/AccountsService/icons
81	@dir /var/db/AccountsService/users	92	@dir(,,0700) /var/db/AccountsService/users
82	@dir /var/db/AccountsService	93	@dir /var/db/AccountsService