Update to 2.1.2

- Fix linking: change from libmsgpuck.a to libmsgpuck.so

Changes:	https://github.com/tarantool/tarantool/releases

7 files changed, 128 insertions, 0 deletions

diff --git a/databases/tarantool/files/patch-src-box-tuple_format.c b/databases/tarantool/files/patch-src-box-tuple_format.c
new file mode 100644
index 000000000000..0635d1ce7f70
--- /dev/null
+++ b/databases/tarantool/files/patch-src-box-tuple_format.c
@@ -0,0 +1,36 @@
+Obtained from:	https://github.com/tarantool/tarantool/commit/518557963250fd30b22005376feb4e0e2a6786a1
+
+--- src/box/tuple_format.c.orig
++++ src/box/tuple_format.c
+@@ -850,8 +850,8 @@ tuple_field_map_create(struct tuple_format *format, const char *tuple,
+ 	struct tuple_field *field;
+ 	struct json_token *parent = &format->fields.root;
+ 	while (true) {
+-		int idx;
+-		while ((idx = mp_stack_advance(&stack)) == -1) {
++		struct mp_frame *frame = mp_stack_top(&stack);
++		while (!mp_frame_advance(frame)) {
+ 			/*
+ 			 * If the elements of the current frame
+ 			 * are over, pop this frame out of stack
+@@ -863,6 +863,7 @@ tuple_field_map_create(struct tuple_format *format, const char *tuple,
+ 			mp_stack_pop(&stack);
+ 			if (mp_stack_is_empty(&stack))
+ 				goto finish;
++			frame = mp_stack_top(&stack);
+ 			parent = parent->parent;
+ 		}
+ 		/*
+@@ -871,10 +872,10 @@ tuple_field_map_create(struct tuple_format *format, const char *tuple,
+ 		 * for the subsequent format::fields lookup.
+ 		 */
+ 		struct json_token token;
+-		switch (mp_stack_type(&stack)) {
++		switch (frame->type) {
+ 		case MP_ARRAY:
+ 			token.type = JSON_TOKEN_NUM;
+-			token.num = idx;
++			token.num = frame->idx;
+ 			break;
+ 		case MP_MAP:
+ 			if (mp_typeof(*pos) != MP_STR) {
diff --git a/databases/tarantool/files/patch-src-box-vy_stmt.c b/databases/tarantool/files/patch-src-box-vy_stmt.c
new file mode 100644
index 000000000000..6a1c08fdf21e
--- /dev/null
+++ b/databases/tarantool/files/patch-src-box-vy_stmt.c
@@ -0,0 +1,28 @@
+Obtained from:	https://github.com/tarantool/tarantool/commit/518557963250fd30b22005376feb4e0e2a6786a1
+
+--- src/box/vy_stmt.c.orig
++++ src/box/vy_stmt.c
+@@ -447,18 +447,19 @@ vy_stmt_new_surrogate_delete_raw(struct tuple_format *format,
+ 	struct tuple_field *field;
+ 	struct json_token *parent = &format->fields.root;
+ 	while (true) {
+-		int idx;
+-		while ((idx = mp_stack_advance(&stack)) == -1) {
++		struct mp_frame *frame = mp_stack_top(&stack);
++		while (!mp_frame_advance(frame)) {
+ 			mp_stack_pop(&stack);
+ 			if (mp_stack_is_empty(&stack))
+ 				goto finish;
++			frame = mp_stack_top(&stack);
+ 			parent = parent->parent;
+ 		}
+ 		struct json_token token;
+-		switch (mp_stack_type(&stack)) {
++		switch (frame->type) {
+ 		case MP_ARRAY:
+ 			token.type = JSON_TOKEN_NUM;
+-			token.num = idx;
++			token.num = frame->idx;
+ 			break;
+ 		case MP_MAP:
+ 			if (mp_typeof(*src_pos) != MP_STR) {
diff --git a/databases/tarantool/files/patch-src-lib-swim-swim_io.h b/databases/tarantool/files/patch-src-lib-swim-swim_io.h
new file mode 100644
index 000000000000..301779ffe7e3
--- /dev/null
+++ b/databases/tarantool/files/patch-src-lib-swim-swim_io.h
@@ -0,0 +1,12 @@
+Obtained from:	https://github.com/tarantool/tarantool/commit/67d33761ceaf07564a156dc8252b5edb857808ed
+
+--- src/lib/swim/swim_io.h.orig
++++ src/lib/swim/swim_io.h
+@@ -37,6 +37,7 @@
+ #include "tarantool_ev.h"
+ #include <stdbool.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
+ 
+ /**
+  * SWIM protocol transport level.
diff --git a/databases/tarantool/files/patch-src-lib-swim-swim_proto.c b/databases/tarantool/files/patch-src-lib-swim-swim_proto.c
new file mode 100644
index 000000000000..5ab781cb278c
--- /dev/null
+++ b/databases/tarantool/files/patch-src-lib-swim-swim_proto.c
@@ -0,0 +1,12 @@
+Obtained from:	https://github.com/tarantool/tarantool/commit/67d33761ceaf07564a156dc8252b5edb857808ed
+
+--- src/lib/swim/swim_proto.c.orig
++++ src/lib/swim/swim_proto.c
+@@ -33,6 +33,7 @@
+ #include "say.h"
+ #include "version.h"
+ #include "diag.h"
++#include <sys/socket.h> /* AF_INET for FreeBSD. */
+ 
+ const char *swim_member_status_strs[] = {
+ 	"alive",
diff --git a/databases/tarantool/files/patch-src-lib-swim-swim_proto.h b/databases/tarantool/files/patch-src-lib-swim-swim_proto.h
new file mode 100644
index 000000000000..cf0aca124ef1
--- /dev/null
+++ b/databases/tarantool/files/patch-src-lib-swim-swim_proto.h
@@ -0,0 +1,13 @@
+Obtained from:	https://github.com/tarantool/tarantool/commit/67d33761ceaf07564a156dc8252b5edb857808ed
+
+--- src/lib/swim/swim_proto.h.orig	2019-04-05 11:27:32 UTC
++++ src/lib/swim/swim_proto.h
+@@ -33,6 +33,8 @@
+ #include "trivia/util.h"
+ #include "uuid/tt_uuid.h"
+ #include <arpa/inet.h>
++#include <netinet/in.h>
++#include <sys/socket.h>
+ #include <stdbool.h>
+ 
+ /**
diff --git a/databases/tarantool/files/patch-src-lib-swim-swim_transport.h b/databases/tarantool/files/patch-src-lib-swim-swim_transport.h
new file mode 100644
index 000000000000..a15aaa88a19e
--- /dev/null
+++ b/databases/tarantool/files/patch-src-lib-swim-swim_transport.h
@@ -0,0 +1,15 @@
+Obtained from:	https://github.com/tarantool/tarantool/commit/67d33761ceaf07564a156dc8252b5edb857808ed
+		https://github.com/tarantool/tarantool/commit/03e114b91a55dbb89ea9b0b5f134dd6a19ea6a81
+
+--- src/lib/swim/swim_transport.h.orig	2019-04-05 11:27:32 UTC
++++ src/lib/swim/swim_transport.h
+@@ -31,7 +31,9 @@
+  * SUCH DAMAGE.
+  */
+ #include "trivia/util.h"
++#include <netinet/in.h>
+ #include <arpa/inet.h>
++#include <unistd.h>
+ 
+ /** Transport implementation. */
+ struct swim_transport {
diff --git a/databases/tarantool/files/patch-test-unit-swim_test_transport.c b/databases/tarantool/files/patch-test-unit-swim_test_transport.c
new file mode 100644
index 000000000000..3b6948deca01
--- /dev/null
+++ b/databases/tarantool/files/patch-test-unit-swim_test_transport.c
@@ -0,0 +1,12 @@
+Obtained from:	https://github.com/tarantool/tarantool/commit/67d33761ceaf07564a156dc8252b5edb857808ed
+
+--- test/unit/swim_test_transport.c.orig
++++ test/unit/swim_test_transport.c
+@@ -33,6 +33,7 @@
+ #include "swim/swim_io.h"
+ #include "fiber.h"
+ #include <errno.h>
++#include <sys/socket.h>
+ 
+ enum {
+ 	/**