Date: Wed, 22 Sep 2021 22:44:14 GMT From: Craig Leres <leres@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 074a0107d104 - 2021Q3 - security/zeek: Unbreak build under 14.0-CURRENT Message-ID: <202109222244.18MMiEaF085469@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q3 has been updated by leres: URL: https://cgit.FreeBSD.org/ports/commit/?id=074a0107d104704f4eb3e30d3abb2a3bc49f08be commit 074a0107d104704f4eb3e30d3abb2a3bc49f08be Author: Craig Leres <leres@FreeBSD.org> AuthorDate: 2021-07-12 01:57:05 +0000 Commit: Craig Leres <leres@FreeBSD.org> 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 <sys/cpuset.h> + #include <sys/param.h> ++#include <sys/cpuset.h> /* must come after sys/param.h */ + #include <unistd.h> + #else + #define OS_FREEBSD 0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109222244.18MMiEaF085469>