Remove unused patch

(cherry picked from commit e288e1255ead18ac4791577314bdb194e6de74ce)

Update to expat-2.5.0 (#169)

Update to expat-2.5.0

Patched into version 2.5.0-aoo.
(cherry picked from commit b6c96fbc33bcb02cbd67f2d110ed776004ec6a4c)

Align to expat-2.2.13

Patch by Carl Marcum.

(cherry picked from commit 4ad3f9e955ba9bfdf2c6f709f60fdfc6f095c25a)

Produce expat-2.2.13, derived from 2.4.7

(cherry picked from commit 6027210f9c9f69912774bd8cb8d0c1709c8a875e)

Upgrade expat-2.2.10 into 2.2.12

Also use only one patch file named after the base version

(cherry picked from commit b3c6ca9c0c6d662a6b677cbe0eb72ccd48e78f85)

Backport changes from libexpat 2.4.0 into ours

Backport by Carl Marcum

(cherry picked from commit e5a05897583ca40ab4ebf72fff86d6d81f34eef8)

Uprade bundled expat to version 2.2.10

This is a bug fix release.

Remove loadlibrary.obj build from 64-bit Windows build as well.
This will fix the Windows 32-bit build of expat on 64-bit Windows
when the --enable-win-x64-shellext configure option is specified.

Cl

Remove loadlibrary.obj build from 64-bit Windows build as well.
This will fix the Windows 32-bit build of expat on 64-bit Windows
when the --enable-win-x64-shellext configure option is specified.

Clean up loadlibrary.obj leftovers.

(cherry picked from commit 883a5120b3cdc2b17b07fe726623b93bc7a70551)

show more ...

Upgrade bundled expat to 2.2.9.

Delete expat-winapi.patch which was needed to get linkage on Windows
to work with the expat static libraries. Instead add -DXML_STATIC
to the compiler flags when bui

Upgrade bundled expat to 2.2.9.

Delete expat-winapi.patch which was needed to get linkage on Windows
to work with the expat static libraries. Instead add -DXML_STATIC
to the compiler flags when building the modules that link to the
expat static libraries to accomplish the same thing, but in a
supported way.

Don't build the expat man pages since we don't have the necessary
build dependencies and we don't need them anyway.

(cherry picked from commit 190cb14849237ec7207449ab78b1e9f4cddb3d32)

show more ...

Correct backport of expat fix


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1809226 13f79535-47bb-0310-9956-ffa450edef68

Merge r1805208 from trunk:

Fix the Windows 64bit shell extension build breakage caused by expat-2.2.3.
The 64 bit expat libraries also need to include loadlibrary.obj.

Submitted by: truckman
Review

Merge r1805208 from trunk:

Fix the Windows 64bit shell extension build breakage caused by expat-2.2.3.
The 64 bit expat libraries also need to include loadlibrary.obj.

Submitted by: truckman
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1809224 13f79535-47bb-0310-9956-ffa450edef68

show more ...

revert 1804232 for 4.1.4... still no work. Use ugly but working patch from RC1


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1804389 13f79535-47bb-0310-9956-ffa450edef68

Close BZ127484 with the trunk fix for Windows builds and expat 2.2.3


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1804232 13f79535-47bb-0310-9956-ffa450edef68

OK... With the loadlibrary.c code in xmlparse.c, Windows complains:
xmlparse.c(459) : error C2371: 'ELEMENT_TYPE' : redefinition; different basic types
E:/Microsoft_SDKs/Windows/v7.0/include\

OK... With the loadlibrary.c code in xmlparse.c, Windows complains:
xmlparse.c(459) : error C2371: 'ELEMENT_TYPE' : redefinition; different basic types
E:/Microsoft_SDKs/Windows/v7.0/include\winioctl.h(2774) : see declaration of 'ELEMENT_TYPE'
xmlparse.c(1095) : warning C4310: cast truncates constant value
xmlparse.c(3350) : error C2223: left of '->nDefaultAtts' must point to struct/union
xmlparse.c(3418) : error C2223: left of '->defaultAtts' must point to struct/union
xmlparse.c(3419) : error C2223: left of '->defaultAtts' must point to struct/union
xmlparse.c(3465) : error C2223: left of '->idAtt' must point to struct/union
xmlparse.c(3465) : error C2223: left of '->idAtt' must point to struct/union
xmlparse.c(3467) : error C2223: left of '->idAtt' must point to struct/union
xmlparse.c(3477) : error C2223: left of '->defaultAtts' must point to struct/union
xmlparse.c(3651) : error C2223: left of '->prefix' must point to struct/union
xmlparse.c(3652) : error C2223: left of '->prefix' must point to struct/union
xmlparse.c(4804) : error C2223: left of '->name' must point to struct/union

Sooooo use a different name for the typedef. This is an ugly, ugly patch. Someone
fixing the build/makefile for Windows would be mucho preferred. I'm sure there's
stuff in our makefile.mk or that needs fixing.



git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1804159 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Temp hack for Windows build failure in 4.1.4 w/ expat 2.2.3: We are not
building/linking in the loadlibrary.obj files as we should for Windows, which
is killing the apr and sax builds. Force this fun

Temp hack for Windows build failure in 4.1.4 w/ expat 2.2.3: We are not
building/linking in the loadlibrary.obj files as we should for Windows, which
is killing the apr and sax builds. Force this function into the xmlparse.c
file for the time being.


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1804151 13f79535-47bb-0310-9956-ffa450edef68

show more ...

Merge r1803939 from trunk:

Expat is now at v 2.2.3
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1803940 13f79535-47bb-0310-9956-ffa450edef68

backport r1803709 for https://github.com/libexpat/libexpat/issues/52


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1803710 13f79535-47bb-0310-9956-ffa450edef68

Merge r1755873, r1800568 from trunk:

#i127069#: bundled expat version 2.1.0 has two vulnerabilities

Upgrade bundled expat to version 2.2.0, which fixes:
CVE-2016-5300
CVE-2012-6702

It is not k

Merge r1755873, r1800568 from trunk:

#i127069#: bundled expat version 2.1.0 has two vulnerabilities

Upgrade bundled expat to version 2.2.0, which fixes:
CVE-2016-5300
CVE-2012-6702

It is not known whether these can be exploited when expat is used
as part of OpenOffice. All of input files to expat seem to come
from the OpenOffice source.

One patch is needed to the expat source, without which saxparser
crashes during the build. It has been submitted upstream, see
<https://sourceforge.net/p/expat/bugs/539/>. It is only triggered
when building expat with -DXML_UNICODE which is not the default,
but this flag is used when building the bundled expat.



#i127461#: Update bundled expat to version 2.2.1

Version 2.2.0 that is bundled in trunk has vulnerabilities CVE-2017-9233
and CVE-2016-9063 and other potential problems. It is not known whether
these impact OpenOffice.

The patch for <https://sourceforge.net/p/expat/bugs/539/> is included so
we no longer need a local patch for that. We do need a new patch to
work around the lack of <stdint.h> in MS Visual Studio 9.0.


Submitted by: truckman
Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/openoffice/branches/AOO414@1800869 13f79535-47bb-0310-9956-ffa450edef68

show more ...