ruby-changes:35253
From: usa <ko1@a...>
Date: Sun, 31 Aug 2014 16:22:28 +0900 (JST)
Subject: [ruby-changes:35253] usa:r47335 (ruby_2_0_0): merge revision(s) 45144: [Backport #9544]
usa 2014-08-31 16:22:16 +0900 (Sun, 31 Aug 2014) New Revision: 47335 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=47335 Log: merge revision(s) 45144: [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_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/lib/resolv.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 47334) +++ ruby_2_0_0/ChangeLog (revision 47335) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Sun Aug 31 16:20:14 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] + Sun Aug 31 16:16:24 2014 Nobuyoshi Nakada <nobu@r...> * re.c (match_aref): should not ignore name after NUL byte. Index: ruby_2_0_0/lib/resolv.rb =================================================================== --- ruby_2_0_0/lib/resolv.rb (revision 47334) +++ ruby_2_0_0/lib/resolv.rb (revision 47335) @@ -646,7 +646,9 @@ class Resolv https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/resolv.rb#L646 begin port = rangerand(1024..65535) udpsock.bind(bind_host, port) - rescue Errno::EADDRINUSE + 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_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 47334) +++ ruby_2_0_0/version.h (revision 47335) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-08-31" -#define RUBY_PATCHLEVEL 535 +#define RUBY_PATCHLEVEL 536 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 8 Property changes on: ruby_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r45144 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/