From nobody Wed Jul 17 09:10:12 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 4WP9BX6G0Dz5QvMH; Wed, 17 Jul 2024 09:10:12 +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 4WP9BX5lvKz4SNr; Wed, 17 Jul 2024 09:10:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721207412; 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=3/DidR1rJCgfG9D+Md7YcuqJaOjhKH8nH4x+b4JqbYQ=; b=KS1mJRKMcajvCG7amFDcdtAkJAbyehUnC52STUJ6UyRJ0VmF8+VFMalinn70SKfpESHQMk M0ScmrMICVna5Upm3fNTQgMm2fiiWwuHPjeyzHUy+mQ6m2Ebjn/+wmjpJkV4hOv8kl4eMS ZhpLYd5tJByBq+4R8iV3GeOARfPACmy3Hdjy1mf7YL/XFruzC2h0g8k154eVHvYWFHJsPq v5ZVqiHhMC0NKyGPwga8QQChtbBrNXwWyfs24p6nxBIqjVYSAgXT9C9xiP6E195sdzhkJg z7xSx8J2X9ziCzVJ6jNbA+SCn7W/aIlj9/KENjdyeBmuwdnyRIBWKFlyiwu1Jw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721207412; a=rsa-sha256; cv=none; b=UNdeQN73e+z42GX1uuL/Q6jgXk56jWDIlmc91FGt61iXApag4zhDRs0zJE9zwkofxVnuPV CPzLUL57gZnOMg1TIl+Pd55Oq8mQ25GYa5AGuWThnsrQzIjSFo8TuvZXw++kQtUX/pNZ/1 CGfbKGBh6j8DzBk0c1pbfJKMcMjRJja5YvgvIxe9/N2oYo8g9Tl6pESdQ8opdo+CTk/LiM HHLpNkhHjJGa2wC+YGieW4jn0qWRecT0USdaBuvx65ic0TIzPWS8dDadfFYtfZ3427T6RH OSshBMXXbW0V+SgZomhzOpvxxGxV3C9KxZQ5Av18MtM/MzSceHPmiPmn9ZluQw== 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=1721207412; 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=3/DidR1rJCgfG9D+Md7YcuqJaOjhKH8nH4x+b4JqbYQ=; b=ZpTaSKDQoRmaxtL6AHo1rucDuvfW8SOI4/5eMCSAOW6IAQ6N8EBb43ezWUZqGyibB5az+Y F5ZJUHLGcwYi8YKu0l+o3A0mqTdmfwBQt9Hcy6GL6ucA94CoFBNrn05hCE1VYy0+48rMmy CAWo1H6wtr/wtWXKqDqk5t7QzU9p0pGLwEeNlvfuWQjOavo7gveFy9pLzP/ukc6j8Hf94d CqRaYHBocVdyOVb6flmi2O4sSxlAlS58XU3Zr9EdQOLWAEUgJdAJef7yuyhMDY55VxOlcm 2bBT2ZVFXGH4gtZgJnIul5CkcVtEToLQrc8cRikkbi2oeH/CywNQUlLLWn/STw== 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 4WP9BX5FH0z1D5F; Wed, 17 Jul 2024 09:10:12 +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 46H9ACNm097212; Wed, 17 Jul 2024 09:10:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46H9ACwC097204; Wed, 17 Jul 2024 09:10:12 GMT (envelope-from git) Date: Wed, 17 Jul 2024 09:10:12 GMT Message-Id: <202407170910.46H9ACwC097204@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 263d5293fc66 - main - net-p2p/transmission-components: 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 263d5293fc66e3f9f48a8cc3217235fb933d1f08 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=263d5293fc66e3f9f48a8cc3217235fb933d1f08 commit 263d5293fc66e3f9f48a8cc3217235fb933d1f08 Author: Anton Saietskii AuthorDate: 2024-07-17 09:03:29 +0000 Commit: Vladimir Druzenko CommitDate: 2024-07-17 09:09:29 +0000 net-p2p/transmission-components: Fix build with miniupnpc-2.2.8 /usr/ports/net-p2p/transmission-components/work-cli/transmission-4.0.6/libtransmission/port-forwarding-upnp.cc:278:13: error: no matching function for call to 'UPNP_GetValidIGD' 278 | if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) == | ^~~~~~~~~~~~~~~~ /usr/local/include/miniupnpc/miniupnpc.h:122:1: note: candidate function not viable: requires 7 arguments, but 5 were provided 122 | UPNP_GetValidIGD(struct UPNPDev * devlist, | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ 123 | struct UPNPUrls * urls, | ~~~~~~~~~~~~~~~~~~~~~~~ 124 | struct IGDdatas * data, | ~~~~~~~~~~~~~~~~~~~~~~~ 125 | char * lanaddr, int lanaddrlen, | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 126 | char * wanaddr, int wanaddrlen); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 error generated. ninja: build stopped: subcommand failed. *** Error code 1 PR: 280298 Approved by: Rafe (maintainer) Obtained from: https://github.com/transmission/transmission/commit/febfe49ca3ecab1a7142ecb34012c1f0b2bcdee8 --- .../files/patch-libtransmission_port-forwarding-upnp.cc | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/net-p2p/transmission-components/files/patch-libtransmission_port-forwarding-upnp.cc b/net-p2p/transmission-components/files/patch-libtransmission_port-forwarding-upnp.cc new file mode 100644 index 000000000000..ae97f1095a60 --- /dev/null +++ b/net-p2p/transmission-components/files/patch-libtransmission_port-forwarding-upnp.cc @@ -0,0 +1,17 @@ +--- libtransmission/port-forwarding-upnp.cc.orig 2024-05-29 01:38:35 UTC ++++ libtransmission/port-forwarding-upnp.cc +@@ -275,8 +275,12 @@ tr_port_forwarding_state tr_upnpPulse(tr_upnp* handle, + + FreeUPNPUrls(&handle->urls); + auto lanaddr = std::array{}; +- if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) == +- UPNP_IGD_VALID_CONNECTED) ++#if (MINIUPNPC_API_VERSION >= 18) ++ if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1, nullptr, 0) ++#else ++ if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) ++#endif ++ == UPNP_IGD_VALID_CONNECTED) + { + tr_logAddInfo(fmt::format(_("Found Internet Gateway Device '{url}'"), fmt::arg("url", handle->urls.controlURL))); + tr_logAddInfo(fmt::format(_("Local Address is '{address}'"), fmt::arg("address", lanaddr.data())));