From b225d75714a866e47443ab89d7fa0bbd33f04b4b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 11 Oct 2022 14:23:04 +0300 Subject: Upgrade to 3.2.4 --- TODO | 9 +++++++-- libxerces-c/INSTALL | 4 +--- libxerces-c/README-DEV | 2 +- libxerces-c/build/root.build | 2 +- libxerces-c/buildfile | 2 +- libxerces-c/manifest | 12 ++++-------- libxerces-c/tests/build/root.build | 2 +- libxerces-c/xercesc/internal/IGXMLScanner.cpp | 11 +++++++---- upstream | 2 +- 9 files changed, 24 insertions(+), 22 deletions(-) diff --git a/TODO b/TODO index da80960..4d343a7 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,11 @@ On the revision: On the release: -- Use legal{} target type for legal documentation (LICENSE, AUTHORS, etc). + Note that here we record items that require bumping build2 version + requirement to the latest released version of the toolchain. - Note that this requires bumping build2 version requirement to 0.13.0. +Additional (permanent) notes: + +- Review '@@ TMP' notes. + +- Add/remove 'priority: security' manifest value, if required. diff --git a/libxerces-c/INSTALL b/libxerces-c/INSTALL index 022fbf8..ce836ee 100644 --- a/libxerces-c/INSTALL +++ b/libxerces-c/INSTALL @@ -9,6 +9,4 @@ package manually using the standard build2 build system. Note that by default libxerces-c is built without network support. To enable it, run the following command instead: -@@ Revise when the package conditional dependencies are supported. - -$ bpkg build libxerces-c +{ config.libxerces_c.network=true } libcurl +$ bpkg build libxerces-c +{ config.libxerces_c.network=true } diff --git a/libxerces-c/README-DEV b/libxerces-c/README-DEV index b27a7ef..526bcde 100644 --- a/libxerces-c/README-DEV +++ b/libxerces-c/README-DEV @@ -6,7 +6,7 @@ Symlink the required upstream files and provide our own implementations for auto-generated headers: $ ln -s ../upstream/LICENSE -$ ln -s ../../upstream/src/xercesc/{dom,framework,internal,parsers,sax,sax2,xinclude} \ +$ ln -s ../../upstream/src/xercesc/{dom,framework,parsers,sax,sax2,xinclude} \ xercesc/ $ ln -s ../../upstream/src/{stricmp,strnicmp}.{h,c} xercesc/ diff --git a/libxerces-c/build/root.build b/libxerces-c/build/root.build index 85934ec..82c6790 100644 --- a/libxerces-c/build/root.build +++ b/libxerces-c/build/root.build @@ -6,7 +6,7 @@ # # If enabled, then the libcurl library is used to access network resources. # -config [bool] config.libxerces_c.network ?= false +config [bool] config.libxerces_c.network ?= true # @@ TMP # We rely on C99 in macro deductions (see xercesc/config.h and # xercesc/util/Xerces_autoconf_config.hpp for details). diff --git a/libxerces-c/buildfile b/libxerces-c/buildfile index 28aa742..7f4fe5e 100644 --- a/libxerces-c/buildfile +++ b/libxerces-c/buildfile @@ -1,7 +1,7 @@ # file : buildfile # license : Apache License 2.0; see accompanying LICENSE file -./: {*/ -build/} doc{LICENSE INSTALL README} manifest +./: {*/ -build/} doc{INSTALL README} legal{LICENSE} manifest # Don't install tests or the INSTALL file. # diff --git a/libxerces-c/manifest b/libxerces-c/manifest index 77dee15..cd982d0 100644 --- a/libxerces-c/manifest +++ b/libxerces-c/manifest @@ -3,7 +3,7 @@ name: libxerces-c # Note: remember to update doc-url below! # -version: 3.2.3+4 +version: 3.2.4-a.0.z project: xerces-c summary: Validating XML parsing and serialization C++ library @@ -17,12 +17,8 @@ package-url: https://git.build2.org/cgit/packaging/xerces-c/ email: c-users@xerces.apache.org ; Mailing list. package-email: packaging@build2.org ; Mailing list. build-error-email: builds@build2.org -depends: * build2 >= 0.12.0 -depends: * bpkg >= 0.12.0 - -# @@ Disable until conditional dependencies are supported. -# -#depends: libcurl ^7.67.0 - +depends: * build2 >= 0.15.0 +depends: * bpkg >= 0.15.0 +depends: libcurl ^7.67.0 ? ($config.libxerces_c.network) depends: libicuuc >= 65.1.0 depends: libicui18n >= 65.1.0 diff --git a/libxerces-c/tests/build/root.build b/libxerces-c/tests/build/root.build index 261a20a..0ec2feb 100644 --- a/libxerces-c/tests/build/root.build +++ b/libxerces-c/tests/build/root.build @@ -3,7 +3,7 @@ # Test network support (see parent project for details). # -config [bool] config.libxerces_c.network ?= false +config [bool] config.libxerces_c.network ?= true # @@ TMP cxx.std = latest diff --git a/libxerces-c/xercesc/internal/IGXMLScanner.cpp b/libxerces-c/xercesc/internal/IGXMLScanner.cpp index aa344be..246a46a 100644 --- a/libxerces-c/xercesc/internal/IGXMLScanner.cpp +++ b/libxerces-c/xercesc/internal/IGXMLScanner.cpp @@ -1374,7 +1374,14 @@ void IGXMLScanner::scanDocTypeDecl() // Get copies of the ids we got pubId = XMLString::replicate(bbPubId.getRawBuffer(), fMemoryManager); sysId = XMLString::replicate(bbSysId.getRawBuffer(), fMemoryManager); + } + + // Insure that the ids get cleaned up, if they got allocated + ArrayJanitor janSysId(sysId, fMemoryManager); + ArrayJanitor janPubId(pubId, fMemoryManager); + if (hasExtSubset) + { // Skip spaces and check again for the opening of an internal subset fReaderMgr.skipPastSpaces(); @@ -1384,10 +1391,6 @@ void IGXMLScanner::scanDocTypeDecl() } } - // Insure that the ids get cleaned up, if they got allocated - ArrayJanitor janSysId(sysId, fMemoryManager); - ArrayJanitor janPubId(pubId, fMemoryManager); - // If we have a doc type handler and advanced callbacks are enabled, // call the doctype event. if (fDocTypeHandler) diff --git a/upstream b/upstream index cf1912a..bfe32a1 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit cf1912ac95d4147be08aef4e78f894a3919277d9 +Subproject commit bfe32a149e8cfb60f1ffcdc916996bd8450bedc2 -- cgit v1.1