9 files changed, 23 insertions, 19 deletions
diff --git a/expat/CMake.README b/expat/CMake.README
index 281eb52c..6ec025b9 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.2.4 is the source directory of expat, add a subdirectory
+Assuming ~/expat-2.2.5 is the source directory of expat, add a subdirectory
 build and change into that directory:
-~/expat-2.2.4$ mkdir build && cd build
-~/expat-2.2.4/build$
+~/expat-2.2.5$ mkdir build && cd build
+~/expat-2.2.5/build$
 
 From that directory, call cmake first, then call make, make test and 
 make install in the usual way:
-~/expat-2.2.4/build$ cmake ..
+~/expat-2.2.5/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.2.4/build
+-- Build files have been written to: /home/patrick/expat-2.2.5/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.2.4/build$ make && make test && make install
+~/expat-2.2.5/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 230986c5..504d087a 100644
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -6,7 +6,7 @@ project(expat)
 cmake_minimum_required(VERSION 2.6)
 set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")
 set(PACKAGE_NAME "expat")
-set(PACKAGE_VERSION "2.2.4")
+set(PACKAGE_VERSION "2.2.5")
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
 set(PACKAGE_TARNAME "${PACKAGE_NAME}")
 
diff --git a/expat/Changes b/expat/Changes
index 89a066ec..8044982b 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 2.2.5 ???????????????????
+Release 2.2.5 Tue October 31 2017
         Bug fixes:
               #8  If the parser runs out of memory, make sure its internal
                     state reflects the memory it actually has, not the memory
diff --git a/expat/README.md b/expat/README.md
index 5fd5da62..984e927e 100644
--- a/expat/README.md
+++ b/expat/README.md
@@ -2,7 +2,7 @@
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/libexpat/libexpat?svg=true)](https://ci.appveyor.com/project/libexpat/libexpat)
 
 
-# Expat, Release 2.2.4
+# Expat, Release 2.2.5
 
 This is Expat, a C library for parsing XML, started by
 [James Clark](https://en.wikipedia.org/wiki/James_Clark_(programmer)) in 1997.
diff --git a/expat/expat.spec b/expat/expat.spec
index cb7453e4..cd4f4dcd 100644
--- a/expat/expat.spec
+++ b/expat/expat.spec
@@ -1,4 +1,4 @@
-%define version 2.2.4
+%define version 2.2.5
 %define release 1
 
 Summary: Expat is an XML 1.0 parser written in C.
@@ -42,6 +42,10 @@ install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf
 /usr/share/man/man1/xmlwf.1.gz
 
 %changelog
+* Tue Oct 31 2017 Sebastian Pipping <sebastian@pipping.org>
+[Release 2.2.5-1]
+- Update for the 2.2.5 release.
+
 * Sat Aug 19 2017 Sebastian Pipping <sebastian@pipping.org>
 [Release 2.2.4-1]
 - Update for the 2.2.4 release.
diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index d0735bb5..1f608c02 100644
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1076,7 +1076,7 @@ XML_GetFeatureList(void);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 4
+#define XML_MICRO_VERSION 5
 
 #ifdef __cplusplus
 }
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 69ce8d2b..90a237f3 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,4 +1,4 @@
-/* 8c6b2be7c6281da65ce05218fc15c339f02a811706340824ab596aa86e1fd51a (2.2.4+)
+/* 4b74aa710b4ed5ce464b0ce544852cb47bf905c85a49c7bae2749f5885cb966d (2.2.5+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 5d729eab..463bb389 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -8022,13 +8022,13 @@ START_TEST(test_misc_version)
         fail("Version mismatch");
 
 #if ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T)
-    if (xcstrcmp(version_text, XCS("expat_2.2.4")))  /* needs bump on releases */
+    if (xcstrcmp(version_text, XCS("expat_2.2.5")))  /* 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
      * then XML_LChar is defined as char, for some reason.
      */
-    if (strcmp(version_text, "expat_2.2.4")) /* needs bump on releases */
+    if (strcmp(version_text, "expat_2.2.5")) /* needs bump on releases */
         fail("XML_*_VERSION in expat.h out of sync?\n");
 #endif  /* ! defined(XML_UNICODE) || defined(XML_UNICODE_WCHAR_T) */
 }
diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss
index 73f3080b..91dd7a1d 100644
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -7,17 +7,17 @@
 [Setup]
 AppName=Expat
 AppId=expat
-AppVersion=2.2.4
-AppVerName=Expat 2.2.4
+AppVersion=2.2.5
+AppVerName=Expat 2.2.5
 AppCopyright=Copyright � 1998-2017 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
 AppPublisher=The Expat Developers
 AppPublisherURL=http://www.libexpat.org/
 AppSupportURL=http://www.libexpat.org/
 AppUpdatesURL=http://www.libexpat.org/
-UninstallDisplayName=Expat XML Parser 2.2.4
-VersionInfoVersion=2.2.4
+UninstallDisplayName=Expat XML Parser 2.2.5
+VersionInfoVersion=2.2.5
 
-DefaultDirName={pf}\Expat 2.2.4
+DefaultDirName={pf}\Expat 2.2.5
 UninstallFilesDir={app}\Uninstall
 
 Compression=lzma