Prepare release version 2.2.6 (#209)

diff --git a/expat/CMake.README b/expat/CMake.README
index 6ec025b91093a48434297fc1395b158dbf1c51a6..57824a46a2c8d76a00a7f29d8c99360f0a03bfbb 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.5 is the source directory of expat, add a subdirectory\r
+Assuming ~/expat-2.2.6 is the source directory of expat, add a subdirectory\r
 build and change into that directory:\r
-~/expat-2.2.5$ mkdir build && cd build\r
-~/expat-2.2.5/build$\r
+~/expat-2.2.6$ mkdir build && cd build\r
+~/expat-2.2.6/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.5/build$ cmake ..\r
+~/expat-2.2.6/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.5/build\r
+-- Build files have been written to: /home/patrick/expat-2.2.6/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.5/build$ make && make test && make install\r
+~/expat-2.2.6/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 c107deb7a454e896267c55a527d8953185885619..a537f8a778563bf82bc6c386805dea515077dc1e 100644 (file)
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -6,7 +6,7 @@ project(expat)
 cmake_minimum_required(VERSION 2.8.10)\r
 set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")\r
 set(PACKAGE_NAME "expat")\r
-set(PACKAGE_VERSION "2.2.5")\r
+set(PACKAGE_VERSION "2.2.6")\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 ce6413ba8ebb7a3057eba2f25ba5abbadfb421e7..b0ee42cd36cf7392f34a1c05304221f2a875b329 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.6 Sun August 12 2018
         Bug fixes:
        #170 #206  Avoid doing arithmetic with NULL pointers in XML_GetBuffer
        #204 #205  Fix 2.2.5 regression with suspend-resume while parsing

diff --git a/expat/README.md b/expat/README.md
index 984e927e810134e118fad804df01ae781c340c4d..2c7e6ac40506590305b9cdb2ee17de5d7c1ee414 100644 (file)
--- 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.5
+# Expat, Release 2.2.6
 
 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 cd4f4dcd7e8f6c50cefde2d22a3571a4ea710718..3fe7863ba385dd45d2f5e365564b9d057929f96c 100644 (file)
--- a/expat/expat.spec
+++ b/expat/expat.spec
@@ -1,4 +1,4 @@
-%define version 2.2.5
+%define version 2.2.6
 %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
+* Sun Aug 12 2018 Sebastian Pipping <sebastian@pipping.org>
+[Release 2.2.6-1]
+- Update for the 2.2.6 release.
+
 * Tue Oct 31 2017 Sebastian Pipping <sebastian@pipping.org>
 [Release 2.2.5-1]
 - Update for the 2.2.5 release.

diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index 578efac43228946f4a155a045d79f12c1b3f9ea1..174c3fafda3f27342f78666ce241abf4519e2464 100644 (file)
--- 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 5
+#define XML_MICRO_VERSION 6
 
 #ifdef __cplusplus
 }

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index 9d7c96e8d77ed6957b602ccef0cc8590b1c0ecc0..c4f3ffc215c9ef9b3f385a9fc6e3199236e99b5a 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,4 +1,4 @@
-/* 4b74aa710b4ed5ce464b0ce544852cb47bf905c85a49c7bae2749f5885cb966d (2.2.5+)
+/* 19ac4776051591216f1874e34ee99b6a43a3784c8bd7d70efeb9258dd22b906a (2.2.6+)
                             __  __            _
                          ___\ \/ /_ __   __ _| |_
                         / _ \\  /| '_ \ / _` | __|

diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c
index 0597d6078bd7884b6d1d4b2ddc113bf656eea8c3..4f4d2687f113060d1838ecb1b1803a27fb614b77 100644 (file)
--- a/expat/tests/runtests.c
+++ b/expat/tests/runtests.c
@@ -8062,7 +8062,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.2.5")))  /* needs bump on releases */
+    if (xcstrcmp(version_text, XCS("expat_2.2.6")))  /* 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 6168cf7a26f2a08d0c176a2d48fdbf37e224aaf7..20ca746043763f928c601a1707386dd2c7891180 100644 (file)
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -4,7 +4,7 @@
 ; This script was contributed by Tim Peters.
 ; It was designed for Inno Setup 2.0.19 but works with later versions as well.
 
-#define expatVer "2.2.5"
+#define expatVer "2.2.6"
 
 [Setup]
 AppName=Expat