summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:31:31 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-16 04:31:31 +0000
commit36ecd73133f43b336ace7943ad1c91c3ce4ef9ad (patch)
tree23d7fc0082e2e39590c67db849b689e9717e6021
parentaf4907c54f5f356d94c9c0ba53539487f8118659 (diff)
* lib/rubygems/package.rb: Fixed potential perms issue unpacking of
gems on NFS. [Backport #12579] * lib/rubygems.rb: bump version. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55920 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/rubygems.rb2
-rw-r--r--lib/rubygems/package.rb3
-rw-r--r--version.h6
4 files changed, 13 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 755fa86fe1..851372d96e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Aug 16 13:29:25 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * lib/rubygems/package.rb: Fixed potential perms issue unpacking of
+ gems on NFS. [Backport #12579]
+
+ * lib/rubygems.rb: bump version.
+
Fri Aug 12 11:48:27 2016 NARUSE, Yui <naruse@ruby-lang.org>
* vm_args.c (setup_parameters_complex): don't raise ArgumentError
diff --git a/lib/rubygems.rb b/lib/rubygems.rb
index 98e7dfaf82..f48496aa31 100644
--- a/lib/rubygems.rb
+++ b/lib/rubygems.rb
@@ -9,7 +9,7 @@ require 'rbconfig'
require 'thread'
module Gem
- VERSION = '2.4.5.1'
+ VERSION = '2.4.5.2'
end
# Must be first since it unloads the prelude from 1.9.2
diff --git a/lib/rubygems/package.rb b/lib/rubygems/package.rb
index 417b34b79f..e8b8b38b06 100644
--- a/lib/rubygems/package.rb
+++ b/lib/rubygems/package.rb
@@ -366,8 +366,9 @@ EOM
FileUtils.mkdir_p mkdir, mkdir_options
- open destination, 'wb', entry.header.mode do |out|
+ open destination, 'wb' do |out|
out.write entry.read
+ FileUtils.chmod entry.header.mode, destination
end if entry.file?
verbose destination
diff --git a/version.h b/version.h
index 7a0cad2548..d6e8e3e8b7 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.2.6"
-#define RUBY_RELEASE_DATE "2016-08-12"
-#define RUBY_PATCHLEVEL 348
+#define RUBY_RELEASE_DATE "2016-08-16"
+#define RUBY_PATCHLEVEL 349
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 8
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 16
#include "ruby/version.h"