Prepare release version 2.2.3R_2_2_3

9 files changed, 22 insertions, 18 deletions

diff --git a/expat/CMake.README b/expat/CMake.README
index 817f7b40..6ac3eb44 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.2 is the source directory of expat, add a subdirectory

+Assuming ~/expat-2.2.3 is the source directory of expat, add a subdirectory

 build and change into that directory:

-~/expat-2.2.2$ mkdir build && cd build

-~/expat-2.2.2/build$

+~/expat-2.2.3$ mkdir build && cd build

+~/expat-2.2.3/build$

 

 From that directory, call cmake first, then call make, make test and 

 make install in the usual way:

-~/expat-2.2.2/build$ cmake ..

+~/expat-2.2.3/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.2/build

+-- Build files have been written to: /home/patrick/expat-2.2.3/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.2/build$ make && make test && make install

+~/expat-2.2.3/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 748a9357..9ba93f40 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.2")

+set(PACKAGE_VERSION "2.2.3")

 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

 set(PACKAGE_TARNAME "${PACKAGE_NAME}")

 

diff --git a/expat/Changes b/expat/Changes
index cdb1f945..147f4828 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.? ????????????????
+Release 2.2.3 Wed August 2 2017
         Security fixes:
              #82  CVE-2017-11742 -- Windows: Fix DLL hijacking vulnerability
                     using Steve Holme's LoadLibrary wrapper for/of cURL
diff --git a/expat/README.md b/expat/README.md
index 367c4383..0a1777e7 100644
--- a/expat/README.md
+++ b/expat/README.md
@@ -1,4 +1,4 @@
-# Expat, Release 2.2.2
+# Expat, Release 2.2.3
 
 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 e826755b..924b8362 100644
--- a/expat/expat.spec
+++ b/expat/expat.spec
@@ -1,4 +1,4 @@
-%define version 2.2.2
+%define version 2.2.3
 %define release 1
 
 Summary: Expat is an XML 1.0 parser written in C.
@@ -40,6 +40,10 @@ install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf
 /usr/share/man/man1/xmlwf.1.gz
 
 %changelog
+* Wed Aug 2 2017 Sebastian Pipping <sebastian@pipping.org>
+[Release 2.2.3-1]
+- Update for the 2.2.3 release.
+
 * Wed Jul 12 2017 Sebastian Pipping <sebastian@pipping.org>
 [Release 2.2.2-1]
 - Update for the 2.2.2 release.
diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index b6b02f49..7e5bbb7e 100644
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1048,7 +1048,7 @@ XML_GetFeatureList(void);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 2
+#define XML_MICRO_VERSION 3
 
 #ifdef __cplusplus
 }
diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index c20bc395..b703e61a 100644
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
    See the file COPYING for copying permission.
 
-   cd4063469a95eab9a93001afb109e3dee122cdda4635bbec36257fc01c327348 (2.2.2+)
+   101bfd65d1ff3d1511cf6671e6aae65f82cd97df6f4da137d46d510731830ad9 (2.2.3+)
 */
 
 #if !defined(_GNU_SOURCE)
diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 572473c9..aa95fd37 100644
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -7738,7 +7738,7 @@ START_TEST(test_misc_version)
         fail("Version mismatch");
 
 #if ! defined(XML_UNICODE)
-    if (strcmp(version_text, "expat_2.2.2"))  /* needs bump on releases */
+    if (strcmp(version_text, "expat_2.2.3"))  /* needs bump on releases */
         fail("XML_*_VERSION in expat.h out of sync?\n");
 #endif  /* ! defined(XML_UNICODE) */
 }
diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss
index babd1bb8..04968e7d 100644
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -7,17 +7,17 @@
 [Setup]
 AppName=Expat
 AppId=expat
-AppVersion=2.2.2
-AppVerName=Expat 2.2.2
+AppVersion=2.2.3
+AppVerName=Expat 2.2.3
 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.2
-VersionInfoVersion=2.2.2
+UninstallDisplayName=Expat XML Parser 2.2.3
+VersionInfoVersion=2.2.3
 
-DefaultDirName={pf}\Expat 2.2.2
+DefaultDirName={pf}\Expat 2.2.3
 UninstallFilesDir={app}\Uninstall
 
 Compression=lzma