ruby.git/ext/psych/yaml, branch v2_1_5

merge revision(s) r45453,r45455,r45577: [Backport #9798]

2014-05-04T15:45:33+00:00

	* 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.

	* ext/psych/psych.gemspec: update gemspec for psych-2.0.5


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

merge revision(s) 44809,44811,44813,44815,44816,44817,44818,44918,45003: [Backport #9482]

2014-02-24T04:24:15+00:00

	* ext/psych/yaml/emitter.c: merge libyaml 0.1.5

	* ext/psych/yaml/loader.c: ditto

	* ext/psych/yaml/parser.c: ditto

	* ext/psych/yaml/reader.c: ditto

	* ext/psych/yaml/scanner.c: ditto

	* ext/psych/yaml/writer.c: ditto

	* ext/psych/yaml/yaml_private.h: ditto

	* ext/psych/lib/psych.rb: New release of psych.

	* ext/psych/psych.gemspec: ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/yaml/emitter.c: Fix typo in the variable name

2013-12-14T01:19:06+00:00

s/preceeded/preceded/

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/yaml/yaml.h: [DOC] merge upstream typo fix by @GreenGeorge

2013-09-20T14:51:35+00:00

  https://github.com/tenderlove/psych/pull/161


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

fix typos. Patch by k_takata.

2013-05-19T03:10:21+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/yaml/scanner.c: Fix typos, patch by James Dabbs

2013-01-13T07:47:10+00:00

  [Github tenderlove/psych#118]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* remove trailing spaces.

2012-12-05T04:08:17+00:00

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38204 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

emitter.c: constify

2012-11-28T12:23:20+00:00

* ext/psych/yaml/emitter.c (yaml_emitter_write_indicator): constify.
* ext/psych/yaml/emitter.c (yaml_emitter_write_block_scalar_hints):
  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

* ext/psych/extconf.rb: use embedded libyaml if no system libyaml is

2012-11-28T04:34:41+00:00

  found. [ruby-core:49463]
* ext/psych/lib/psych.rb: updating to psych 2.0.0
* ext/psych/lib/psych/deprecated.rb: updated docs
* ext/psych/psych.gemspec: updated to psych 2.0.0
* ext/psych/psych.h: fixing header file include for rename
* ext/psych/psych_emitter.c: renamed to avoid libyaml conflict.
* ext/psych/psych_emitter.h: ditto
* ext/psych/psych_parser.c: ditto
* ext/psych/psych_parser.h: ditto
* ext/psych/psych_to_ruby.c: ditto
* ext/psych/psych_to_ruby.h: ditto
* ext/psych/psych_yaml_tree.c: ditto
* ext/psych/psych_yaml_tree.h: ditto
* ext/psych/yaml/LICENSE: embedding libyaml 0.1.4
* ext/psych/yaml/api.c: ditto
* ext/psych/yaml/config.h: ditto
* ext/psych/yaml/dumper.c: ditto
* ext/psych/yaml/emitter.c: ditto
* ext/psych/yaml/loader.c: ditto
* ext/psych/yaml/parser.c: ditto
* ext/psych/yaml/reader.c: ditto
* ext/psych/yaml/scanner.c: ditto
* ext/psych/yaml/writer.c: ditto
* ext/psych/yaml/yaml.h: ditto
* ext/psych/yaml/yaml_private.h: ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37919 b2dd03c8-39d4-4d8f-98ff-823fe69b080e