From d3b78b42a2dcdea98e22625cfff67a49d47e6025 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Wed, 19 Jun 2019 18:33:02 +0200 Subject: [PATCH] Bump version from 2.2.6 to 2.2.7 --- expat/CMake.README | 12 ++++++------ expat/CMakeLists.txt | 2 +- expat/Changes | 2 +- expat/README.md | 2 +- expat/expat.spec | 6 +++++- expat/lib/expat.h | 2 +- expat/lib/xmlparse.c | 2 +- expat/tests/runtests.c | 2 +- expat/win32/expat.iss | 2 +- 9 files changed, 18 insertions(+), 14 deletions(-) diff --git a/expat/CMake.README b/expat/CMake.README index 57824a46..fa6823a9 100644 --- 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.2.6 is the source directory of expat, add a subdirectory +Assuming ~/expat-2.2.7 is the source directory of expat, add a subdirectory build and change into that directory: -~/expat-2.2.6$ mkdir build && cd build -~/expat-2.2.6/build$ +~/expat-2.2.7$ mkdir build && cd build +~/expat-2.2.7/build$ From that directory, call cmake first, then call make, make test and make install in the usual way: -~/expat-2.2.6/build$ cmake .. +~/expat-2.2.7/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.2.6/build +-- Build files have been written to: /home/patrick/expat-2.2.7/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.2.6/build$ make && make test && make install +~/expat-2.2.7/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 76830abb..bcd91ba6 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -6,7 +6,7 @@ project(expat) cmake_minimum_required(VERSION 2.8.10) set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org") set(PACKAGE_NAME "expat") -set(PACKAGE_VERSION "2.2.6") +set(PACKAGE_VERSION "2.2.7") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}") diff --git a/expat/Changes b/expat/Changes index e1f7bcaa..a587e9ab 100644 --- 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 x.x.x XXX XXXXXX XX XXXX +Release 2.2.7 Wed June 19 2019 Security fixes: #186 #262 Fix extraction of namespace prefixes from XML names; XML names with multiple colons could end up in the diff --git a/expat/README.md b/expat/README.md index 505d9dfe..fd3911eb 100644 --- a/expat/README.md +++ b/expat/README.md @@ -3,7 +3,7 @@ [![Packaging status](https://repology.org/badge/tiny-repos/expat.svg)](https://repology.org/metapackage/expat/versions) -# Expat, Release 2.2.6 +# Expat, Release 2.2.7 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 3fe7863b..634dfafd 100644 --- a/expat/expat.spec +++ b/expat/expat.spec @@ -1,4 +1,4 @@ -%define version 2.2.6 +%define version 2.2.7 %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 +* Wed Jun 19 2019 Sebastian Pipping +[Release 2.2.7-1] +- Update for the 2.2.7 release. + * Sun Aug 12 2018 Sebastian Pipping [Release 2.2.6-1] - Update for the 2.2.6 release. diff --git a/expat/lib/expat.h b/expat/lib/expat.h index 174c3faf..c050f1d9 100644 --- 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 6 +#define XML_MICRO_VERSION 7 #ifdef __cplusplus } diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c index 737d7cd2..9c0987f4 100644 --- a/expat/lib/xmlparse.c +++ b/expat/lib/xmlparse.c @@ -1,4 +1,4 @@ -/* 19ac4776051591216f1874e34ee99b6a43a3784c8bd7d70efeb9258dd22b906a (2.2.6+) +/* 69df5be70289a11fb834869ce4a91c23c1d9dd04baffcbd10e86742d149a080c (2.2.7+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| diff --git a/expat/tests/runtests.c b/expat/tests/runtests.c index 4f4d2687..ccad50f4 100644 --- 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.6"))) /* needs bump on releases */ + if (xcstrcmp(version_text, XCS("expat_2.2.7"))) /* 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 20ca7460..20f50815 100644 --- 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.6" +#define expatVer "2.2.7" [Setup] AppName=Expat