[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit a80816cbbb81e5e27a017b10847d906bfb5fb6f6
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 9 20:59:53 2002 +0000

    2002-03-09  Ken Kocienda  <kocienda at apple.com>
    
            Fixed this bug:
            Radar 2859368 (IFURLFileDatabase must set correct permissions when creating files)
    
            The IFURLFileDatabase now creates directories and files with the correct permissions.
    
            * Database.subproj/IFURLFileDatabase.m: (+[IFURLFileDatabase initialize]),
            (-[IFURLFileDatabase setObject:forKey:]), (-[IFURLFileDatabase open]):
            * Misc.subproj/IFNSFileManagerExtensions.h:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@724 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/Misc.subproj/WebFileDatabase.m b/WebKit/Misc.subproj/WebFileDatabase.m
index 96764dd..3024fab 100644
--- a/WebKit/Misc.subproj/WebFileDatabase.m
+++ b/WebKit/Misc.subproj/WebFileDatabase.m
@@ -18,10 +18,10 @@ static NSNumber *IFURLFilePosixPermissions;
 +(void)initialize
 {
     // set file perms to owner read/write/execute only
-    IFURLFileDirectoryPosixPermissions = [[NSNumber numberWithInt:700] retain];
+    IFURLFileDirectoryPosixPermissions = [[NSNumber numberWithInt:(IF_UREAD | IF_UWRITE | IF_UEXEC)] retain];
 
     // set file perms to owner read/write only
-    IFURLFilePosixPermissions = [[NSNumber numberWithInt:600] retain];
+    IFURLFilePosixPermissions = [[NSNumber numberWithInt:(IF_UREAD | IF_UWRITE)] retain];
 }
 
 -(id)initWithPath:(NSString *)thePath
@@ -88,20 +88,21 @@ static NSNumber *IFURLFilePosixPermissions;
     [archiver encodeObject:key];
     [archiver encodeObject:object];
     
-    // FIXME: [kocienda] Radar 2859368 (IFURLFileDatabase must set correct permissions when creating files)
     attributes = [NSDictionary dictionaryWithObjectsAndKeys:
         [NSDate date], @"NSFileModificationDate",
         NSUserName(), @"NSFileOwnerAccountName",
+        IFURLFilePosixPermissions, @"NSFilePosixPermissions",
         NULL
     ];
 
     directoryAttributes = [NSDictionary dictionaryWithObjectsAndKeys:
         [NSDate date], @"NSFileModificationDate",
         NSUserName(), @"NSFileOwnerAccountName",
+        IFURLFileDirectoryPosixPermissions, @"NSFilePosixPermissions",
         NULL
     ];
 
-//        IFURLFilePosixPermissions, @"NSFilePosixPermissions",
+//        
     filePath = [NSString stringWithFormat:@"%@/%@", path, [IFURLFileDatabase uniqueFilePathForKey:key]];
     result = [[NSFileManager defaultManager] createFileAtPathWithIntermediateDirectories:filePath contents:data attributes:attributes directoryAttributes:directoryAttributes];
 
@@ -180,6 +181,7 @@ static NSNumber *IFURLFilePosixPermissions;
             isOpen = [manager createDirectoryAtPathWithIntermediateDirectories:path attributes:[NSDictionary dictionaryWithObjectsAndKeys:
                 [NSDate date], @"NSFileModificationDate",
                 NSUserName(), @"NSFileOwnerAccountName",
+                IFURLFileDirectoryPosixPermissions, @"NSFilePosixPermissions",
                 NULL
             ]];
         }
@@ -187,8 +189,6 @@ static NSNumber *IFURLFilePosixPermissions;
     
     return isOpen;
 }
-//                IFURLFileDirectoryPosixPermissions, @"NSFilePosixPermissions",
-
 
 -(BOOL)close
 {

-- 
WebKit Debian packaging