rpms/openoffice.org/devel openoffice.org-1.9.125.ooo54586.nfslock.sal.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18716

Modified Files:
	openoffice.org-1.9.125.ooo54586.nfslock.sal.patch 
Log Message:
rh#171949# try an alternative nfs workaround

openoffice.org-1.9.125.ooo54586.nfslock.sal.patch:
 soffice.sh |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Index: openoffice.org-1.9.125.ooo54586.nfslock.sal.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.125.ooo54586.nfslock.sal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.125.ooo54586.nfslock.sal.patch	14 Sep 2005 12:13:52 -0000	1.1
+++ openoffice.org-1.9.125.ooo54586.nfslock.sal.patch	4 Nov 2005 11:05:39 -0000	1.2
@@ -1,39 +1,15 @@
-Index: sal/osl/unx/file.cxx
-===================================================================
-RCS file: /cvs/porting/sal/osl/unx/file.cxx,v
-retrieving revision 1.8
-diff -u -p -u -r1.8 file.cxx
---- openoffice.org.orig/sal/osl/unx/file.cxx	31 May 2005 17:07:41 -0000	1.8
-+++ openoffice.org/sal/osl/unx/file.cxx	23 Aug 2005 16:42:43 -0000
-@@ -650,6 +652,8 @@ oslFileError osl_openFile( rtl_uString* 
-             fd = open( buffer, flags, mode );
-             if ( fd >= 0 )
-             {
-+				sal_Bool got_flock;
-+
-                 /* check if file lock is enabled and clear l_type member of flock otherwise */
-                 if( (char *) -1 == pFileLockEnvVar )
-                 {
-@@ -663,8 +667,21 @@ oslFileError osl_openFile( rtl_uString* 
-                 if( NULL == pFileLockEnvVar )
-                     aflock.l_type = 0;
+--- OOO680_m3/desktop/scripts/soffice.sh.orig	2005-11-04 11:02:47.000000000 +0000
++++ OOO680_m3/desktop/scripts/soffice.sh	2005-11-04 11:03:13.000000000 +0000
+@@ -44,9 +44,10 @@
+ # export STAR_PROFILE_LOCKING_DISABLED
+ #
  
-+				got_flock = sal_False;
-                 /* lock the file if flock.l_type is set */
--                if( F_WRLCK != aflock.l_type || -1 != fcntl( fd, F_SETLK, &aflock ) )
-+                if( F_WRLCK != aflock.l_type)
-+					got_flock = sal_True;
-+				if( -1 != fcntl( fd, F_SETLK, &aflock ) )
-+					got_flock = sal_True;
-+				else if( errno == EAGAIN )
-+					errno = EACCES; /* misleading synonym */
-+				else if( errno == ENOLCK )
-+				{ /* locking not supported */
-+					errno = 0;
-+					got_flock = sal_True;
-+				}
-+
-+				if (got_flock)
-                 {
-                     /* allocate memory for impl structure */
-                     pHandleImpl = (oslFileHandleImpl*) rtl_allocateMemory( sizeof(oslFileHandleImpl) );
++#http://www.openoffice.org/issues/show_bug.cgi?id=54586
+ # file locking now enabled by default
+-SAL_ENABLE_FILE_LOCKING=1
+-export SAL_ENABLE_FILE_LOCKING
++#SAL_ENABLE_FILE_LOCKING=1
++#export SAL_ENABLE_FILE_LOCKING
+ 
+ # the following test is needed on Linux PPC with IBM j2sdk142
+ if [ `uname -s` = "Linux" -a  "`uname -m`" = "ppc" ] ; then