From nobody Wed May 29 15:02:47 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 4VqCKz0yXmz5MfxF; Wed, 29 May 2024 15:02:47 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VqCKz0htgz4WwR; Wed, 29 May 2024 15:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716994967; 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=FwYu0fxVcdfznpcqd79Slhl80RzaygsoJPTED3dTrpo=; b=XMg5pxIBItnyj8iul8AqZPPhO/NSwkQ7GzWLNIam3IC4DjaB9jlbsMvmpCpNPWrY0jdLFI Xu91610IqkxA4thYTbFXUsTG45cZiw0KWT/N0FIK1MBoichjxhLlIK03jOZUGzyjEyvyeO CfJfE1CaFB8TuZwiMOpXT90/7/bZQF8y32RyklKxJ2xltx4ZANahsR+oaZJmfdL7Feogkr LDynjDE/dawkIE8V8pPLW/HPMaO/ACH0LSeij9cTuZ+vOiDQewduQy2Q68mtuP49xeHS2u zMKMpbEHblAlyFnoPgUYaDvSQV718kCX0AL4aag1NQTnLhASKSKrRr/bApmTWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716994967; a=rsa-sha256; cv=none; b=knj1NHRHTScqBKh4I/a6TQNPgqhk0GsvLXzMQdYDYH82V6jhdui0RmxqeLGwrbQEvFVdA8 DP+Tj/+AWI70IEAuktn5YeGSxxWcr7YHJ1bpFQsRIsnI85UdejPqsYKVvIuXJlUgOzBPeE Tf/D/xadTgs/aOaYT+7q+AK/T46yPaY9K5SskMum/q18EIB8NG8wWFfe7xNCj7FsrC+LfR 280WnXw226vOISO1mpVwMbUp96PhmfdOoodF4aFxgHOo+4mQuYFahOvHry5Ss7QyTT6FRR kJCzcfw7xQacEbiBiN1kjTKI11AXSf2x+kxJnIh0dHoYcVWVm9T5g+m5hpNKig== 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=1716994967; 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=FwYu0fxVcdfznpcqd79Slhl80RzaygsoJPTED3dTrpo=; b=jhdQoWD6ukvZz3A2zfHe/4OKw95bKYfDIzjQH0vPXkFckAMlC7DzGbEZCtmgadF0wm3mXn xFCmr5Q9b5zc5qYm7iflFC+O2M/gQvSK3zeTHHKtBS4WGhGo5xVC8Hg8z8ku4neqv0LV1W MzVJFRNMqkiOdzJE5tKLPCGTBNshE2C5sUs3p+TAqV/4yZ0DQzF0EysP10u5vc3zeHAhkh cNaHMmBip86/2bpJ9syuDfkPFTdP9f+oxtly3vL0RiDC9DvHJ+E9XN2r++fBSJR8ySUA2N bX8eu3+2M598OGv5VH2Q1bvqutKjVDeZawJxDXTREDmdzfvLarBcHme3j3RKbQ== 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 4VqCKz0J6pz11N9; Wed, 29 May 2024 15:02:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44TF2lVL048142; Wed, 29 May 2024 15:02:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44TF2lKW048139; Wed, 29 May 2024 15:02:47 GMT (envelope-from git) Date: Wed, 29 May 2024 15:02:47 GMT Message-Id: <202405291502.44TF2lKW048139@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 81eb1a733dac - main - net/miniupnpd: update to 2.3.6 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81eb1a733dacc201a8264908cc0bb7053fdaa8e3 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=81eb1a733dacc201a8264908cc0bb7053fdaa8e3 commit 81eb1a733dacc201a8264908cc0bb7053fdaa8e3 Author: Kristof Provost AuthorDate: 2024-05-08 08:39:08 +0000 Commit: Baptiste Daroussin CommitDate: 2024-05-29 15:02:08 +0000 net/miniupnpd: update to 2.3.6 PR: 273207 PR: https://redmine.pfsense.org/issues/15470 Sponsored by: Rubicon Communications, LLC ("Netgate") --- net/miniupnpd/Makefile | 5 +- net/miniupnpd/distinfo | 6 +- net/miniupnpd/files/patch-pf_obsdrdr.c | 164 ++++++++++++++++++++++++------- net/miniupnpd/files/patch-pf_pfpinhole.c | 88 +++++++++++++---- 4 files changed, 201 insertions(+), 62 deletions(-) diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index 5a4fbb0bdcf4..cce1a2539cb1 100644 --- a/net/miniupnpd/Makefile +++ b/net/miniupnpd/Makefile @@ -1,6 +1,5 @@ PORTNAME= miniupnpd -DISTVERSION= 2.3.3 -PORTREVISION= 3 +DISTVERSION= 2.3.6 PORTEPOCH= 1 CATEGORIES= net @@ -18,7 +17,7 @@ CPE_VENDOR= miniupnp_project USE_GITHUB= yes GH_ACCOUNT= miniupnp GH_PROJECT= miniupnp -GH_TAGNAME= e439318 +GH_TAGNAME= miniupnpd_2_3_6 USE_RC_SUBR= miniupnpd diff --git a/net/miniupnpd/distinfo b/net/miniupnpd/distinfo index 5dea730d0c4b..1d7be071d12b 100644 --- a/net/miniupnpd/distinfo +++ b/net/miniupnpd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683175217 -SHA256 (miniupnp-miniupnp-2.3.3-e439318_GH0.tar.gz) = 9324cd00db2d203f0f09e15d8556ff63b40de09bfa755b2b9a64856e146b3b44 -SIZE (miniupnp-miniupnp-2.3.3-e439318_GH0.tar.gz) = 454838 +TIMESTAMP = 1715155832 +SHA256 (miniupnp-miniupnp-2.3.6-miniupnpd_2_3_6_GH0.tar.gz) = 6e5ee2239030486675f558cc840d154e5e2db9517efc96c5b0ab2b2c34c1a128 +SIZE (miniupnp-miniupnp-2.3.6-miniupnpd_2_3_6_GH0.tar.gz) = 462607 diff --git a/net/miniupnpd/files/patch-pf_obsdrdr.c b/net/miniupnpd/files/patch-pf_obsdrdr.c index 0f245db26a1b..a13e3888ed46 100644 --- a/net/miniupnpd/files/patch-pf_obsdrdr.c +++ b/net/miniupnpd/files/patch-pf_obsdrdr.c @@ -1,4 +1,4 @@ ---- pf/obsdrdr.c.orig 2023-02-17 03:09:33 UTC +--- pf/obsdrdr.c.orig 2024-03-19 23:41:25 UTC +++ pf/obsdrdr.c @@ -64,6 +64,8 @@ #include @@ -9,7 +9,7 @@ #include "../macros.h" #include "config.h" #include "obsdrdr.h" -@@ -154,7 +156,7 @@ init_redirect(void) +@@ -155,7 +157,7 @@ init_redirect(void) int init_redirect(void) { @@ -18,7 +18,7 @@ if(dev>=0) shutdown_redirect(); dev = open("/dev/pf", O_RDWR); -@@ -162,14 +164,16 @@ init_redirect(void) +@@ -163,14 +165,16 @@ init_redirect(void) syslog(LOG_ERR, "open(\"/dev/pf\"): %m"); return -1; } @@ -37,23 +37,33 @@ return 0; } -@@ -464,6 +468,7 @@ delete_nat_rule(const char * ifname, unsigned short ip - { - int i, n; +@@ -471,6 +475,7 @@ delete_nat_rule(const char * ifname, unsigned short ip + int i, n, r; + unsigned int tnum; struct pfioc_rule pr; + struct pfctl_rule rule; UNUSED(ifname); if(dev<0) { syslog(LOG_ERR, "pf device is not open"); -@@ -486,19 +491,19 @@ delete_nat_rule(const char * ifname, unsigned short ip +@@ -486,7 +491,7 @@ delete_nat_rule(const char * ifname, unsigned short ip + #endif + if(ioctl(dev, DIOCGETRULES, &pr) < 0) + { +- syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...): %m"); ++ syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...) (%s:%d): %m", __func__, __LINE__); + return -1; + } + n = pr.nr; +@@ -497,7 +502,7 @@ delete_nat_rule(const char * ifname, unsigned short ip for(i=0; i= n) goto error; pr.nr = index; - if(ioctl(dev, DIOCGETRULE, &pr) < 0) -+ if (pfctl_get_rule(dev, index, pr.ticket, pr.anchor, pr.action, &rule, pr.anchor_call) < 0) ++ if (pfctl_get_rule(dev, index, pr.ticket, pr.anchor, PF_RDR, &rule, pr.anchor_call) != 0) { syslog(LOG_ERR, "ioctl(dev, DIOCGETRULE): %m"); goto error; @@ -300,7 +381,7 @@ #endif #ifndef PF_NEWSTYLE memset(&pp, 0, sizeof(pp)); -@@ -1292,15 +1300,15 @@ get_redirect_rule_by_index(int index, +@@ -1363,15 +1366,15 @@ get_redirect_rule_by_index(int index, iaddr, iaddrlen); #endif #else @@ -319,7 +400,7 @@ #endif { rhost[0] = '\0'; /* empty string */ -@@ -1308,10 +1316,10 @@ get_redirect_rule_by_index(int index, +@@ -1379,10 +1382,10 @@ get_redirect_rule_by_index(int index, else { #ifdef PFVAR_NEW_STYLE @@ -332,7 +413,7 @@ rhost, rhostlen); #endif } -@@ -1334,6 +1342,7 @@ get_portmappings_in_range(unsigned short startport, un +@@ -1406,6 +1409,7 @@ get_portmappings_in_range(unsigned short startport, un int i, n; unsigned short eport; struct pfioc_rule pr; @@ -340,12 +421,21 @@ *number = 0; if(dev<0) { -@@ -1362,19 +1371,19 @@ get_portmappings_in_range(unsigned short startport, un +@@ -1426,7 +1430,7 @@ get_portmappings_in_range(unsigned short startport, un + #endif + if(ioctl(dev, DIOCGETRULES, &pr) < 0) + { +- syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...): %m"); ++ syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...) (%s:%d): %m", __func__, __LINE__); + free(array); + return NULL; + } +@@ -1437,19 +1441,19 @@ get_portmappings_in_range(unsigned short startport, un for(i=0; i @@ -8,21 +8,31 @@ #include "config.h" #include "pfpinhole.h" -@@ -170,6 +171,7 @@ int find_pinhole(const char * ifname, - unsigned int ts; +@@ -171,6 +172,7 @@ int find_pinhole(const char * ifname, + unsigned int ts, tnum; int i, n; struct pfioc_rule pr; + struct pfctl_rule rule; struct in6_addr saddr; struct in6_addr daddr; UNUSED(ifname); -@@ -196,21 +198,21 @@ int find_pinhole(const char * ifname, +@@ -191,7 +193,7 @@ int find_pinhole(const char * ifname, + pr.rule.action = PF_PASS; + #endif + if(ioctl(dev, DIOCGETRULES, &pr) < 0) { +- syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...): %m"); ++ syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...) (%s:%d): %m", __func__, __LINE__); + return -1; + } n = pr.nr; +@@ -200,22 +202,22 @@ int find_pinhole(const char * ifname, + #endif /* PF_RELEASETICKETS */ for(i=0; i= 0; i--) { pr.nr = i; - if(ioctl(dev, DIOCGETRULE, &pr) < 0) { -+ if (pfctl_get_rule(dev, i, pr.ticket, pr.anchor, pr.action, &rule, pr.anchor_call) < 0) { ++ if (pfctl_get_rule(dev, i, pr.ticket, pr.anchor, PF_PASS, &rule, pr.anchor_call) < 0) { syslog(LOG_ERR, "ioctl(dev, DIOCGETRULE): %m"); + release_ticket(dev, tnum); return -1; } - if(sscanf(pr.rule.label, PINEHOLE_LABEL_FORMAT_SKIPDESC, &uid, &ts) != 2) { @@ -158,3 +199,12 @@ pr.action = PF_CHANGE_GET_TICKET; if(ioctl(dev, DIOCCHANGERULE, &pr) < 0) { syslog(LOG_ERR, "ioctl(dev, DIOCCHANGERULE, ...) PF_CHANGE_GET_TICKET: %m"); +@@ -449,7 +454,7 @@ int clean_pinhole_list(unsigned int * next_timestamp) + #endif + release_ticket(dev, tnum); + if(ioctl(dev, DIOCGETRULES, &pr) < 0) { +- syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...): %m"); ++ syslog(LOG_ERR, "ioctl(dev, DIOCGETRULES, ...) (%s:%d): %m", __func__, __LINE__); + return -1; + } + #ifdef PF_RELEASETICKETS