From nobody Wed Mar 1 12:16:46 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRYBQ3tMBz3vn5k; Wed, 1 Mar 2023 12:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRYBQ3FZBz4YXH; Wed, 1 Mar 2023 12:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677673006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OPvtWswFkNeGIxF2N0F92agQpq7KtD+dbIifIAhB5tM=; b=nqxGWwlrZJehfXzXaq2kybULCyaqhkKMAqiRiSFeL3yHxjvhbLJ7OT0G+V28qB9Ek5noX9 qLbu2qDwB7WfZfK8Zmfd3xJxY6WP6kWnf3TrkGKVGSuM14TcuVsG7nqSY0OzL++e2h0utM umBCpOYYoPyngxA6Dgj7rLqxsQhakzS6J8m6N//E1edeQQjGsxmGSyVUGurxcdaAKj5TVj toQTUXy/uEVBe8FWKEzOmRpfWB4Sbeu7W6pS8Hkaex8tLe3tYImMN3EfIqlr30ZdKVcRar 44rA+zCp+p6+CNeFj1YlPgL/HmDluxxNexuyYyq9GL6k9r/GQiif7MEIX7zriQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677673006; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OPvtWswFkNeGIxF2N0F92agQpq7KtD+dbIifIAhB5tM=; b=UoUrjwe0OnUBg808gDOgOSIugoORfzqkQfK8YjL9OrOEnh42j9ZfEbHXm5GsKyTkXRg4y4 WbD/obRZ8VxpeFVdr12XeI+5bpLYPv31XDEy/1VBoPl+cl3THlRKCgppWhd6UfxBpKY8WY 3i7jKLKDTyXJ4fazZ+wzpHf8QI2vLXiAvPtjJNnK0mB6xb8N3nEQLn2N4oCHP/EKk3golE 9Yt7lcgCWTYmqjN2SV5ybUcaKV30NqXML30/WQj2pos4tctzdQ5axenWTtcO/vR33YlBrV kDkhuKohhBNTZxBcrY7cmgNni4VdhszY9Be/hOF8PGn0A6u8GC8Pta4wMZwRHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677673006; a=rsa-sha256; cv=none; b=V7h/cKWBSBzR8yxeKAyp2SFzuaNh/o6XubzmysTOs/b51GdWMM0JO7u7ak4QmsB0AIU2qa iNDSru5VTWPt9dM1roGiGHsQmMjSC5UFz28pZEmsjK3gUywpd5TAlqhgG88OgsKqKzLSQF q4ZyJHJVkyAY0cy4E/s0DFcQNu6uX4wQlA7Z5lmkcpe2kjoBOMgFitEPbLTvgwq4SkQdh7 L+yP1b9mqhK3O5lkE3JorbPXbKfVnmTJbjJuO1IDoc6JueWBqYGJLjKuhPhEMGHH4S6h9Q QhfR6aGFtD8FB+wnZGGDtkxBKVF4s9VhnnFqY8Sy6MI+9NSIf2uIglB2RA16Bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRYBQ2JNgzYX8; Wed, 1 Mar 2023 12:16:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321CGk6Q075007; Wed, 1 Mar 2023 12:16:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321CGkwL075006; Wed, 1 Mar 2023 12:16:46 GMT (envelope-from git) Date: Wed, 1 Mar 2023 12:16:46 GMT Message-Id: <202303011216.321CGkwL075006@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 0f57a0feb817 - main - games/vcmi: the port had been updated to version 1.1.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0f57a0feb817e543debe018615c2678f375c541d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=0f57a0feb817e543debe018615c2678f375c541d commit 0f57a0feb817e543debe018615c2678f375c541d Author: Alexey Dokuchaev AuthorDate: 2023-03-01 12:15:40 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-03-01 12:15:40 +0000 games/vcmi: the port had been updated to version 1.1.1 Rather than hardcoding socket buffer size to 4MB, set it based on the ``kern.ipc.maxsockbuf'' sysctl value*. Reported by: portscout *) https://bugs.vcmi.eu/view.php?id=3027 --- games/vcmi/Makefile | 4 ++-- games/vcmi/distinfo | 6 ++--- .../vcmi/files/patch-lib_serializer_Connection.cpp | 26 ++++++++++++++++++++++ 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile index 1c083d5a6a09..78b98d9ae40f 100644 --- a/games/vcmi/Makefile +++ b/games/vcmi/Makefile @@ -1,5 +1,5 @@ PORTNAME= vcmi -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= games MAINTAINER= danfe@FreeBSD.org @@ -36,7 +36,7 @@ QT_USE= QT=buildtools:build,qmake:build,core,gui,network,widgets QT_CMAKE_OFF= -DENABLE_LAUNCHER:BOOL=OFF -DENABLE_EDITOR:BOOL=OFF post-configure: - ${SED} -e 's,@GIT_SHA1@,5278271,' ${WRKSRC}/Version.cpp.in \ + ${SED} -e 's,@GIT_SHA1@,b429f0b,' ${WRKSRC}/Version.cpp.in \ > ${BUILD_WRKSRC}/Version.cpp post-install-DOCS-on: diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo index dea8d6a9dc6d..375d1249de6a 100644 --- a/games/vcmi/distinfo +++ b/games/vcmi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1671792720 -SHA256 (vcmi-vcmi-1.1.0_GH0.tar.gz) = 39db3ac7a2d1e386be1982957c0746e4e47f0d6a57268a57e65df9c95c967474 -SIZE (vcmi-vcmi-1.1.0_GH0.tar.gz) = 6412813 +TIMESTAMP = 1675416308 +SHA256 (vcmi-vcmi-1.1.1_GH0.tar.gz) = 41cf343e45a3c1f4ddf95e97697c25e68e40b93f681c0b9d631b3c9d1608a49b +SIZE (vcmi-vcmi-1.1.1_GH0.tar.gz) = 6412309 diff --git a/games/vcmi/files/patch-lib_serializer_Connection.cpp b/games/vcmi/files/patch-lib_serializer_Connection.cpp new file mode 100644 index 000000000000..8d7f2389e1a3 --- /dev/null +++ b/games/vcmi/files/patch-lib_serializer_Connection.cpp @@ -0,0 +1,26 @@ +--- lib/serializer/Connection.cpp.orig 2023-02-03 09:25:08 UTC ++++ lib/serializer/Connection.cpp +@@ -15,6 +15,7 @@ + #include "../CGameState.h" + + #include ++#include + + VCMI_LIB_NAMESPACE_BEGIN + +@@ -46,8 +47,13 @@ void CConnection::init() + socket->set_option(boost::asio::ip::tcp::no_delay(true)); + try + { +- socket->set_option(boost::asio::socket_base::send_buffer_size(4194304)); +- socket->set_option(boost::asio::socket_base::receive_buffer_size(4194304)); ++ unsigned long sb_max, sb_max_adj; ++ size_t len = sizeof(sb_max); ++ (void)sysctlbyname("kern.ipc.maxsockbuf", &sb_max, &len, NULL, 0); ++ sb_max_adj = sb_max * MCLBYTES / (MSIZE + MCLBYTES); ++ ++ socket->set_option(boost::asio::socket_base::send_buffer_size(sb_max_adj)); ++ socket->set_option(boost::asio::socket_base::receive_buffer_size(sb_max_adj)); + } + catch (const boost::system::system_error & e) + {