From 998ec31d77db6799bf63c508ed93fd0c59db46aa Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Tue, 25 Aug 2020 12:54:23 +0000
Subject: [PATCH] MFH: r546029

security/bsmtrace: backport the -fno-common fix

This port is the older version of bsmtrace and should go away in due time,
but it's easy enough to backport the fix in the meantime. This version did
need an additional fix to log.{c,h} that was no longer needed in 3.x.

PR:		248756
Approved by:	csjp (maintainer, also discussed with)

Approved by:	ports-secteam (implicit, -fno-common build fix)
---
 security/bsmtrace/files/patch-bsmtrace.c |  8 ++++++++
 security/bsmtrace/files/patch-bsmtrace.h |  9 ++++++++-
 security/bsmtrace/files/patch-conf.c     | 10 ++++++++++
 security/bsmtrace/files/patch-log.c      | 11 +++++++++++
 security/bsmtrace/files/patch-log.h      | 11 +++++++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 security/bsmtrace/files/patch-conf.c
 create mode 100644 security/bsmtrace/files/patch-log.c
 create mode 100644 security/bsmtrace/files/patch-log.h

diff --git a/security/bsmtrace/files/patch-bsmtrace.c b/security/bsmtrace/files/patch-bsmtrace.c
index 3b6cc52d592c..0d7d49310197 100644
--- a/security/bsmtrace/files/patch-bsmtrace.c
+++ b/security/bsmtrace/files/patch-bsmtrace.c
@@ -1,5 +1,13 @@
 --- bsmtrace.c.orig	2014-01-14 22:51:19 UTC
 +++ bsmtrace.c
+@@ -30,6 +30,7 @@
+ #include "includes.h"
+ 
+ static int	daemonized;	/* daemonized or not? */
++int	audit_pipe_fd;
+ 
+ /*
+  * If we are going to be daemonized, write out a pid file to
 @@ -92,7 +92,7 @@ bsmtrace_exit(int x)
  }
  
diff --git a/security/bsmtrace/files/patch-bsmtrace.h b/security/bsmtrace/files/patch-bsmtrace.h
index fc9f41288fde..2a4cdf35600a 100644
--- a/security/bsmtrace/files/patch-bsmtrace.h
+++ b/security/bsmtrace/files/patch-bsmtrace.h
@@ -1,6 +1,13 @@
 --- bsmtrace.h.orig	2014-02-05 02:34:38 UTC
 +++ bsmtrace.h
-@@ -43,6 +43,6 @@ int	audit_pipe_fd;	/* XXX not happy abou
+@@ -38,11 +38,11 @@ int	audit_pipe_fd;	/* XXX not happy abou
+ 	char	*pflag;
+ };
+ 
+-struct g_conf opts;
+-int	audit_pipe_fd;	/* XXX not happy about this global */
++extern struct g_conf opts;
++extern int	audit_pipe_fd;	/* XXX not happy about this global */
  
  void	bsmtrace_error(int, char *, ...);
  void	bsmtrace_exit(int);
diff --git a/security/bsmtrace/files/patch-conf.c b/security/bsmtrace/files/patch-conf.c
new file mode 100644
index 000000000000..42706b71e73d
--- /dev/null
+++ b/security/bsmtrace/files/patch-conf.c
@@ -0,0 +1,10 @@
+--- conf.c.orig	2014-01-14 22:51:19 UTC
++++ conf.c
+@@ -54,6 +54,7 @@ extern int	 yyparse(void);
+ bsm_set_head_t	 bsm_set_head;
+ int		 lineno = 1;
+ char		*conffile;
++struct g_conf opts;
+ 
+ /*
+  * Return BSM set named str, or NULL if the set was not found in the BSM set
diff --git a/security/bsmtrace/files/patch-log.c b/security/bsmtrace/files/patch-log.c
new file mode 100644
index 000000000000..aaf081508dec
--- /dev/null
+++ b/security/bsmtrace/files/patch-log.c
@@ -0,0 +1,11 @@
+--- log.c.orig	2020-08-23 21:49:15 UTC
++++ log.c
+@@ -31,6 +31,8 @@
+ #include "includes.h"
+ #undef SYSLOG_NAMES
+ 
++struct logchannel_head log_head;
++
+ int
+ log_bsm_syslog(struct logchannel *lc, struct bsm_sequence *bs,
+     struct bsm_record_data *br);
diff --git a/security/bsmtrace/files/patch-log.h b/security/bsmtrace/files/patch-log.h
new file mode 100644
index 000000000000..6fb0e637a3ea
--- /dev/null
+++ b/security/bsmtrace/files/patch-log.h
@@ -0,0 +1,11 @@
+--- log.h.orig	2020-08-23 21:49:13 UTC
++++ log.h
+@@ -30,7 +30,7 @@
+ #ifndef LOG_H_
+ #define LOG_H_
+ 
+-TAILQ_HEAD(, logchannel) log_head;
++extern TAILQ_HEAD(logchannel_head, logchannel) log_head;
+ 
+ enum {
+ 	LOG_CHANNEL_NOP,