Set version 2.2.0/2016-06-18 where missing

diff --git a/expat/CMake.README b/expat/CMake.README
index 0b081ee7296876a4f576d92b68fd02bbf518ddc4..8ea551fbb488268abfef26f3e77d50816ebbdcd0 100755 (executable)
--- 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.1.1 is the source directory of expat, add a subdirectory\r
+Assuming ~/expat-2.2.0 is the source directory of expat, add a subdirectory\r
 build and change into that directory:\r
-~/expat-2.1.1$ mkdir build && cd build\r
-~/expat-2.1.1/build$\r
+~/expat-2.2.0$ mkdir build && cd build\r
+~/expat-2.2.0/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.1.1/build$ cmake ..\r
+~/expat-2.2.0/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.1.1/build\r
+-- Build files have been written to: /home/patrick/expat-2.2.0/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.1.1/build$ make && make test && make install\r
+~/expat-2.2.0/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 7dac026cfc6b898743ff88e3e1dfae3b62a11870..53c65bcc3ad320b53412214f6dce694d87330438 100755 (executable)
--- 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.1.1")\r
+set(PACKAGE_VERSION "2.2.0")\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 a43fcfa61c1c9a9e22c4f0c076d2eac7787f50af..292c633f9dd4aebee903d4816c6d3e1d99240e14 100644 (file)
--- a/expat/Changes
+++ b/expat/Changes
@@ -1,4 +1,4 @@
-Release ??? ???
+Release 2.2.0 Sat June 18 2016
         Security fixes:
             #537  CVE-2016-0718 -- Fix crash on malformed input
                   CVE-2016-4472 -- Improve insufficient fix to CVE-2015-1283 /

diff --git a/expat/README b/expat/README
index d61e75a29dc1f523aca9d6aaa84a6bd695c34a57..a7d28450d54fe965052ea759b41c7f32d03128d4 100644 (file)
--- a/expat/README
+++ b/expat/README
@@ -1,5 +1,5 @@
 
-                        Expat, Release 2.1.1
+                        Expat, Release 2.2.0
 
 This is Expat, a C library for parsing XML, written by James Clark.
 Expat is a stream-oriented XML parser.  This means that you register

diff --git a/expat/configure.ac b/expat/configure.ac
index 9598c00cee8e2f1609f34a5072ef7b17ee9fde15..a06c3e49fc25d0ba67672b0983ad4fc18d969556 100644 (file)
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -25,7 +25,7 @@ dnl test. I believe this test will work, but I don't have a place with non-
 dnl GNU M4 to test it right now.
 define([expat_version], ifdef([__gnu__],
                               [esyscmd(conftools/get-version.sh lib/expat.h)],
-                              [2.1.x]))
+                              [2.2.x]))
 AC_INIT(expat, expat_version, expat-bugs@libexpat.org)
 undefine([expat_version])
 

diff --git a/expat/expat.spec b/expat/expat.spec
index 664aceda869e099b09cd86fdf82bdc4a34e499d3..f0f7d919c7bf3ba847b58b3031dec7e9af380746 100644 (file)
--- a/expat/expat.spec
+++ b/expat/expat.spec
@@ -40,6 +40,10 @@ install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf
 /usr/share/man/man1/xmlwf.1.gz
 
 %changelog
+* Sat Jun 18 2016 Sebastian Pipping <sebastian@pipping.org>
+[Release 2.2.0-1]
+- Update for the 2.2.0 release.
+
 * Wed Mar 2 2016 Sebastian Pipping <sebastian@pipping.org>
 [Release 2.1.1-1]
 - Update for the 2.1.1 release.

diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index 9ac27cbb2b753fa5aaaf7e8f33e0cea3c352a3de..fb1bb273723520d7f09a0aa5b49bcb31111cbc3f 100644 (file)
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1040,8 +1040,8 @@ XML_GetFeatureList(void);
    change to major or minor version.
 */
 #define XML_MAJOR_VERSION 2
-#define XML_MINOR_VERSION 1
-#define XML_MICRO_VERSION 1
+#define XML_MINOR_VERSION 2
+#define XML_MICRO_VERSION 0
 
 #ifdef __cplusplus
 }

diff --git a/htdocs/index.html b/htdocs/index.html
index 29d6f3db81bbfefc11babd68987f90898a17cc32..c76b514c3d7e3d871e4276815c5eaa5250642f65 100644 (file)
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -60,10 +60,10 @@ of Expat.</p>
 <h3 id="news">News</h3>
 
 <dl>
-  <dt><em>???</em>,
-      Expat ??? released.
+  <dt><em>18 June 2016</em>,
+      Expat 2.2.0 released.
     </dt>
-  <dd><p>Release ??? includes security &amp; other bug fixes.</p>
+  <dd><p>Release 2.2.0 includes security &amp; other bug fixes.</p>
     <h4>Security fixes</h4>
     <dl>
       <dt><a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-0718">CVE-2016-0718</a>