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

To: source-changes%NetBSD.org@localhost
Subject: CVS import: src/external/mit/expat/dist
From: "Christos Zoulas" <christos%netbsd.org@localhost>
Date: Wed, 23 Feb 2022 10:21:37 -0500
Module Name:    src
Committed By:   christos
Date:           Wed Feb 23 15:21:37 UTC 2022

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

Log Message:
Upgrade expat from 2.2.8 -> 2.4.6 to include the security fixes from 2.4.5

Release 2.4.6 Sun February 20 2022
        Bug fixes:
            #566  Fix a regression introduced by the fix for CVE-2022-25313
                    in release 2.4.5 that affects applications that (1)
                    call function XML_SetElementDeclHandler and (2) are
                    parsing XML that contains nested element declarations
                    (e.g. "<!ELEMENT junk ((bar|foo|xyz+), zebra*)>").

        Other changes:
       #567 #568  Version info bumped from 9:5:8 to 9:6:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Matt Sergeant
            Samanta Navarro
            Sergei Trofimovich
                 and
            NixOS
            Perl XML::Parser

Release 2.4.5 Fri February 18 2022
        Security fixes:
            #562  CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8
                    sequences (e.g. from start tag names) to the XML
                    processing application on top of Expat can cause
                    arbitrary damage (e.g. code execution) depending
                    on how invalid UTF-8 is handled inside the XML
                    processor; validation was not their job but Expat's.
                    Exploits with code execution are known to exist.
            #561  CVE-2022-25236 -- Passing (one or more) namespace separator
                    characters in "xmlns[:prefix]" attribute values
                    made Expat send malformed tag names to the XML
                    processor on top of Expat which can cause
                    arbitrary damage (e.g. code execution) depending
                    on such unexpectable cases are handled inside the XML
                    processor; validation was not their job but Expat's.
                    Exploits with code execution are known to exist.
            #558  CVE-2022-25313 -- Fix stack exhaustion in doctype parsing
                    that could be triggered by e.g. a 2 megabytes
                    file with a large number of opening braces.
                    Expected impact is denial of service or potentially
                    arbitrary code execution.
            #560  CVE-2022-25314 -- Fix integer overflow in function copyString;
                    only affects the encoding name parameter at parser creation
                    time which is often hardcoded (rather than user input),
                    takes a value in the gigabytes to trigger, and a 64-bit
                    machine.  Expected impact is denial of service.
            #559  CVE-2022-25315 -- Fix integer overflow in function storeRawNames;
                    needs input in the gigabytes and a 64-bit machine.
                    Expected impact is denial of service or potentially
                    arbitrary code execution.

        Other changes:
       #557 #564  Version info bumped from 9:4:8 to 9:5:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Ivan Fratric
            Samanta Navarro
                 and
            Google Project Zero
            JetBrains

Release 2.4.4 Sun January 30 2022
        Security fixes:
            #550  CVE-2022-23852 -- Fix signed integer overflow
                    (undefined behavior) in function XML_GetBuffer
                    (that is also called by function XML_Parse internally)
                    for when XML_CONTEXT_BYTES is defined to >0 (which is both
                    common and default).
                    Impact is denial of service or more.
            #551  CVE-2022-23990 -- Fix unsigned integer overflow in function
                    doProlog triggered by large content in element type
                    declarations when there is an element declaration handler
                    present (from a prior call to XML_SetElementDeclHandler).
                    Impact is denial of service or more.

        Bug fixes:
       #544 #545  xmlwf: Fix a memory leak on output file opening error

        Other changes:
            #546  Autotools: Fix broken CMake support under Cygwin
            #554  Windows: Add missing files to the installer to fix
                    compilation with CMake from installed sources
       #552 #554  Version info bumped from 9:3:8 to 9:4:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Carlo Bramini
            hwt0415
            Roland Illig
            Samanta Navarro
                 and
            Clang LeakSan and the Clang team

Release 2.4.3 Sun January 16 2022
        Security fixes:
       #531 #534  CVE-2021-45960 -- Fix issues with left shifts by >=29 places
                    resulting in
                      a) realloc acting as free
                      b) realloc allocating too few bytes
                      c) undefined behavior
                    depending on architecture and precise value
                    for XML documents with >=2^27+1 prefixed attributes
                    on a single XML tag a la
                    "<r xmlns:a='[..]' a:a123='[..]' [..] />"
                    where XML_ParserCreateNS is used to create the parser
                    (which needs argument "-n" when running xmlwf).
                    Impact is denial of service, or more.
       #532 #538  CVE-2021-46143 (ZDI-CAN-16157) -- Fix integer overflow
                    on variable m_groupSize in function doProlog leading
                    to realloc acting as free.
                    Impact is denial of service or more.
            #539  CVE-2022-22822 to CVE-2022-22827 -- Prevent integer overflows
                    near memory allocation at multiple places.  Mitre assigned
                    a dedicated CVE for each involved internal C function:
                    - CVE-2022-22822 for function addBinding
                    - CVE-2022-22823 for function build_model
                    - CVE-2022-22824 for function defineAttribute
                    - CVE-2022-22825 for function lookup
                    - CVE-2022-22826 for function nextScaffoldPart
                    - CVE-2022-22827 for function storeAtts
                    Impact is denial of service or more.

        Other changes:
            #535  CMake: Make call to file(GENERATE [..]) work for CMake <3.19
            #541  Autotools|CMake: MinGW: Make run.sh(.in) work for Cygwin
                    and MSYS2 by not going through Wine on these platforms
       #527 #528  Address compiler warnings
       #533 #543  Version info bumped from 9:2:8 to 9:3:8;
                    see https://verbump.de/ for what these numbers do

        Infrastructure:
            #536  CI: Check for realistic minimum CMake version
       #529 #539  CI: Cover compilation with -m32
            #529  CI: Store coverage reports as artifacts for download
            #528  CI: Upgrade Clang from 11 to 13

        Special thanks to:
            An anonymous whitehat
            Christopher Degawa
            J. Peter Mugaas
            Tyson Smith
                 and
            GCC Farm Project
            Trend Micro Zero Day Initiative

Release 2.4.2 Sun December 19 2021
        Other changes:
       #509 #510  Link againgst libm for function "isnan"
       #513 #514  Include expat_config.h as early as possible
            #498  Autotools: Include files with release archives:
                    - buildconf.sh
                    - fuzz/*.c
       #507 #519  Autotools: Sync CMake templates
       #495 #524  CMake: MinGW: Fix pkg-config section "Libs" for
                    - non-release build types (e.g. -DCMAKE_BUILD_TYPE=Debug)
                    - multi-config CMake generators (e.g. Ninja Multi-Config)
       #502 #503  docs: Document that function XML_GetBuffer may return NULL
                    when asking for a buffer of 0 (zero) bytes size
       #522 #523  docs: Fix return value docs for both
                    XML_SetBillionLaughsAttackProtection* functions
       #525 #526  Version info bumped from 9:1:8 to 9:2:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Dong-hee Na
            Joergen Ibsen
            Kai Pastor

Release 2.4.1 Sun May 23 2021
        Bug fixes:
       #488 #490  Autotools: Fix installed header expat_config.h for multilib
                    systems; regression introduced in 2.4.0 by pull request #486

        Other changes:
       #491 #492  Version info bumped from 9:0:8 to 9:1:8;
                    see https://verbump.de/ for what these numbers do

        Special thanks to:
            Gentoo's QA check "multilib_check_headers"

Release 2.4.0 Sun May 23 2021
        Security fixes:
   #34 #466 #484  CVE-2013-0340/CWE-776 -- Protect against billion laughs attacks
                    (denial-of-service; flavors targeting CPU time or RAM or both,
                    leveraging general entities or parameter entities or both)
                    by tracking and limiting the input amplification factor
                    (<amplification> := (<direct> + <indirect>) / <direct>).
                    By conservative default, amplification up to a factor of 100.0
                    is tolerated and rejection only starts after 8 MiB of output bytes
                    (=<direct> + <indirect>) have been processed.
                    The fix adds the following to the API:
                    - A new error code XML_ERROR_AMPLIFICATION_LIMIT_BREACH to
                      signals this specific condition.
                    - Two new API functions ..
                      - XML_SetBillionLaughsAttackProtectionMaximumAmplification and
                      - XML_SetBillionLaughsAttackProtectionActivationThreshold
                      .. to further tighten billion laughs protection parameters
                      when desired.  Please see file "doc/reference.html" for details.
                      If you ever need to increase the defaults for non-attack XML
                      payload, please file a bug report with libexpat.
                    - Two new XML_FEATURE_* constants ..
                      - that can be queried using the XML_GetFeatureList function, and
                      - that are shown in "xmlwf -v" output.
                    - Two new environment variable switches ..
                      - EXPAT_ACCOUNTING_DEBUG=(0|1|2|3) and
                      - EXPAT_ENTITY_DEBUG=(0|1)
                      .. for runtime debugging of accounting and entity processing.
                      Specific behavior of these values may change in the future.
                    - Two new command line arguments "-a FACTOR" and "-b BYTES"
                      for xmlwf to further tighten billion laughs protection
                      parameters when desired.
                      If you ever need to increase the defaults for non-attack XML
                      payload, please file a bug report with libexpat.

        Bug fixes:
       #332 #470  For (non-default) compilation with -DEXPAT_MIN_SIZE=ON (CMake)
                    or CPPFLAGS=-DXML_MIN_SIZE (GNU Autotools): Fix segfault
                    for UTF-16 payloads containing CDATA sections.
       #485 #486  Autotools: Fix generated CMake files for non-64bit and
                    non-Linux platforms (e.g. macOS and MinGW in particular)
                    that were introduced with release 2.3.0

        Other changes:
       #468 #469  xmlwf: Improve help output and the xmlwf man page
            #463  xmlwf: Improve maintainability through some refactoring
            #477  xmlwf: Fix man page DocBook validity
       #458 #459  CMake: Support absolute paths for both CMAKE_INSTALL_LIBDIR
                    and CMAKE_INSTALL_INCLUDEDIR
       #471 #481  CMake: Add support for standard variable BUILD_SHARED_LIBS
            #457  Unexpose symbol _INTERNAL_trim_to_complete_utf8_characters
            #467  Resolve macro HAVE_EXPAT_CONFIG_H
            #472  Delete unused legacy helper file "conftools/PrintPath"
       #473 #483  Improve attribution
  #464 #465 #477  doc/reference.html: Fix XHTML validity
       #475 #478  doc/reference.html: Replace the 90s look by OK.css
            #479  Version info bumped from 8:0:7 to 9:0:8
                    due to addition of new symbols and error codes;
                    see https://verbump.de/ for what these numbers do

        Infrastructure:
            #456  CI: Enable periodic runs
            #457  CI: Start covering the list of exported symbols
            #474  CI: Isolate coverage task
       #476 #482  CI: Adapt to breaking changes in image "ubuntu-18.04"
            #477  CI: Cover well-formedness and DocBook/XHTML validity
                    of doc/reference.html and doc/xmlwf.xml

        Special thanks to:
            Dimitry Andric
            Eero Helenius
            Nick Wellnhofer
            Rhodri James
            Tomas Korbar
            Yury Gribov
                 and
            Clang LeakSan
            JetBrains
            OSS-Fuzz

Release 2.3.0 Thu March 25 2021
        Bug fixes:
            #438  When calling XML_ParseBuffer without a prior successful call to
                    XML_GetBuffer as a user, no longer trigger undefined behavior
                    (by adding an integer to a NULL pointer) but rather return
                    XML_STATUS_ERROR and set the error code to (new) code
                    XML_ERROR_NO_BUFFER. Found by UBSan (UndefinedBehaviorSanitizer)
                    of Clang 11 (but not Clang 9).
            #444  xmlwf: Exit status 2 was used for both:
                    - malformed input files (documented) and
                    - invalid command-line arguments (undocumented).
                    The case of invalid command-line arguments now
                    has its own exit status 4, resolving the ambiguity.

        Other changes:
            #439  xmlwf: Add argument -k to allow continuing after
                    non-fatal errors
            #439  xmlwf: Add section about exit status to the -h help output
  #422 #426 #447  Windows: Drop support for Visual Studio <=14.0/2015
            #434  Windows: CMake: Detect unsupported Visual Studio at
                    configure time (rather than at compile time)
       #382 #428  testrunner: Make verbose mode (argument "-v") report
                    about passed tests, and make default mode report about
                    failures, as well.
            #442  CMake: Call "enable_language(CXX)" prior to tinkering
                    with CMAKE_CXX_* variables
            #448  Document use of libexpat from a CMake-based project
            #451  Autotools: Install CMake files as generated by CMake 3.19.6
                    so that users with "find_package(expat [..] CONFIG [..])"
                    are served on distributions that are *not* using the CMake
                    build system inside for libexpat packaging
       #436 #437  Autotools: Drop obsolescent macro AC_HEADER_STDC
       #450 #452  Autotools: Resolve use of obsolete macro AC_CONFIG_HEADER
            #441  Address compiler warnings
            #443  Version info bumped from 7:12:6 to 8:0:7
                    due to addition of error code XML_ERROR_NO_BUFFER
                    (see https://verbump.de/ for what these numbers do)

        Infrastructure:
       #435 #446  Replace Travis CI by GitHub Actions

        Special thanks to:
            Alexander Richardson
            Oleksandr Popovych
            Thomas Beutlich
            Tim Bray
                 and
            Clang LeakSan, Clang 11 UBSan and the Clang team

Release 2.2.10 Sat October 3 2020
        Bug fixes:
  #390 #395 #398  Fix undefined behavior during parsing caused by
                    pointer arithmetic with NULL pointers
       #404 #405  Fix reading uninitialized variable during parsing
            #406  xmlwf: Add missing check for malloc NULL return

        Other changes:
            #396  Windows: Drop support for Visual Studio <=8.0/2005
            #409  Windows: Add missing file "Changes" to the installer
                    to fix compilation with CMake from installed sources
            #403  xmlwf: Document exit codes in xmlwf manpage and
                    exit with code 3 (rather than code 1) for output errors
                    when used with "-d DIRECTORY"
       #356 #359  MinGW: Provide declaration of rand_s for mingwrt <5.3.0
       #383 #392  Autotools: Use -Werror while configure tests the compiler
                    for supported compile flags to avoid false positives
  #383 #393 #394  Autotools: Improve handling of user (C|CPP|CXX|LD)FLAGS,
                    e.g. ensure that they have the last word over flags added
                    while running ./configure
            #360  CMake: Create libexpatw.{dll,so} and expatw.pc (with emphasis
                    on suffix "w") with -DEXPAT_CHAR_TYPE=(ushort|wchar_t)
            #360  CMake: Detect and deny unsupported build combinations
                    involving -DEXPAT_CHAR_TYPE=(ushort|wchar_t)
            #360  CMake: Install pre-compiled shipped xmlwf.1 manpage in case
                    of -DEXPAT_BUILD_DOCS=OFF
  #375 #380 #419  CMake: Fix use of Expat by means of add_subdirectory
       #407 #408  CMake: Keep expat target name constant at "expat"
                    (i.e. refrain from using the target name to control
                    build artifact filenames)
            #385  CMake: Fix compilation with -DEXPAT_SHARED_LIBS=OFF for
                    Windows
                  CMake: Expose man page compilation as target "xmlwf-manpage"
       #413 #414  CMake: Introduce option EXPAT_BUILD_PKGCONFIG
                    to control generation of pkg-config file "expat.pc"
            #424  CMake: Add minimalistic support for building binary packages
                    with CMake target "package"; based on CPack
            #366  CMake: Add option -DEXPAT_OSSFUZZ_BUILD=(ON|OFF) with
                    default OFF to build fuzzer code against OSS-Fuzz and
                    related environment variable LIB_FUZZING_ENGINE
            #354  Fix testsuite for -DEXPAT_DTD=OFF and -DEXPAT_NS=OFF, each
    #354 #355 ..
       #356 #412  Address compiler warnings
       #368 #369  Address pngcheck warnings with doc/*.png images
            #425  Version info bumped from 7:11:6 to 7:12:6

        Special thanks to:
            asavah
            Ben Wagner
            Bhargava Shastry
            Frank Landgraf
            Jeffrey Walton
            Joe Orton
            Kleber Tarc�sio
            Ma Lin
            Maciej Sroczy#ski
            Mohammed Khajapasha
            Vadim Zeitlin
                 and
            Cppcheck 2.0 and the Cppcheck team

Release 2.2.9 Wed September 25 2019
        Other changes:
                  examples: Drop executable bits from elements.c
            #349  Windows: Change the name of the Windows DLLs from expat*.dll
                    to libexpat*.dll once more (regression from 2.2.8, first
                    fixed in 1.95.3, issue #61 on SourceForge today,
                    was issue #432456 back then); needs a fix due
                    case-insensitive file systems on Windows and the fact that
                    Perl's XML::Parser::Expat compiles into Expat.dll.
            #347  Windows: Only define _CRT_RAND_S if not defined
                  Version info bumped from 7:10:6 to 7:11:6

        Special thanks to:
            Ben Wagner

Status:

Vendor Tag:     expat
Release Tags:   expat-2-4-6
                
U src/external/mit/expat/dist/Makefile.in
N src/external/mit/expat/dist/expat.pc.cmake
U src/external/mit/expat/dist/COPYING
U src/external/mit/expat/dist/test-driver-wrapper.sh
C src/external/mit/expat/dist/expat_config.h
U src/external/mit/expat/dist/AUTHORS
U src/external/mit/expat/dist/configure.ac
U src/external/mit/expat/dist/run.sh.in
U src/external/mit/expat/dist/fix-xmltest-log.sh
U src/external/mit/expat/dist/expat_config.h.in
U src/external/mit/expat/dist/Makefile.am
U src/external/mit/expat/dist/ConfigureChecks.cmake
U src/external/mit/expat/dist/configure
U src/external/mit/expat/dist/aclocal.m4
U src/external/mit/expat/dist/README.md
U src/external/mit/expat/dist/CMake.README
U src/external/mit/expat/dist/CMakeLists.txt
U src/external/mit/expat/dist/expat_config.h.cmake
U src/external/mit/expat/dist/expat.pc.in
U src/external/mit/expat/dist/acinclude.m4
N src/external/mit/expat/dist/buildconf.sh
U src/external/mit/expat/dist/Changes
U src/external/mit/expat/dist/xmlwf/xmltchar.h
U src/external/mit/expat/dist/xmlwf/Makefile.in
U src/external/mit/expat/dist/xmlwf/codepage.h
U src/external/mit/expat/dist/xmlwf/win32filemap.c
U src/external/mit/expat/dist/xmlwf/unixfilemap.c
U src/external/mit/expat/dist/xmlwf/xmlmime.h
U src/external/mit/expat/dist/xmlwf/Makefile.am
U src/external/mit/expat/dist/xmlwf/filemap.h
U src/external/mit/expat/dist/xmlwf/ct.c
U src/external/mit/expat/dist/xmlwf/codepage.c
U src/external/mit/expat/dist/xmlwf/xmlwf_helpgen.py
U src/external/mit/expat/dist/xmlwf/xmlfile.c
U src/external/mit/expat/dist/xmlwf/xmlwf_helpgen.sh
U src/external/mit/expat/dist/xmlwf/xmlfile.h
U src/external/mit/expat/dist/xmlwf/xmlwf.c
U src/external/mit/expat/dist/xmlwf/readfilemap.c
U src/external/mit/expat/dist/xmlwf/xmlmime.c
U src/external/mit/expat/dist/m4/ltsugar.m4
U src/external/mit/expat/dist/m4/ltversion.m4
U src/external/mit/expat/dist/m4/libtool.m4
U src/external/mit/expat/dist/m4/lt~obsolete.m4
U src/external/mit/expat/dist/m4/ltoptions.m4
N src/external/mit/expat/dist/fuzz/xml_parse_fuzzer.c
N src/external/mit/expat/dist/fuzz/xml_parsebuffer_fuzzer.c
U src/external/mit/expat/dist/cmake/expat-config.cmake.in
U src/external/mit/expat/dist/cmake/mingw-toolchain.cmake
N src/external/mit/expat/dist/cmake/autotools/expat.cmake
N src/external/mit/expat/dist/cmake/autotools/expat-package-init.cmake
N src/external/mit/expat/dist/cmake/autotools/expat-noconfig__linux.cmake.in
N src/external/mit/expat/dist/cmake/autotools/expat-config-version.cmake.in
N src/external/mit/expat/dist/cmake/autotools/expat-noconfig__windows.cmake.in
N src/external/mit/expat/dist/cmake/autotools/expat-noconfig__macos.cmake.in
U src/external/mit/expat/dist/examples/Makefile.in
U src/external/mit/expat/dist/examples/elements.c
U src/external/mit/expat/dist/examples/Makefile.am
U src/external/mit/expat/dist/examples/outline.c
U src/external/mit/expat/dist/win32/README.txt
U src/external/mit/expat/dist/win32/expat.iss
U src/external/mit/expat/dist/win32/MANIFEST.txt
U src/external/mit/expat/dist/win32/build_expat_iss.bat
U src/external/mit/expat/dist/conftools/ar-lib
U src/external/mit/expat/dist/conftools/ltmain.sh
U src/external/mit/expat/dist/conftools/install-sh
U src/external/mit/expat/dist/conftools/compile
U src/external/mit/expat/dist/conftools/ax-require-defined.m4
U src/external/mit/expat/dist/conftools/expatcfg-compiler-supports-visibility.m4
U src/external/mit/expat/dist/conftools/expat.m4
C src/external/mit/expat/dist/conftools/config.guess
U src/external/mit/expat/dist/conftools/depcomp
U src/external/mit/expat/dist/conftools/missing
U src/external/mit/expat/dist/conftools/ax-append-compile-flags.m4
U src/external/mit/expat/dist/conftools/ax-check-compile-flag.m4
U src/external/mit/expat/dist/conftools/ax-append-link-flags.m4
U src/external/mit/expat/dist/conftools/ax-check-link-flag.m4
U src/external/mit/expat/dist/conftools/ax-append-flag.m4
U src/external/mit/expat/dist/conftools/test-driver
U src/external/mit/expat/dist/conftools/get-version.sh
C src/external/mit/expat/dist/conftools/config.sub
U src/external/mit/expat/dist/doc/Makefile.in
U src/external/mit/expat/dist/doc/reference.html
U src/external/mit/expat/dist/doc/style.css
N src/external/mit/expat/dist/doc/ok.min.css
U src/external/mit/expat/dist/doc/Makefile.am
U src/external/mit/expat/dist/doc/xmlwf.1
U src/external/mit/expat/dist/doc/xmlwf.xml
U src/external/mit/expat/dist/tests/README.txt
C src/external/mit/expat/dist/tests/xmltest.sh
U src/external/mit/expat/dist/tests/Makefile.in
U src/external/mit/expat/dist/tests/chardata.h
U src/external/mit/expat/dist/tests/memcheck.c
U src/external/mit/expat/dist/tests/minicheck.h
U src/external/mit/expat/dist/tests/Makefile.am
U src/external/mit/expat/dist/tests/minicheck.c
U src/external/mit/expat/dist/tests/xmltest.log.expected
U src/external/mit/expat/dist/tests/memcheck.h
U src/external/mit/expat/dist/tests/runtests.c
U src/external/mit/expat/dist/tests/structdata.h
U src/external/mit/expat/dist/tests/structdata.c
U src/external/mit/expat/dist/tests/chardata.c
U src/external/mit/expat/dist/tests/udiffer.py
U src/external/mit/expat/dist/tests/runtestspp.cpp
U src/external/mit/expat/dist/tests/benchmark/README.txt
U src/external/mit/expat/dist/tests/benchmark/Makefile.in
U src/external/mit/expat/dist/tests/benchmark/benchmark.c
U src/external/mit/expat/dist/tests/benchmark/Makefile.am
U src/external/mit/expat/dist/lib/Makefile.in
U src/external/mit/expat/dist/lib/libexpatw.def
C src/external/mit/expat/dist/lib/xmltok.h
U src/external/mit/expat/dist/lib/xmlrole.h
U src/external/mit/expat/dist/lib/latin1tab.h
U src/external/mit/expat/dist/lib/xmltok_impl.h
U src/external/mit/expat/dist/lib/siphash.h
U src/external/mit/expat/dist/lib/nametab.h
U src/external/mit/expat/dist/lib/expat_external.h
U src/external/mit/expat/dist/lib/Makefile.am
U src/external/mit/expat/dist/lib/utf8tab.h
U src/external/mit/expat/dist/lib/xmlrole.c
U src/external/mit/expat/dist/lib/expat.h
U src/external/mit/expat/dist/lib/winconfig.h
U src/external/mit/expat/dist/lib/asciitab.h
C src/external/mit/expat/dist/lib/xmltok.c
U src/external/mit/expat/dist/lib/iasciitab.h
U src/external/mit/expat/dist/lib/xmltok_ns.c
U src/external/mit/expat/dist/lib/internal.h
C src/external/mit/expat/dist/lib/xmlparse.c
C src/external/mit/expat/dist/lib/xmltok_impl.c
U src/external/mit/expat/dist/lib/libexpat.def
U src/external/mit/expat/dist/lib/ascii.h

8 conflicts created by this import.
Use the following command to help the merge:

        cvs checkout -jexpat:yesterday -jexpat src/external/mit/expat/dist
Prev by Date: CVS commit: src/doc
Next by Date: CVS commit: src/external/mit/expat/dist
Previous by Thread: CVS commit: src/doc
Next by Thread: CVS commit: src/external/mit/expat/dist
Indexes:
Home | Main Index | Thread Index | Old Index