Update to 2.1.3

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

7 files changed, 17 insertions, 79 deletions

diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile
index 18f45271808e..96a9916f3d6a 100644
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tarantool
-PORTVERSION=	2.1.2
-PORTREVISION=	2
+PORTVERSION=	2.1.3
 CATEGORIES=	databases
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -27,7 +26,10 @@ USE_PERL5=	build
 CMAKE_ARGS=	-DCMAKE_INSTALL_FULL_SYSCONFDIR=${ETCDIR} \
 		-DCMAKE_INSTALL_LOCALSTATEDIR=/var \
 		-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
-CMAKE_OFF=	ENABLE_BUNDLED_LIBYAML ENABLE_BUNDLED_MSGPUCK ENABLE_BUNDLED_ZSTD
+CMAKE_OFF=	ENABLE_BUNDLED_LIBCURL \
+		ENABLE_BUNDLED_LIBYAML \
+		ENABLE_BUNDLED_MSGPUCK \
+		ENABLE_BUNDLED_ZSTD
 CMAKE_ON=	ENABLE_DIST
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
@@ -38,10 +40,10 @@ PLIST_SUB=	TT_DATADIR=${TT_DATADIR} \
 SUB_FILES=	pkg-message
 
 GH_TUPLE=	luafun:luafun:e248e00:luafun/third_party/luafun \
-		tarantool:luajit:5f0a43a:luajit/third_party/luajit \
+		tarantool:luajit:4625404:luajit/third_party/luajit \
 		tarantool:luarocks:05312b5:luarocks/third_party/luarocks \
-		tarantool:small:020716d:small/src/lib/small \
-		tarantool:test-run:27aebd9:test_run/test-run
+		tarantool:small:9046d88:small/src/lib/small \
+		tarantool:test-run:e665a66:test_run/test-run
 USE_GITHUB=	yes
 
 USERS=		tarantool
diff --git a/databases/tarantool/distinfo b/databases/tarantool/distinfo
index 014cc6fd9c19..ab60cb0ae765 100644
--- a/databases/tarantool/distinfo
+++ b/databases/tarantool/distinfo
@@ -1,13 +1,13 @@
-TIMESTAMP = 1560671633
-SHA256 (tarantool-tarantool-2.1.2_GH0.tar.gz) = bc8ec0e3e060ca620159179fff169a505aaa0eec5942bf86999897e2087f9596
-SIZE (tarantool-tarantool-2.1.2_GH0.tar.gz) = 4206520
+TIMESTAMP = 1573657558
+SHA256 (tarantool-tarantool-2.1.3_GH0.tar.gz) = e909cf0eae1aa4f6d51230eb0fab56ef724fb9fffed1e3038f1203d44cd0a894
+SIZE (tarantool-tarantool-2.1.3_GH0.tar.gz) = 4243053
 SHA256 (luafun-luafun-e248e00_GH0.tar.gz) = 9978dd21c0688d5c6206846697be17363a4be446851c1c1d60e2427fe200b7f2
 SIZE (luafun-luafun-e248e00_GH0.tar.gz) = 67323
-SHA256 (tarantool-luajit-5f0a43a_GH0.tar.gz) = 4b0bb2b8c1c87defbef24664c784d98b8aa531263d461117271f2f4adf38329d
-SIZE (tarantool-luajit-5f0a43a_GH0.tar.gz) = 1028458
+SHA256 (tarantool-luajit-4625404_GH0.tar.gz) = ebcbb0a404898fa129f199f18dc6628fffea1103b2cf78b05634bb1064e8d8e8
+SIZE (tarantool-luajit-4625404_GH0.tar.gz) = 1031568
 SHA256 (tarantool-luarocks-05312b5_GH0.tar.gz) = 4ee5ef77b67f2e5eed41aba8e4682aa7dd2516618c1d38caf781d38a7e19818f
 SIZE (tarantool-luarocks-05312b5_GH0.tar.gz) = 4027574
-SHA256 (tarantool-small-020716d_GH0.tar.gz) = f30115f7d07f0f333f6b933aa635aad9795586a7adcbc37ef851eab70907f750
-SIZE (tarantool-small-020716d_GH0.tar.gz) = 113841
-SHA256 (tarantool-test-run-27aebd9_GH0.tar.gz) = 19a41fce7120106b7c91b27eee7f99fb605ec11f16b0669bda5604bd23b9ebbe
-SIZE (tarantool-test-run-27aebd9_GH0.tar.gz) = 62051
+SHA256 (tarantool-small-9046d88_GH0.tar.gz) = 69c7b864989c6cff22edfaa85e403b152586c20722c93dbe772b4fe3e3594628
+SIZE (tarantool-small-9046d88_GH0.tar.gz) = 114015
+SHA256 (tarantool-test-run-e665a66_GH0.tar.gz) = 5b21c515b46c24e55aa815888af3b69a1cdea83aa89c946528b1bdf090be0ab7
+SIZE (tarantool-test-run-e665a66_GH0.tar.gz) = 61452
diff --git a/databases/tarantool/files/patch-src-lib-swim-swim_io.h b/databases/tarantool/files/patch-src-lib-swim-swim_io.h
deleted file mode 100644
index 301779ffe7e3..000000000000
--- a/databases/tarantool/files/patch-src-lib-swim-swim_io.h
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index 5ab781cb278c..000000000000
--- a/databases/tarantool/files/patch-src-lib-swim-swim_proto.c
+++ /dev/null
@@ -1,12 +0,0 @@
-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
deleted file mode 100644
index cf0aca124ef1..000000000000
--- a/databases/tarantool/files/patch-src-lib-swim-swim_proto.h
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index a15aaa88a19e..000000000000
--- a/databases/tarantool/files/patch-src-lib-swim-swim_transport.h
+++ /dev/null
@@ -1,15 +0,0 @@
-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
deleted file mode 100644
index 3b6948deca01..000000000000
--- a/databases/tarantool/files/patch-test-unit-swim_test_transport.c
+++ /dev/null
@@ -1,12 +0,0 @@
-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 {
- 	/**