Skip to content

Commit

Permalink
Prepare release version 2.2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
hartwork committed Aug 2, 2017
1 parent e5470ee commit 97c6bd0
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 18 deletions.
12 changes: 6 additions & 6 deletions expat/CMake.README
Expand Up @@ -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.2 is the source directory of expat, add a subdirectory
Assuming ~/expat-2.2.3 is the source directory of expat, add a subdirectory
build and change into that directory:
~/expat-2.2.2$ mkdir build && cd build
~/expat-2.2.2/build$
~/expat-2.2.3$ mkdir build && cd build
~/expat-2.2.3/build$

From that directory, call cmake first, then call make, make test and
make install in the usual way:
~/expat-2.2.2/build$ cmake ..
~/expat-2.2.3/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.2/build
-- Build files have been written to: /home/patrick/expat-2.2.3/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.2/build$ make && make test && make install
~/expat-2.2.3/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
Expand Down
2 changes: 1 addition & 1 deletion expat/CMakeLists.txt
Expand Up @@ -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.2")
set(PACKAGE_VERSION "2.2.3")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_TARNAME "${PACKAGE_NAME}")

Expand Down
2 changes: 1 addition & 1 deletion expat/Changes
Expand Up @@ -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.? ????????????????
Release 2.2.3 Wed August 2 2017
Security fixes:
#82 CVE-2017-11742 -- Windows: Fix DLL hijacking vulnerability
using Steve Holme's LoadLibrary wrapper for/of cURL
Expand Down
2 changes: 1 addition & 1 deletion expat/README.md
@@ -1,4 +1,4 @@
# Expat, Release 2.2.2
# Expat, Release 2.2.3

This is Expat, a C library for parsing XML, started by
[James Clark](https://en.wikipedia.org/wiki/James_Clark_(programmer)) in 1997.
Expand Down
6 changes: 5 additions & 1 deletion expat/expat.spec
@@ -1,4 +1,4 @@
%define version 2.2.2
%define version 2.2.3
%define release 1

Summary: Expat is an XML 1.0 parser written in C.
Expand Down Expand Up @@ -40,6 +40,10 @@ install -D xmlwf/xmlwf $RPM_BUILD_ROOT/usr/bin/xmlwf
/usr/share/man/man1/xmlwf.1.gz

%changelog
* Wed Aug 2 2017 Sebastian Pipping <sebastian@pipping.org>
[Release 2.2.3-1]
- Update for the 2.2.3 release.

* Wed Jul 12 2017 Sebastian Pipping <sebastian@pipping.org>
[Release 2.2.2-1]
- Update for the 2.2.2 release.
Expand Down
2 changes: 1 addition & 1 deletion expat/lib/expat.h
Expand Up @@ -1048,7 +1048,7 @@ XML_GetFeatureList(void);
*/
#define XML_MAJOR_VERSION 2
#define XML_MINOR_VERSION 2
#define XML_MICRO_VERSION 2
#define XML_MICRO_VERSION 3

#ifdef __cplusplus
}
Expand Down
2 changes: 1 addition & 1 deletion 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.
cd4063469a95eab9a93001afb109e3dee122cdda4635bbec36257fc01c327348 (2.2.2+)
101bfd65d1ff3d1511cf6671e6aae65f82cd97df6f4da137d46d510731830ad9 (2.2.3+)
*/

#if !defined(_GNU_SOURCE)
Expand Down
2 changes: 1 addition & 1 deletion expat/tests/runtests.c
Expand Up @@ -7738,7 +7738,7 @@ START_TEST(test_misc_version)
fail("Version mismatch");

#if ! defined(XML_UNICODE)
if (strcmp(version_text, "expat_2.2.2")) /* needs bump on releases */
if (strcmp(version_text, "expat_2.2.3")) /* needs bump on releases */
fail("XML_*_VERSION in expat.h out of sync?\n");
#endif /* ! defined(XML_UNICODE) */
}
Expand Down
10 changes: 5 additions & 5 deletions expat/win32/expat.iss
Expand Up @@ -7,17 +7,17 @@
[Setup]
AppName=Expat
AppId=expat
AppVersion=2.2.2
AppVerName=Expat 2.2.2
AppVersion=2.2.3
AppVerName=Expat 2.2.3
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.2
VersionInfoVersion=2.2.2
UninstallDisplayName=Expat XML Parser 2.2.3
VersionInfoVersion=2.2.3

DefaultDirName={pf}\Expat 2.2.2
DefaultDirName={pf}\Expat 2.2.3
UninstallFilesDir={app}\Uninstall

Compression=lzma
Expand Down

0 comments on commit 97c6bd0

Please sign in to comment.