diff options
| author | Cy Schubert <cy@FreeBSD.org> | 2021-11-01 15:46:54 +0000 |
|---|---|---|
| committer | Cy Schubert <cy@FreeBSD.org> | 2021-11-01 16:46:24 +0000 |
| commit | 8ddd812bf22acb3819d80b25c059c74a4382d277 (patch) | |
| tree | da29830b4f90e4f07f06341637ff6c6d19d581e0 | |
| parent | 31821409265c9e2436ca7ac3f9d521d834173feb (diff) | |
security/fwanalog: Fix 14-CURRENT build
Chase the 14-CURRENT restructure the bool definition.
MFH after: 1 week
| -rw-r--r-- | security/fwlogwatch/files/patch-main.h | 8 | ||||
| -rw-r--r-- | security/fwlogwatch/files/patch-resolve.c | 8 | ||||
| -rw-r--r-- | security/fwlogwatch/files/patch-utils.c | 8 | ||||
| -rw-r--r-- | security/fwlogwatch/files/patch-whois.c | 8 |
4 files changed, 24 insertions, 8 deletions
diff --git a/security/fwlogwatch/files/patch-main.h b/security/fwlogwatch/files/patch-main.h index 888039c8e704..532b254b455a 100644 --- a/security/fwlogwatch/files/patch-main.h +++ b/security/fwlogwatch/files/patch-main.h @@ -1,5 +1,5 @@ --- main.h.orig 2016-02-19 06:57:49.938584000 -0800 -+++ main.h 2016-04-21 19:31:22.393058000 -0700 ++++ main.h 2021-11-01 08:41:34.443421000 -0700 @@ -10,9 +10,15 @@ /* Paths */ @@ -16,11 +16,15 @@ /* i18n */ -@@ -377,7 +383,9 @@ +@@ -377,7 +383,13 @@ /* Data structures */ #include <time.h> +#define _KERNEL ++#include <sys/param.h> ++#if __FreeBSD_version > 1400038 ++#include <stdbool.h> ++#endif #include <netinet/in.h> +#undef _KERNEL diff --git a/security/fwlogwatch/files/patch-resolve.c b/security/fwlogwatch/files/patch-resolve.c index 29f2947a8b64..dd33eb27df8e 100644 --- a/security/fwlogwatch/files/patch-resolve.c +++ b/security/fwlogwatch/files/patch-resolve.c @@ -1,10 +1,14 @@ --- resolve.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ resolve.c 2016-04-21 19:32:37.383666000 -0700 -@@ -5,7 +5,9 @@ ++++ resolve.c 2021-11-01 08:44:17.362963000 -0700 +@@ -5,7 +5,13 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#define _KERNEL ++#include <sys/param.h> ++#if __FreeBSD_version > 1400038 ++#include <stdbool.h> ++#endif #include <netinet/in.h> +#undef _KERNEL #include <arpa/inet.h> diff --git a/security/fwlogwatch/files/patch-utils.c b/security/fwlogwatch/files/patch-utils.c index 5a0374545271..1ddfd41c671b 100644 --- a/security/fwlogwatch/files/patch-utils.c +++ b/security/fwlogwatch/files/patch-utils.c @@ -1,11 +1,15 @@ --- utils.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ utils.c 2016-04-21 19:36:08.436094000 -0700 -@@ -9,7 +9,10 @@ ++++ utils.c 2021-11-01 08:45:07.736663000 -0700 +@@ -9,7 +9,14 @@ #include <errno.h> #include <sys/types.h> #include <sys/wait.h> +#include <sys/socket.h> +#define _KERNEL ++#include <sys/param.h> ++#if __FreeBSD_version > 1400038 ++#include <stdbool.h> ++#endif #include <netinet/in.h> +#undef _KERNEL #include <arpa/inet.h> diff --git a/security/fwlogwatch/files/patch-whois.c b/security/fwlogwatch/files/patch-whois.c index 95bd9c3f7900..761baecabf16 100644 --- a/security/fwlogwatch/files/patch-whois.c +++ b/security/fwlogwatch/files/patch-whois.c @@ -1,10 +1,14 @@ --- whois.c.orig 2016-02-19 06:35:50.592222000 -0800 -+++ whois.c 2016-04-21 19:33:49.670304000 -0700 -@@ -14,7 +14,9 @@ ++++ whois.c 2021-11-01 08:45:36.119198000 -0700 +@@ -14,7 +14,13 @@ #include <strings.h> #endif +#define _KERNEL ++#include <sys/param.h> ++#if __FreeBSD_version > 1400038 ++#include <stdbool.h> ++#endif #include <netinet/in.h> +#undef _KERNEL #include <arpa/inet.h> |