Merge pull request #526 from libexpat/issue-525-prepare-release
Release Expat 2.4.2 (part of #525)
diff --git a/expat/CMake.README b/expat/CMake.README
index 99e7e69..581b20b 100644
--- a/expat/CMake.README
+++ b/expat/CMake.README
@@ -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.1 is the source directory of expat, add a subdirectory
+Assuming ~/expat-2.4.2 is the source directory of expat, add a subdirectory
build and change into that directory:
-~/expat-2.4.1$ mkdir build && cd build
-~/expat-2.4.1/build$
+~/expat-2.4.2$ mkdir build && cd build
+~/expat-2.4.2/build$
From that directory, call cmake first, then call make, make test and
make install in the usual way:
-~/expat-2.4.1/build$ cmake ..
+~/expat-2.4.2/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.1/build
+-- Build files have been written to: /home/patrick/expat-2.4.2/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.1/build$ make && make test && make install
+~/expat-2.4.2/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
diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index 11797a5..7e5b959 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -64,7 +64,7 @@
project(expat
VERSION
- 2.4.1
+ 2.4.2
LANGUAGES
C
)
@@ -388,7 +388,7 @@
endif()
set(LIBCURRENT 9) # sync
-set(LIBREVISION 1) # with
+set(LIBREVISION 2) # with
set(LIBAGE 8) # configure.ac!
math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}")
diff --git a/expat/Changes b/expat/Changes
index f566cbf..6e7f739 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -2,18 +2,23 @@
https://github.com/libexpat/libexpat/labels/help%20wanted
If you can help, please get in touch. Thanks!
-Release 2.4.2 xxx xxx xx xxxx
+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
- #497 Autotools: Include files with release archives:
+ #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
diff --git a/expat/README.md b/expat/README.md
index 251dc8a..5530082 100644
--- a/expat/README.md
+++ b/expat/README.md
@@ -5,7 +5,7 @@
[](https://github.com/libexpat/libexpat/releases)
-# Expat, Release 2.4.1
+# Expat, Release 2.4.2
This is Expat, a C library for parsing XML, started by
[James Clark](https://en.wikipedia.org/wiki/James_Clark_%28programmer%29) in 1997.
diff --git a/expat/configure.ac b/expat/configure.ac
index 44a954f..e71bdbd 100644
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -82,7 +82,7 @@
dnl
LIBCURRENT=9 # sync
-LIBREVISION=1 # with
+LIBREVISION=2 # with
LIBAGE=8 # CMakeLists.txt!
AC_CONFIG_HEADERS([expat_config.h])
diff --git a/expat/doc/reference.html b/expat/doc/reference.html
index bfea3b2..9f5bb9a 100644
--- a/expat/doc/reference.html
+++ b/expat/doc/reference.html
@@ -49,7 +49,7 @@
<div>
<h1>
The Expat XML Parser
- <small>Release 2.4.1</small>
+ <small>Release 2.4.2</small>
</h1>
</div>
<div class="content">
diff --git a/expat/doc/xmlwf.xml b/expat/doc/xmlwf.xml
index fa1b356..99197a0 100644
--- a/expat/doc/xmlwf.xml
+++ b/expat/doc/xmlwf.xml
@@ -22,7 +22,7 @@
<!ENTITY dhfirstname "<firstname>Scott</firstname>">
<!ENTITY dhsurname "<surname>Bronson</surname>">
<!-- Please adjust the date whenever revising the manpage. -->
- <!ENTITY dhdate "<date>May 23, 2021</date>">
+ <!ENTITY dhdate "<date>December 19, 2021</date>">
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
<!ENTITY dhemail "<email>bronson@rinspin.com</email>">
<!ENTITY dhusername "Scott Bronson">
diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index b7d6d35..16bc92a 100644
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1041,7 +1041,7 @@
*/
#define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 4
-#define XML_MICRO_VERSION 1
+#define XML_MICRO_VERSION 2
#ifdef __cplusplus
}
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 2811d86..d730f41 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,4 +1,4 @@
-/* 8539b9040d9d901366a62560a064af7cb99811335784b363abc039c5b0ebc416 (2.4.1+)
+/* 0550bc9a27b099d462d8d1007271cfeaa39852f20cd0d5d2caeadaeb39516fbe (2.4.2+)
__ __ _
___\ \/ /_ __ __ _| |_
/ _ \\ /| '_ \ / _` | __|
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 3f514c3..6388d9d 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -7352,7 +7352,7 @@
fail("Version mismatch");
#if ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T)
- if (xcstrcmp(version_text, XCS("expat_2.4.1"))) /* needs bump on releases */
+ if (xcstrcmp(version_text, XCS("expat_2.4.2"))) /* 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
diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss
index 3879033..13940d1 100644
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -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.1"
+#define expatVer "2.4.2"
[Setup]
AppName=Expat
