ruby-changes:50442
From: naruse <ko1@a...>
Date: Sat, 24 Feb 2018 16:19:12 +0900 (JST)
Subject: [ruby-changes:50442] naruse:r62561 (ruby_2_5): merge revision(s) 62513: [Backport #12762]
naruse 2018-02-24 16:19:06 +0900 (Sat, 24 Feb 2018) New Revision: 62561 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=62561 Log: merge revision(s) 62513: [Backport #12762] Update url with 404 status on LEGAL file. * Update redirected and upstream url. * Added the Wayback Machine url for missing link. [Bug #12762][ruby-dev:49802] From: SHIBATA Hiroshi <hsbt@r...> Modified directories: branches/ruby_2_5/ Modified files: branches/ruby_2_5/LEGAL branches/ruby_2_5/version.h Index: ruby_2_5/LEGAL =================================================================== --- ruby_2_5/LEGAL (revision 62560) +++ ruby_2_5/LEGAL (revision 62561) @@ -143,9 +143,8 @@ Oniguruma LICENSE https://github.com/ruby/ruby/blob/trunk/ruby_2_5/LEGAL#L143 */ https://github.com/k-takata/Onigmo/ -http://www.geocities.jp/kosako3/oniguruma/ -http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/ -http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/ +https://github.com/kkos/oniguruma +https://svnweb.freebsd.org/ports/head/devel/oniguruma/ When this software is partly used or it is distributed with Ruby, this of Ruby follows the license of Ruby. @@ -363,6 +362,8 @@ random.c https://github.com/ruby/ruby/blob/trunk/ruby_2_5/LEGAL#L362 http://www.math.keio.ac.jp/matumoto/emt.html email: matumoto@m... + The Wayback Machine url: http://web.archive.org/web/19990429082237/http://www.math.keio.ac.jp/matumoto/emt.html + vm_dump.c:procstat_vm This file is under the new-style BSD license. @@ -756,6 +757,8 @@ ext/win32ole/win32ole.c: https://github.com/ruby/ruby/blob/trunk/ruby_2_5/LEGAL#L757 License or the Artistic License, as specified in the README file of the Perl distribution. + The Wayback Machine url: http://web.archive.org/web/19970607104352/http://www.activeware.com:80/ + lib/rdoc/generator/template/darkfish/css/fonts.css: This file is licensed under the SIL Open Font License. Index: ruby_2_5/version.h =================================================================== --- ruby_2_5/version.h (revision 62560) +++ ruby_2_5/version.h (revision 62561) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1 #define RUBY_VERSION "2.5.0" -#define RUBY_RELEASE_DATE "2018-02-23" -#define RUBY_PATCHLEVEL 33 +#define RUBY_RELEASE_DATE "2018-02-24" +#define RUBY_PATCHLEVEL 34 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 23 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" Index: ruby_2_5 =================================================================== --- ruby_2_5 (revision 62560) +++ ruby_2_5 (revision 62561) Property changes on: ruby_2_5 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r62513 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/