svn commit: r546029 - head/security/bsmtrace/files

[Kyle Evans]

Author: kevans
Date: Mon Aug 24 00:28:44 2020
New Revision: 546029
URL: https://svnweb.freebsd.org/changeset/ports/546029

Log:
  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)
  MFH:		2020Q3 (-fno-common build fix)

Added:
  head/security/bsmtrace/files/patch-conf.c   (contents, props changed)
  head/security/bsmtrace/files/patch-log.c   (contents, props changed)
  head/security/bsmtrace/files/patch-log.h   (contents, props changed)
Modified:
  head/security/bsmtrace/files/patch-bsmtrace.c
  head/security/bsmtrace/files/patch-bsmtrace.h

Modified: head/security/bsmtrace/files/patch-bsmtrace.c
==============================================================================
--- head/security/bsmtrace/files/patch-bsmtrace.c	Mon Aug 24 00:27:13 2020	(r546028)
+++ head/security/bsmtrace/files/patch-bsmtrace.c	Mon Aug 24 00:28:44 2020	(r546029)
@@ -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)
  }
  

Modified: head/security/bsmtrace/files/patch-bsmtrace.h
==============================================================================
--- head/security/bsmtrace/files/patch-bsmtrace.h	Mon Aug 24 00:27:13 2020	(r546028)
+++ head/security/bsmtrace/files/patch-bsmtrace.h	Mon Aug 24 00:28:44 2020	(r546029)
@@ -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);

Added: head/security/bsmtrace/files/patch-conf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/bsmtrace/files/patch-conf.c	Mon Aug 24 00:28:44 2020	(r546029)
@@ -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

Added: head/security/bsmtrace/files/patch-log.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/bsmtrace/files/patch-log.c	Mon Aug 24 00:28:44 2020	(r546029)
@@ -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);

Added: head/security/bsmtrace/files/patch-log.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/bsmtrace/files/patch-log.h	Mon Aug 24 00:28:44 2020	(r546029)
@@ -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,