naruse	2019-01-06 06:33:26 +0900 (Sun, 06 Jan 2019)

  New Revision: 66729

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

  Log:
    merge revision(s) 66699: [Backport #15494]
    
    Fix Random.urandom in a chroot on OpenBSD
    
    [ruby-core:90850] [Bug #15494]
    
    From: jeremyevans0 (Jeremy Evans) <merch-redmine@j...>

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/random.c
    branches/ruby_2_6/version.h
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 66728)
+++ ruby_2_6/version.h	(revision 66729)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.0"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 4
+#define RUBY_PATCHLEVEL 5
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 1
Index: ruby_2_6/random.c
===================================================================
--- ruby_2_6/random.c	(revision 66728)
+++ ruby_2_6/random.c	(revision 66729)
@@ -89,6 +89,11 @@ The original copyright notice follows. https://github.com/ruby/ruby/blob/trunk/ruby_2_6/random.c#L89
 #endif
 #include "ruby_atomic.h"
 
+#ifdef __OpenBSD__
+/* to define OpenBSD for version check */
+#include <sys/param.h>
+#endif
+
 typedef int int_must_be_32bit_at_least[sizeof(int) * CHAR_BIT < 32 ? -1 : 1];
 
 /* Period parameters */
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 66728)
+++ ruby_2_6	(revision 66729)

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

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