Update accountsservices to 0.6.37. Remove patch-src_Makefile.in and patch-src_fgetpwent.c, those

are not needed anymore. Adapt patch-src_daemon.c, the pw stuff is still needed.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19237 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 9 insertions, 175 deletions

diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile
index bffae7955..63a5ee0ae 100644
--- a/sysutils/accountsservice/Makefile
+++ b/sysutils/accountsservice/Makefile
@@ -3,7 +3,7 @@
 #    $MCom$
 
 PORTNAME=	accountsservice
-PORTVERSION=	0.6.35
+PORTVERSION=	0.6.37
 CATEGORIES=	sysutils devel
 MASTER_SITES=	http://www.freedesktop.org/software/${PORTNAME}/
 
diff --git a/sysutils/accountsservice/distinfo b/sysutils/accountsservice/distinfo
index 5ff7f0146..fe4fdc7e8 100644
--- a/sysutils/accountsservice/distinfo
+++ b/sysutils/accountsservice/distinfo
@@ -1,2 +1,2 @@
-SHA256 (accountsservice-0.6.35.tar.xz) = 65a1c7013c9c6785c7feb710ee940bb297207dabdb93561fdfdd140e0dfd3038
-SIZE (accountsservice-0.6.35.tar.xz) = 360824
+SHA256 (accountsservice-0.6.37.tar.xz) = b0b21136dc9d74a7135fd5ed7fa1a8069efb91bc6ecc1ef8911125433345a5c1
+SIZE (accountsservice-0.6.37.tar.xz) = 363244
diff --git a/sysutils/accountsservice/files/patch-src_Makefile.in b/sysutils/accountsservice/files/patch-src_Makefile.in
deleted file mode 100644
index 98efb907a..000000000
--- a/sysutils/accountsservice/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig	2014-03-15 15:02:34.000000000 +0100
-+++ src/Makefile.in	2014-03-15 15:03:04.000000000 +0100
-@@ -435,6 +435,10 @@
- 	libaccounts-generated.la	\
- 	$(POLKIT_LIBS)
- 
-+EXTRA_DIST = \
-+	fgetpwent.c	\
-+	$(NULL)
-+
- CLEANFILES = \
- 	$(BUILT_SOURCES) \
- 	*.gcda \
diff --git a/sysutils/accountsservice/files/patch-src_daemon.c b/sysutils/accountsservice/files/patch-src_daemon.c
index 3d8ddfc04..29226ddd1 100644
--- a/sysutils/accountsservice/files/patch-src_daemon.c
+++ b/sysutils/accountsservice/files/patch-src_daemon.c
@@ -1,58 +1,15 @@
---- src/daemon.c.orig	2013-10-15 22:25:19.000000000 +0200
-+++ src/daemon.c	2014-03-15 15:33:49.000000000 +0100
-@@ -50,9 +50,8 @@
+--- src/daemon.c.orig	2014-03-23 09:36:37.194365289 +0000
++++ src/daemon.c	2014-03-23 09:36:39.836364714 +0000
+@@ -48,7 +48,7 @@
  #define PATH_PASSWD "/etc/passwd"
  #define PATH_SHADOW "/etc/shadow"
  #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_UTMPX_H
--#define PATH_WTMP _PATH_WTMPX
- #endif
  
  enum {
-@@ -73,7 +72,7 @@
-         GFileMonitor *group_monitor;
-         GFileMonitor *gdm_monitor;
- #ifdef HAVE_UTMPX_H
--        GFileMonitor *wtmp_monitor;
-+//        GFileMonitor *wtmp_monitor;
- #endif
- 
-         guint reload_id;
-@@ -162,6 +161,10 @@
-         g_free (previous_login);
- }
- 
-+#ifndef HAVE_FGETPWENT
-+#include "fgetpwent.c"
-+#endif
-+
- static struct passwd *
- entry_generator_wtmp (GHashTable *users,
-                       gpointer   *state)
-@@ -183,7 +186,7 @@
-                         return NULL;
-                 }
- #else
--                utmpxname (PATH_WTMP);
-+//                utmpxname (PATH_WTMP);
-                 setutxent ();
- #endif
-                 *state = g_new (WTmpGeneratorState, 1);
-@@ -697,11 +700,6 @@
-                                                      PATH_GROUP,
-                                                      on_users_monitor_changed);
- 
--#ifdef HAVE_UTMPX_H
--        daemon->priv->wtmp_monitor = setup_monitor (daemon,
--                                                    PATH_WTMP,
--                                                    on_users_monitor_changed);
--#endif
- 
-         daemon->priv->gdm_monitor = setup_monitor (daemon,
-                                                    PATH_GDM_CUSTOM,
-@@ -1061,20 +1059,18 @@
+         PROP_0,
+@@ -892,20 +892,18 @@
  
          sys_log (context, "create user '%s'", cd->user_name);
  
diff --git a/sysutils/accountsservice/files/patch-src_fgetpwent.c b/sysutils/accountsservice/files/patch-src_fgetpwent.c
deleted file mode 100644
index ae48ff2d4..000000000
--- a/sysutils/accountsservice/files/patch-src_fgetpwent.c
+++ /dev/null
@@ -1,111 +0,0 @@
---- src/fgetpwent.c.orig	2014-03-15 15:05:11.000000000 +0100
-+++ src/fgetpwent.c	2014-03-15 15:02:41.000000000 +0100
-@@ -0,0 +1,108 @@
-+/*
-+ * Copyright (C) 2013 Canonical Limited
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 3 of the licence, or
-+ * (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ *
-+ * Authors: Ryan Lortie <desrt@desrt.ca>
-+ */
-+
-+static gchar *
-+fgetpwent_getline (FILE *fp)
-+{
-+  static GString str;
-+
-+  /* We could be "more clever" here and avoid the strlen() but this is a
-+   * clear case of dumb is better.
-+   */
-+  str.len = 0;
-+  while (!str.len || str.str[str.len - 1] != '\n')
-+    {
-+      if (str.allocated_len < str.len + 32)
-+        {
-+          str.allocated_len = str.len + 32;
-+          str.str = g_realloc (str.str, str.allocated_len);
-+        }
-+
-+      if (fgets (str.str + str.len, str.allocated_len - str.len, fp) == NULL)
-+        return NULL;
-+
-+      str.len = strlen (str.str + str.len) + str.len;
-+    }
-+
-+  /* chomp the '\n' */
-+  str.str[str.len - 1] = '\0';
-+
-+  return str.str;
-+}
-+
-+static struct passwd *
-+fgetpwent (FILE *fp)
-+{
-+  static struct passwd pw;
-+  guint64 intval;
-+  gchar *line;
-+
-+  /* In case of failure, we ignore the line and start again */
-+again:
-+  line = fgetpwent_getline (fp);
-+  if (!line)
-+    return NULL;
-+
-+  while (g_ascii_isspace (*line))
-+    line++;
-+
-+  /* comments, empty lines */
-+  if (line[0] == '#' || line[0] == '\0')
-+    goto again;
-+
-+  /* username */
-+  pw.pw_name = line;
-+  if (!(line = strchr (line, ':')))
-+    goto again;
-+  *line++ = '\0';
-+
-+  /* password */
-+  pw.pw_passwd = line;
-+  if (!(line = strchr (line, ':')))
-+    goto again;
-+  *line++ = '\0';
-+
-+  /* uid */
-+  pw.pw_uid = intval = g_ascii_strtoull (line, &line, 10);
-+  if (pw.pw_uid != intval || *line++ != ':')
-+    goto again;
-+
-+  /* gid */
-+  pw.pw_gid = intval = g_ascii_strtoull (line, &line, 10);
-+  if (pw.pw_gid != intval || *line++ != ':')
-+    goto again;
-+
-+  /* gecos */
-+  pw.pw_gecos = line;
-+  if (!(line = strchr (line, ':')))
-+    goto again;
-+  *line++ = '\0';
-+
-+  /* home directory */
-+  pw.pw_dir = line;
-+  if (!(line = strchr (line, ':')))
-+    goto again;
-+  *line++ = '\0';
-+
-+  /* shell */
-+  pw.pw_shell = line;
-+
-+  return &pw;
-+}
diff --git a/sysutils/accountsservice/pkg-plist b/sysutils/accountsservice/pkg-plist
index 538132121..ce06c2f13 100644
--- a/sysutils/accountsservice/pkg-plist
+++ b/sysutils/accountsservice/pkg-plist
@@ -97,5 +97,6 @@ share/polkit-1/actions/org.freedesktop.accounts.policy
 @dirrm include/accountsservice-1.0
 @cwd /
 @dirrmtry var/db/AccountsService/users
+@dirrmtry var/db/AccountsService/icons
 @dirrmtry var/db/AccountsService
 @cwd