From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 17E6615817D for ; Tue, 11 Jun 2024 01:05:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41A082BC013; Tue, 11 Jun 2024 01:05:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D24EF2BC013 for ; Tue, 11 Jun 2024 01:05:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2876335D1C for ; Tue, 11 Jun 2024 01:05:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B8CE15F7 for ; Tue, 11 Jun 2024 01:05:08 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1718067844.77a19a999ea1f73ac0e4b0ec1973d4392994ab68.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/, net-p2p/transmission/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch net-p2p/transmission/transmission-4.0.6-r1.ebuild net-p2p/transmission/transmission-4.0.6-r2.ebuild X-VCS-Directories: net-p2p/transmission/files/ net-p2p/transmission/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 77a19a999ea1f73ac0e4b0ec1973d4392994ab68 X-VCS-Branch: master Date: Tue, 11 Jun 2024 01:05:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dd2ebcec-94d4-4267-b109-b88d8d834282 X-Archives-Hash: a39820deddb1ae232431464326aac969 commit: 77a19a999ea1f73ac0e4b0ec1973d4392994ab68 Author: Mike Gilbert gentoo org> AuthorDate: Tue Jun 11 01:04:04 2024 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Tue Jun 11 01:04:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77a19a99 net-p2p/transmission: fix build with net-libs/miniupnpc-2.2.8 Closes: https://bugs.gentoo.org/934016 Signed-off-by: Mike Gilbert gentoo.org> .../files/transmission-4.0.6-miniupnpc-2.2.8.patch | 24 ++++++++++++++++++++++ ....0.6-r1.ebuild => transmission-4.0.6-r2.ebuild} | 6 +++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch b/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch new file mode 100644 index 000000000000..e1f9c2e36b8d --- /dev/null +++ b/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/934016 +https://github.com/transmission/transmission/pull/6907 + +From 3523b928c8c968d0b7bca2c6c3a84a939e908f8c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C5=93ur?= +Date: Mon, 10 Jun 2024 22:16:06 +0800 +Subject: [PATCH] bump miniupnpc to 2.2.8 + +diff --git a/libtransmission/port-forwarding-upnp.cc b/libtransmission/port-forwarding-upnp.cc +index 6d7bbc7f7c2..d805bc18218 100644 +--- a/libtransmission/port-forwarding-upnp.cc ++++ b/libtransmission/port-forwarding-upnp.cc +@@ -261,7 +261,11 @@ tr_port_forwarding_state tr_upnpPulse( + + FreeUPNPUrls(&handle->urls); + auto lanaddr = std::array{}; ++#if (MINIUPNPC_API_VERSION >= 18) ++ if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1, NULL, 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))); diff --git a/net-p2p/transmission/transmission-4.0.6-r1.ebuild b/net-p2p/transmission/transmission-4.0.6-r2.ebuild similarity index 97% rename from net-p2p/transmission/transmission-4.0.6-r1.ebuild rename to net-p2p/transmission/transmission-4.0.6-r2.ebuild index de67e505ed49..b30c5a0934af 100644 --- a/net-p2p/transmission/transmission-4.0.6-r1.ebuild +++ b/net-p2p/transmission/transmission-4.0.6-r2.ebuild @@ -46,7 +46,7 @@ COMMON_DEPEND=" mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 - =net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) @@ -76,6 +76,10 @@ RDEPEND="${COMMON_DEPEND} ${ACCT_DEPEND} " +PATCHES=( + "${FILESDIR}/transmission-4.0.6-miniupnpc-2.2.8.patch" +) + src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}