Merge branch 'master-2.5' into dist/2.5/bionic

sorah · sorah · commit 680f61136b3f · 2019-03-15T10:55:56.000+09:00
diff --git a/ChangeLog b/ChangeLog
@@ -1,7 +1,22 @@
 ------------------------------------------------------------------------
-r67245 | nagachika | 2019-03-13 18:38:32 +0900 (Wed, 13 Mar 2019) | 1 line
+r67260 | nagachika | 2019-03-15 07:24:22 +0900 (Fri, 15 Mar 2019) | 1 line
 
-add tag v2_5_4
+add tag v2_5_5
+------------------------------------------------------------------------
+r67259 | nagachika | 2019-03-15 07:21:30 +0900 (Fri, 15 Mar 2019) | 8 lines
+
+merge revision(s) 63309:
+
+	thread_sync.c (condvar_ptr): reset fork_gen after forking
+
+	Otherwise the condition variable waiter list will always
+	be empty, which is wrong :x
+
+	[Bug #14725] [Bug #14634]
+------------------------------------------------------------------------
+r67258 | nagachika | 2019-03-15 07:16:48 +0900 (Fri, 15 Mar 2019) | 1 line
+
+bump up teeny version to 2.5.5
 ------------------------------------------------------------------------
 r67242 | nagachika | 2019-03-13 09:32:12 +0900 (Wed, 13 Mar 2019) | 7 lines
 
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+ruby2.5 (2.5.5-0nkmi1~dist) unstable; urgency=medium
+
+  * Ruby 2.5.5
+
+ -- Sorah Fukumori <sorah@cookpad.com>  Fri, 15 Mar 2019 01:51:14 +0000
+
 ruby2.5 (2.5.4-0nkmi1~dist) unstable; urgency=medium
 
   * Ruby 2.5.4
diff --git a/revision.h b/revision.h
@@ -1 +1 @@
-#define RUBY_REVISION 67245
+#define RUBY_REVISION 67260
diff --git a/thread_sync.c b/thread_sync.c
@@ -1314,6 +1314,7 @@ condvar_ptr(VALUE self)
 
     /* forked children can't reach into parent thread stacks */
     if (cv->fork_gen != fork_gen) {
+        cv->fork_gen = fork_gen;
         list_head_init(&cv->waitq);
     }
 
diff --git a/version.h b/version.h
@@ -1,10 +1,10 @@
-#define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2019-03-13"
-#define RUBY_PATCHLEVEL 155
+#define RUBY_VERSION "2.5.5"
+#define RUBY_RELEASE_DATE "2019-03-15"
+#define RUBY_PATCHLEVEL 157
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 15
 
 #include "ruby/version.h"
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-#define RUBY_REVISION 67245`
	`1`	`+#define RUBY_REVISION 67260`
Original file line number	Diff line number	Diff line change
`@@ -1314,6 +1314,7 @@ condvar_ptr(VALUE self)`
`1314`	`1314`
`1315`	`1315`	`/* forked children can't reach into parent thread stacks */`
`1316`	`1316`	`if (cv->fork_gen != fork_gen) {`
	`1317`	`+ cv->fork_gen = fork_gen;`
`1317`	`1318`	`list_head_init(&cv->waitq);`
`1318`	`1319`	`}`
`1319`	`1320`