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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C6F481581C1 for ; Mon, 8 Jul 2024 18:45:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D4BD8E2A9F; Mon, 8 Jul 2024 18:45:42 +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 ADF5BE2A9F for ; Mon, 8 Jul 2024 18:45:42 +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 9CE4A335C9B for ; Mon, 8 Jul 2024 18:45:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 093311A7C for ; Mon, 8 Jul 2024 18:45:40 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1720464286.38db44467c63071527cdf7fd9cff4e642d14b27f.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/files/, net-vpn/tinc/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/tinc/files/tinc-1.1_pre18-fix-upnp.patch net-vpn/tinc/tinc-1.1_pre18-r1.ebuild net-vpn/tinc/tinc-1.1_pre18.ebuild X-VCS-Directories: net-vpn/tinc/files/ net-vpn/tinc/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 38db44467c63071527cdf7fd9cff4e642d14b27f X-VCS-Branch: master Date: Mon, 8 Jul 2024 18:45:40 +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: dcef0cf9-5115-493e-8000-907ad9405eec X-Archives-Hash: e134ebd96e0fccce9d3cd681e1f718c8 commit: 38db44467c63071527cdf7fd9cff4e642d14b27f Author: Yixun Lan gentoo org> AuthorDate: Mon Jul 8 18:41:11 2024 +0000 Commit: Yixun Lan gentoo org> CommitDate: Mon Jul 8 18:44:46 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38db4446 net-vpn/tinc: fix upnp issue Closes: https://bugs.gentoo.org/935718 Signed-off-by: Yixun Lan gentoo.org> net-vpn/tinc/files/tinc-1.1_pre18-fix-upnp.patch | 18 ++++++++++++++++++ ...{tinc-1.1_pre18.ebuild => tinc-1.1_pre18-r1.ebuild} | 9 +++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/net-vpn/tinc/files/tinc-1.1_pre18-fix-upnp.patch b/net-vpn/tinc/files/tinc-1.1_pre18-fix-upnp.patch new file mode 100644 index 000000000000..1850540d96fc --- /dev/null +++ b/net-vpn/tinc/files/tinc-1.1_pre18-fix-upnp.patch @@ -0,0 +1,18 @@ +diff --git a/src/upnp.c b/src/upnp.c +index 553630e..fd2b30b 100644 +--- a/src/upnp.c ++++ b/src/upnp.c +@@ -124,8 +124,12 @@ static void upnp_refresh() { + struct IGDdatas data; + + char myaddr[64]; +- ++#if (MINIUPNPC_API_VERSION >= 18) ++ char wnaddr[64]; ++ int result = UPNP_GetValidIGD(devices, &urls, &data, myaddr, sizeof(myaddr), wnaddr, sizeof(wnaddr)); ++#else + int result = UPNP_GetValidIGD(devices, &urls, &data, myaddr, sizeof(myaddr)); ++#endif + + if(result <= 0) { + logger(DEBUG_PROTOCOL, LOG_WARNING, "[upnp] No IGD found"); diff --git a/net-vpn/tinc/tinc-1.1_pre18.ebuild b/net-vpn/tinc/tinc-1.1_pre18-r1.ebuild similarity index 95% rename from net-vpn/tinc/tinc-1.1_pre18.ebuild rename to net-vpn/tinc/tinc-1.1_pre18-r1.ebuild index e5e8aca62cfa..0fe4682890c8 100644 --- a/net-vpn/tinc/tinc-1.1_pre18.ebuild +++ b/net-vpn/tinc/tinc-1.1_pre18-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 MY_PV=${PV/_/} MY_P=${PN}-${MY_PV} @@ -13,6 +13,7 @@ HOMEPAGE="https://www.tinc-vpn.org/" SRC_URI="https://www.tinc-vpn.org/packages/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" @@ -25,15 +26,15 @@ DEPEND=" lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) - upnp? ( net-libs/miniupnpc ) + upnp? ( net-libs/miniupnpc:= ) zlib? ( sys-libs/zlib )" RDEPEND="${DEPEND} vde? ( net-misc/vde )" -S="${WORKDIR}/${MY_P}" PATCHES+=( "${FILESDIR}"/tinc-1.1_pre16-r1-fix-paths.patch #560528 "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 + "${FILESDIR}"/${P}-fix-upnp.patch #935718 ) src_prepare() { @@ -45,7 +46,7 @@ src_prepare() { sed -i "6d" configure.ac || die sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac || die - eautoreconf + eautoreconf } src_configure() {