Bump version, year, and ID for 2.2.1

Also fill earliest release date

9 files changed, 23 insertions, 19 deletions

diff --git a/expat/CMake.README b/expat/CMake.README
index 8ea551fb..0a2f6007 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.2.0 is the source directory of expat, add a subdirectory

+Assuming ~/expat-2.2.1 is the source directory of expat, add a subdirectory

 build and change into that directory:

-~/expat-2.2.0$ mkdir build && cd build

-~/expat-2.2.0/build$

+~/expat-2.2.1$ mkdir build && cd build

+~/expat-2.2.1/build$

 

 From that directory, call cmake first, then call make, make test and 

 make install in the usual way:

-~/expat-2.2.0/build$ cmake ..

+~/expat-2.2.1/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.0/build

+-- Build files have been written to: /home/patrick/expat-2.2.1/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.0/build$ make && make test && make install

+~/expat-2.2.1/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 665df806..e891496b 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.2.0")

+set(PACKAGE_VERSION "2.2.1")

 set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

 set(PACKAGE_TARNAME "${PACKAGE_NAME}")

 

diff --git a/expat/COPYING b/expat/COPYING
index 092c83ba..8d288f0f 100644
--- 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 3b6d16c7..028b6190 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 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 a7d28450..cd11a226 100644
--- 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 77e8c2f3..c852f649 100644
--- 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 9cd68a17..28b0f954 100644
--- 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 b6e183d7..76f078e2 100644
--- 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 4a0dea05..8f63866b 100644
--- 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