nagachika	2014-07-23 22:44:14 +0900 (Wed, 23 Jul 2014)

  New Revision: 46909

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=46909

  Log:
    merge revision(s) r45144: [Backport #9544]
    
    * lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
      security.mac.portacl.port_high is changed.
      See mac_portacl(4) for details.
      Reported by Jakub Szafranski.  [ruby-core:60917] [Bug #9544]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/resolv.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46908)
+++ ruby_2_1/ChangeLog	(revision 46909)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Jul 23 22:43:50 2014  Tanaka Akira  <akr@f...>
+
+	* lib/resolv.rb (bind_random_port): Rescue EPERM for FreeBSD which
+	  security.mac.portacl.port_high is changed.
+	  See mac_portacl(4) for details.
+	  Reported by Jakub Szafranski.  [ruby-core:60917] [Bug #9544]
+
 Wed Jul 23 22:24:26 2014  CHIKANAGA Tomoyuki  <nagachika@r...>
 
 	* test/openssl/test_x509cert.rb: split assertions into algorithms.
Index: ruby_2_1/lib/resolv.rb
===================================================================
--- ruby_2_1/lib/resolv.rb	(revision 46908)
+++ ruby_2_1/lib/resolv.rb	(revision 46909)
@@ -653,7 +653,9 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/resolv.rb#L653
       begin
         port = rangerand(1024..65535)
         udpsock.bind(bind_host, port)
-      rescue Errno::EADDRINUSE, Errno::EACCES
+      rescue Errno::EADDRINUSE, # POSIX
+             Errno::EACCES, # SunOS: See PRIV_SYS_NFS in privileges(5)
+             Errno::EPERM # FreeBSD: security.mac.portacl.port_high is configurable.  See mac_portacl(4).
         retry
       end
     end
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46908)
+++ ruby_2_1/version.h	(revision 46909)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
 #define RUBY_RELEASE_DATE "2014-07-23"
-#define RUBY_PATCHLEVEL 177
+#define RUBY_PATCHLEVEL 178
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 7

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45144


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/