diff options
| author | jkim <jkim@FreeBSD.org> | 2007-04-10 00:29:52 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2007-04-10 00:29:52 +0800 |
| commit | ea73149bbfacb74dc5876a75ae418c2e90b93d94 (patch) | |
| tree | 21f7d63ea353305832cac7f1cd61ed3cbf92d3a3 | |
| parent | 767765b1bb0954a53ae3938d1a96362f536d6b47 (diff) | |
| download | freebsd-ports-gnome-ea73149bbfacb74dc5876a75ae418c2e90b93d94.tar.gz freebsd-ports-gnome-ea73149bbfacb74dc5876a75ae418c2e90b93d94.tar.zst freebsd-ports-gnome-ea73149bbfacb74dc5876a75ae418c2e90b93d94.zip | |
Re-add OOo issue 64906 workaround for FreeBSD. The root cause of the crash
is i65462 but it was dormant until i65004 was closed.
Approved by: maho
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-i65462 | 24 | ||||
| -rw-r--r-- | editors/openoffice.org-2-devel/files/patch-i65462 | 24 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/files/patch-i65462 | 24 | ||||
| -rw-r--r-- | editors/openoffice.org-vcltesttool/files/patch-i65462 | 24 |
4 files changed, 96 insertions, 0 deletions
diff --git a/editors/openoffice-3-devel/files/patch-i65462 b/editors/openoffice-3-devel/files/patch-i65462 new file mode 100644 index 000000000000..34a8a569562a --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i65462 @@ -0,0 +1,24 @@ +Re-add #i64906# workaround. The root cause of the crash is #i65462#. +Also see #i65004# for more information. + +--- sal/osl/unx/security.c 14 Mar 2007 08:28:11 -0000 1.24 ++++ sal/osl/unx/security.c 6 Apr 2007 05:59:15 -0000 +@@ -76,6 +76,10 @@ + static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); + + static oslSecurityImpl * newSecurityImpl(size_t * bufSize) { ++#if defined (MACOSX) || defined (FREEBSD) ++ /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */ ++ size_t n = 1024; ++#else + long m; + size_t n; + errno = 0; +@@ -95,6 +99,7 @@ + OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX); + n = (size_t) m; + } ++#endif + if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) { + *bufSize = n; + n += offsetof(oslSecurityImpl, m_buffer); diff --git a/editors/openoffice.org-2-devel/files/patch-i65462 b/editors/openoffice.org-2-devel/files/patch-i65462 new file mode 100644 index 000000000000..34a8a569562a --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-i65462 @@ -0,0 +1,24 @@ +Re-add #i64906# workaround. The root cause of the crash is #i65462#. +Also see #i65004# for more information. + +--- sal/osl/unx/security.c 14 Mar 2007 08:28:11 -0000 1.24 ++++ sal/osl/unx/security.c 6 Apr 2007 05:59:15 -0000 +@@ -76,6 +76,10 @@ + static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); + + static oslSecurityImpl * newSecurityImpl(size_t * bufSize) { ++#if defined (MACOSX) || defined (FREEBSD) ++ /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */ ++ size_t n = 1024; ++#else + long m; + size_t n; + errno = 0; +@@ -95,6 +99,7 @@ + OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX); + n = (size_t) m; + } ++#endif + if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) { + *bufSize = n; + n += offsetof(oslSecurityImpl, m_buffer); diff --git a/editors/openoffice.org-3-devel/files/patch-i65462 b/editors/openoffice.org-3-devel/files/patch-i65462 new file mode 100644 index 000000000000..34a8a569562a --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i65462 @@ -0,0 +1,24 @@ +Re-add #i64906# workaround. The root cause of the crash is #i65462#. +Also see #i65004# for more information. + +--- sal/osl/unx/security.c 14 Mar 2007 08:28:11 -0000 1.24 ++++ sal/osl/unx/security.c 6 Apr 2007 05:59:15 -0000 +@@ -76,6 +76,10 @@ + static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); + + static oslSecurityImpl * newSecurityImpl(size_t * bufSize) { ++#if defined (MACOSX) || defined (FREEBSD) ++ /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */ ++ size_t n = 1024; ++#else + long m; + size_t n; + errno = 0; +@@ -95,6 +99,7 @@ + OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX); + n = (size_t) m; + } ++#endif + if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) { + *bufSize = n; + n += offsetof(oslSecurityImpl, m_buffer); diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65462 b/editors/openoffice.org-vcltesttool/files/patch-i65462 new file mode 100644 index 000000000000..34a8a569562a --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-i65462 @@ -0,0 +1,24 @@ +Re-add #i64906# workaround. The root cause of the crash is #i65462#. +Also see #i65004# for more information. + +--- sal/osl/unx/security.c 14 Mar 2007 08:28:11 -0000 1.24 ++++ sal/osl/unx/security.c 6 Apr 2007 05:59:15 -0000 +@@ -76,6 +76,10 @@ + static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax); + + static oslSecurityImpl * newSecurityImpl(size_t * bufSize) { ++#if defined (MACOSX) || defined (FREEBSD) ++ /* #i64906#: sysconf(_SC_GETPW_R_SIZE_MAX) returns -1 on Mac OS X and FreeBSD */ ++ size_t n = 1024; ++#else + long m; + size_t n; + errno = 0; +@@ -95,6 +99,7 @@ + OSL_ASSERT(m >= 0 && (unsigned long) m < SIZE_MAX); + n = (size_t) m; + } ++#endif + if (n <= SIZE_MAX - offsetof(oslSecurityImpl, m_buffer)) { + *bufSize = n; + n += offsetof(oslSecurityImpl, m_buffer); |