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@ruby-lang.org>

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-02-24 07:19:06 +00:00
parent 86613d13d5
commit a94362d31f
2 changed files with 9 additions and 6 deletions

9
LEGAL
View file

@ -143,9 +143,8 @@ Oniguruma LICENSE
*/
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
http://www.math.keio.ac.jp/matumoto/emt.html
email: matumoto@math.keio.ac.jp
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:
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.

View file

@ -1,10 +1,10 @@
#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"