[ruby-cvs:52958] nagachika:r45812 (ruby_2_1): merge revision(s) r45453, r45455, r45577: [Backport #9798]

nagachika at ruby-lang.org nagachika at ruby-lang.org
Mon May 5 00:45:34 JST 2014


nagachika	2014-05-05 00:45:33 +0900 (Mon, 05 May 2014)

  New Revision: 45812

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45812

  Log:
    merge revision(s) r45453,r45455,r45577: [Backport #9798]
    
    * 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

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/ext/psych/lib/psych.rb
    branches/ruby_2_1/ext/psych/psych.gemspec
    branches/ruby_2_1/ext/psych/yaml/config.h
    branches/ruby_2_1/ext/psych/yaml/scanner.c
    branches/ruby_2_1/ext/psych/yaml/yaml_private.h
    branches/ruby_2_1/version.h


More information about the ruby-cvs mailing list