Prepare release version 2.2.3

diff --git a/expat/CMake.README b/expat/CMake.README
index 817f7b40b6aa94e640f725c1185b6efa9b909091..6ac3eb446c80e2f0ab7ed0dc0516525f81065bdd 100644 (file)
--- a/expat/CMake.README
+++ b/expat/CMake.README
@@ -3,25 +3,25 @@
 The cmake based buildsystem for expat works on Windows (cygwin, mingw, Visual \r
 Studio) and should work on all other platform cmake supports.\r
 \r
-Assuming ~/expat-2.2.2 is the source directory of expat, add a subdirectory\r
+Assuming ~/expat-2.2.3 is the source directory of expat, add a subdirectory\r
 build and change into that directory:\r
-~/expat-2.2.2$ mkdir build && cd build\r
-~/expat-2.2.2/build$\r
+~/expat-2.2.3$ mkdir build && cd build\r
+~/expat-2.2.3/build$\r
 \r
 From that directory, call cmake first, then call make, make test and \r
 make install in the usual way:\r
-~/expat-2.2.2/build$ cmake ..\r
+~/expat-2.2.3/build$ cmake ..\r
 -- The C compiler identification is GNU\r
 -- The CXX compiler identification is GNU\r
 ....\r
 -- Configuring done\r
 -- Generating done\r
--- Build files have been written to: /home/patrick/expat-2.2.2/build\r
+-- Build files have been written to: /home/patrick/expat-2.2.3/build\r
 \r
 If you want to specify the install location for your files, append \r
 -DCMAKE_INSTALL_PREFIX=/your/install/path to the cmake call.\r
 \r
-~/expat-2.2.2/build$ make && make test && make install\r
+~/expat-2.2.3/build$ make && make test && make install\r
 Scanning dependencies of target expat\r
 [  5%] Building C object CMakeFiles/expat.dir/lib/xmlparse.c.o\r
 [ 11%] Building C object CMakeFiles/expat.dir/lib/xmlrole.c.o\r

diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt
index 748a93578b39b286836aa34e5bf549985aff15fc..9ba93f400b04c9468a26fc2f141f5c3557b50977 100644 (file)
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -6,7 +6,7 @@ project(expat)
 cmake_minimum_required(VERSION 2.6)\r
 set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")\r
 set(PACKAGE_NAME "expat")\r
-set(PACKAGE_VERSION "2.2.2")\r
+set(PACKAGE_VERSION "2.2.3")\r
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")\r
 set(PACKAGE_TARNAME "${PACKAGE_NAME}")\r
 \r

diff --git a/expat/Changes b/expat/Changes
index cdb1f945293a19cedda8a7a39e410486cf3059de..147f48288aaaf17b1b3dd78eb1e5dea31ec1fc02 100644 (file)
--- 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 367c43839d281a123ecd2f1e09c6578cd1868a48..0a1777e7eac820a6a2f6b1db34213e485fae2d78 100644 (file)
--- 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 e826755b4e5cb8a212d96e086ad8b312cbe1a9cb..924b836284bd40a5b965ae9583e431bab1bf9894 100644 (file)
--- 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 b6b02f4955f7329d751682e3dadddd310c0351f5..7e5bbb7e393591eb2bbba5ce53d758736f8c3735 100644 (file)
--- 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 c20bc395be4dac18f95ce050f3ae1121a7ff984f..b703e61a040454997366a052cc21c7201cc1ed6d 100644 (file)
--- 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 572473c9c59cd04b3f75403fe3949377489aa526..aa95fd377b82d1ce20b60eeb7a2d9dbd23f5f2e6 100644 (file)
--- 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 babd1bb8f5c14c9b1a999b9f68fb9a0f72a7c571..04968e7d41b7cb4c3d2416430fd36b7f6bd3df2c 100644 (file)
--- 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