Date: Mon, 5 Nov 2018 16:34:56 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r484199 - in branches/2018Q4/databases/tarantool: . files Message-ID: <201811051634.wA5GYuBE088981@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Nov 5 16:34:56 2018 New Revision: 484199 URL: https://svnweb.freebsd.org/changeset/ports/484199 Log: MFH: r482052 r483943 Update to 1.10.2 Changes: https://github.com/tarantool/tarantool/releases Fix build with curl 7.62.0 Approved by: ports-secteam (miwi) Added: branches/2018Q4/databases/tarantool/files/patch-src-httpc.c - copied unchanged from r483943, head/databases/tarantool/files/patch-src-httpc.c branches/2018Q4/databases/tarantool/files/patch-src-say.c - copied unchanged from r482052, head/databases/tarantool/files/patch-src-say.c Modified: branches/2018Q4/databases/tarantool/Makefile branches/2018Q4/databases/tarantool/distinfo branches/2018Q4/databases/tarantool/files/patch-cmake-FindICONV.cmake Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/tarantool/Makefile ============================================================================== --- branches/2018Q4/databases/tarantool/Makefile Mon Nov 5 16:28:01 2018 (r484198) +++ branches/2018Q4/databases/tarantool/Makefile Mon Nov 5 16:34:56 2018 (r484199) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tarantool -PORTVERSION= 1.9.2 +PORTVERSION= 1.10.2 CATEGORIES= databases MAINTAINER= sunpoet@FreeBSD.org Modified: branches/2018Q4/databases/tarantool/distinfo ============================================================================== --- branches/2018Q4/databases/tarantool/distinfo Mon Nov 5 16:28:01 2018 (r484198) +++ branches/2018Q4/databases/tarantool/distinfo Mon Nov 5 16:34:56 2018 (r484199) @@ -1,6 +1,6 @@ -TIMESTAMP = 1536249044 -SHA256 (tarantool-tarantool-1.9.2_GH0.tar.gz) = a263518ae3198b7d30d55f1f75dd1d24e2b943fc846f12f2a1ecbf210d9cbf63 -SIZE (tarantool-tarantool-1.9.2_GH0.tar.gz) = 2383272 +TIMESTAMP = 1539426850 +SHA256 (tarantool-tarantool-1.10.2_GH0.tar.gz) = 786343d3e63644165afb74917f6129491d54e3c9bd8b28dd0e36028755f1ba3f +SIZE (tarantool-tarantool-1.10.2_GH0.tar.gz) = 2508475 SHA256 (rtsisyk-luafun-04c99f9_GH0.tar.gz) = 4f135f25a2d31116723162ec8ad54f7d4e0e1258557bb1665557532ac64dc625 SIZE (rtsisyk-luafun-04c99f9_GH0.tar.gz) = 67326 SHA256 (tarantool-luajit-b8587fa_GH0.tar.gz) = 620a023a5ee6a52fc5f9fb3ece568b5ff58246a807c9ba4e31a8157451e9cff2 Modified: branches/2018Q4/databases/tarantool/files/patch-cmake-FindICONV.cmake ============================================================================== --- branches/2018Q4/databases/tarantool/files/patch-cmake-FindICONV.cmake Mon Nov 5 16:28:01 2018 (r484198) +++ branches/2018Q4/databases/tarantool/files/patch-cmake-FindICONV.cmake Mon Nov 5 16:34:56 2018 (r484199) @@ -1,18 +1,11 @@ ---- cmake/FindICONV.cmake.orig 2018-09-06 16:31:05 UTC +--- cmake/FindICONV.cmake.orig 2018-10-12 19:53:35 UTC +++ cmake/FindICONV.cmake -@@ -4,14 +4,8 @@ +@@ -4,7 +4,7 @@ # ICONV_LIBRARIES # -if (TARGET_OS_LINUX) +if (TARGET_OS_FREEBSD OR TARGET_OS_LINUX) set(ICONV_LIBRARY "") --else() -- find_library(ICONV_LIBRARY iconv) -- if(NOT ICONV_LIBRARY) -- message(WARNING "iconv library not found") -- set(ICONV_LIBRARY "") -- endif() - endif() - find_path(ICONV_INCLUDE_DIR iconv.h) - if(NOT ICONV_INCLUDE_DIR) + else() + find_library(ICONV_LIBRARY iconv) Copied: branches/2018Q4/databases/tarantool/files/patch-src-httpc.c (from r483943, head/databases/tarantool/files/patch-src-httpc.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/tarantool/files/patch-src-httpc.c Mon Nov 5 16:34:56 2018 (r484199, copy of r483943, head/databases/tarantool/files/patch-src-httpc.c) @@ -0,0 +1,12 @@ +--- src/httpc.c.orig 2018-10-12 19:53:35 UTC ++++ src/httpc.c +@@ -333,7 +333,9 @@ httpc_execute(struct httpc_request *req, + ++env->stat.http_other_responses; + } + break; ++#if LIBCURL_VERSION_NUM < 0x073e00 + case CURLE_SSL_CACERT: ++#endif + case CURLE_PEER_FAILED_VERIFICATION: + /* 495 SSL Certificate Error (nginx non-standard) */ + req->status = 495; Copied: branches/2018Q4/databases/tarantool/files/patch-src-say.c (from r482052, head/databases/tarantool/files/patch-src-say.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/databases/tarantool/files/patch-src-say.c Mon Nov 5 16:34:56 2018 (r484199, copy of r482052, head/databases/tarantool/files/patch-src-say.c) @@ -0,0 +1,10 @@ +--- src/say.c.orig 2018-10-12 19:53:35 UTC ++++ src/say.c +@@ -37,6 +37,7 @@ + #include <stdio.h> + #include <string.h> + #include <netdb.h> ++#include <netinet/in.h> + #include <sys/types.h> + #include <unistd.h> + #include <fcntl.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811051634.wA5GYuBE088981>