mirror of
https://github.com/libexpat/libexpat.git
synced 2025-04-08 06:29:23 +00:00
Merge pull request #568 from libexpat/issue-567-prepare-release
Prepare release 2.4.6 (part of #567)
This commit is contained in:
Sebastian Pipping
GitHub
commit
65a21f2b2a
11 changed files with 22 additions and 18 deletions
|
|
@ -3,25 +3,25 @@
|
|||
The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual
|
||||
Studio) and should work on all other platform cmake supports.
|
||||
|
||||
Assuming ~/expat-2.4.5 is the source directory of expat, add a subdirectory
|
||||
Assuming ~/expat-2.4.6 is the source directory of expat, add a subdirectory
|
||||
build and change into that directory:
|
||||
~/expat-2.4.5$ mkdir build && cd build
|
||||
~/expat-2.4.5/build$
|
||||
~/expat-2.4.6$ mkdir build && cd build
|
||||
~/expat-2.4.6/build$
|
||||
|
||||
From that directory, call cmake first, then call make, make test and
|
||||
make install in the usual way:
|
||||
~/expat-2.4.5/build$ cmake ..
|
||||
~/expat-2.4.6/build$ cmake ..
|
||||
-- The C compiler identification is GNU
|
||||
-- The CXX compiler identification is GNU
|
||||
....
|
||||
-- Configuring done
|
||||
-- Generating done
|
||||
-- Build files have been written to: /home/patrick/expat-2.4.5/build
|
||||
-- Build files have been written to: /home/patrick/expat-2.4.6/build
|
||||
|
||||
If you want to specify the install location for your files, append
|
||||
-DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.
|
||||
|
||||
~/expat-2.4.5/build$ make && make test && make install
|
||||
~/expat-2.4.6/build$ make && make test && make install
|
||||
Scanning dependencies of target expat
|
||||
[ 5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o
|
||||
[ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ endif()
|
|||
|
||||
project(expat
|
||||
VERSION
|
||||
2.4.5
|
||||
2.4.6
|
||||
LANGUAGES
|
||||
C
|
||||
)
|
||||
|
|
@ -408,7 +408,7 @@ if(EXPAT_WITH_LIBBSD)
|
|||
endif()
|
||||
|
||||
set(LIBCURRENT 9) # sync
|
||||
set(LIBREVISION 5) # with
|
||||
set(LIBREVISION 6) # with
|
||||
set(LIBAGE 8) # configure.ac!
|
||||
math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,18 @@ NOTE: We are looking for help with a few things:
|
|||
https://github.com/libexpat/libexpat/labels/help%20wanted
|
||||
If you can help, please get in touch. Thanks!
|
||||
|
||||
Release x.x.x xxx xxxxxxxx xx xxxx
|
||||
Release 2.4.6 Sun February 20 2022
|
||||
Bug fixes:
|
||||
#??? Fix a regression intruced by the fix for CVE-2022-25313
|
||||
#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
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
[](https://github.com/libexpat/libexpat/releases)
|
||||
|
||||
|
||||
# Expat, Release 2.4.5
|
||||
# Expat, Release 2.4.6
|
||||
|
||||
This is Expat, a C library for parsing XML, started by
|
||||
[James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997.
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0
|
|||
dnl
|
||||
|
||||
LIBCURRENT=9 # sync
|
||||
LIBREVISION=5 # with
|
||||
LIBREVISION=6 # with
|
||||
LIBAGE=8 # CMakeLists.txt!
|
||||
|
||||
AC_CONFIG_HEADERS([expat_config.h])
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
<div>
|
||||
<h1>
|
||||
The Expat XML Parser
|
||||
<small>Release 2.4.5</small>
|
||||
<small>Release 2.4.6</small>
|
||||
</h1>
|
||||
</div>
|
||||
<div class="content">
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
|
||||
<!ENTITY dhfirstname "<firstname>Scott</firstname>">
|
||||
<!ENTITY dhsurname "<surname>Bronson</surname>">
|
||||
<!ENTITY dhdate "<date>February 18, 2022</date>">
|
||||
<!ENTITY dhdate "<date>February 20, 2022</date>">
|
||||
<!-- Please adjust this^^ date whenever cutting a new release. -->
|
||||
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
|
||||
<!ENTITY dhemail "<email>bronson@rinspin.com</email>">
|
||||
|
|
|
|||
|
|
@ -1041,7 +1041,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold(
|
|||
*/
|
||||
#define XML_MAJOR_VERSION 2
|
||||
#define XML_MINOR_VERSION 4
|
||||
#define XML_MICRO_VERSION 5
|
||||
#define XML_MICRO_VERSION 6
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* 042615face2b8727e23bb27cf4f56baa292a1f91df47c1bca8f09dff49067888 (2.4.5+)
|
||||
/* a30d2613dcfdef81475a9d1a349134d2d42722172fdaa7d5bb12ed2aa74b9596 (2.4.6+)
|
||||
__ __ _
|
||||
___\ \/ /_ __ __ _| |_
|
||||
/ _ \\ /| '_ \ / _` | __|
|
||||
|
|
|
|||
|
|
@ -7588,7 +7588,7 @@ START_TEST(test_misc_version) {
|
|||
fail("Version mismatch");
|
||||
|
||||
#if ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T)
|
||||
if (xcstrcmp(version_text, XCS("expat_2.4.5"))) /* needs bump on releases */
|
||||
if (xcstrcmp(version_text, XCS("expat_2.4.6"))) /* needs bump on releases */
|
||||
fail("XML_*_VERSION in expat.h out of sync?\n");
|
||||
#else
|
||||
/* If we have XML_UNICODE defined but not XML_UNICODE_WCHAR_T
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
; OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
||||
; USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
#define expatVer "2.4.5"
|
||||
#define expatVer "2.4.6"
|
||||
|
||||
[Setup]
|
||||
AppName=Expat
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue