From owner-svn-ports-head@freebsd.org Mon Dec 16 08:13:40 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 20DEE1DD4A3; Mon, 16 Dec 2019 08:13:40 +0000 (UTC) (envelope-from pi@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 47bvDM75VNz4VcQ; Mon, 16 Dec 2019 08:13:39 +0000 (UTC) (envelope-from pi@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 D47EE226A8; Mon, 16 Dec 2019 08:13:39 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBG8Ddhu021447; Mon, 16 Dec 2019 08:13:39 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBG8DdTp021446; Mon, 16 Dec 2019 08:13:39 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201912160813.xBG8DdTp021446@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Mon, 16 Dec 2019 08:13:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520227 - in head/net/miniupnpd: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/net/miniupnpd: . files X-SVN-Commit-Revision: 520227 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2019 08:13:40 -0000 Author: pi Date: Mon Dec 16 08:13:39 2019 New Revision: 520227 URL: https://svnweb.freebsd.org/changeset/ports/520227 Log: net/miniupnpd: Fix build when CHECK_PORTINUSE option enabled PR: 233963 Reported by: ncrogers@gmail.com Submitted by: w.schwarzenfeld@utanet.at Reviewed by: franco@opnsense.org Approved by: squat@squat.no (maintainer) Added: head/net/miniupnpd/files/extra-patch-portinuse.c (contents, props changed) Deleted: head/net/miniupnpd/files/patch-portinuse.c Modified: head/net/miniupnpd/Makefile Modified: head/net/miniupnpd/Makefile ============================================================================== --- head/net/miniupnpd/Makefile Mon Dec 16 08:07:07 2019 (r520226) +++ head/net/miniupnpd/Makefile Mon Dec 16 08:13:39 2019 (r520227) @@ -37,6 +37,12 @@ UPNP_IGDV2_EXTRA_PATCHES= ${PATCHDIR}/enable_igdv2.pat UPNP_STRICT_EXTRA_PATCHES= ${PATCHDIR}/enable_upnp_strict.patch LEASEFILE_EXTRA_PATCHES= ${PATCHDIR}/enable_leasefile.patch +.include + +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-portinuse.c +.endif + post-patch: ${REINPLACE_CMD} -e 's|\(-lssl -lcrypto\)|$$(LDFLAGS) \1|g' \ ${WRKSRC}/Makefile Added: head/net/miniupnpd/files/extra-patch-portinuse.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/miniupnpd/files/extra-patch-portinuse.c Mon Dec 16 08:13:39 2019 (r520227) @@ -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 */ + }