rpms/openoffice.org/FC-3 1sax+source+expatwrap+xml2utf.cxx.diff, NONE, 1.1 openoffice.org.spec, 1.65, 1.66 redhat-fixes.patch, 1.36, 1.37
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jun 30 07:17:20 UTC 2006
Author: caolanm
Update of /cvs/dist/rpms/openoffice.org/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv30247
Modified Files:
openoffice.org.spec redhat-fixes.patch
Added Files:
1sax+source+expatwrap+xml2utf.cxx.diff
Log Message:
backport 1.1.5 extra bit
1sax+source+expatwrap+xml2utf.cxx.diff:
xml2utf.cxx | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
--- NEW FILE 1sax+source+expatwrap+xml2utf.cxx.diff ---
Index: source/expatwrap/xml2utf.cxx
===================================================================
RCS file: /cvs/xml/sax/source/expatwrap/xml2utf.cxx,v
retrieving revision 1.5
retrieving revision 1.5.16.1
diff -u -r1.5 -r1.5.16.1
--- sax.orig/source/expatwrap/xml2utf.cxx 28 Apr 2003 15:21:30 -0000 1.5
+++ sax/source/expatwrap/xml2utf.cxx 10 Jun 2005 13:34:42 -0000 1.5.16.1
@@ -194,7 +194,7 @@
}
else
{
- int nStop = str.indexOf( "\"" , nStart +1);
+ nStop = str.indexOf( "\"" , nStart +1);
}
if( nStart >= 0 && nStop >= 0 && nStart+1 < nStop )
@@ -257,7 +257,7 @@
sal_Bool XMLFile2UTFConverter::scanForEncoding( Sequence< sal_Int8 > &seq )
{
- const sal_Int8 *pSource = seq.getConstArray();
+ const sal_uInt8 *pSource = reinterpret_cast<const sal_uInt8*>( seq.getConstArray() );
sal_Bool bReturn = sal_True;
if( seq.getLength() < 4 ) {
@@ -290,7 +290,7 @@
}
else
{
- int nStop = str.indexOf( "\"" , nStart +1);
+ nStop = str.indexOf( "\"" , nStart +1);
}
if( nStart >= 0 && nStop >= 0 && nStart+1 < nStop )
{
@@ -299,14 +299,14 @@
}
}
}
- else if( 0xFE == static_cast<unsigned char> (pSource[0]) &&
- 0xFF == static_cast<unsigned char> (pSource[1]) ) {
+ else if( 0xFE == pSource[0] &&
+ 0xFF == pSource[1] ) {
// UTF-16 big endian
// conversion is done so that encoding information can be easily extracted
m_sEncoding = "utf-16";
}
- else if( 0xFF == static_cast<unsigned char> (pSource[0]) &&
- 0xFE == static_cast<unsigned char> (pSource[1]) ) {
+ else if( 0xFF == pSource[0] &&
+ 0xFE == pSource[1] ) {
// UTF-16 little endian
// conversion is done so that encoding information can be easily extracted
m_sEncoding = "utf-16";
@@ -334,6 +334,16 @@
m_sEncoding = "utf-16";
}
+ else if( 0xEF == pSource[0] &&
+ 0xBB == pSource[1] &&
+ 0xBF == pSource[2] )
+ {
+ // UTF-8 BOM (byte order mark); signifies utf-8, and not byte order
+ // The BOM is removed.
+ memmove( seq.getArray(), &( seq.getArray()[3] ), seq.getLength()-3 );
+ seq.realloc( seq.getLength() - 3 );
+ m_sEncoding = "utf-8";
+ }
else if( 0x00 == pSource[0] && 0x00 == pSource[1] && 0x00 == pSource[2] && 0x3c == pSource[3] ) {
// UCS-4 big endian
m_sEncoding = "ucs-4";
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/openoffice.org.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- openoffice.org.spec 26 Jun 2006 14:24:17 -0000 1.65
+++ openoffice.org.spec 30 Jun 2006 07:17:16 -0000 1.66
@@ -112,7 +112,7 @@
Version: 1.1.3
# SET RPM RELEASE # HERE!!!
-%define ooo_rpm_release 12
+%define ooo_rpm_release 13
Release: %{ooo_rpm_release}%{release_extension}%{java_release_tag}
URL: http://www.openoffice.org/
@@ -222,6 +222,7 @@
Patch26: 6438334-macros-so7-sfx2.diff
Patch27: disable-java-applets.diff
Patch28: sax+source+expatwrap+xml2utf.cxx.diff
+Patch29: 1sax+source+expatwrap+xml2utf.cxx.diff
##################################
# Description
##################################
@@ -312,6 +313,7 @@
ln -s %{PATCH26} patches/OOO_1_1/
ln -s %{PATCH27} patches/OOO_1_1/
ln -s %{PATCH28} patches/OOO_1_1/
+ln -s %{PATCH29} patches/OOO_1_1/
# autogen here only needed when sources come from intermediate CVS releases,
# not release from ooo.ximian.com
@@ -578,7 +580,7 @@
# Changelog
##################################
%changelog
-* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1.1.3-12
+* Mon Jun 26 2006 Caolan McNamara <caolanm at redhat.com> - 1.1.3-13
- add a fix for rh#147395#/ooo#52023# (caolanm)
- CVE-2006-2198 macro security
- CVE-2006-2199 java applets
redhat-fixes.patch:
bin/build-ooo | 30 ++++++++++++
bin/install-dictionaries | 44 +-----------------
bin/ooo-wrapper.in | 40 ----------------
configure.in | 4 -
patches/OOO_1_1/gui-menu-new-wizard-translations.diff | 39 ---------------
patches/OOO_1_1/sc-filter-hide-filteredrows.diff | 1
patches/OOO_1_1_3/apply | 22 +++++++--
7 files changed, 56 insertions(+), 124 deletions(-)
Index: redhat-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-3/redhat-fixes.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- redhat-fixes.patch 26 Jun 2006 14:24:17 -0000 1.36
+++ redhat-fixes.patch 30 Jun 2006 07:17:16 -0000 1.37
@@ -289,7 +289,7 @@
+6438334-macros-so7-sfx2.diff
+disable-java-applets.diff
+sax+source+expatwrap+xml2utf.cxx.diff
-+
++1sax+source+expatwrap+xml2utf.cxx.diff
[ GnomeVFS ]
# New VFS provider stuff ..
More information about the fedora-cvs-commits
mailing list