From nobody Fri Jul 19 15:08:26 2024 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 4WQY2y5Gvyz5Rp5c; Fri, 19 Jul 2024 15:08:26 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WQY2y4j1mz4qJK; Fri, 19 Jul 2024 15:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721401706; 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=gL6Nf278TH/iifHhg/YqLZQqcVwU5lqKa/vSxgnztrU=; b=WOCeebfFIlJHy9gAlW4QG8HocI/fgrPNEe0/5sZE9TrNfKdMxp5Jcewirap/PR7PsaSjjX C593PdlsHjaO1wJxBCl7Ytr6X8zd0VSVlSg4DaJts8haJjibdbhbMq2Jc+5r+xigthuQal tvkNfjOYHy/yhJAVNh/icNM9GhMHcvawbgoLHLrB9B4l9u7/IUBr/0JcCtB0nW5Vl+QUNa OxrAIHLAXf3uAnEfIcoWbEWqNEhMwm7V5dvuB5s43s72gQHm82573ai/swA7faVvFTd1Zt uSRiCAc0SWlnzHkJz0HSzMm0IPVmRK+aQcDSdozVYFGtxDy8r3/+lTUzctjDqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721401706; a=rsa-sha256; cv=none; b=Z8FO9MamHYDVGAezdSD0vURKPEu0awFsRCFocubH9JTC/iHkqUSVPzbN5IZnmplSQ9Drjp qdUlW4paxA/UkNvtn8llOaE7TUivemXqECXoJguj1vo93UlFPXkTZtmWCFyF2Oh42DMQ5P HNo/XmZiDm64dQp7wVi+YLqcveEY3cZ5+V+oM1/A4b7oSgx79u9N9LLPm4Es60sQIk9nwx XBJqctrJZIs6UqCQ2wO1YzIdBHKv61H4cKCdlecBb+dJ1abBiY99+HUIWx0Qx6Q4OEWJ1P XWbIkEhhYpedYRgqsFI9mce5K682i0HQD33++DtcWgs6/QKk33CxK76v6nnJAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721401706; 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=gL6Nf278TH/iifHhg/YqLZQqcVwU5lqKa/vSxgnztrU=; b=J0Q4rHdIEDyfnZXnnZV5AF5GROw6WD8K/NBkSOHkzFjiP4oFUgeQPJj3bU8wMlkQQgbKUx sWPKtzqvG53x5hMp8cov5pwDBF1N3oX/sbv1+fPXROvBx4G7gxTNQcwrCFEFy1sVTUNlrq MBOyyBs+K8njIWQLl9eFm410TA7/0jvBKEcphdg5+TRdd1r4dImk+Mqihi6kOstA8xcP8x 73PhUfTSKP3283MVs+G8Q7mePcCEE4O8DEsc/KxbKMBFEG7LbFbC1ynMZpM6tFSRn0EBx4 EU309T2hA3DGaEaIR3xypOhqYsGtUep0FerMks+WJnx3fACbaMnvK/EfWj4PBg== 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 4WQY2y4JQwzcRx; Fri, 19 Jul 2024 15:08:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46JF8QNt023250; Fri, 19 Jul 2024 15:08:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JF8QpT023247; Fri, 19 Jul 2024 15:08:26 GMT (envelope-from git) Date: Fri, 19 Jul 2024 15:08:26 GMT Message-Id: <202407191508.46JF8QpT023247@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 49c08288dee3 - main - net-p2p/monero-cli: fix build with miniupnpc 2.2.8 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 49c08288dee302df00202b879cfd77b09c83b781 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=49c08288dee302df00202b879cfd77b09c83b781 commit 49c08288dee302df00202b879cfd77b09c83b781 Author: Dirk Meyer AuthorDate: 2024-07-19 15:08:14 +0000 Commit: Dirk Meyer CommitDate: 2024-07-19 15:08:14 +0000 net-p2p/monero-cli: fix build with miniupnpc 2.2.8 PR: 280298 --- .../monero-cli/files/patch-src_p2p_net__node.inl | 32 +++++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/net-p2p/monero-cli/files/patch-src_p2p_net__node.inl b/net-p2p/monero-cli/files/patch-src_p2p_net__node.inl index 5b41c099fdb3..b58bd7d07158 100644 --- a/net-p2p/monero-cli/files/patch-src_p2p_net__node.inl +++ b/net-p2p/monero-cli/files/patch-src_p2p_net__node.inl @@ -1,8 +1,8 @@ ---- src/p2p/net_node.inl.orig 2018-06-06 19:28:51.925128000 UTC -+++ src/p2p/net_node.inl 2018-06-06 19:29:06.877331000 UTC -@@ -49,9 +49,9 @@ - #include "storages/levin_abstract_invoke2.h" +--- src/p2p/net_node.inl.orig 2023-10-02 19:28:11 UTC ++++ src/p2p/net_node.inl +@@ -60,9 +60,9 @@ #include "cryptonote_core/cryptonote_core.h" + #include "net/parse.h" -#include -#include @@ -13,3 +13,27 @@ #undef MONERO_DEFAULT_LOG_CATEGORY #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p" +@@ -2989,7 +2989,11 @@ namespace nodetool + UPNPUrls urls; + IGDdatas igdData; + char lanAddress[64]; ++#if MINIUPNPC_API_VERSION >= 18 ++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, NULL, 0); ++#else + result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress); ++#endif + freeUPNPDevlist(deviceList); + if (result > 0) { + if (result == 1) { +@@ -3057,7 +3061,11 @@ namespace nodetool + UPNPUrls urls; + IGDdatas igdData; + char lanAddress[64]; ++#if MINIUPNPC_API_VERSION >= 18 ++ result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, NULL, 0); ++#else + result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress); ++#endif + freeUPNPDevlist(deviceList); + if (result > 0) { + if (result == 1) {