[ooo-build-commit] Branch 'ooo/OOO310' - 2 commits - setup_native/scripts setup_native/source

[Jan Holesovsky]

 setup_native/scripts/source/getuid.c      |   27 +++++++++++++++++++++------
 setup_native/source/java/javaversion2.dat |   26 +++++++++++++-------------
 2 files changed, 34 insertions(+), 19 deletions(-)

New commits:
commit 6c31c46c5602a344a083decfcec59b909726cba2
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Aug 13 15:36:44 2009 +0000

    CWS-TOOLING: integrate CWS native264
    2009-08-13 11:58:58 +0200 is  r274928 : #i104200# update to jre6u16

diff --git a/setup_native/source/java/javaversion2.dat b/setup_native/source/java/javaversion2.dat
index e997838..87172c3 100644
--- a/setup_native/source/java/javaversion2.dat
+++ b/setup_native/source/java/javaversion2.dat
@@ -30,30 +30,30 @@
 #*************************************************************************
 
 # GUI String in the installer ("Java Runtime Environment (${JAVAVERSION})")
-JAVAVERSION=Java 6 Update 15
-WINDOWSJAVAVERSION=Java 6 Update 15
+JAVAVERSION=Java 6 Update 16
+WINDOWSJAVAVERSION=Java 6 Update 16
 
 # Windows (scp2 and downloadtemplate.nsi)
-WINDOWSJAVAFILENAME=jre-6u15-windows-i586.exe
-WINDOWSJAVAREGISTRYENTRY=1.6.0_15
+WINDOWSJAVAFILENAME=jre-6u16-windows-i586.exe
+WINDOWSJAVAREGISTRYENTRY=1.6.0_16
 
 # Linux (scp2)
-LINUXJAVAFILENAME=jre-6u15-linux-i586.rpm
+LINUXJAVAFILENAME=jre-6u16-linux-i586.rpm
 # Linux (rpmUnit.xml, rpm -qp <filename> )
-LINUXJAVANAME=jre-1.6.0_15-fcs
+LINUXJAVANAME=jre-1.6.0_16-fcs
 
 # Linux-x64 (scp2)
-LINUXX64JAVAFILENAME=jre-6u15-linux-amd64.rpm
+LINUXX64JAVAFILENAME=jre-6u16-linux-amd64.rpm
 
 # Solaris Sparc (scp2)
-SOLSJAVARTPACKED=SUNWj6rt_1_6_0_15_sparc.tar.gz
-SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_15_sparc.tar.gz
-SOLSJAVAMANPACKED=SUNWj6man_1_6_0_15_sparc.tar.gz
+SOLSJAVARTPACKED=SUNWj6rt_1_6_0_16_sparc.tar.gz
+SOLSJAVACFGPACKED=SUNWj6cfg_1_6_0_16_sparc.tar.gz
+SOLSJAVAMANPACKED=SUNWj6man_1_6_0_16_sparc.tar.gz
 
 # Solaris x86 (scp2)
-SOLIJAVARTPACKED=SUNWj6rt_1_6_0_15_x86.tar.gz
-SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_15_x86.tar.gz
-SOLIJAVAMANPACKED=SUNWj6man_1_6_0_15_x86.tar.gz
+SOLIJAVARTPACKED=SUNWj6rt_1_6_0_16_x86.tar.gz
+SOLIJAVACFGPACKED=SUNWj6cfg_1_6_0_16_x86.tar.gz
+SOLIJAVAMANPACKED=SUNWj6man_1_6_0_16_x86.tar.gz
 
 # Solaris (pkgUnit.xml, needs only to be changed in major changes)
 SOLARISJAVART=SUNWj6rt
commit 701285e073629654cd529f87b6cf86d15900590d
Author: Kurt Zenker <kz at openoffice.org>
Date:   Thu Aug 13 15:16:19 2009 +0000

    CWS-TOOLING: integrate CWS sysui311
    2009-08-11 18:30:31 +0200 ihi  r274874 : #104116# use __lxstat wrapper for X86_64 Linux

diff --git a/setup_native/scripts/source/getuid.c b/setup_native/scripts/source/getuid.c
index 5893116..101b46e 100644
--- a/setup_native/scripts/source/getuid.c
+++ b/setup_native/scripts/source/getuid.c
@@ -88,13 +88,29 @@ int fstatat64(int fildes, const char *path, struct stat64  *buf, int flag)
 
     return ret;
 }
-
-#elif defined LINUX
+#elif  defined LINUX
 
 uid_t getuid  (void) {return 0;}
 uid_t geteuid (void) {return 0;}
 
 /* This is to fool tar */
+#ifdef X86_64
+int __lxstat(int n, const char *path, struct stat *buf)
+{
+    int ret = 0;
+    static int (*p_lstat) (int n, const char *path, struct stat *buf) = NULL;
+    if (p_lstat == NULL)
+        p_lstat = (int (*)(int n, const char *path, struct stat *buf))
+            dlsym (RTLD_NEXT, "__lxstat");
+    ret = (*p_lstat)(n, path, buf);
+    if (buf != NULL)
+    {
+        buf->st_uid = 0; /* root */
+        buf->st_gid = 0; /* root */
+    }
+    return ret;
+}
+#else
 int __lxstat64(int n, const char *path, struct stat64 *buf)
 {
     int ret = 0;
@@ -105,13 +121,12 @@ int __lxstat64(int n, const char *path, struct stat64 *buf)
     ret = (*p_lstat)(n, path, buf);
     if (buf != NULL)
     {
-        buf->st_uid = 0; /* root */
-        buf->st_gid = 0; /* root */
+        buf->st_uid = 0;
+        buf->st_gid = 0; 
     }
-
     return ret;
 }
-
+#endif
 #endif
 
 #ifdef _cplusplus