From dc4f5abaeb007771684f3bd7e13c1cea9bf356e6 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 23 Feb 2022 10:53:11 +0300 Subject: Upgrade to 2.4.6 --- libexpat/.gitignore | 5 +++++ libexpat/README-DEV | 5 ++--- libexpat/build/bootstrap.build | 4 ++-- libexpat/build/root.build | 10 ++++++++++ libexpat/buildfile | 1 + libexpat/libexpat/buildfile | 8 +++++--- libexpat/libexpat/expat_config.h | 4 ---- libexpat/manifest | 3 ++- libexpat/tests/regression/ascii.h | 1 - libexpat/tests/regression/buildfile | 6 ------ libexpat/tests/regression/chardata.c | 1 - libexpat/tests/regression/chardata.h | 1 - libexpat/tests/regression/internal.h | 1 - libexpat/tests/regression/memcheck.c | 1 - libexpat/tests/regression/memcheck.h | 1 - libexpat/tests/regression/minicheck.c | 1 - libexpat/tests/regression/minicheck.h | 1 - libexpat/tests/regression/runtests.c | 1 - libexpat/tests/regression/siphash.h | 1 - libexpat/tests/regression/structdata.c | 1 - libexpat/tests/regression/structdata.h | 1 - libexpat/tests/regression/testscript | 9 --------- libexpat/unit-tests/.gitignore | 8 ++++++++ libexpat/unit-tests/regression/buildfile | 9 +++++++++ libexpat/unit-tests/regression/chardata.c | 1 + libexpat/unit-tests/regression/chardata.h | 1 + libexpat/unit-tests/regression/memcheck.c | 1 + libexpat/unit-tests/regression/memcheck.h | 1 + libexpat/unit-tests/regression/minicheck.c | 1 + libexpat/unit-tests/regression/minicheck.h | 1 + libexpat/unit-tests/regression/runtests.c | 1 + libexpat/unit-tests/regression/structdata.c | 1 + libexpat/unit-tests/regression/structdata.h | 1 + libexpat/unit-tests/regression/testscript | 9 +++++++++ 34 files changed, 62 insertions(+), 40 deletions(-) delete mode 120000 libexpat/tests/regression/ascii.h delete mode 100644 libexpat/tests/regression/buildfile delete mode 120000 libexpat/tests/regression/chardata.c delete mode 120000 libexpat/tests/regression/chardata.h delete mode 120000 libexpat/tests/regression/internal.h delete mode 120000 libexpat/tests/regression/memcheck.c delete mode 120000 libexpat/tests/regression/memcheck.h delete mode 120000 libexpat/tests/regression/minicheck.c delete mode 120000 libexpat/tests/regression/minicheck.h delete mode 120000 libexpat/tests/regression/runtests.c delete mode 120000 libexpat/tests/regression/siphash.h delete mode 120000 libexpat/tests/regression/structdata.c delete mode 120000 libexpat/tests/regression/structdata.h delete mode 100644 libexpat/tests/regression/testscript create mode 100644 libexpat/unit-tests/.gitignore create mode 100644 libexpat/unit-tests/regression/buildfile create mode 120000 libexpat/unit-tests/regression/chardata.c create mode 120000 libexpat/unit-tests/regression/chardata.h create mode 120000 libexpat/unit-tests/regression/memcheck.c create mode 120000 libexpat/unit-tests/regression/memcheck.h create mode 120000 libexpat/unit-tests/regression/minicheck.c create mode 120000 libexpat/unit-tests/regression/minicheck.h create mode 120000 libexpat/unit-tests/regression/runtests.c create mode 120000 libexpat/unit-tests/regression/structdata.c create mode 120000 libexpat/unit-tests/regression/structdata.h create mode 100644 libexpat/unit-tests/regression/testscript (limited to 'libexpat') diff --git a/libexpat/.gitignore b/libexpat/.gitignore index 4c4fec7..3dcc22f 100644 --- a/libexpat/.gitignore +++ b/libexpat/.gitignore @@ -3,9 +3,14 @@ *.d *.t *.i +*.i.* *.ii +*.ii.* *.o *.obj +*.gcm +*.pcm +*.ifc *.so *.so.* *.dll diff --git a/libexpat/README-DEV b/libexpat/README-DEV index 32bd6d0..9eb0455 100644 --- a/libexpat/README-DEV +++ b/libexpat/README-DEV @@ -12,9 +12,8 @@ $ popd Use some of the upstream's tests for testing: -$ pushd tests/regression/ +$ pushd unit-tests/regression/ $ ln -s ../../../upstream/expat/tests/*.{c,h} ./ -$ ln -s ../../../upstream/expat/lib/{internal,siphash,ascii}.h ./ $ popd Create libexpat/expat_config.h using as a base the upstream's auto-generated @@ -29,7 +28,7 @@ expat_config.h: $ ln -s ../../upstream/expat/expat_config.h.cmake libexpat/expat_config.h.cmake.orig -$ for m in `cat libexpat/expat_config.h.cmake.orig libexpat/winconfig.h.orig | \ +$ for m in `cat libexpat/expat_config.h.cmake.orig libexpat/winconfig.h | \ sed -n 's/.*#\s*\(define\|cmakedefine\)\s\{1,\}\([_a-zA-Z0-9]\{1,\}\)\(\s.*\)\{0,1\}$/\2/p' | sort -u`; do if grep -q -e "\b$m\b" `find -L . -type f -not -path "./tests/*" -a \( -name '*.h' -a ! -name expat_config.h -o -name '*.c' \)`; then echo "$m" diff --git a/libexpat/build/bootstrap.build b/libexpat/build/bootstrap.build index eb0c50f..a145a49 100644 --- a/libexpat/build/bootstrap.build +++ b/libexpat/build/bootstrap.build @@ -18,10 +18,10 @@ using install # from the comment in expat/configure.ac, the major version (current - age) is # incremented for backwards-incompatible ABI changes. # -if ($version.major == 2 && $version.minor == 2 && $version.patch == 9) +if ($version.major == 2 && $version.minor == 4 && $version.patch == 6) { abi_version_major = 1 - abi_version = "$abi_version_major.6.11" # .. + abi_version = "$abi_version_major.8.6" # .. } else fail 'increment the ABI version?' diff --git a/libexpat/build/root.build b/libexpat/build/root.build index 070d5ec..f34f548 100644 --- a/libexpat/build/root.build +++ b/libexpat/build/root.build @@ -11,3 +11,13 @@ if ($c.target.system == 'win32-msvc') if ($c.class == 'msvc') c.coptions += /wd4251 /wd4275 /wd4800 + +# All exe{} in unit-tests/ are, well, tests. Also don't link whole archives +# by default there. +# +unit-tests/exe{*}: test = true +unit-tests/{libue libul}{*}: bin.whole = false + +# Specify the test target for cross-testing (running tests under Wine, etc). +# +test.target = $c.target diff --git a/libexpat/buildfile b/libexpat/buildfile index 6d3efdd..095eebf 100644 --- a/libexpat/buildfile +++ b/libexpat/buildfile @@ -6,4 +6,5 @@ # Don't install tests or the INSTALL file. # tests/: install = false +unit-tests/: install = false doc{INSTALL}@./: install = false diff --git a/libexpat/libexpat/buildfile b/libexpat/libexpat/buildfile index ef06a2e..c20e977 100644 --- a/libexpat/libexpat/buildfile +++ b/libexpat/libexpat/buildfile @@ -1,11 +1,13 @@ # file : libexpat/buildfile # license : MIT; see accompanying COPYING file +lib{expat}: libul{expat} + # xmltok_{impl,nc}.c files are included into xmltok.c, so exclude them from # the compilation. # -lib{expat}: h{*} c{* -xmltok_impl -xmltok_ns} -lib{expat}: c{xmltok_impl xmltok_ns}: include = false +{libul libue}{expat}: h{*} c{* -xmltok_impl -xmltok_ns} +{libul libue}{expat}: c{xmltok_impl xmltok_ns}: include = false tclass = $c.target.class @@ -21,7 +23,7 @@ libs{expat}: def{libexpat}: include = $msvc_runtime # Build options. # -c.poptions += -DHAVE_EXPAT_CONFIG_H +c.poptions += -DHAVE_EXPAT_CONFIG_H -DXML_BUILDING_EXPAT if! $msvc_runtime c.poptions += -DXML_ENABLE_VISIBILITY=1 diff --git a/libexpat/libexpat/expat_config.h b/libexpat/libexpat/expat_config.h index 38ae39b..6eb5496 100644 --- a/libexpat/libexpat/expat_config.h +++ b/libexpat/libexpat/expat_config.h @@ -5,10 +5,6 @@ #ifndef LIBEXPAT_EXPAT_CONFIG_H #define LIBEXPAT_EXPAT_CONFIG_H -/* Note that on Windows the library source files include winconfig.h that - * includes this header, additionally adding the Windows-specific definitions. - */ - /* Endianess. */ #ifdef __FreeBSD__ diff --git a/libexpat/manifest b/libexpat/manifest index 3651e76..641803e 100644 --- a/libexpat/manifest +++ b/libexpat/manifest @@ -1,7 +1,8 @@ : 1 name: libexpat -version: 2.2.9 +version: 2.4.6-a.0.z project: expat +priority: security summary: Stream-oriented XML parsing C library license: MIT topics: Expat, C, XML parser, streaming diff --git a/libexpat/tests/regression/ascii.h b/libexpat/tests/regression/ascii.h deleted file mode 120000 index 0ad0b66..0000000 --- a/libexpat/tests/regression/ascii.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/lib/ascii.h \ No newline at end of file diff --git a/libexpat/tests/regression/buildfile b/libexpat/tests/regression/buildfile deleted file mode 100644 index f3ed442..0000000 --- a/libexpat/tests/regression/buildfile +++ /dev/null @@ -1,6 +0,0 @@ -# file : tests/regression/buildfile -# license : MIT; see accompanying COPYING file - -import libs = libexpat%lib{expat} - -exe{driver}: {h c}{**} $libs testscript diff --git a/libexpat/tests/regression/chardata.c b/libexpat/tests/regression/chardata.c deleted file mode 120000 index 321a5e8..0000000 --- a/libexpat/tests/regression/chardata.c +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/chardata.c \ No newline at end of file diff --git a/libexpat/tests/regression/chardata.h b/libexpat/tests/regression/chardata.h deleted file mode 120000 index fe51175..0000000 --- a/libexpat/tests/regression/chardata.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/chardata.h \ No newline at end of file diff --git a/libexpat/tests/regression/internal.h b/libexpat/tests/regression/internal.h deleted file mode 120000 index d23a734..0000000 --- a/libexpat/tests/regression/internal.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/lib/internal.h \ No newline at end of file diff --git a/libexpat/tests/regression/memcheck.c b/libexpat/tests/regression/memcheck.c deleted file mode 120000 index c59d54a..0000000 --- a/libexpat/tests/regression/memcheck.c +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/memcheck.c \ No newline at end of file diff --git a/libexpat/tests/regression/memcheck.h b/libexpat/tests/regression/memcheck.h deleted file mode 120000 index 3b9545f..0000000 --- a/libexpat/tests/regression/memcheck.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/memcheck.h \ No newline at end of file diff --git a/libexpat/tests/regression/minicheck.c b/libexpat/tests/regression/minicheck.c deleted file mode 120000 index abcc94a..0000000 --- a/libexpat/tests/regression/minicheck.c +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/minicheck.c \ No newline at end of file diff --git a/libexpat/tests/regression/minicheck.h b/libexpat/tests/regression/minicheck.h deleted file mode 120000 index c499235..0000000 --- a/libexpat/tests/regression/minicheck.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/minicheck.h \ No newline at end of file diff --git a/libexpat/tests/regression/runtests.c b/libexpat/tests/regression/runtests.c deleted file mode 120000 index 7753f85..0000000 --- a/libexpat/tests/regression/runtests.c +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/runtests.c \ No newline at end of file diff --git a/libexpat/tests/regression/siphash.h b/libexpat/tests/regression/siphash.h deleted file mode 120000 index af2eb7e..0000000 --- a/libexpat/tests/regression/siphash.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/lib/siphash.h \ No newline at end of file diff --git a/libexpat/tests/regression/structdata.c b/libexpat/tests/regression/structdata.c deleted file mode 120000 index 69aaeb7..0000000 --- a/libexpat/tests/regression/structdata.c +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/structdata.c \ No newline at end of file diff --git a/libexpat/tests/regression/structdata.h b/libexpat/tests/regression/structdata.h deleted file mode 120000 index f6f572d..0000000 --- a/libexpat/tests/regression/structdata.h +++ /dev/null @@ -1 +0,0 @@ -../../../upstream/expat/tests/structdata.h \ No newline at end of file diff --git a/libexpat/tests/regression/testscript b/libexpat/tests/regression/testscript deleted file mode 100644 index d2af7af..0000000 --- a/libexpat/tests/regression/testscript +++ /dev/null @@ -1,9 +0,0 @@ -# file : tests/regression/testscript -# license : MIT; see accompanying COPYING file - -: check -: -$* >>~/EOE/ - /Expat version: expat_\d+.\d+.\d+/d - /100%: Checks: .+, Failed: 0/ - EOE diff --git a/libexpat/unit-tests/.gitignore b/libexpat/unit-tests/.gitignore new file mode 100644 index 0000000..662178d --- /dev/null +++ b/libexpat/unit-tests/.gitignore @@ -0,0 +1,8 @@ +# Test executables. +# +driver + +# Testscript output directories (can be symlinks). +# +test +test-* diff --git a/libexpat/unit-tests/regression/buildfile b/libexpat/unit-tests/regression/buildfile new file mode 100644 index 0000000..7834355 --- /dev/null +++ b/libexpat/unit-tests/regression/buildfile @@ -0,0 +1,9 @@ +# file : unit-tests/regression/buildfile +# license : MIT; see accompanying COPYING file + +include ../../libexpat/ + +c.poptions += -DXML_BUILDING_EXPAT +c.poptions =+ "-I$src_root/libexpat" + +exe{driver}: {h c}{**} ../../libexpat/libue{expat} testscript diff --git a/libexpat/unit-tests/regression/chardata.c b/libexpat/unit-tests/regression/chardata.c new file mode 120000 index 0000000..321a5e8 --- /dev/null +++ b/libexpat/unit-tests/regression/chardata.c @@ -0,0 +1 @@ +../../../upstream/expat/tests/chardata.c \ No newline at end of file diff --git a/libexpat/unit-tests/regression/chardata.h b/libexpat/unit-tests/regression/chardata.h new file mode 120000 index 0000000..fe51175 --- /dev/null +++ b/libexpat/unit-tests/regression/chardata.h @@ -0,0 +1 @@ +../../../upstream/expat/tests/chardata.h \ No newline at end of file diff --git a/libexpat/unit-tests/regression/memcheck.c b/libexpat/unit-tests/regression/memcheck.c new file mode 120000 index 0000000..c59d54a --- /dev/null +++ b/libexpat/unit-tests/regression/memcheck.c @@ -0,0 +1 @@ +../../../upstream/expat/tests/memcheck.c \ No newline at end of file diff --git a/libexpat/unit-tests/regression/memcheck.h b/libexpat/unit-tests/regression/memcheck.h new file mode 120000 index 0000000..3b9545f --- /dev/null +++ b/libexpat/unit-tests/regression/memcheck.h @@ -0,0 +1 @@ +../../../upstream/expat/tests/memcheck.h \ No newline at end of file diff --git a/libexpat/unit-tests/regression/minicheck.c b/libexpat/unit-tests/regression/minicheck.c new file mode 120000 index 0000000..abcc94a --- /dev/null +++ b/libexpat/unit-tests/regression/minicheck.c @@ -0,0 +1 @@ +../../../upstream/expat/tests/minicheck.c \ No newline at end of file diff --git a/libexpat/unit-tests/regression/minicheck.h b/libexpat/unit-tests/regression/minicheck.h new file mode 120000 index 0000000..c499235 --- /dev/null +++ b/libexpat/unit-tests/regression/minicheck.h @@ -0,0 +1 @@ +../../../upstream/expat/tests/minicheck.h \ No newline at end of file diff --git a/libexpat/unit-tests/regression/runtests.c b/libexpat/unit-tests/regression/runtests.c new file mode 120000 index 0000000..7753f85 --- /dev/null +++ b/libexpat/unit-tests/regression/runtests.c @@ -0,0 +1 @@ +../../../upstream/expat/tests/runtests.c \ No newline at end of file diff --git a/libexpat/unit-tests/regression/structdata.c b/libexpat/unit-tests/regression/structdata.c new file mode 120000 index 0000000..69aaeb7 --- /dev/null +++ b/libexpat/unit-tests/regression/structdata.c @@ -0,0 +1 @@ +../../../upstream/expat/tests/structdata.c \ No newline at end of file diff --git a/libexpat/unit-tests/regression/structdata.h b/libexpat/unit-tests/regression/structdata.h new file mode 120000 index 0000000..f6f572d --- /dev/null +++ b/libexpat/unit-tests/regression/structdata.h @@ -0,0 +1 @@ +../../../upstream/expat/tests/structdata.h \ No newline at end of file diff --git a/libexpat/unit-tests/regression/testscript b/libexpat/unit-tests/regression/testscript new file mode 100644 index 0000000..19e072a --- /dev/null +++ b/libexpat/unit-tests/regression/testscript @@ -0,0 +1,9 @@ +# file : unit-tests/regression/testscript +# license : MIT; see accompanying COPYING file + +: check +: +$* >>~/EOE/ + /Expat version: expat_\d+.\d+.\d+/d + /100%: Checks: .+, Failed: 0/ + EOE -- cgit v1.1