merge revision(s) 57546: [Backport #13194]

	rbinstall.rb: Gem::Installer lacks dir_mode option

	* tool/rbinstall.rb (bundle-gems): Gem::Installer does not support
	  directory permission option, set umask to owner writable.

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

2 files changed, 7 insertions, 2 deletions

diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 2edf31d0ff..9a5efcb538 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -763,7 +763,12 @@ install?(:ext, :comm, :gem) do
   if defined?(Zlib)
     Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
     gems.each do |gem|
-      Gem.install(gem, Gem::Requirement.default, options)
+      begin
+        File.umask(022)
+        Gem.install(gem, Gem::Requirement.default, options)
+      ensure
+        File.umask(0222)
+      end
       gemname = File.basename(gem)
       puts "#{" "*30}#{gemname}"
     end
diff --git a/version.h b/version.h
index a64366415e..7b86e5aa9a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.3"
 #define RUBY_RELEASE_DATE "2017-03-28"
-#define RUBY_PATCHLEVEL 268
+#define RUBY_PATCHLEVEL 269
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3