From nobody Fri Aug 16 15:02:35 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 4WllbH6J7yz5T4CS; Fri, 16 Aug 2024 15:02:35 +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 4WllbH5mCpz4Y28; Fri, 16 Aug 2024 15:02:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723820555; 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=HOscCgUCvF6lXhXi7NNUpe4frbN6A9kMSA417uMfeDY=; b=LfLrr/1c//0cL+mCYH3vScLqQ9c7j3OieeHjXWk21zDjBGwH4Qkh5o4AgLXqfI+ZT0mp3Z qI/LfZ7CYIku5NbSW1WLcO/MKwYLA6Fgm6nw+9CqJhsNoL48k/kRw3VVDzJwcHvmDP7udW 2m1l2JFq3zNKUlYfKjqp7SDuE2e3C/H9TlgRpl0IeoCW7/iGYsUZmDdRSS5hYTopZwAWsr iG+krDXlvDNsSo81Mp+1Du7hEN7BND4bnhfoNr5bK4GxFkkHl7mvKBFxjTYdk1bFex8QIL veF2eqLtege0TuCVXYSRz3lRZP4e4seH8L+QeZ+azcCuP7SgWwchhbcncnbT+Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723820555; a=rsa-sha256; cv=none; b=qWCL4B1QAFfndW+aj1ZAOxOEivRx2tbn/nGrJw2kRLvdVen3i0rt5ehP17GHJdZypxrRvn SvVTFPy22qcfnWD3LAfo0AZnQh4IMf6GsciLYm4FBCuswrjvcKB4Zk6nc5wXjaNdtE1Bhw HYtXxUVlaDIP+0kPWNsiSVS+ZnczQ4h4pnr+CWFZd3cUsXtwK9s75vuvDyasa+ePUDewDY YxV4eyf69mf6emFz333bK54mHVA2boGrS/UwlUEO9iHKg9N4FbG7TL1+JjjdErVn3/2Zix 7olcQe5I1QkDNgA/peShynqkEVgX9Kq8UlwCio4rA9yNivnvAx2mM8UBU//RUA== 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=1723820555; 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=HOscCgUCvF6lXhXi7NNUpe4frbN6A9kMSA417uMfeDY=; b=E4KTtG6XyoF7Xu2MS/s+oflZuoFYiozNbFId4zU0QnvmZVrzKyziXANYb06W2Zgx4MB5u9 1BFYv6AEp/RdNJjKd5Fv/6hzMJWhUlv1SMpN7JlBix2nTIRdf/ATloTKfm7LftIVSijbPd 3U+P6psrkALj8gxsvFj2gkp2Cnne94MPCmKZzhNkiKlo5/vZwWZmPdXtns14WB87ahWL4e EtpgMaDEq3BncP0xIlyBJjIE8z7ocMlImAq8/9y+0yWWDNz7NjKEw9Zc0XrqaTzdC0WgWc lO0H29JVJX1e+jYNpq/UEjdwZfuBDak4wMOpEM7Jhqm+L+D4oIw9aMRa742Ueg== 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 4WllbH5MrKz19s9; Fri, 16 Aug 2024 15:02:35 +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 47GF2Ztj027921; Fri, 16 Aug 2024 15:02:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47GF2ZEN027919; Fri, 16 Aug 2024 15:02:35 GMT (envelope-from git) Date: Fri, 16 Aug 2024 15:02:35 GMT Message-Id: <202408161502.47GF2ZEN027919@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: 12a18174c4f6 - main - net-p2p/monero-cli: fix returcode 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: 12a18174c4f6dbfd63e4902723a12d32a9552e8c Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=12a18174c4f6dbfd63e4902723a12d32a9552e8c commit 12a18174c4f6dbfd63e4902723a12d32a9552e8c Author: Dirk Meyer AuthorDate: 2024-08-16 15:02:16 +0000 Commit: Dirk Meyer CommitDate: 2024-08-16 15:02:16 +0000 net-p2p/monero-cli: fix returcode with miniupnpc 2.2.8 PR: 280298 --- net-p2p/monero-cli/Makefile | 2 +- .../monero-cli/files/patch-src_p2p_net__node.inl | 27 +++++++++++++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/net-p2p/monero-cli/Makefile b/net-p2p/monero-cli/Makefile index b248ad6be563..8cae7b9935d4 100644 --- a/net-p2p/monero-cli/Makefile +++ b/net-p2p/monero-cli/Makefile @@ -1,7 +1,7 @@ PORTNAME= monero-cli DISTVERSIONPREFIX= v DISTVERSION= 0.18.3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= net-p2p finance MAINTAINER= ports@FreeBSD.org 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 b58bd7d07158..b2414132714d 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 @@ -25,7 +25,7 @@ freeUPNPDevlist(deviceList); if (result > 0) { if (result == 1) { -@@ -3057,7 +3061,11 @@ namespace nodetool +@@ -3057,10 +3061,18 @@ namespace nodetool UPNPUrls urls; IGDdatas igdData; char lanAddress[64]; @@ -36,4 +36,29 @@ +#endif freeUPNPDevlist(deviceList); if (result > 0) { ++#if MINIUPNPC_API_VERSION >= 18 ++ if ((result == 1) || (result == 2)) { ++#else if (result == 1) { ++#endif + std::ostringstream portString; + portString << port; + +@@ -3071,10 +3083,17 @@ namespace nodetool + } else { + MLOG_GREEN(el::Level::Info, "Deleted IGD port mapping."); + } ++#if MINIUPNPC_API_VERSION >= 18 ++ } else if (result == 3) { ++ MWARNING("IGD was found but reported as not connected."); ++ } else if (result == 4) { ++ MWARNING("UPnP device was found but not recognized as IGD."); ++#else + } else if (result == 2) { + MWARNING("IGD was found but reported as not connected."); + } else if (result == 3) { + MWARNING("UPnP device was found but not recognized as IGD."); ++#endif + } else { + MWARNING("UPNP_GetValidIGD returned an unknown result code."); + }