merge revision(s) 44598,44599,44600:

	/usr/lib/libc.so is not symlink on FreeBSD 10

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

5 files changed, 11 insertions, 5 deletions

diff --git a/test/dl/test_base.rb b/test/dl/test_base.rb
index a07056d142..dafba6e44d 100644
--- a/test/dl/test_base.rb
+++ b/test/dl/test_base.rb
@@ -39,6 +39,9 @@ when /gnu/	#GNU/Hurd
 when /mirbsd/
   libc_so = "/usr/lib/libc.so.41.10"
   libm_so = "/usr/lib/libm.so.7.0"
+when /freebsd/
+  libc_so = "/lib/libc.so.7"
+  libm_so = "/lib/libm.so.5"
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
diff --git a/test/dl/test_handle.rb b/test/dl/test_handle.rb
index 4ef93adf41..83b8af1960 100644
--- a/test/dl/test_handle.rb
+++ b/test/dl/test_handle.rb
@@ -181,7 +181,7 @@ module DL
       # In general uses of dlerror(3) should call it before use it.
       require 'socket'
       Socket.gethostbyname("localhost")
-      DL.dlopen("/usr/lib/libc.so").sym('strcpy')
+      DL.dlopen("/lib/libc.so.7").sym('strcpy')
     end if /freebsd/=~ RUBY_PLATFORM
   end
 end
diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
index 404c137f97..f58077e7bc 100644
--- a/test/fiddle/helper.rb
+++ b/test/fiddle/helper.rb
@@ -40,6 +40,9 @@ when /gnu/	#GNU/Hurd
 when /mirbsd/
   libc_so = "/usr/lib/libc.so.41.10"
   libm_so = "/usr/lib/libm.so.7.0"
+when /freebsd/
+  libc_so = "/lib/libc.so.7"
+  libm_so = "/lib/libm.so.5"
 when /bsd|dragonfly/
   libc_so = "/usr/lib/libc.so"
   libm_so = "/usr/lib/libm.so"
diff --git a/test/fiddle/test_handle.rb b/test/fiddle/test_handle.rb
index 2af3e5c903..c598cc33a2 100644
--- a/test/fiddle/test_handle.rb
+++ b/test/fiddle/test_handle.rb
@@ -183,7 +183,7 @@ module Fiddle
       # In general uses of dlerror(3) should call it before use it.
       require 'socket'
       Socket.gethostbyname("localhost")
-      Fiddle.dlopen("/usr/lib/libc.so").sym('strcpy')
+      Fiddle.dlopen("/lib/libc.so.7").sym('strcpy')
     end if /freebsd/=~ RUBY_PLATFORM
   end
 end if defined?(Fiddle)
diff --git a/version.h b/version.h
index bdc8096fac..b97e200e75 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-01-11"
-#define RUBY_PATCHLEVEL 5
+#define RUBY_RELEASE_DATE "2014-01-15"
+#define RUBY_PATCHLEVEL 6
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"