diff --git a/0001-gvdb-Restore-permissions-on-changed-files.patch b/0001-gvdb-Restore-permissions-on-changed-files.patch index 97ee113..e23be2c 100644 --- a/0001-gvdb-Restore-permissions-on-changed-files.patch +++ b/0001-gvdb-Restore-permissions-on-changed-files.patch @@ -1,18 +1,5 @@ -From 4e303b094dc2b6c53739fb65f0e6e9f508a8f99c Mon Sep 17 00:00:00 2001 -From: Marek Kasik -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 -index 90ea50b..a185cb3 100644 +index 90ea50b..cf5f1f4 100644 --- a/gvdb/gvdb-builder.c +++ b/gvdb/gvdb-builder.c @@ -21,6 +21,7 @@ @@ -23,7 +10,7 @@ index 90ea50b..a185cb3 100644 #include #if !defined(G_OS_WIN32) || !defined(_MSC_VER) #include -@@ -509,13 +510,20 @@ gvdb_table_write_contents (GHashTable *table, +@@ -509,13 +510,22 @@ gvdb_table_write_contents (GHashTable *table, gboolean status; FileBuilder *fb; GString *str; @@ -41,9 +28,8 @@ index 90ea50b..a185cb3 100644 + if (stat_ret == 0) + g_chmod (filename, buf.st_mode); ++ else ++ g_chmod (filename, 0644); + return status; } --- -2.5.0 - diff --git a/dconf.changes b/dconf.changes index 0131dc5..baad441 100644 --- a/dconf.changes +++ b/dconf.changes @@ -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 @@ -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 -- 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. ------------------------------------------------------------------- diff --git a/dconf.spec b/dconf.spec index c563637..31b459e 100644 --- a/dconf.spec +++ b/dconf.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -25,7 +25,7 @@ Group: System/Libraries Url: http://live.gnome.org/dconf Source: http://download.gnome.org/sources/dconf/0.26/%{name}-%{version}.tar.xz 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 # For directory ownership BuildRequires: dbus-1