Set version 2.2.0/2016-06-18 where missing
diff --git a/expat/CMake.README b/expat/CMake.README
index 0b081ee..8ea551f 100755
--- 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.1.1 is the source directory of expat, add a subdirectory
+Assuming ~/expat-2.2.0 is the source directory of expat, add a subdirectory
build and change into that directory:
-~/expat-2.1.1$ mkdir build && cd build
-~/expat-2.1.1/build$
+~/expat-2.2.0$ mkdir build && cd build
+~/expat-2.2.0/build$
From that directory, call cmake first, then call make, make test and
make install in the usual way:
-~/expat-2.1.1/build$ cmake ..
+~/expat-2.2.0/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.1.1/build
+-- Build files have been written to: /home/patrick/expat-2.2.0/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.1.1/build$ make && make test && make install
+~/expat-2.2.0/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 7dac026..53c65bc 100755
--- a/expat/CMakeLists.txt
+++ b/expat/CMakeLists.txt
@@ -6,7 +6,7 @@
cmake_minimum_required(VERSION 2.6)
set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org")
set(PACKAGE_NAME "expat")
-set(PACKAGE_VERSION "2.1.1")
+set(PACKAGE_VERSION "2.2.0")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}")
diff --git a/expat/Changes b/expat/Changes
index a43fcfa..292c633 100644
--- 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 d61e75a..a7d2845 100644
--- 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 9598c00..a06c3e4 100644
--- a/expat/configure.ac
+++ b/expat/configure.ac
@@ -25,7 +25,7 @@
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 664aced..f0f7d91 100644
--- a/expat/expat.spec
+++ b/expat/expat.spec
@@ -40,6 +40,10 @@
/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 9ac27cb..fb1bb27 100644
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1040,8 +1040,8 @@
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 29d6f3d..c76b514 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -60,10 +60,10 @@
<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 & other bug fixes.</p>
+ <dd><p>Release 2.2.0 includes security & 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>
