[Libreoffice-commits] .: patches/dev300

[Michael Meeks]

 patches/dev300/apply                            |    3 ---
 patches/dev300/desktop-safer-user-dir-perm.diff |   23 -----------------------
 2 files changed, 26 deletions(-)

New commits:
commit 16e6586ad32c0a3c56df3139bab1dd2e473ecb74
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Dec 14 10:48:29 2010 +0000

    flatten into master

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 8378f2e..a1d4b59 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -315,9 +315,6 @@ helpcontent2-auxiliary-cfg.diff, pmladek
 # .. and add eu
 helpcontent2-auxiliary-eu.diff, i#108534
 
-# more secure permissions for the user directory by default
-desktop-safer-user-dir-perm.diff, i#62858, pmladek
-
 # Added support for "application/octet-stream" mime type in package manager
 desktop-application-octet-stream-mime-type.diff, i#73301, flr
 
diff --git a/patches/dev300/desktop-safer-user-dir-perm.diff b/patches/dev300/desktop-safer-user-dir-perm.diff
deleted file mode 100644
index 53877f2..0000000
--- a/patches/dev300/desktop-safer-user-dir-perm.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- desktop/source/app/userinstall.cxx |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git desktop/source/app/userinstall.cxx desktop/source/app/userinstall.cxx
-index f72d138..d2ac260 100644
---- desktop/source/app/userinstall.cxx
-+++ desktop/source/app/userinstall.cxx
-@@ -246,6 +246,11 @@ namespace desktop {
-         FileBase::RC rc = Directory::createPath(aUserPath);
-         if ((rc != FileBase::E_None) && (rc != FileBase::E_EXIST)) return UserInstall::E_Creation;
- 
-+#ifdef UNIX
-+    // set safer permissions for the user directory by default
-+    File::setAttributes(aUserPath, Attribute_OwnWrite| Attribute_OwnRead| Attribute_OwnExe);
-+#endif
-+
-             // copy data from shared data directory of base installation
-         for (sal_Int32 i=0; pszSrcList[i]!=NULL && pszDstList[i]!=NULL; i++)
-         {
--- 
-1.7.0.1
-