From nobody Fri Apr 28 17:19:49 2023 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 4Q7K9L1rXLz47jwW; Fri, 28 Apr 2023 17:19:50 +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 4Q7K9L0vlCz4JVf; Fri, 28 Apr 2023 17:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682702390; 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=2q+y/ru2PeLj+2BjRS8zuDaZiY9yKXw44eXwu4JS5ug=; b=gMRJI9m6eJeHG2NTULInTSxbtuBwMc0nHRAwpLomdFGhocwtnbdBFSDGPBH4eL8GQybAQj A7TB7HnIu11lAxiU4cP2w7FZ6puueZgcjlJpmyWYIeyUSXrQPT2CuhE1TwoRdl4CGm24js oc8Rwn52DOMKhfk+cvnisf+RNd5I6SaQJsCQcVDESTKQbgwPzHe4GVw94R/PWRtGvsy9GI Ezb9zdqkGc8mTEUVORyitpyhSxJw+n7VdLfcZWEKrARKpyi6rvjONf8FdKbkPaQnvHK4a1 UT4/QXqC/1/b37b1b8e8x/V9eMRfaDYueBUuZ7SS0ZNWjjRUhSPIOAw5R8SAbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682702390; 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=2q+y/ru2PeLj+2BjRS8zuDaZiY9yKXw44eXwu4JS5ug=; b=lC1ExGS9xPml1Zan3WuRaTVIWvbxJBxQDGY1k9NJiRhuEvh/aySVASPRoJhO1B/0ArJx/4 /5MSd9zIs/VIODerzO//vHzwy+I4QLPX8S0xm6V6+vPe2rRd2BLxkc6jsHSJnHHM8rxXVJ t+2ZHyG10x28/YlQAfUhH/UyWS3KUR7VBFORMan5mybTUwokRyISod2AZsOX/ytfz/otRF X82+a12OweFaB/+FsVGDgddXqPtAGQvvARi3K+hEIUVmVUqVxwKbWrwKD5ypxYvqtwadIz v1G+9iH/ZycdgUs1z6rM0Sxb5cXZqwl6X4sjU9LVbsIeB4gznyTk8lHTr+6wOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682702390; a=rsa-sha256; cv=none; b=qymqPEt2NyHwPxHFTmZ4w9pHUd5pChsVli8+dDfSLxf6O1xAvGHBAXtC2LHwkecLh1RBEj +PGq6QCfvtjvmS8p/eUbhY+O1xZX/9dXLaAmrWqyZ3z+42UnzfEDTDZM7AZVYuoASAkDva IyDeClGAy81RuPgru9I53yd6qVYzUr1oew215Nws4hCpvsC1v+ybKfukBo39CPomJASJnK gxDPsrUWmFQk7i8N+4sY7rO0wfX1qaY5acofLKxhaiw2T8BCkYtzpjbHlzoyaVo/bIiSsK oJ5QsemsIafe4hVYzbQN58x+7+5LvvYTh9+D9OgDGIwPZnIAIIYuhZm4aXbotQ== 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 4Q7K9K7378z17YP; Fri, 28 Apr 2023 17:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33SHJnos044641; Fri, 28 Apr 2023 17:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33SHJnUV044640; Fri, 28 Apr 2023 17:19:49 GMT (envelope-from git) Date: Fri, 28 Apr 2023 17:19:49 GMT Message-Id: <202304281719.33SHJnUV044640@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 52814f7a042f - main - net/libusrsctp: Unbreak on HEAD 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52814f7a042fe9699c388e48cf4f0ada175cf6b9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=52814f7a042fe9699c388e48cf4f0ada175cf6b9 commit 52814f7a042fe9699c388e48cf4f0ada175cf6b9 Author: Muhammad Moinur Rahman AuthorDate: 2023-04-28 12:46:15 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-04-28 17:18:11 +0000 net/libusrsctp: Unbreak on HEAD Upstream bug: https://github.com/sctplab/usrsctp/issues/667 Approved by: portmgr (just-fix-it) --- net/libusrsctp/Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/libusrsctp/Makefile b/net/libusrsctp/Makefile index da5b238cd9fd..d5636b99c927 100644 --- a/net/libusrsctp/Makefile +++ b/net/libusrsctp/Makefile @@ -9,8 +9,6 @@ WWW= https://github.com/sctplab/usrsctp LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md -BROKEN_FreeBSD_14= compilation fails: no netinet6/ip6protosw.h on FreeBSD 14, see https://github.com/sctplab/usrsctp/issues/667 - USES= cmake USE_LDCONFIG= yes @@ -28,4 +26,11 @@ PLIST_FILES= include/usrsctp.h \ CFLAGS+= -Wno-error -.include +.include + +post-patch: +.if ${OSVERSION} >= 1400000 + @${REINPLACE_CMD} -e 's|ip6protosw.h|ip6_var.h|g' \ + ${WRKSRC}/usrsctplib/netinet/sctp_os_userspace.h +.endif +.include