From 9ccc4f319320f4ea7497aceeb83ff064793b818673258b9454e0aa63f7706260 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 3 Apr 2014 20:53:20 +0000 Subject: [PATCH] Accepting request 228733 from GNOME:Next Update to 0.6.37 OBS-URL: https://build.opensuse.org/request/show/228733 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=69 --- accountsservice-0.6.35.tar.xz | 3 -- accountsservice-0.6.37.tar.xz | 3 ++ accountsservice-filter-suse-accounts.patch | 10 +++---- accountsservice-sysconfig.patch | 32 +++++++++++----------- accountsservice.changes | 13 +++++++++ accountsservice.spec | 4 +-- 6 files changed, 39 insertions(+), 26 deletions(-) delete mode 100644 accountsservice-0.6.35.tar.xz create mode 100644 accountsservice-0.6.37.tar.xz diff --git a/accountsservice-0.6.35.tar.xz b/accountsservice-0.6.35.tar.xz deleted file mode 100644 index 5cdd133..0000000 --- a/accountsservice-0.6.35.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:65a1c7013c9c6785c7feb710ee940bb297207dabdb93561fdfdd140e0dfd3038 -size 360824 diff --git a/accountsservice-0.6.37.tar.xz b/accountsservice-0.6.37.tar.xz new file mode 100644 index 0000000..631c85d --- /dev/null +++ b/accountsservice-0.6.37.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b0b21136dc9d74a7135fd5ed7fa1a8069efb91bc6ecc1ef8911125433345a5c1 +size 363244 diff --git a/accountsservice-filter-suse-accounts.patch b/accountsservice-filter-suse-accounts.patch index 1d15d3d..309bf19 100644 --- a/accountsservice-filter-suse-accounts.patch +++ b/accountsservice-filter-suse-accounts.patch @@ -1,8 +1,8 @@ -Index: accountsservice-0.6.35/src/user-classify.c +Index: accountsservice-0.6.37/src/user-classify.c =================================================================== ---- accountsservice-0.6.35.orig/src/user-classify.c -+++ accountsservice-0.6.35/src/user-classify.c -@@ -54,7 +54,13 @@ static const char *default_excludes[] = +--- accountsservice-0.6.37.orig/src/user-classify.c ++++ accountsservice-0.6.37/src/user-classify.c +@@ -53,7 +53,13 @@ static const char *default_excludes[] = "man", "at", "gdm", @@ -16,4 +16,4 @@ Index: accountsservice-0.6.35/src/user-classify.c + "cyrus" }; - #define PATH_NOLOGIN "/sbin/nologin" + static gboolean diff --git a/accountsservice-sysconfig.patch b/accountsservice-sysconfig.patch index 0afd71f..642c639 100644 --- 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.35/src/Makefile.am +Index: accountsservice-0.6.37/src/Makefile.am =================================================================== ---- accountsservice-0.6.35.orig/src/Makefile.am -+++ accountsservice-0.6.35/src/Makefile.am +--- accountsservice-0.6.37.orig/src/Makefile.am ++++ accountsservice-0.6.37/src/Makefile.am @@ -31,6 +31,8 @@ libexec_PROGRAMS = accounts-daemon accounts_daemon_SOURCES = \ @@ -17,19 +17,19 @@ Index: accountsservice-0.6.35/src/Makefile.am types.h \ daemon.h \ daemon.c \ -Index: accountsservice-0.6.35/src/daemon.c +Index: accountsservice-0.6.37/src/daemon.c =================================================================== ---- accountsservice-0.6.35.orig/src/daemon.c -+++ accountsservice-0.6.35/src/daemon.c -@@ -46,6 +46,7 @@ - #include "user-classify.h" +--- accountsservice-0.6.37.orig/src/daemon.c ++++ accountsservice-0.6.37/src/daemon.c +@@ -44,6 +44,7 @@ + #include "wtmp-helper.h" #include "daemon.h" #include "util.h" +#include "gdm-sysconfig.h" #define PATH_PASSWD "/etc/passwd" #define PATH_SHADOW "/etc/shadow" -@@ -547,7 +548,7 @@ reload_autologin_timeout (Daemon *daemon +@@ -376,7 +377,7 @@ reload_autologin_timeout (Daemon *daemon daemon->priv->autologin_id = 0; if (!load_autologin (daemon, &name, &enabled, &error)) { @@ -38,7 +38,7 @@ Index: accountsservice-0.6.35/src/daemon.c g_error_free (error); g_free (name); -@@ -1440,6 +1441,43 @@ daemon_local_check_auth (Daemon +@@ -1272,6 +1273,43 @@ daemon_local_check_auth (Daemon g_object_unref (subject); } @@ -82,7 +82,7 @@ Index: accountsservice-0.6.35/src/daemon.c gboolean load_autologin (Daemon *daemon, gchar **name, -@@ -1450,6 +1488,8 @@ load_autologin (Daemon *daemon, +@@ -1282,6 +1320,8 @@ load_autologin (Daemon *daemon, GError *local_error; gchar *string; @@ -91,7 +91,7 @@ Index: accountsservice-0.6.35/src/daemon.c keyfile = g_key_file_new (); if (!g_key_file_load_from_file (keyfile, PATH_GDM_CUSTOM, -@@ -1497,6 +1537,8 @@ save_autologin (Daemon *daemon, +@@ -1329,6 +1369,8 @@ save_autologin (Daemon *daemon, gchar *data; gboolean result; @@ -100,10 +100,10 @@ Index: accountsservice-0.6.35/src/daemon.c keyfile = g_key_file_new (); if (!g_key_file_load_from_file (keyfile, PATH_GDM_CUSTOM, -Index: accountsservice-0.6.35/src/gdm-sysconfig.c +Index: accountsservice-0.6.37/src/gdm-sysconfig.c =================================================================== --- /dev/null -+++ accountsservice-0.6.35/src/gdm-sysconfig.c ++++ accountsservice-0.6.37/src/gdm-sysconfig.c @@ -0,0 +1,484 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * @@ -589,10 +589,10 @@ Index: accountsservice-0.6.35/src/gdm-sysconfig.c + g_strfreev (lines); + return result; +} -Index: accountsservice-0.6.35/src/gdm-sysconfig.h +Index: accountsservice-0.6.37/src/gdm-sysconfig.h =================================================================== --- /dev/null -+++ accountsservice-0.6.35/src/gdm-sysconfig.h ++++ accountsservice-0.6.37/src/gdm-sysconfig.h @@ -0,0 +1,43 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * diff --git a/accountsservice.changes b/accountsservice.changes index d51f36b..1ec0c42 100644 --- a/accountsservice.changes +++ b/accountsservice.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Apr 2 11:48:24 UTC 2014 - dimstar@opensuse.org + +- Update to version 0.6.37: + + BSD fixes. +- Changes from version 0.6.36: + + Fixes for deleting users. + + Leak fix. + + Change user classification logic. + + BSD fixes. +- Rebase accountsservice-sysconfig.patch and + accountsservice-filter-suse-accounts.patch. + ------------------------------------------------------------------- Wed Oct 16 06:42:07 UTC 2013 - dimstar@opensuse.org diff --git a/accountsservice.spec b/accountsservice.spec index 2f5c50a..8adc1d4 100644 --- a/accountsservice.spec +++ b/accountsservice.spec @@ -1,7 +1,7 @@ # # spec file for package accountsservice # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: accountsservice -Version: 0.6.35 +Version: 0.6.37 Release: 0 Summary: D-Bus Service to Manipulate User Account Information License: GPL-3.0+