Date: Sun, 16 Jun 2019 10:34:24 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r504295 - in head/databases/tarantool: . files Message-ID: <201906161034.x5GAYOLL082195@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Jun 16 10:34:23 2019 New Revision: 504295 URL: https://svnweb.freebsd.org/changeset/ports/504295 Log: Update to 2.1.2 - Fix linking: change from libmsgpuck.a to libmsgpuck.so Changes: https://github.com/tarantool/tarantool/releases Added: head/databases/tarantool/files/patch-src-box-tuple_format.c (contents, props changed) head/databases/tarantool/files/patch-src-box-vy_stmt.c (contents, props changed) head/databases/tarantool/files/patch-src-lib-swim-swim_io.h (contents, props changed) head/databases/tarantool/files/patch-src-lib-swim-swim_proto.c (contents, props changed) head/databases/tarantool/files/patch-src-lib-swim-swim_proto.h (contents, props changed) head/databases/tarantool/files/patch-src-lib-swim-swim_transport.h (contents, props changed) head/databases/tarantool/files/patch-test-unit-swim_test_transport.c (contents, props changed) Modified: head/databases/tarantool/Makefile head/databases/tarantool/distinfo Modified: head/databases/tarantool/Makefile ============================================================================== --- head/databases/tarantool/Makefile Sun Jun 16 10:14:21 2019 (r504294) +++ head/databases/tarantool/Makefile Sun Jun 16 10:34:23 2019 (r504295) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.10.3 -PORTREVISION= 1 +PORTVERSION= 2.1.2 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org @@ -37,11 +36,11 @@ PLIST_SUB= TT_DATADIR=${TT_DATADIR} \ TT_LOGDIR=${TT_LOGDIR} SUB_FILES= pkg-message -GH_TUPLE= rtsisyk:luafun:e248e00:luafun/third_party/luafun \ - tarantool:luajit:d92380f:luajit/third_party/luajit \ +GH_TUPLE= luafun:luafun:e248e00:luafun/third_party/luafun \ + tarantool:luajit:5f0a43a:luajit/third_party/luajit \ tarantool:luarocks:05312b5:luarocks/third_party/luarocks \ - tarantool:small:cdf7d4a:small/src/lib/small \ - tarantool:test-run:8ed7445:test_run/test-run + tarantool:small:020716d:small/src/lib/small \ + tarantool:test-run:27aebd9:test_run/test-run USE_GITHUB= yes USERS= tarantool @@ -58,6 +57,7 @@ DEBUG_CMAKE_BOOL= ENABLE_BACKTRACE post-patch: @${ECHO_CMD} ${PORTVERSION}-0 > ${WRKSRC}/VERSION @${GREP} -lr 'msgpuck/msgpuck.h' ${WRKSRC}/ | ${XARGS} ${REINPLACE_CMD} -e 's|msgpuck/msgpuck.h|msgpuck.h|' + @${REINPLACE_CMD} -e 's|libmsgpuck.a|libmsgpuck.so|' ${WRKSRC}/cmake/FindMsgPuck.cmake post-install: @${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/ Modified: head/databases/tarantool/distinfo ============================================================================== --- head/databases/tarantool/distinfo Sun Jun 16 10:14:21 2019 (r504294) +++ head/databases/tarantool/distinfo Sun Jun 16 10:34:23 2019 (r504295) @@ -1,13 +1,13 @@ -TIMESTAMP = 1554489603 -SHA256 (tarantool-tarantool-1.10.3_GH0.tar.gz) = f07448e8f06e40370ef0d9c3681121e39769299e4b6afad3cefdc956c1f7d50e -SIZE (tarantool-tarantool-1.10.3_GH0.tar.gz) = 2542792 -SHA256 (rtsisyk-luafun-e248e00_GH0.tar.gz) = 9978dd21c0688d5c6206846697be17363a4be446851c1c1d60e2427fe200b7f2 -SIZE (rtsisyk-luafun-e248e00_GH0.tar.gz) = 67323 -SHA256 (tarantool-luajit-d92380f_GH0.tar.gz) = 41597564b3fc11ce96f3f49044fc39745d39b80abd33ad72483614566a3bad74 -SIZE (tarantool-luajit-d92380f_GH0.tar.gz) = 1027807 +TIMESTAMP = 1560671633 +SHA256 (tarantool-tarantool-2.1.2_GH0.tar.gz) = bc8ec0e3e060ca620159179fff169a505aaa0eec5942bf86999897e2087f9596 +SIZE (tarantool-tarantool-2.1.2_GH0.tar.gz) = 4206520 +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-luarocks-05312b5_GH0.tar.gz) = 4ee5ef77b67f2e5eed41aba8e4682aa7dd2516618c1d38caf781d38a7e19818f SIZE (tarantool-luarocks-05312b5_GH0.tar.gz) = 4027574 -SHA256 (tarantool-small-cdf7d4a_GH0.tar.gz) = 7b3e37d2bcc4dfbc4924785cc27bc2bddaa81393044826956470ff8eebd5c7bf -SIZE (tarantool-small-cdf7d4a_GH0.tar.gz) = 108844 -SHA256 (tarantool-test-run-8ed7445_GH0.tar.gz) = 501e84dd15e2d00910a5f95488cf6c96981cce1f4a45b642be04dd6cf57e8cc4 -SIZE (tarantool-test-run-8ed7445_GH0.tar.gz) = 60641 +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 Added: head/databases/tarantool/files/patch-src-box-tuple_format.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-src-box-tuple_format.c Sun Jun 16 10:34:23 2019 (r504295) @@ -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) { Added: head/databases/tarantool/files/patch-src-box-vy_stmt.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-src-box-vy_stmt.c Sun Jun 16 10:34:23 2019 (r504295) @@ -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) { Added: head/databases/tarantool/files/patch-src-lib-swim-swim_io.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-src-lib-swim-swim_io.h Sun Jun 16 10:34:23 2019 (r504295) @@ -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. Added: head/databases/tarantool/files/patch-src-lib-swim-swim_proto.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-src-lib-swim-swim_proto.c Sun Jun 16 10:34:23 2019 (r504295) @@ -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", Added: head/databases/tarantool/files/patch-src-lib-swim-swim_proto.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-src-lib-swim-swim_proto.h Sun Jun 16 10:34:23 2019 (r504295) @@ -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> + + /** Added: head/databases/tarantool/files/patch-src-lib-swim-swim_transport.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-src-lib-swim-swim_transport.h Sun Jun 16 10:34:23 2019 (r504295) @@ -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 { Added: head/databases/tarantool/files/patch-test-unit-swim_test_transport.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/tarantool/files/patch-test-unit-swim_test_transport.c Sun Jun 16 10:34:23 2019 (r504295) @@ -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 { + /**
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201906161034.x5GAYOLL082195>