naruse	2019-03-06 18:49:16 +0900 (Wed, 06 Mar 2019)

  New Revision: 67184

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

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

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/ext/pty/pty.c
    branches/ruby_2_6/version.h
Index: ruby_2_6/ext/pty/pty.c
===================================================================
--- ruby_2_6/ext/pty/pty.c	(revision 67183)
+++ ruby_2_6/ext/pty/pty.c	(revision 67184)
@@ -247,7 +247,7 @@ get_device_once(int *master, int *slave, https://github.com/ruby/ruby/blob/trunk/ruby_2_6/ext/pty/pty.c#L247
     int masterfd = -1, slavefd = -1;
     char *slavedevice;
 
-#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_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67183)
+++ ruby_2_6/version.h	(revision 67184)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.1"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 39
+#define RUBY_PATCHLEVEL 40
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67183)
+++ ruby_2_6	(revision 67184)

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

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