Accepting request 88361 from home:vuntz:branches:GNOME:Factory
Update to 0.6.15 -- bugfixes we want for 12.1 OBS-URL: https://build.opensuse.org/request/show/88361 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/accountsservice?expand=0&rev=16
This commit is contained in:
parent
aceb41cc9e
commit
21d1c8f5e6
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fcf26f5198521392f11078a9177e430e0ca09bd6bc481b106fc0cbbc586bfd64
|
||||
size 286220
|
3
accountsservice-0.6.15.tar.xz
Normal file
3
accountsservice-0.6.15.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9feb3d58c5c739f2df4b5410404b29f16e3f4aa6739b685ceb12903f4d5ea867
|
||||
size 286480
|
@ -1,44 +0,0 @@
|
||||
commit d7c5d29a1f5d1305f66a24209ddb0719fecf2160
|
||||
Author: Vincent Untz <vuntz@gnome.org>
|
||||
Date: Thu Sep 29 10:44:18 2011 +0200
|
||||
|
||||
daemon: Only accept regular files when setting icon
|
||||
|
||||
We don't want to call cat on a FIFO, for instance.
|
||||
|
||||
diff --git a/src/user.c b/src/user.c
|
||||
index 4587bbb..8f0bdd3 100644
|
||||
--- a/src/user.c
|
||||
+++ b/src/user.c
|
||||
@@ -1370,6 +1370,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
|
||||
GFile *file;
|
||||
GFileInfo *info;
|
||||
guint32 mode;
|
||||
+ GFileType type;
|
||||
guint64 size;
|
||||
|
||||
filename = g_strdup (data);
|
||||
@@ -1400,14 +1401,23 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
|
||||
|
||||
file = g_file_new_for_path (filename);
|
||||
info = g_file_query_info (file, G_FILE_ATTRIBUTE_UNIX_MODE ","
|
||||
+ G_FILE_ATTRIBUTE_STANDARD_TYPE ","
|
||||
G_FILE_ATTRIBUTE_STANDARD_SIZE,
|
||||
0, NULL, NULL);
|
||||
mode = g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE);
|
||||
+ type = g_file_info_get_file_type (info);
|
||||
size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
|
||||
|
||||
g_object_unref (info);
|
||||
g_object_unref (file);
|
||||
|
||||
+ if (type != G_FILE_TYPE_REGULAR) {
|
||||
+ g_debug ("not a regular file\n");
|
||||
+ throw_error (context, ERROR_FAILED, "file '%s' is not a regular file", filename);
|
||||
+ g_free (filename);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
if (size > 1048576) {
|
||||
g_debug ("file too large\n");
|
||||
/* 1MB ought to be enough for everybody */
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 18 06:54:27 UTC 2011 - vuntz@opensuse.org
|
||||
|
||||
- Update to version 0.6.15:
|
||||
+ Only accept regular files as icons
|
||||
+ Don't track non-graphical sessions
|
||||
+ Fix wtmp handling
|
||||
+ Fix build on FreeBSD and OpenBSD
|
||||
- Drop accountsservice-regular-file-for-icon.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 29 08:46:11 UTC 2011 - vuntz@opensuse.org
|
||||
|
||||
|
@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
Name: accountsservice
|
||||
Version: 0.6.14
|
||||
Version: 0.6.15
|
||||
Release: 1
|
||||
License: GPLv3+
|
||||
Summary: D-Bus Service to Manipulate User Account Information
|
||||
@ -28,8 +28,6 @@ Source: http://www.freedesktop.org/software/accountsservice/%{name}-%{ve
|
||||
# WARNING: do not remove/significantly change patch0 without updating the relevant patch in gdm too
|
||||
# PATCH-FIX-OPENSUSE accountsservice-sysconfig.patch bnc#688071 vuntz@opensuse.org -- Read/write autologin configuration from sysconfig, like gdm (see gdm-sysconfig-settings.patch)
|
||||
Patch0: accountsservice-sysconfig.patch
|
||||
# PATCH-FIX-UPSTREAM accountsservice-regular-file-for-icon.patch fdo#41320 bnc#676638 vuntz@opensuse.org -- Check files are regular files before using them as user icons
|
||||
Patch1: accountsservice-regular-file-for-icon.patch
|
||||
# needed for patch0
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: gobject-introspection-devel
|
||||
@ -77,7 +75,6 @@ querying and manipulating user account information.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
# needed for patch0
|
||||
|
Loading…
x
Reference in New Issue
Block a user