From owner-dev-commits-ports-branches@freebsd.org Wed Sep 22 22:44:15 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 4BFF46736C5; Wed, 22 Sep 2021 22:44:15 +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 4HFCyl1cJ7z3l1c; Wed, 22 Sep 2021 22:44:15 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1798A1FA44; Wed, 22 Sep 2021 22:44:15 +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 18MMiF1N085470; Wed, 22 Sep 2021 22:44:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18MMiEaF085469; Wed, 22 Sep 2021 22:44:14 GMT (envelope-from git) Date: Wed, 22 Sep 2021 22:44:14 GMT Message-Id: <202109222244.18MMiEaF085469@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Craig Leres Subject: git: 074a0107d104 - 2021Q3 - security/zeek: Unbreak build under 14.0-CURRENT MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: leres X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: 074a0107d104704f4eb3e30d3abb2a3bc49f08be Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2021 22:44:15 -0000 The branch 2021Q3 has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=074a0107d104704f4eb3e30d3abb2a3bc49f08be commit 074a0107d104704f4eb3e30d3abb2a3bc49f08be Author: Craig Leres AuthorDate: 2021-07-12 01:57:05 +0000 Commit: Craig Leres CommitDate: 2021-09-22 22:39:19 +0000 security/zeek: Unbreak build under 14.0-CURRENT According to the cpuset(2) man page, sys/param.h must be included before sys/cpuset.h. This was fixed in zeek (in the highwayhash submodule) in May of 2020 and undone in August of 2020. Add a patch that matches the pull request I just created with upstream: https://github.com/zeek/highwayhash/pull/1 Thanks to @pluknet for diagnosing the build failure. Reported by: pkg-fallout (cherry picked from commit 385875760f0749c31b4c596f4663485b7d68b464) --- .../patch-auxil_highwayhash_highwayhash_os__specific.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/security/zeek/files/patch-auxil_highwayhash_highwayhash_os__specific.cc b/security/zeek/files/patch-auxil_highwayhash_highwayhash_os__specific.cc new file mode 100644 index 000000000000..65ac1859a18b --- /dev/null +++ b/security/zeek/files/patch-auxil_highwayhash_highwayhash_os__specific.cc @@ -0,0 +1,12 @@ +--- auxil/highwayhash/highwayhash/os_specific.cc.orig 2021-07-06 20:10:10 UTC ++++ auxil/highwayhash/highwayhash/os_specific.cc +@@ -53,8 +53,8 @@ + + #ifdef __FreeBSD__ + #define OS_FREEBSD 1 +-#include + #include ++#include /* must come after sys/param.h */ + #include + #else + #define OS_FREEBSD 0