rpm/dconf
SHA256
1
0
Fork 0
forked from pool/dconf
Code Pull Requests Activity

Accepting request 490184 from GNOME:Factory

Browse Source 
- Update 0001-gvdb-Restore-permissions-on-changed-files.patch:
  'dconf update' should set permissions to 0644 on restored missing
  db files, despite of the umask setting (bsc#1025721, bsc#971074,
  bgo#758066). (forwarded request 483857 from zhangxiaofei)

OBS-URL: https://build.opensuse.org/request/show/490184
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dconf?expand=0&rev=43
This commit is contained in:
Dominique Leuenberger 2017-04-29 08:47:57 +00:00 committed by Git OBS Bridge
commit b113102672
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
0001-gvdb-Restore-permissions-on-changed-files.patch
View File

@ -1,18 +1,5 @@
From 4e303b094dc2b6c53739fb65f0e6e9f508a8f99c Mon Sep 17 00:00:00 2001
From: Marek Kasik <mkasik@redhat.com>
Date: Fri, 13 Nov 2015 17:22:31 +0100
Subject: [PATCH] gvdb: Restore permissions on changed files
Restore permissions of files changed in gvdb_table_write_contents().
Since g_file_set_contents() doesn't preserve permissions it can happen
that if user calling e.g. "dconf update" has umask set then
the originally readable file becomes unreadable.
---
gvdb/gvdb-builder.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/gvdb/gvdb-builder.c b/gvdb/gvdb-builder.c diff --git a/gvdb/gvdb-builder.c b/gvdb/gvdb-builder.c
index 90ea50b..a185cb3 100644 index 90ea50b..cf5f1f4 100644
--- a/gvdb/gvdb-builder.c --- a/gvdb/gvdb-builder.c
+++ b/gvdb/gvdb-builder.c +++ b/gvdb/gvdb-builder.c
@@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
@ -23,7 +10,7 @@ index 90ea50b..a185cb3 100644
#include <fcntl.h> #include <fcntl.h>
#if !defined(G_OS_WIN32) || !defined(_MSC_VER) #if !defined(G_OS_WIN32) || !defined(_MSC_VER)
#include <unistd.h> #include <unistd.h>
@@ -509,13 +510,20 @@ gvdb_table_write_contents (GHashTable *table, @@ -509,13 +510,22 @@ gvdb_table_write_contents (GHashTable *table,
gboolean status; gboolean status;
FileBuilder *fb; FileBuilder *fb;
GString *str; GString *str;
@ -41,9 +28,8 @@ index 90ea50b..a185cb3 100644
+ if (stat_ret == 0) + if (stat_ret == 0)
+ g_chmod (filename, buf.st_mode); + g_chmod (filename, buf.st_mode);
+ else
+ g_chmod (filename, 0644);
+ +
return status; return status;
} }
--
2.5.0

10
dconf.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Mar 2 14:36:50 UTC 2017 - fezhang@suse.com
- Update 0001-gvdb-Restore-permissions-on-changed-files.patch:
'dconf update' should set permissions to 0644 on restored missing
db files, despite of the umask setting (bsc#1025721, bsc#971074,
bgo#758066).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 19 18:10:24 UTC 2016 - fezhang@suse.com Fri Aug 19 18:10:24 UTC 2016 - fezhang@suse.com
@ -459,7 +467,7 @@ Fri Oct 28 07:59:11 UTC 2011 - dimstar@opensuse.org
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 28 19:07:22 UTC 2011 - zaitor@opensuse.org Wed Sep 28 19:07:22 UTC 2011 - zaitor@opensuse.org
- Changed BuildRequires from vala-devel to vala, as vala-devel - Changed BuildRequires from vala-devel to vala, as vala-devel
is an old deprecated name. is an old deprecated name.
------------------------------------------------------------------- -------------------------------------------------------------------

4
dconf.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package dconf # spec file for package dconf
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -25,7 +25,7 @@ Group: System/Libraries
Url: http://live.gnome.org/dconf Url: http://live.gnome.org/dconf
Source: http://download.gnome.org/sources/dconf/0.26/%{name}-%{version}.tar.xz Source: http://download.gnome.org/sources/dconf/0.26/%{name}-%{version}.tar.xz
Source99: baselibs.conf Source99: baselibs.conf
# PATCH-FIX-UPSTREAM 0001-gvdb-Restore-permissions-on-changed-files.patch bsc#971074 bgo#758066 fezhang@suse.com -- Restore permissions on files changed by dconf update. # PATCH-FIX-UPSTREAM 0001-gvdb-Restore-permissions-on-changed-files.patch bsc#1025721 bsc#971074 bgo#758066 fezhang@suse.com -- Restore permissions on files changed by dconf update.
Patch0: 0001-gvdb-Restore-permissions-on-changed-files.patch Patch0: 0001-gvdb-Restore-permissions-on-changed-files.patch
# For directory ownership # For directory ownership
BuildRequires: dbus-1 BuildRequires: dbus-1