aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Leres <leres@FreeBSD.org>2021-07-12 01:57:05 +0000
committerCraig Leres <leres@FreeBSD.org>2021-07-12 01:57:05 +0000
commit385875760f0749c31b4c596f4663485b7d68b464 (patch)
tree4fcd359d5abcf7ed960504a68a87d625c1996c48
parent9e62378e27a9b2be1fbadcb403e1de13f0f02b07 (diff)
downloadports-385875760f0749c31b4c596f4663485b7d68b464.tar.gz
ports-385875760f0749c31b4c596f4663485b7d68b464.zip
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
-rw-r--r--security/zeek/files/patch-auxil_highwayhash_highwayhash_os__specific.cc12
1 files changed, 12 insertions, 0 deletions
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