summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Pipping <sebastian@pipping.org>2021-05-11 15:55:19 +0200
committerSebastian Pipping <sebastian@pipping.org>2021-05-22 19:07:49 +0200
commitb913a529ae090647c015d4212048b58ebae93aeb (patch)
tree9f190f7a34bb43c06b4ee5273a65010d7eb7059a
parentbc6495dfc0ce36277d36c231f794b10e5ed4e609 (diff)
downloadlibexpat-git-b913a529ae090647c015d4212048b58ebae93aeb.tar.gz
Bump version to 2.4.0
-rw-r--r--expat/CMake.README12
-rw-r--r--expat/CMakeLists.txt2
-rw-r--r--expat/Changes2
-rw-r--r--expat/README.md2
-rw-r--r--expat/doc/reference.html2
-rw-r--r--expat/lib/expat.h2
-rw-r--r--expat/lib/xmlparse.c2
-rw-r--r--expat/tests/runtests.c2
-rw-r--r--expat/win32/expat.iss2
9 files changed, 14 insertions, 14 deletions
diff --git a/expat/CMake.README b/expat/CMake.README
index a512a7b7..bd7c51c5 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.3.0 is the source directory of expat, add a subdirectory
+Assuming ~/expat-2.4.0 is the source directory of expat, add a subdirectory
build and change into that directory:
-~/expat-2.3.0$ mkdir build && cd build
-~/expat-2.3.0/build$
+~/expat-2.4.0$ mkdir build && cd build
+~/expat-2.4.0/build$
From that directory, call cmake first, then call make, make test and
make install in the usual way:
-~/expat-2.3.0/build$ cmake ..
+~/expat-2.4.0/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.3.0/build
+-- Build files have been written to: /home/patrick/expat-2.4.0/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.3.0/build$ make && make test && make install
+~/expat-2.4.0/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 bf48e6d1..c747f3e1 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -64,7 +64,7 @@ endif()
project(expat
VERSION
- 2.3.0
+ 2.4.0
LANGUAGES
C
)
diff --git a/expat/Changes b/expat/Changes
index 07b2e1a3..c9d17276 100644
--- a/expat/Changes
+++ b/expat/Changes
@@ -2,7 +2,7 @@ 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 XXXXX XX XXXX
+Release 2.4.0 XXX XXXXX XX XXXX
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,
diff --git a/expat/README.md b/expat/README.md
index 9f1f8410..94e0bb14 100644
--- a/expat/README.md
+++ b/expat/README.md
@@ -5,7 +5,7 @@
[![Downloads GitHub](https://img.shields.io/github/downloads/libexpat/libexpat/total?label=Downloads%20GitHub)](https://github.com/libexpat/libexpat/releases)
-# Expat, Release 2.3.0
+# Expat, Release 2.4.0
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/doc/reference.html b/expat/doc/reference.html
index 8e77a10c..acedcf1c 100644
--- a/expat/doc/reference.html
+++ b/expat/doc/reference.html
@@ -48,7 +48,7 @@
<div>
<h1>
The Expat XML Parser
- <small>Release 2.3.0</small>
+ <small>Release 2.4.0</small>
</h1>
</div>
<div class="content">
diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index 30a064ad..016c1c5f 100644
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1040,7 +1040,7 @@ XML_SetBillionLaughsAttackProtectionActivationThreshold(
See http://semver.org.
*/
#define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 3
+#define XML_MINOR_VERSION 4
#define XML_MICRO_VERSION 0
#ifdef __cplusplus
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 6a59342c..214c93fd 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,4 +1,4 @@
-/* d667b5f8e56e24fdfaf5e38596d419d924a9fadceb987d81d5613ecb7ca51b0e (2.3.0+)
+/* 40f0f9c2be99a31dd0c833cd7d5a1bbd825a95e241f6e6c689b69ce275aba9a9 (2.4.0+)
__ __ _
___\ \/ /_ __ __ _| |_
/ _ \\ /| '_ \ / _` | __|
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index e3944561..8cee7ee8 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -7351,7 +7351,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.3.0"))) /* needs bump on releases */
+ if (xcstrcmp(version_text, XCS("expat_2.4.0"))) /* 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 2f25a501..4d37cd24 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.3.0"
+#define expatVer "2.4.0"
[Setup]
AppName=Expat