nagachika	2019-03-06 20:32:02 +0900 (Wed, 06 Mar 2019)

  New Revision: 67186

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

  Log:
    merge revision(s) 67183: [Backport #15607]
    
    Fix PTY.open on OpenBSD [Bug #15607]
    
    From: Jeremy Evans <code@j...>

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/ext/pty/pty.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 67185)
+++ ruby_2_5/version.h	(revision 67186)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2019-02-11"
-#define RUBY_PATCHLEVEL 140
+#define RUBY_RELEASE_DATE "2019-03-06"
+#define RUBY_PATCHLEVEL 141
 
 #define RUBY_RELEASE_YEAR 2019
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 6
 
 #include "ruby/version.h"
 
Index: ruby_2_5/ext/pty/pty.c
===================================================================
--- ruby_2_5/ext/pty/pty.c	(revision 67185)
+++ ruby_2_5/ext/pty/pty.c	(revision 67186)
@@ -237,7 +237,7 @@ get_device_once(int *master, int *slave, https://github.com/ruby/ruby/blob/trunk/ruby_2_5/ext/pty/pty.c#L237
     dfl.sa_flags = 0;
     sigemptyset(&dfl.sa_mask);
 
-#if defined(__sun) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
+#if defined(__sun) || defined(__OpenBSD__) || (defined(__FreeBSD__) && __FreeBSD_version < 902000)
     /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set.  [ruby-dev:44688] */
     /* FreeBSD 9.2 or later supports O_CLOEXEC
      * http://www.freebsd.org/cgi/query-pr.cgi?pr=162374 */
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 67185)
+++ ruby_2_5	(revision 67186)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r67183

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