From owner-svn-ports-all@freebsd.org Mon Mar 25 13:28:38 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A19321561145; Mon, 25 Mar 2019 13:28:38 +0000 (UTC) (envelope-from rodrigo@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 43A816B91A; Mon, 25 Mar 2019 13:28:38 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 18D2F86DE; Mon, 25 Mar 2019 13:28:38 +0000 (UTC) (envelope-from rodrigo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2PDSbWv026567; Mon, 25 Mar 2019 13:28:37 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2PDSb3e026565; Mon, 25 Mar 2019 13:28:37 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201903251328.x2PDSb3e026565@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Mon, 25 Mar 2019 13:28:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r496821 - in head/net/miniupnpd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: rodrigo X-SVN-Commit-Paths: in head/net/miniupnpd: . files X-SVN-Commit-Revision: 496821 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 43A816B91A X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.969,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Mar 2019 13:28:38 -0000 Author: rodrigo Date: Mon Mar 25 13:28:37 2019 New Revision: 496821 URL: https://svnweb.freebsd.org/changeset/ports/496821 Log: Upgrade net/miniupnpd from 2.0.20180503 to 2.1.20190210 Add a patch to unbreak port when CHECK_PORTINUSE option is activated. The issue was caussed by changes in the structures xtcpcb and xinpcb returned by the kernel after r315662. The fix was inspired by changes made in usr.bin/systat/netstat.c tool. The patch was submitted to the upstream project and merged : https://github.com/miniupnp/miniupnp/pull/353 PR: 236173 Reported by: Igor Pavlov Approved by: Tor Halvard Furulund (maintainer) Added: head/net/miniupnpd/files/patch-portinuse.c (contents, props changed) Modified: head/net/miniupnpd/Makefile head/net/miniupnpd/distinfo Modified: head/net/miniupnpd/Makefile ============================================================================== --- head/net/miniupnpd/Makefile Mon Mar 25 13:00:23 2019 (r496820) +++ head/net/miniupnpd/Makefile Mon Mar 25 13:28:37 2019 (r496821) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= miniupnpd -PORTVERSION= 2.0.20180503 +PORTVERSION= 2.1.20190210 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= http://miniupnp.tuxfamily.org/files/ \ Modified: head/net/miniupnpd/distinfo ============================================================================== --- head/net/miniupnpd/distinfo Mon Mar 25 13:00:23 2019 (r496820) +++ head/net/miniupnpd/distinfo Mon Mar 25 13:28:37 2019 (r496821) @@ -1,3 +1,3 @@ -TIMESTAMP = 1525713934 -SHA256 (miniupnpd-2.0.20180503.tar.gz) = b61bed16865f8692803a9f155523ca7c6e01c65db20362b6173226b08ce12a0c -SIZE (miniupnpd-2.0.20180503.tar.gz) = 225454 +TIMESTAMP = 1551791337 +SHA256 (miniupnpd-2.1.20190210.tar.gz) = 1aaecd25cf152d99557dfe80c7508af9cb06e97ecad4786ce5dafb4c958d196b +SIZE (miniupnpd-2.1.20190210.tar.gz) = 235093 Added: head/net/miniupnpd/files/patch-portinuse.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/miniupnpd/files/patch-portinuse.c Mon Mar 25 13:28:37 2019 (r496821) @@ -0,0 +1,49 @@ +--- portinuse.c.orig 2017-11-02 17:38:02 UTC ++++ portinuse.c +@@ -280,7 +280,7 @@ static struct nlist list[] = { + struct xinpgen *xig, *exig; + struct xinpcb *xip; + struct xtcpcb *xtp; +- struct inpcb *inp; ++ struct in_conninfo *inc; + void *buf = NULL; + size_t len; + +@@ -339,7 +339,8 @@ static struct nlist list[] = { + free(buf); + return -1; + } +- inp = &xtp->xt_inp; ++ xip = &xtp->xt_inp; ++ inc = &xip->inp_inc; + break; + case IPPROTO_UDP: + xip = (struct xinpcb *)xig; +@@ -349,21 +350,21 @@ static struct nlist list[] = { + free(buf); + return -1; + } +- inp = &xip->xi_inp; ++ inc = &xip->inp_inc; + break; + default: + abort(); + } + /* no support for IPv6 */ +- if ((inp->inp_vflag & INP_IPV6) != 0) ++ if ((xip->inp_vflag & INP_IPV6) != 0) + continue; + syslog(LOG_DEBUG, "%08lx:%hu %08lx:%hu <=> %hu %08lx:%hu", +- (u_long)inp->inp_laddr.s_addr, ntohs(inp->inp_lport), +- (u_long)inp->inp_faddr.s_addr, ntohs(inp->inp_fport), ++ (u_long)inc->inc_laddr.s_addr, ntohs(inc->inc_lport), ++ (u_long)inc->inc_faddr.s_addr, ntohs(inc->inc_fport), + eport, (u_long)ip_addr.s_addr, iport + ); +- if (eport == (unsigned)ntohs(inp->inp_lport)) { +- if (inp->inp_laddr.s_addr == INADDR_ANY || inp->inp_laddr.s_addr == ip_addr.s_addr) { ++ if (eport == (unsigned)ntohs(inc->inc_lport)) { ++ if (inc->inc_laddr.s_addr == INADDR_ANY || inc->inc_laddr.s_addr == ip_addr.s_addr) { + found++; + break; /* don't care how many, just that we found at least one */ + }