merges r23774 from trunk into ruby_1_9_1.

--
* lib/fileutils.rb (FileUtils::Entry_#copy_file): open with
  default umask.  [ruby-core:23952]

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

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 6dfc9e66f6..5fcf562ed0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 21 10:47:21 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/fileutils.rb (FileUtils::Entry_#copy_file): open with
+	  default umask.  [ruby-core:23952]
+
 Sun Jun 21 10:46:32 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* transcode.c (enc_arg): default interanl encoding may not be set.
diff --git a/lib/fileutils.rb b/lib/fileutils.rb
index b1e20f64e2..0a3fdc41db 100644
--- a/lib/fileutils.rb
+++ b/lib/fileutils.rb
@@ -1261,7 +1261,9 @@ module FileUtils
     end
 
     def copy_file(dest)
-      IO.copy_stream(path(),  dest)
+      File.open(dest, 'wb') do |f|
+        IO.copy_stream(path(), f)
+      end
     end
 
     def copy_metadata(path)
diff --git a/version.h b/version.h
index a692cabeb9..336679dbe2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-22"
-#define RUBY_PATCHLEVEL 198
+#define RUBY_PATCHLEVEL 199
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1