nagachika	2019-01-20 13:51:41 +0900 (Sun, 20 Jan 2019)

  New Revision: 66878

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

  Log:
    merge revision(s) 63720: [Backport #14864]
    
    dir.c: define O_CLOEXEC for older systems
    
    SuSE 10 has openat(), but not O_CLOEXEC
    
    Reported-by: wangpeiwen
    
    [ruby-core:87591] [Bug #14864]

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/dir.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 66877)
+++ ruby_2_5/version.h	(revision 66878)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.4"
 #define RUBY_RELEASE_DATE "2019-01-20"
-#define RUBY_PATCHLEVEL 133
+#define RUBY_PATCHLEVEL 134
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_5/dir.c
===================================================================
--- ruby_2_5/dir.c	(revision 66877)
+++ ruby_2_5/dir.c	(revision 66878)
@@ -22,6 +22,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/dir.c#L22
 #include <unistd.h>
 #endif
 
+#ifndef O_CLOEXEC
+#  define O_CLOEXEC 0
+#endif
+
 #ifndef USE_OPENDIR_AT
 # if defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD) && \
     defined(HAVE_OPENAT) && defined(HAVE_FSTATAT)
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 66877)
+++ ruby_2_5	(revision 66878)

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

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