From nobody Fri Jul 19 14:36:07 2024 X-Original-To: dev-commits-ports-all@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 4WQXKg1w04z5RlWM; Fri, 19 Jul 2024 14:36:07 +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 4WQXKg1QFHz4n8B; Fri, 19 Jul 2024 14:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721399767; 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=mvlF6q9I56vTLK8rHbJIa0dTtkqkFVC02sYg+0FZuxs=; b=D2Qda0ovhkdSbevAsYQICy3NnWnVmgYs0z2U3s51/Fy5ygvqr1jtB6wUs54VFhK+3sYbir Ia1KW1fPqkXdyQBnfmmGuE/iVSc8SNN+rtS7NP67ztVkojmqf1mNaspCV3QSxcHDusAe47 YPZAAkvv2JYqoNT8MaTN1yvqUsmQIwW1fCUk9pT34IQytBrcbELfN/ChaBvxEHyyHn0tBU pWh7Wq2TbRnzR0b1Fq8HBoQrw2fNAb1CYTXgCh0WQdUgSutGNbLfPHldhamNIPdI9QJzOI 9+uH4kD11+rBNUgZownwcXu8L2PWa65Qy6jctibceOSxHvfK3u0yzCmPO5NxiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721399767; a=rsa-sha256; cv=none; b=v5b0w+l1w0vQaM6jgcSQfDrX9yUD9Z1G9xO2ikiRydbiWc/MUo/bdxC5/kqOlqs8PIHtJ3 gAosQj7bgmT0xq5ky+dC+mL55JsnlfRaw/EcFlaqSmq4kLuSttNl6VSRnKfsP2ykUSwHiW yqM+C6dGsa4CbdSMRrTuAFk1sGHkXt4pOqmAyL974OIUpL5PuhnryhVqh68td57Au0mqF0 cPI3+jIwlEyHAsRZF2HPxn26ZYJWXdvPL5W8HzDVxUA1ovVlPnZxLh4VGMCOJBx5AQvHmt iD2+cRq5ugtH7T4umEoOVBrDZQ17c3+CaOvBn77jMTCwLc0895Hq98Z8Ve9ASw== 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=1721399767; 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=mvlF6q9I56vTLK8rHbJIa0dTtkqkFVC02sYg+0FZuxs=; b=Ad0YBJ+O4oTEffwjbxn+GLYV6wduIppGDUN0n73x9pOR7XtMClQtfdbPs8T1mhAdHctFes 2E0ssgYa9EIsL3sHG3BD1TteyjCbqXOw69fdzrBjJAX666pVnx60EczIZdbxELgwXesm+6 x1HcPpwStVLlllbADPehujwDuB+NkjSczsKmWRdx1E9ZhDrhiTHotUuLcPz92FP49Bw4oy pw9kMlbMk1/OxAiWyb56IVfN4KYqs/ZSZrNPooF2FLzxrh66OXXKaYhfJfWf1WodYOpHHq YYKlLzJGNINbuRWjMwuLBZgpv4HhmFbGOlkSPnDZCqe6i0+oTZAlTb34J/eLfg== 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 4WQXKg11cCzbwY; Fri, 19 Jul 2024 14:36:07 +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 46JEa73g071327; Fri, 19 Jul 2024 14:36:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JEa7Oo071324; Fri, 19 Jul 2024 14:36:07 GMT (envelope-from git) Date: Fri, 19 Jul 2024 14:36:07 GMT Message-Id: <202407191436.46JEa7Oo071324@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: e71086573796 - main - dns/kadnode: fix build with miniupnpc 2.2.8 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: e71086573796589c56d292163011005ec354b94e Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=e71086573796589c56d292163011005ec354b94e commit e71086573796589c56d292163011005ec354b94e Author: Dirk Meyer AuthorDate: 2024-07-19 14:35:47 +0000 Commit: Dirk Meyer CommitDate: 2024-07-19 14:35:47 +0000 dns/kadnode: fix build with miniupnpc 2.2.8 PR: 280298 --- dns/kadnode/files/patch-src_upnp.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dns/kadnode/files/patch-src_upnp.c b/dns/kadnode/files/patch-src_upnp.c new file mode 100644 index 000000000000..f23f8487aa04 --- /dev/null +++ b/dns/kadnode/files/patch-src_upnp.c @@ -0,0 +1,16 @@ +--- src/upnp.c.orig 2020-02-09 21:48:57 UTC ++++ src/upnp.c +@@ -134,8 +134,13 @@ int upnp_handler(struct upnp_handle_t *handle, uint16_ + handle->retry = now + (10 * 60); + handle->state = UPNP_STATE_DISCOVER_GATEWAY; + return PF_RETRY; ++#if (MINIUPNPC_API_VERSION >= 18) + } else if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, ++ handle->addr, sizeof(handle->addr), NULL, 0) == 1) { ++#else ++ } else if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, + handle->addr, sizeof(handle->addr)) == 1) { ++#endif + freeUPNPDevlist(devlist); + log_info("UPnP: Found gateway device \"%s\".", handle->urls.controlURL); + handle->state = UPNP_STATE_GET_PORTMAPPING;