Hello community,

here is the log from the commit of package dconf for openSUSE:Factory checked 
in at 2017-04-29 10:47:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dconf (Old)
 and      /work/SRC/openSUSE:Factory/.dconf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dconf"

Sat Apr 29 10:47:57 2017 rev:43 rq:490184 version:0.26.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/dconf/dconf.changes      2016-08-25 
09:51:35.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dconf.new/dconf.changes 2017-04-29 
10:47:57.867354687 +0200
@@ -1,0 +2,8 @@
+Thu Mar  2 14:36:50 UTC 2017 - fezh...@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).
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dconf.spec ++++++
--- /var/tmp/diff_new_pack.spS8DM/_old  2017-04-29 10:47:58.527261460 +0200
+++ /var/tmp/diff_new_pack.spS8DM/_new  2017-04-29 10:47:58.527261460 +0200
@@ -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 @@
 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 fezh...@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 fezh...@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

++++++ 0001-gvdb-Restore-permissions-on-changed-files.patch ++++++
--- /var/tmp/diff_new_pack.spS8DM/_old  2017-04-29 10:47:58.555257505 +0200
+++ /var/tmp/diff_new_pack.spS8DM/_new  2017-04-29 10:47:58.559256940 +0200
@@ -1,18 +1,5 @@
-From 4e303b094dc2b6c53739fb65f0e6e9f508a8f99c Mon Sep 17 00:00:00 2001
-From: Marek Kasik <mka...@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
-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 @@
  #include <fcntl.h>
  #if !defined(G_OS_WIN32) || !defined(_MSC_VER)
  #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;
    FileBuilder *fb;
    GString *str;
@@ -41,9 +28,8 @@
  
 +  if (stat_ret == 0)
 +    g_chmod (filename, buf.st_mode);
++  else
++    g_chmod (filename, 0644);
 +
    return status;
  }
--- 
-2.5.0
-


Reply via email to