From a0eaef2d6713e1ca02e7714fe569c24115fd776e Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 17 Jun 2016 23:52:19 +0200 Subject: [PATCH] Set version 2.2.0/2016-06-18 where missing --- expat/CMake.README | 12 ++++++------ expat/CMakeLists.txt | 2 +- expat/Changes | 2 +- expat/README | 2 +- expat/configure.ac | 2 +- expat/expat.spec | 4 ++++ expat/lib/expat.h | 4 ++-- htdocs/index.html | 6 +++--- 8 files changed, 19 insertions(+), 15 deletions(-) diff --git a/expat/CMake.README b/expat/CMake.README index 0b081ee7..8ea551fb 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 7dac026c..53c65bcc 100755 --- 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.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 a43fcfa6..292c633f 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 d61e75a2..a7d28450 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 9598c00c..a06c3e49 100644 --- 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 664aceda..f0f7d919 100644 --- 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 +[Release 2.2.0-1] +- Update for the 2.2.0 release. + * Wed Mar 2 2016 Sebastian Pipping [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 9ac27cbb..fb1bb273 100644 --- 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 29d6f3db..c76b514c 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -60,10 +60,10 @@ of Expat.

News

-
???, - Expat ??? released. +
18 June 2016, + Expat 2.2.0 released.
-

Release ??? includes security & other bug fixes.

+

Release 2.2.0 includes security & other bug fixes.

Security fixes

CVE-2016-0718 -- 2.40.0