Accepting request 206238 from home:dimstar:branches:GNOME:Factory

Update to 0.6.35

OBS-URL: https://build.opensuse.org/request/show/206238
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=67
This commit is contained in:
Dominique Leuenberger 2013-11-12 19:15:47 +00:00 committed by Git OBS Bridge
parent f7d9530680
commit 9ea9000aed
7 changed files with 45 additions and 66 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:15672a6e87a218e2a2c09947e340cc6617cd5ccb201da6885c409c16362d6b14
size 359436

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:65a1c7013c9c6785c7feb710ee940bb297207dabdb93561fdfdd140e0dfd3038
size 360824

View File

@ -1,17 +1,19 @@
Index: accountsservice-0.6.34/src/daemon.c Index: accountsservice-0.6.35/src/user-classify.c
=================================================================== ===================================================================
--- accountsservice-0.6.34.orig/src/daemon.c --- accountsservice-0.6.35.orig/src/user-classify.c
+++ accountsservice-0.6.34/src/daemon.c +++ accountsservice-0.6.35/src/user-classify.c
@@ -83,6 +83,12 @@ static const char *default_excludes[] = @@ -54,7 +54,13 @@ static const char *default_excludes[] =
"man",
"at", "at",
"gdm", "gdm",
"gnome-initial-setup", - "gnome-initial-setup"
+ "gnome-initial-setup",
+ "beagleindex", + "beagleindex",
+ "fax", + "fax",
+ "suse-ncc", + "suse-ncc",
+ "mailman", + "mailman",
+ "ldap", + "ldap",
+ "cyrus", + "cyrus"
NULL
}; };
#define PATH_NOLOGIN "/sbin/nologin"

View File

@ -1,33 +0,0 @@
From 631c57790fe79ee70d79522eb1b3e461e2899d82 Mon Sep 17 00:00:00 2001
From: Ray Strode <rstrode@redhat.com>
Date: Tue, 01 Oct 2013 14:50:46 +0000
Subject: user: treat NULL shadow entry as "password handled remotely"
Right now we set the password mode of a user based on the password
hash in shadow. SSSD (and other remote login facilities
presumably) don't send the password hash over the wire to the client,
but of course those users do have a password set.
This commit changes the code to notice when there's no shadow entry
for a user and treat that case conservatively (assume user has a password).
Related to: https://bugzilla.gnome.org/show_bug.cgi?id=708997
https://bugs.freedesktop.org/show_bug.cgi?id=70005
---
diff --git a/src/user.c b/src/user.c
index 1f28e78..76cb470 100644
--- a/src/user.c
+++ b/src/user.c
@@ -271,7 +271,7 @@ user_update_from_pwent (User *user,
g_object_notify (G_OBJECT (user), "locked");
}
- if (passwd && passwd[0] != 0) {
+ if (passwd == NULL || passwd[0] != 0) {
mode = PASSWORD_MODE_REGULAR;
}
else {
--
cgit v0.9.0.2-2-gbebe

View File

@ -4,10 +4,10 @@ Date: Wed Jul 20 16:48:41 2011 +0200
Use autologin configuration from sysconfig (SUSE-ism) Use autologin configuration from sysconfig (SUSE-ism)
Index: accountsservice-0.6.31/src/Makefile.am Index: accountsservice-0.6.35/src/Makefile.am
=================================================================== ===================================================================
--- accountsservice-0.6.31.orig/src/Makefile.am --- accountsservice-0.6.35.orig/src/Makefile.am
+++ accountsservice-0.6.31/src/Makefile.am +++ accountsservice-0.6.35/src/Makefile.am
@@ -31,6 +31,8 @@ libexec_PROGRAMS = accounts-daemon @@ -31,6 +31,8 @@ libexec_PROGRAMS = accounts-daemon
accounts_daemon_SOURCES = \ accounts_daemon_SOURCES = \
@ -17,19 +17,19 @@ Index: accountsservice-0.6.31/src/Makefile.am
types.h \ types.h \
daemon.h \ daemon.h \
daemon.c \ daemon.c \
Index: accountsservice-0.6.31/src/daemon.c Index: accountsservice-0.6.35/src/daemon.c
=================================================================== ===================================================================
--- accountsservice-0.6.31.orig/src/daemon.c --- accountsservice-0.6.35.orig/src/daemon.c
+++ accountsservice-0.6.31/src/daemon.c +++ accountsservice-0.6.35/src/daemon.c
@@ -44,6 +44,7 @@ @@ -46,6 +46,7 @@
#include "user-classify.h"
#include "daemon.h" #include "daemon.h"
#include "util.h" #include "util.h"
+#include "gdm-sysconfig.h" +#include "gdm-sysconfig.h"
#define PATH_PASSWD "/etc/passwd" #define PATH_PASSWD "/etc/passwd"
#define PATH_SHADOW "/etc/shadow" #define PATH_SHADOW "/etc/shadow"
@@ -636,7 +637,7 @@ reload_autologin_timeout (Daemon *daemon @@ -547,7 +548,7 @@ reload_autologin_timeout (Daemon *daemon
daemon->priv->autologin_id = 0; daemon->priv->autologin_id = 0;
if (!load_autologin (daemon, &name, &enabled, &error)) { if (!load_autologin (daemon, &name, &enabled, &error)) {
@ -38,7 +38,7 @@ Index: accountsservice-0.6.31/src/daemon.c
g_error_free (error); g_error_free (error);
g_free (name); g_free (name);
@@ -1515,6 +1516,43 @@ daemon_local_check_auth (Daemon @@ -1440,6 +1441,43 @@ daemon_local_check_auth (Daemon
g_object_unref (subject); g_object_unref (subject);
} }
@ -82,7 +82,7 @@ Index: accountsservice-0.6.31/src/daemon.c
gboolean gboolean
load_autologin (Daemon *daemon, load_autologin (Daemon *daemon,
gchar **name, gchar **name,
@@ -1525,6 +1563,8 @@ load_autologin (Daemon *daemon, @@ -1450,6 +1488,8 @@ load_autologin (Daemon *daemon,
GError *local_error; GError *local_error;
gchar *string; gchar *string;
@ -91,7 +91,7 @@ Index: accountsservice-0.6.31/src/daemon.c
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
if (!g_key_file_load_from_file (keyfile, if (!g_key_file_load_from_file (keyfile,
PATH_GDM_CUSTOM, PATH_GDM_CUSTOM,
@@ -1572,6 +1612,8 @@ save_autologin (Daemon *daemon, @@ -1497,6 +1537,8 @@ save_autologin (Daemon *daemon,
gchar *data; gchar *data;
gboolean result; gboolean result;
@ -100,10 +100,10 @@ Index: accountsservice-0.6.31/src/daemon.c
keyfile = g_key_file_new (); keyfile = g_key_file_new ();
if (!g_key_file_load_from_file (keyfile, if (!g_key_file_load_from_file (keyfile,
PATH_GDM_CUSTOM, PATH_GDM_CUSTOM,
Index: accountsservice-0.6.31/src/gdm-sysconfig.c Index: accountsservice-0.6.35/src/gdm-sysconfig.c
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ accountsservice-0.6.31/src/gdm-sysconfig.c +++ accountsservice-0.6.35/src/gdm-sysconfig.c
@@ -0,0 +1,484 @@ @@ -0,0 +1,484 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *
@ -589,10 +589,10 @@ Index: accountsservice-0.6.31/src/gdm-sysconfig.c
+ g_strfreev (lines); + g_strfreev (lines);
+ return result; + return result;
+} +}
Index: accountsservice-0.6.31/src/gdm-sysconfig.h Index: accountsservice-0.6.35/src/gdm-sysconfig.h
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ accountsservice-0.6.31/src/gdm-sysconfig.h +++ accountsservice-0.6.35/src/gdm-sysconfig.h
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ * + *

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Wed Oct 16 06:42:07 UTC 2013 - dimstar@opensuse.org
- Update to version 0.6.35:
+ Handle non-existent users better.
+ Misc bug fixes.
+ Misc clean ups.
+ Emit "changed" signal when account type changes for user.
+ Stop shipping vapi files.
+ Avoid connecting to ConsoleKit on logind systems.
+ Add extension interface.
+ Add --enable-coverage option for gcov support.
- Rebase accountsservice-sysconfig.patch and
accountsservice-filter-suse-accounts.patch.
- Drop accountsservice-remotePW-verification.patch: fixed upstream.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 9 11:51:08 UTC 2013 - dimstar@opensuse.org Wed Oct 9 11:51:08 UTC 2013 - dimstar@opensuse.org

View File

@ -17,7 +17,7 @@
Name: accountsservice Name: accountsservice
Version: 0.6.34 Version: 0.6.35
Release: 0 Release: 0
Summary: D-Bus Service to Manipulate User Account Information Summary: D-Bus Service to Manipulate User Account Information
License: GPL-3.0+ License: GPL-3.0+
@ -29,8 +29,6 @@ Source: http://www.freedesktop.org/software/accountsservice/%{name}-%{ve
Patch0: accountsservice-sysconfig.patch Patch0: accountsservice-sysconfig.patch
# PATCH-FIX-OPENSUSE accountsservice-filter-suse-accounts.patch vuntz@opensuse.org -- Filter out some system users that are specific to openSUSE # PATCH-FIX-OPENSUSE accountsservice-filter-suse-accounts.patch vuntz@opensuse.org -- Filter out some system users that are specific to openSUSE
Patch1: accountsservice-filter-suse-accounts.patch Patch1: accountsservice-filter-suse-accounts.patch
# PATCH-FIX-UPSTREAM accountsservice-remotePW-verification.patch bnc#844933 bgo#708997 fdo#70005 dimstar@opensuse.org -- treat NULL shadow entry as "password handled remotely"
Patch2: accountsservice-remotePW-verification.patch
# needed for patch0 # needed for patch0
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
@ -91,7 +89,6 @@ querying and manipulating user account information.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
# needed for patch0 # needed for patch0
@ -154,9 +151,6 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/accountsservice.pc %{_libdir}/pkgconfig/accountsservice.pc
%{_includedir}/accountsservice-1.0/ %{_includedir}/accountsservice-1.0/
%{_datadir}/gir-1.0/AccountsService-1.0.gir %{_datadir}/gir-1.0/AccountsService-1.0.gir
%dir %{_datadir}/vala
%dir %{_datadir}/vala/vapi
%{_datadir}/vala/vapi/accountsservice.*
%files lang -f accounts-service.lang %files lang -f accounts-service.lang