sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update to 2.3.1

Browse source 
Changes:	https://github.com/tarantool/tarantool/releases
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2020-01-01 16:30:37 +00:00
parent 5f37862a99
commit d11fcd42db
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=521729
5 changed files with 23 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
databases/tarantool/Makefile
View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= tarantool
PORTVERSION= 2.1.3
PORTVERSION= 2.3.1
CATEGORIES= databases
MAINTAINER= sunpoet@FreeBSD.org
@ -39,11 +39,13 @@ PLIST_SUB= TT_DATADIR=${TT_DATADIR} \
TT_LOGDIR=${TT_LOGDIR}
SUB_FILES= pkg-message
GH_TUPLE= luafun:luafun:e248e00:luafun/third_party/luafun \
tarantool:luajit:4625404:luajit/third_party/luajit \
tarantool:luarocks:05312b5:luarocks/third_party/luarocks \
tarantool:small:9046d88:small/src/lib/small \
tarantool:test-run:e665a66:test_run/test-run
GH_TUPLE= luafun:luafun:e248e00:luafun_luafun/third_party/luafun \
tarantool:decNumber:ec9e5be:tarantool_decNumber/third_party/decNumber \
tarantool:luajit:c9588f5:tarantool_luajit/third_party/luajit \
tarantool:luarocks:05312b5:tarantool_luarocks/third_party/luarocks \
tarantool:serpent:879580f:tarantool_serpent/third_party/serpent \
tarantool:small:50cb787:tarantool_small/src/lib/small \
tarantool:test-run:b23eeb7:tarantool_test_run/test-run
USE_GITHUB= yes
USERS= tarantool
@ -61,6 +63,7 @@ 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
@${REINPLACE_CMD} -e 's|lib/msgpuck.h|msgpuck.h|' ${WRKSRC}/src/lib/core/decimal.c
post-install:
@${RMDIR} ${STAGEDIR}${PREFIX}/lib/tarantool/

22
databases/tarantool/distinfo
View file

@ -1,13 +1,17 @@
TIMESTAMP = 1573657558
SHA256 (tarantool-tarantool-2.1.3_GH0.tar.gz) = e909cf0eae1aa4f6d51230eb0fab56ef724fb9fffed1e3038f1203d44cd0a894
SIZE (tarantool-tarantool-2.1.3_GH0.tar.gz) = 4243053
TIMESTAMP = 1577872978
SHA256 (tarantool-tarantool-2.3.1_GH0.tar.gz) = 8faca5641c255952425f0eaa3115dd124b592dafb2022f188a3abc8c71b74ce8
SIZE (tarantool-tarantool-2.3.1_GH0.tar.gz) = 4517030
SHA256 (luafun-luafun-e248e00_GH0.tar.gz) = 9978dd21c0688d5c6206846697be17363a4be446851c1c1d60e2427fe200b7f2
SIZE (luafun-luafun-e248e00_GH0.tar.gz) = 67323
SHA256 (tarantool-luajit-4625404_GH0.tar.gz) = ebcbb0a404898fa129f199f18dc6628fffea1103b2cf78b05634bb1064e8d8e8
SIZE (tarantool-luajit-4625404_GH0.tar.gz) = 1031568
SHA256 (tarantool-decNumber-ec9e5be_GH0.tar.gz) = 7585179a0efa992f98e959ae4b067527e037db798e2e510c71f2831315c5e297
SIZE (tarantool-decNumber-ec9e5be_GH0.tar.gz) = 209429
SHA256 (tarantool-luajit-c9588f5_GH0.tar.gz) = c176b5c60d8bcc80dce3cfe2213af30a2967a574a91ce4838da4cbc6698ae715
SIZE (tarantool-luajit-c9588f5_GH0.tar.gz) = 1032347
SHA256 (tarantool-luarocks-05312b5_GH0.tar.gz) = 4ee5ef77b67f2e5eed41aba8e4682aa7dd2516618c1d38caf781d38a7e19818f
SIZE (tarantool-luarocks-05312b5_GH0.tar.gz) = 4027574
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
SHA256 (tarantool-serpent-879580f_GH0.tar.gz) = 2367c5e3ab069f5686a4d23124759a2332b991f73695f3760dd7728e295893be
SIZE (tarantool-serpent-879580f_GH0.tar.gz) = 13234
SHA256 (tarantool-small-50cb787_GH0.tar.gz) = 668f8b206868402601498a1e625d535b60db582806039a79e01c8fab004e99b5
SIZE (tarantool-small-50cb787_GH0.tar.gz) = 115780
SHA256 (tarantool-test-run-b23eeb7_GH0.tar.gz) = 832dccbd1e5273b7a97aadee13c7ee6c25bb596947559cb05ed971404400d842
SIZE (tarantool-test-run-b23eeb7_GH0.tar.gz) = 61758

36
databases/tarantool/files/patch-src-box-tuple_format.c
View file

@ -1,36 +0,0 @@
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) {

28
databases/tarantool/files/patch-src-box-vy_stmt.c
View file

@ -1,28 +0,0 @@
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) {

2
databases/tarantool/pkg-plist
View file

@ -22,6 +22,7 @@ man/man1/tarantoolctl.1.gz
%%DATADIR%%/luarocks/cfg.lua
%%DATADIR%%/luarocks/command_line.lua
%%DATADIR%%/luarocks/config_cmd.lua
%%DATADIR%%/luarocks/core/hardcoded.lua
%%DATADIR%%/luarocks/deps.lua
%%DATADIR%%/luarocks/dir.lua
%%DATADIR%%/luarocks/doc.lua
@ -68,7 +69,6 @@ man/man1/tarantoolctl.1.gz
%%DATADIR%%/luarocks/require.lua
%%DATADIR%%/luarocks/search.lua
%%DATADIR%%/luarocks/show.lua
%%DATADIR%%/luarocks/site_config.lua
%%DATADIR%%/luarocks/tools/patch.lua
%%DATADIR%%/luarocks/tools/tar.lua
%%DATADIR%%/luarocks/tools/zip.lua