diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-28 00:19:15 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-03-28 00:19:15 +0000 |
| commit | e221c6cefc528c1c966fc1820882711d0ad7c898 (patch) | |
| tree | 51e99d4a9cf04a96d3a96c94a9a223c6c51cad7f /ext/psych/yaml/config.h | |
| parent | fb3bd78725105b353ccd187b834a22c9d4586f26 (diff) | |
| download | ruby-e221c6cefc528c1c966fc1820882711d0ad7c898.tar.gz | |
* ext/psych/lib/psych.rb: Merge psych-2.0.5. bump version to
libyaml-0.1.6 for CVE-2014-2525.
* ext/psych/yaml/config.h: ditto.
* ext/psych/yaml/scanner.c: ditto.
* ext/psych/yaml/yaml_private.h: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45453 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/psych/yaml/config.h')
| -rw-r--r-- | ext/psych/yaml/config.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/psych/yaml/config.h b/ext/psych/yaml/config.h index fb62651340..f54c27d339 100644 --- a/ext/psych/yaml/config.h +++ b/ext/psych/yaml/config.h @@ -1,11 +1,10 @@ - #define PACKAGE_NAME "yaml" #define PACKAGE_TARNAME "yaml" -#define PACKAGE_VERSION "0.1.5" -#define PACKAGE_STRING "yaml 0.1.5" +#define PACKAGE_VERSION "0.1.6" +#define PACKAGE_STRING "yaml 0.1.6" #define PACKAGE_BUGREPORT "http://pyyaml.org/newticket?component libyaml" #define PACKAGE_URL "" #define YAML_VERSION_MAJOR 0 #define YAML_VERSION_MINOR 1 -#define YAML_VERSION_PATCH 5 -#define YAML_VERSION_STRING "0.1.5" +#define YAML_VERSION_PATCH 6 +#define YAML_VERSION_STRING "0.1.6" |