CVS commit: src/external/mit/expat/dist

2017-06-17 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Sat Jun 17 22:05:21 UTC 2017

Modified Files:
src/external/mit/expat/dist/lib: xmlparse.c xmltok.c
src/external/mit/expat/dist/tests: xmltest.sh
Removed Files:
src/external/mit/expat/dist: configure.in expat.dsw
src/external/mit/expat/dist/amiga: Makefile README.txt expat.xml
expat_68k.c expat_68k.h expat_68k_handler_stubs.c expat_base.h
expat_lib.c expat_vectors.c launch.c
src/external/mit/expat/dist/amiga/include/inline4: expat.h
src/external/mit/expat/dist/amiga/include/interfaces: expat.h
src/external/mit/expat/dist/amiga/include/libraries: expat.h
src/external/mit/expat/dist/amiga/include/proto: expat.h
src/external/mit/expat/dist/bcb5: README.txt all_projects.bpg
elements.bpf elements.bpr elements.mak expat.bpf expat.bpr
expat.mak expat_static.bpf expat_static.bpr expat_static.mak
expatw.bpf expatw.bpr expatw.mak expatw_static.bpf
expatw_static.bpr expatw_static.mak libexpat_mtd.def
libexpatw_mtd.def makefile.mak outline.bpf outline.bpr outline.mak
setup.bat xmlwf.bpf xmlwf.bpr xmlwf.mak
src/external/mit/expat/dist/examples: elements.dsp outline.dsp
src/external/mit/expat/dist/lib: Makefile.MPW amigaconfig.h expat.dsp
expat_static.dsp expatw.dsp expatw_static.dsp macconfig.h
src/external/mit/expat/dist/tests/benchmark: benchmark.dsp
benchmark.dsw
src/external/mit/expat/dist/vms: README.vms descrip.mms expat_config.h
src/external/mit/expat/dist/xmlwf: xmlwf.dsp

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/configure.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/expat.dsw
cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/amiga/Makefile \
src/external/mit/expat/dist/amiga/README.txt \
src/external/mit/expat/dist/amiga/expat_lib.c \
src/external/mit/expat/dist/amiga/expat_vectors.c \
src/external/mit/expat/dist/amiga/launch.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/amiga/expat.xml \
src/external/mit/expat/dist/amiga/expat_68k.c \
src/external/mit/expat/dist/amiga/expat_68k.h \
src/external/mit/expat/dist/amiga/expat_68k_handler_stubs.c \
src/external/mit/expat/dist/amiga/expat_base.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/expat/dist/amiga/include/inline4/expat.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/expat/dist/amiga/include/interfaces/expat.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/expat/dist/amiga/include/libraries/expat.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/mit/expat/dist/amiga/include/proto/expat.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/bcb5/README.txt \
src/external/mit/expat/dist/bcb5/all_projects.bpg \
src/external/mit/expat/dist/bcb5/elements.bpf \
src/external/mit/expat/dist/bcb5/elements.mak \
src/external/mit/expat/dist/bcb5/expat.bpf \
src/external/mit/expat/dist/bcb5/expat_static.bpf \
src/external/mit/expat/dist/bcb5/expatw.bpf \
src/external/mit/expat/dist/bcb5/expatw_static.bpf \
src/external/mit/expat/dist/bcb5/libexpat_mtd.def \
src/external/mit/expat/dist/bcb5/libexpatw_mtd.def \
src/external/mit/expat/dist/bcb5/makefile.mak \
src/external/mit/expat/dist/bcb5/outline.bpf \
src/external/mit/expat/dist/bcb5/outline.mak \
src/external/mit/expat/dist/bcb5/setup.bat \
src/external/mit/expat/dist/bcb5/xmlwf.bpf
cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/bcb5/elements.bpr \
src/external/mit/expat/dist/bcb5/expat.mak \
src/external/mit/expat/dist/bcb5/expat_static.mak \
src/external/mit/expat/dist/bcb5/expatw.mak \
src/external/mit/expat/dist/bcb5/expatw_static.mak \
src/external/mit/expat/dist/bcb5/outline.bpr \
src/external/mit/expat/dist/bcb5/xmlwf.mak
cvs rdiff -u -r1.1.1.3 -r0 src/external/mit/expat/dist/bcb5/expat.bpr \
src/external/mit/expat/dist/bcb5/expat_static.bpr \
src/external/mit/expat/dist/bcb5/expatw.bpr \
src/external/mit/expat/dist/bcb5/expatw_static.bpr \
src/external/mit/expat/dist/bcb5/xmlwf.bpr
cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/examples/elements.dsp \
src/external/mit/expat/dist/examples/outline.dsp
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/lib/Makefile.MPW \
src/external/mit/expat/dist/lib/macconfig.h
cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/lib/amigaconfig.h \
src/external/mit/expat/dist/lib/expatw_static.dsp
cvs rdiff -u -r1.1.1.3 -r0 src/external/mit/expat/dist/lib/expat.dsp \
src/external/mit/expat/dist/lib/expat_static.dsp \
src/external/mit/expat/dist/lib/expatw.dsp
cvs rdiff -u -r1.6 -r1.7 src/external/mit/expat/dist/lib/xmlparse.c
cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/dist/lib/xmltok.c
cvs rdiff -u 

CVS commit: src/external/mit/expat/dist

2012-04-06 Thread S.P.Zeidler
Module Name:src
Committed By:   spz
Date:   Fri Apr  6 10:23:44 UTC 2012

Update of /cvsroot/src/external/mit/expat/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv16154

Log Message:
import of expat 2.1.0
Fixes CVE-2012-1147, CVE-2012-1148 and CVE-2012-0876 (other security
issues have been previously fixed in our tree)

relevant Changes:
Release 2.1.0 Sat March 24 2012
- Bug Fixes:
  #1742315: Harmful XML_ParserCreateNS suggestion.
  #2895533: CVE-2012-1147 - Resource leak in readfilemap.c.
  #1785430: Expat build fails on linux-amd64 with gcc version=4.1 -O3.
  #1983953, 2517952, 2517962, 2649838: 
Build modifications using autoreconf instead of buildconf.sh.
  #2815947, #2884086: OBJEXT and EXEEXT support while building.
  #1990430: CVE-2009-3720 - Parser crash with special UTF-8 sequences.
  #2517938: xmlwf should return non-zero exit status if not well-formed.
  #2517946: Wrong statement about XMLDecl in xmlwf.1 and xmlwf.sgml.
  #2855609: Dangling positionPtr after error.
  #2894085: CVE-2009-3560 - Buffer over-read and crash in big2_toUtf8().
  #2958794: CVE-2012-1148 - Memory leak in poolGrow.
  #2990652: CMake support.
  #3010819: UNEXPECTED_STATE with a trailing % in entity value.
  #3206497: Unitialized memory returned from XML_Parse.
  #3287849: make check fails on mingw-w64.
  #3496608: CVE-2012-0876 - Hash DOS attack.
- Patches:
  #1749198: pkg-config support.
  #3010222: Fix for bug #3010819.
  #3312568: CMake support.
  #3446384: Report byte offsets for attr names and values.
- New Features / API changes:
  Added new API member XML_SetHashSalt() that allows setting an intial
value (salt) for hash calculations. This is part of the fix for
bug #3496608 to randomize hash parameters.
  When compiled with XML_ATTR_INFO defined, adds new API member
XML_GetAttributeInfo() that allows retrieving the byte
offsets for attribute names and values (patch #3446384).
  Added CMake build system.
See bug #2990652 and patch #3312568.
  Added run-benchmark target to Makefile.in - relies on testdata module
present in the same relative location as in the repository.


Status:

Vendor Tag: expat
Release Tags:   expat-2-1-0

N src/external/mit/expat/dist/CMakeLists.txt
U src/external/mit/expat/dist/COPYING
U src/external/mit/expat/dist/expat.dsw
U src/external/mit/expat/dist/README
U src/external/mit/expat/dist/Changes
N src/external/mit/expat/dist/ConfigureChecks.cmake
U src/external/mit/expat/dist/configure
N src/external/mit/expat/dist/expat.pc.in
N src/external/mit/expat/dist/expat_config.h.cmake
N src/external/mit/expat/dist/CMake.README
U src/external/mit/expat/dist/MANIFEST
U src/external/mit/expat/dist/expat_config.h.in
U src/external/mit/expat/dist/Makefile.in
U src/external/mit/expat/dist/configure.in
N src/external/mit/expat/dist/aclocal.m4
C src/external/mit/expat/dist/conftools/mkinstalldirs
U src/external/mit/expat/dist/conftools/PrintPath
U src/external/mit/expat/dist/conftools/config.sub
U src/external/mit/expat/dist/conftools/expat.m4
U src/external/mit/expat/dist/conftools/get-version.sh
U src/external/mit/expat/dist/conftools/install-sh
U src/external/mit/expat/dist/conftools/ltmain.sh
U src/external/mit/expat/dist/conftools/config.guess
C src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4
U src/external/mit/expat/dist/examples/outline.c
U src/external/mit/expat/dist/examples/elements.c
U src/external/mit/expat/dist/examples/elements.dsp
U src/external/mit/expat/dist/examples/outline.dsp
U src/external/mit/expat/dist/bcb5/libexpatw_mtd.def
U src/external/mit/expat/dist/bcb5/expat_static.mak
U src/external/mit/expat/dist/bcb5/outline.mak
U src/external/mit/expat/dist/bcb5/xmlwf.bpf
U src/external/mit/expat/dist/bcb5/all_projects.bpg
U src/external/mit/expat/dist/bcb5/expatw.mak
U src/external/mit/expat/dist/bcb5/expat.mak
U src/external/mit/expat/dist/bcb5/xmlwf.bpr
U src/external/mit/expat/dist/bcb5/expat_static.bpf
U src/external/mit/expat/dist/bcb5/expatw.bpf
U src/external/mit/expat/dist/bcb5/makefile.mak
U src/external/mit/expat/dist/bcb5/outline.bpr
U src/external/mit/expat/dist/bcb5/expatw.bpr
U src/external/mit/expat/dist/bcb5/expat.bpf
U src/external/mit/expat/dist/bcb5/setup.bat
U src/external/mit/expat/dist/bcb5/outline.bpf
U src/external/mit/expat/dist/bcb5/elements.bpr
U src/external/mit/expat/dist/bcb5/elements.mak
U src/external/mit/expat/dist/bcb5/elements.bpf
U src/external/mit/expat/dist/bcb5/README.txt
U src/external/mit/expat/dist/bcb5/expatw_static.mak
U src/external/mit/expat/dist/bcb5/expatw_static.bpf
U src/external/mit/expat/dist/bcb5/libexpat_mtd.def
U src/external/mit/expat/dist/bcb5/expat_static.bpr
U 

CVS commit: src/external/mit/expat/dist

2012-04-06 Thread S.P.Zeidler
Module Name:src
Committed By:   spz
Date:   Fri Apr  6 10:46:13 UTC 2012

Modified Files:
src/external/mit/expat/dist/conftools: ac_c_bigendian_cross.m4
mkinstalldirs
src/external/mit/expat/dist/lib: xmlparse.c xmltok_impl.c
Removed Files:
src/external/mit/expat/dist/amiga: stdlib.c
src/external/mit/expat/dist/conftools: libtool.m4

Log Message:
merge expat-2.1.0


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/amiga/stdlib.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 \
src/external/mit/expat/dist/conftools/mkinstalldirs
cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/conftools/libtool.m4
cvs rdiff -u -r1.2 -r1.3 src/external/mit/expat/dist/lib/xmlparse.c \
src/external/mit/expat/dist/lib/xmltok_impl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4
diff -u src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.2 src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.3
--- src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.2	Sat Feb 11 18:22:58 2012
+++ src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4	Fri Apr  6 10:46:13 2012
@@ -7,7 +7,7 @@ dnl The implementation will create a bin
 dnl the binary it will be grep'ed for some symbols that will look
 dnl different for different endianess of the binary.
 dnl
-dnl @version $Id: ac_c_bigendian_cross.m4,v 1.2 2012/02/11 18:22:58 tron Exp $
+dnl @version Id: ac_c_bigendian_cross.m4,v 1.2 2001/10/01 20:03:13 fdrake Exp 
 dnl @author Guido Draheim gui...@gmx.de
 dnl
 AC_DEFUN([AC_C_BIGENDIAN_CROSS],
Index: src/external/mit/expat/dist/conftools/mkinstalldirs
diff -u src/external/mit/expat/dist/conftools/mkinstalldirs:1.2 src/external/mit/expat/dist/conftools/mkinstalldirs:1.3
--- src/external/mit/expat/dist/conftools/mkinstalldirs:1.2	Sat Feb 11 18:22:58 2012
+++ src/external/mit/expat/dist/conftools/mkinstalldirs	Fri Apr  6 10:46:13 2012
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.2 2012/02/11 18:22:58 tron Exp $
+# Id: mkinstalldirs,v 1.1 2000/09/18 16:26:21 coopercc Exp 
 
 errstatus=0
 

Index: src/external/mit/expat/dist/lib/xmlparse.c
diff -u src/external/mit/expat/dist/lib/xmlparse.c:1.2 src/external/mit/expat/dist/lib/xmlparse.c:1.3
--- src/external/mit/expat/dist/lib/xmlparse.c:1.2	Sat Feb 11 18:22:58 2012
+++ src/external/mit/expat/dist/lib/xmlparse.c	Fri Apr  6 10:46:13 2012
@@ -5,6 +5,8 @@
 #include stddef.h
 #include string.h /* memset(), memcpy() */
 #include assert.h
+#include limits.h /* UINT_MAX */
+#include time.h   /* time() */
 
 #define XML_BUILDING_EXPAT 1
 
@@ -12,7 +14,7 @@
 #include winconfig.h
 #elif defined(MACOS_CLASSIC)
 #include macconfig.h
-#elif defined(__amigaos4__)
+#elif defined(__amigaos__)
 #include amigaconfig.h
 #elif defined(__WATCOMC__)
 #include watcomconfig.h
@@ -327,15 +329,15 @@ processXmlDecl(XML_Parser parser, int is
 static enum XML_Error
 initializeEncoding(XML_Parser parser);
 static enum XML_Error
-doProlog(XML_Parser parser, const ENCODING *enc, const char *s, 
- const char *end, int tok, const char *next, const char **nextPtr, 
+doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
+ const char *end, int tok, const char *next, const char **nextPtr,
  XML_Bool haveMore);
 static enum XML_Error
-processInternalEntity(XML_Parser parser, ENTITY *entity, 
+processInternalEntity(XML_Parser parser, ENTITY *entity,
   XML_Bool betweenDecl);
 static enum XML_Error
 doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
-  const char *start, const char *end, const char **endPtr, 
+  const char *start, const char *end, const char **endPtr,
   XML_Bool haveMore);
 static enum XML_Error
 doCdataSection(XML_Parser parser, const ENCODING *, const char **startPtr,
@@ -353,7 +355,7 @@ static enum XML_Error
 addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId,
const XML_Char *uri, BINDING **bindingsPtr);
 static int
-defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata, 
+defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *, XML_Bool isCdata,
 XML_Bool isId, const XML_Char *dfltValue, XML_Parser parser);
 static enum XML_Error
 storeAttributeValue(XML_Parser parser, const ENCODING *, XML_Bool isCdata,
@@ -391,12 +393,13 @@ static void dtdReset(DTD *p, const XML_M
 static void
 dtdDestroy(DTD *p, XML_Bool isDocEntity, const XML_Memory_Handling_Suite *ms);
 static int
-dtdCopy(DTD *newDtd, const DTD *oldDtd, const XML_Memory_Handling_Suite *ms);
+dtdCopy(XML_Parser oldParser,
+DTD *newDtd, const DTD *oldDtd, const 

CVS commit: src/external/mit/expat/dist

2012-02-11 Thread Matthias Scheler
Module Name:src
Committed By:   tron
Date:   Sat Feb 11 18:18:24 UTC 2012

Update of /cvsroot/src/external/mit/expat/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv16625

Log Message:
Initial import of expat 2.0.1 into base:
This is James Clark's expat XML parser library in C. It is a stream
oriented parser that requires setting handlers to deal with the
structure that the parser discovers in the document.

This is the first part of the fix for PR lib/40346.

Status:

Vendor Tag: expat
Release Tags:   expat-2-0-1

N src/external/mit/expat/dist/Changes
N src/external/mit/expat/dist/MANIFEST
N src/external/mit/expat/dist/Makefile.in
N src/external/mit/expat/dist/configure
N src/external/mit/expat/dist/configure.in
N src/external/mit/expat/dist/README
N src/external/mit/expat/dist/expat.dsw
N src/external/mit/expat/dist/expat_config.h.in
N src/external/mit/expat/dist/COPYING
N src/external/mit/expat/dist/doc/style.css
N src/external/mit/expat/dist/doc/xmlwf.1
N src/external/mit/expat/dist/doc/valid-xhtml10.png
N src/external/mit/expat/dist/doc/reference.html
N src/external/mit/expat/dist/doc/xmlwf.sgml
N src/external/mit/expat/dist/doc/expat.png
N src/external/mit/expat/dist/xmlwf/xmlfile.c
N src/external/mit/expat/dist/xmlwf/xmlmime.c
N src/external/mit/expat/dist/xmlwf/readfilemap.c
N src/external/mit/expat/dist/xmlwf/xmlwin32url.cxx
N src/external/mit/expat/dist/xmlwf/xmlurl.h
N src/external/mit/expat/dist/xmlwf/codepage.c
N src/external/mit/expat/dist/xmlwf/ct.c
N src/external/mit/expat/dist/xmlwf/filemap.h
N src/external/mit/expat/dist/xmlwf/unixfilemap.c
N src/external/mit/expat/dist/xmlwf/xmlmime.h
N src/external/mit/expat/dist/xmlwf/xmlwf.dsp
N src/external/mit/expat/dist/xmlwf/xmltchar.h
N src/external/mit/expat/dist/xmlwf/xmlwf.c
N src/external/mit/expat/dist/xmlwf/codepage.h
N src/external/mit/expat/dist/xmlwf/xmlfile.h
N src/external/mit/expat/dist/xmlwf/win32filemap.c
N src/external/mit/expat/dist/vms/descrip.mms
N src/external/mit/expat/dist/vms/expat_config.h
N src/external/mit/expat/dist/vms/README.vms
N src/external/mit/expat/dist/lib/expat.dsp
N src/external/mit/expat/dist/lib/xmltok.h
N src/external/mit/expat/dist/lib/expatw.dsp
N src/external/mit/expat/dist/lib/xmltok.c
N src/external/mit/expat/dist/lib/xmlrole.c
N src/external/mit/expat/dist/lib/expat_static.dsp
N src/external/mit/expat/dist/lib/libexpat.def
N src/external/mit/expat/dist/lib/winconfig.h
N src/external/mit/expat/dist/lib/latin1tab.h
N src/external/mit/expat/dist/lib/libexpatw.def
N src/external/mit/expat/dist/lib/expatw_static.dsp
N src/external/mit/expat/dist/lib/expat.h
N src/external/mit/expat/dist/lib/xmlparse.c
N src/external/mit/expat/dist/lib/utf8tab.h
N src/external/mit/expat/dist/lib/asciitab.h
N src/external/mit/expat/dist/lib/nametab.h
N src/external/mit/expat/dist/lib/ascii.h
N src/external/mit/expat/dist/lib/expat_external.h
N src/external/mit/expat/dist/lib/iasciitab.h
N src/external/mit/expat/dist/lib/xmltok_impl.h
N src/external/mit/expat/dist/lib/macconfig.h
N src/external/mit/expat/dist/lib/Makefile.MPW
N src/external/mit/expat/dist/lib/internal.h
N src/external/mit/expat/dist/lib/xmlrole.h
N src/external/mit/expat/dist/lib/xmltok_ns.c
N src/external/mit/expat/dist/lib/amigaconfig.h
N src/external/mit/expat/dist/lib/xmltok_impl.c
N src/external/mit/expat/dist/examples/elements.dsp
N src/external/mit/expat/dist/examples/elements.c
N src/external/mit/expat/dist/examples/outline.c
N src/external/mit/expat/dist/examples/outline.dsp
N src/external/mit/expat/dist/bcb5/makefile.mak
N src/external/mit/expat/dist/bcb5/expat_static.bpf
N src/external/mit/expat/dist/bcb5/libexpatw_mtd.def
N src/external/mit/expat/dist/bcb5/expat.bpr
N src/external/mit/expat/dist/bcb5/expatw.mak
N src/external/mit/expat/dist/bcb5/expatw_static.bpf
N src/external/mit/expat/dist/bcb5/libexpat_mtd.def
N src/external/mit/expat/dist/bcb5/setup.bat
N src/external/mit/expat/dist/bcb5/expatw.bpr
N src/external/mit/expat/dist/bcb5/xmlwf.bpr
N src/external/mit/expat/dist/bcb5/outline.bpr
N src/external/mit/expat/dist/bcb5/expat_static.mak
N src/external/mit/expat/dist/bcb5/expatw_static.bpr
N src/external/mit/expat/dist/bcb5/expatw.bpf
N src/external/mit/expat/dist/bcb5/outline.mak
N src/external/mit/expat/dist/bcb5/outline.bpf
N src/external/mit/expat/dist/bcb5/xmlwf.mak
N src/external/mit/expat/dist/bcb5/expat_static.bpr
N src/external/mit/expat/dist/bcb5/expat.mak
N src/external/mit/expat/dist/bcb5/elements.bpr
N src/external/mit/expat/dist/bcb5/elements.mak
N src/external/mit/expat/dist/bcb5/all_projects.bpg
N src/external/mit/expat/dist/bcb5/elements.bpf
N src/external/mit/expat/dist/bcb5/expat.bpf
N src/external/mit/expat/dist/bcb5/xmlwf.bpf
N src/external/mit/expat/dist/bcb5/expatw_static.mak
N src/external/mit/expat/dist/bcb5/README.txt
N src/external/mit/expat/dist/amiga/expat_lib.c
N src/external/mit/expat/dist/amiga/Makefile
N src/external/mit/expat/dist/amiga/launch.c
N 

CVS commit: src/external/mit/expat/dist

2012-02-11 Thread Matthias Scheler
Module Name:src
Committed By:   tron
Date:   Sat Feb 11 18:22:59 UTC 2012

Modified Files:
src/external/mit/expat/dist/conftools: ac_c_bigendian_cross.m4
mkinstalldirs
src/external/mit/expat/dist/lib: xmlparse.c xmltok_impl.c

Log Message:
Re-apply NetBSD patches.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4 \
src/external/mit/expat/dist/conftools/mkinstalldirs
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/mit/expat/dist/lib/xmlparse.c \
src/external/mit/expat/dist/lib/xmltok_impl.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4
diff -u src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.1.1.1 src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.2
--- src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4:1.1.1.1	Sat Feb 11 18:18:21 2012
+++ src/external/mit/expat/dist/conftools/ac_c_bigendian_cross.m4	Sat Feb 11 18:22:58 2012
@@ -7,7 +7,7 @@ dnl The implementation will create a bin
 dnl the binary it will be grep'ed for some symbols that will look
 dnl different for different endianess of the binary.
 dnl
-dnl @version $Id: ac_c_bigendian_cross.m4,v 1.1.1.1 2012/02/11 18:18:21 tron Exp $
+dnl @version $Id: ac_c_bigendian_cross.m4,v 1.2 2012/02/11 18:22:58 tron Exp $
 dnl @author Guido Draheim gui...@gmx.de
 dnl
 AC_DEFUN([AC_C_BIGENDIAN_CROSS],
Index: src/external/mit/expat/dist/conftools/mkinstalldirs
diff -u src/external/mit/expat/dist/conftools/mkinstalldirs:1.1.1.1 src/external/mit/expat/dist/conftools/mkinstalldirs:1.2
--- src/external/mit/expat/dist/conftools/mkinstalldirs:1.1.1.1	Sat Feb 11 18:18:21 2012
+++ src/external/mit/expat/dist/conftools/mkinstalldirs	Sat Feb 11 18:22:58 2012
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.1.1.1 2012/02/11 18:18:21 tron Exp $
+# $Id: mkinstalldirs,v 1.2 2012/02/11 18:22:58 tron Exp $
 
 errstatus=0
 

Index: src/external/mit/expat/dist/lib/xmlparse.c
diff -u src/external/mit/expat/dist/lib/xmlparse.c:1.1.1.1 src/external/mit/expat/dist/lib/xmlparse.c:1.2
--- src/external/mit/expat/dist/lib/xmlparse.c:1.1.1.1	Sat Feb 11 18:18:19 2012
+++ src/external/mit/expat/dist/lib/xmlparse.c	Sat Feb 11 18:22:58 2012
@@ -3703,6 +3703,9 @@ doProlog(XML_Parser parser,
 return XML_ERROR_UNCLOSED_TOKEN;
   case XML_TOK_PARTIAL_CHAR:
 return XML_ERROR_PARTIAL_CHAR;
+  case -XML_TOK_PROLOG_S:
+	tok = -tok;
+	break;
   case XML_TOK_NONE:
 #ifdef XML_DTD
 /* for internal PE NOT referenced between declarations */
Index: src/external/mit/expat/dist/lib/xmltok_impl.c
diff -u src/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1 src/external/mit/expat/dist/lib/xmltok_impl.c:1.2
--- src/external/mit/expat/dist/lib/xmltok_impl.c:1.1.1.1	Sat Feb 11 18:18:19 2012
+++ src/external/mit/expat/dist/lib/xmltok_impl.c	Sat Feb 11 18:22:58 2012
@@ -1744,7 +1744,7 @@ PREFIX(updatePosition)(const ENCODING *e
const char *end,
POSITION *pos)
 {
-  while (ptr != end) {
+  while (ptr  end) {
 switch (BYTE_TYPE(enc, ptr)) {
 #define LEAD_CASE(n) \
 case BT_LEAD ## n: \