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_4@63804 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-06-30 12:34:19 +00:00
parent 05a8a18530
commit 943b3ae5f6
2 changed files with 9 additions and 6 deletions

9
LEGAL
View file

@ -83,9 +83,8 @@ enc/windows_1251.c
Oniguruma ---- (C) K.Kosako <sndgk393 AT ybb DOT ne DOT jp> Oniguruma ---- (C) K.Kosako <sndgk393 AT ybb DOT ne DOT jp>
http://www.geocities.jp/kosako3/oniguruma/ https://github.com/kkos/oniguruma
http://www.ruby-lang.org/cgi-bin/cvsweb.cgi/oniguruma/ https://svnweb.freebsd.org/ports/head/devel/oniguruma/
http://www.freebsd.org/cgi/cvsweb.cgi/ports/devel/oniguruma/
When this software is partly used or it is distributed with Ruby, When this software is partly used or it is distributed with Ruby,
this of Ruby follows the license of Ruby. this of Ruby follows the license of Ruby.
@ -330,6 +329,8 @@ random.c
http://www.math.keio.ac.jp/matumoto/emt.html http://www.math.keio.ac.jp/matumoto/emt.html
email: matumoto@math.keio.ac.jp 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 vm_dump.c:procstat_vm
This file is under the new-style BSD license. This file is under the new-style BSD license.
@ -679,6 +680,8 @@ ext/win32ole/win32ole.c:
License or the Artistic License, as specified in the README file License or the Artistic License, as specified in the README file
of the Perl distribution. 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: lib/rdoc/generator/template/darkfish/css/fonts.css:
This file is licensed under the SIL Open Font License. This file is licensed under the SIL Open Font License.

View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.4.5" #define RUBY_VERSION "2.4.5"
#define RUBY_RELEASE_DATE "2018-06-18" #define RUBY_RELEASE_DATE "2018-06-30"
#define RUBY_PATCHLEVEL 299 #define RUBY_PATCHLEVEL 300
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 18 #define RUBY_RELEASE_DAY 30
#include "ruby/version.h" #include "ruby/version.h"