Bump version, year, and ID for 2.2.1

Also fill earliest release date

diff --git a/expat/CMake.README b/expat/CMake.README
index 8ea551fbb488268abfef26f3e77d50816ebbdcd0..0a2f6007956a2930313e425f03ffb1e5b316ef4a 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.2.0 is the source directory of expat, add a subdirectory\r
+Assuming ~/expat-2.2.1 is the source directory of expat, add a subdirectory\r
 build and change into that directory:\r
-~/expat-2.2.0$ mkdir build && cd build\r
-~/expat-2.2.0/build$\r
+~/expat-2.2.1$ mkdir build && cd build\r
+~/expat-2.2.1/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.0/build$ cmake ..\r
+~/expat-2.2.1/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.0/build\r
+-- Build files have been written to: /home/patrick/expat-2.2.1/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.0/build$ make && make test && make install\r
+~/expat-2.2.1/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 665df806d060f47e84f61649ff77dbf888e50550..e891496b51dbaa64451b5b90c57d6451e5eb0981 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.2.0")\r
+set(PACKAGE_VERSION "2.2.1")\r
 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")\r
 set(PACKAGE_TARNAME "${PACKAGE_NAME}")\r
 \r

diff --git a/expat/COPYING b/expat/COPYING
index 092c83baee13ae5d6d3d22787bf0da3f610753a7..8d288f0f28fddd7bb86d3b224de2bff642298d9c 100644 (file)
--- a/expat/COPYING
+++ b/expat/COPYING
@@ -1,5 +1,5 @@
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2016 Expat maintainers
+Copyright (c) 2001-2017 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

diff --git a/expat/Changes b/expat/Changes
index 3b6d16c7b91fc386b7d4ac710fe364acb2c0967e..028b6190a951feab1b1412d026954804d5dcdc0b 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.1 ??????????
+Release 2.2.1 Sat June 17 2017
         Security fixes:
                   CVE-2017-9233 -- External entity infinite loop DoS
                     Details: https://libexpat.github.io/doc/cve-2017-9233/

diff --git a/expat/README b/expat/README
index a7d28450d54fe965052ea759b41c7f32d03128d4..cd11a226c07a84184e00dc2c6016e5e4497a88fa 100644 (file)
--- a/expat/README
+++ b/expat/README
@@ -1,5 +1,5 @@
 
-                        Expat, Release 2.2.0
+                        Expat, Release 2.2.1
 
 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/expat.spec b/expat/expat.spec
index 77e8c2f3f183f661a8228fda13c37589e22f975f..c852f64971d3bb373c08ed121c8a3a890b1d7a28 100644 (file)
--- a/expat/expat.spec
+++ b/expat/expat.spec
@@ -1,4 +1,4 @@
-%define version 2.2.0
+%define version 2.2.1
 %define release 1
 
 Summary: Expat is an XML 1.0 parser written in C.
@@ -40,6 +40,10 @@ install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf
 /usr/share/man/man1/xmlwf.1.gz
 
 %changelog
+* Sat Jun 17 2017 Sebastian Pipping <sebastian@pipping.org>
+[Release 2.2.1-1]
+- Update for the 2.2.1 release.
+
 * Tue Jun 21 2016 Sebastian Pipping <sebastian@pipping.org>
 [Release 2.2.0-1]
 - Update for the 2.2.0 release.

diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index 9cd68a1751d361a2f624facc41db83b11daac960..28b0f954d419638e63b68ad4203fadcba17737d2 100644 (file)
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -1049,7 +1049,7 @@ XML_GetFeatureList(void);
 */
 #define XML_MAJOR_VERSION 2
 #define XML_MINOR_VERSION 2
-#define XML_MICRO_VERSION 0
+#define XML_MICRO_VERSION 1
 
 #ifdef __cplusplus
 }

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index b6e183d72171046df3c1ba910a978ef0c2757c31..76f078e2505f90bbf78a66df14e3a7fec0f46540 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -1,7 +1,7 @@
 /* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
    See the file COPYING for copying permission.
 
-   94a357957fc7478c8f2bb696095287c1971296939f3adf27cd081f5f214d3bb1 (2.2.0+)
+   77fea421d361dca90041d0040ecf1dca651167fadf2af79e990e35168d70d933 (2.2.1+)
 */
 
 #define _GNU_SOURCE                     /* syscall prototype */

diff --git a/expat/win32/expat.iss b/expat/win32/expat.iss
index 4a0dea0522c851466f4582539a9d8fe23d98ab41..8f63866b050355e7c1f404a361b53625346f063c 100644 (file)
--- a/expat/win32/expat.iss
+++ b/expat/win32/expat.iss
@@ -7,17 +7,17 @@
 [Setup]
 AppName=Expat
 AppId=expat
-AppVersion=2.2.0
-AppVerName=Expat 2.2.0
-AppCopyright=Copyright © 1998-2016 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
+AppVersion=2.2.1
+AppVerName=Expat 2.2.1
+AppCopyright=Copyright © 1998-2017 Thai Open Source Software Center, Clark Cooper, and the Expat maintainers
 AppPublisher=The Expat Developers
 AppPublisherURL=http://www.libexpat.org/
 AppSupportURL=http://www.libexpat.org/
 AppUpdatesURL=http://www.libexpat.org/
-UninstallDisplayName=Expat XML Parser 2.2.0
-VersionInfoVersion=2.2.0
+UninstallDisplayName=Expat XML Parser 2.2.1
+VersionInfoVersion=2.2.1
 
-DefaultDirName={pf}\Expat 2.2.0
+DefaultDirName={pf}\Expat 2.2.1
 UninstallFilesDir={app}\Uninstall
 
 Compression=lzma