diff options
author | Mark Linimon <linimon@FreeBSD.org> | 2020-06-12 15:34:57 +0000 |
---|---|---|
committer | Mark Linimon <linimon@FreeBSD.org> | 2020-06-12 15:34:57 +0000 |
commit | f79a1f304f2edc7b8f7646782d148e56100d583b (patch) | |
tree | c4f6e1001c9f66f6fb484d14a3145009f4ccb864 | |
parent | 2cb9067729addb09b71de7a4748faf2e40f781c8 (diff) | |
download | ports-f79a1f304f2edc7b8f7646782d148e56100d583b.tar.gz ports-f79a1f304f2edc7b8f7646782d148e56100d583b.zip |
MFH: r532735
security/snortsam: Unbreak build on FreeBSD >= 12.1
snortsam.c:750:6: error: conflicting types for 'parseline'
void parseline(char *arg,bool first,char *file,unsigned long line)
^
./snortsam.h:470:6: note: previous declaration is here
void parseline(char *arg,bool first,char *file,unsigned long line);
^
http://beefy6.nyi.freebsd.org/data/121amd64-default/532242/logs/errors/snortsam-2.70_1.log
http://beefy18.nyi.freebsd.org/data/head-amd64-default/p532607_s360211/logs/errors/snortsam-2.70_1.log
Approved by: portmgr (tier-2 blanket), tobik (committer of change)
Notes
Notes:
svn path=/branches/2020Q2/; revision=538622
-rw-r--r-- | security/snortsam/files/patch-src_snortsam.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/security/snortsam/files/patch-src_snortsam.h b/security/snortsam/files/patch-src_snortsam.h new file mode 100644 index 000000000000..7e8fe2d2dd4f --- /dev/null +++ b/security/snortsam/files/patch-src_snortsam.h @@ -0,0 +1,19 @@ +Avoid redefining bool + +snortsam.c:750:6: error: conflicting types for 'parseline' +void parseline(char *arg,bool first,char *file,unsigned long line) + ^ +./snortsam.h:470:6: note: previous declaration is here +void parseline(char *arg,bool first,char *file,unsigned long line); + ^ + +--- src/snortsam.h.orig 2020-03-30 10:54:24 UTC ++++ src/snortsam.h +@@ -59,6 +59,7 @@ + #endif + + ++#include <stdbool.h> + #include <stdlib.h> + #include <stdio.h> + #include <time.h> |