# HG changeset patch
# User gheet
# Date 1209553726 0
# Node ID ac79d063e1c1262bc5669c35250927b642de5aec
# Parent  f5a0e3bef06ce58350db83094197f4d718a3d4fa
008-04-30  Ghee Teo <ghee.teo@sun.com>

        * patches/gnome-vfs-12-acl-perms-corrupted.diff: Added to fix
          bugster#6652733 and bugzilla#511031 with a patch from Seth Goldberg.
        * base-specs/gnome-vfs.spec: modified to add.

diff -r f5a0e3bef06c -r ac79d063e1c1 ChangeLog
--- a/ChangeLog	Wed Apr 30 10:13:41 2008 +0000
+++ b/ChangeLog	Wed Apr 30 11:08:46 2008 +0000
@@ -1,3 +1,9 @@
+2008-04-30  Ghee Teo <ghee.teo@sun.com>
+
+        * patches/gnome-vfs-12-acl-perms-corrupted.diff: Added to fix
+          bugster#6652733 and bugzilla#511031 with a patch from Seth Goldberg.
+        * base-specs/gnome-vfs.spec: modified to add.
+
 2008-04-30  simon.zheng  <simon.zheng@sun.com>
 
 	* base-specs/dbus.spec:
diff -r f5a0e3bef06c -r ac79d063e1c1 base-specs/gnome-vfs.spec
--- a/base-specs/gnome-vfs.spec	Wed Apr 30 10:13:41 2008 +0000
+++ b/base-specs/gnome-vfs.spec	Wed Apr 30 11:08:46 2008 +0000
@@ -41,6 +41,8 @@
 Patch10:      gnome-vfs-10-acl-zfs.diff
 # date:2008-04-17 type:bug bugster:6614146 bugzilla:495041 owner:migi
 Patch11:      gnome-vfs-11-zfs-trash.diff
+# date:2008-04-30 type:bug bugster:6652733 bugzilla:511031 owner:gheet
+Patch12:      gnome-vfs-12-acl-perms-corrupted.diff
 
 URL:          http://www.gnome.org/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
@@ -106,6 +108,7 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 # Fix for 326431. 
 cd po
 dos2unix -ascii be.po be.po
diff -r f5a0e3bef06c -r ac79d063e1c1 patches/gnome-vfs-12-acl-perms-corrupted.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-vfs-12-acl-perms-corrupted.diff	Wed Apr 30 11:08:46 2008 +0000
@@ -0,0 +1,12 @@
+diff -urN gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-ace.c ../SUNWgnome-vfs-2.20.1.hacked/gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-ace.c
+--- gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-ace.c	2008-04-30 10:51:45.439489000 +0100
++++ ../SUNWgnome-vfs-2.20.1.hacked/gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-ace.c	2008-04-30 10:55:29.607846000 +0100
+@@ -315,7 +315,7 @@
+ 		dest->perms[i] = source->perms[i];
+ 	}
+ 
+-	dest->perms[++i] = 0;
++	dest->perms[source->count] = 0;
+ 	dest->count = source->count;
+ }
+