From owner-svn-ports-all@freebsd.org Tue Aug 25 12:54:25 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4FAB73CA2C0; Tue, 25 Aug 2020 12:54:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BbTTY1ST8z4LSd; Tue, 25 Aug 2020 12:54:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 166AF2A189; Tue, 25 Aug 2020 12:54:25 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07PCsOE0034786; Tue, 25 Aug 2020 12:54:24 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07PCsOFI034779; Tue, 25 Aug 2020 12:54:24 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202008251254.07PCsOFI034779@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Tue, 25 Aug 2020 12:54:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r546165 - branches/2020Q3/security/bsmtrace/files X-SVN-Group: ports-branches X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: branches/2020Q3/security/bsmtrace/files X-SVN-Commit-Revision: 546165 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Aug 2020 12:54:25 -0000 Author: kevans Date: Tue Aug 25 12:54:23 2020 New Revision: 546165 URL: https://svnweb.freebsd.org/changeset/ports/546165 Log: 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) Added: branches/2020Q3/security/bsmtrace/files/patch-conf.c - copied unchanged from r546029, head/security/bsmtrace/files/patch-conf.c branches/2020Q3/security/bsmtrace/files/patch-log.c - copied unchanged from r546029, head/security/bsmtrace/files/patch-log.c branches/2020Q3/security/bsmtrace/files/patch-log.h - copied unchanged from r546029, head/security/bsmtrace/files/patch-log.h Modified: branches/2020Q3/security/bsmtrace/files/patch-bsmtrace.c branches/2020Q3/security/bsmtrace/files/patch-bsmtrace.h Directory Properties: branches/2020Q3/ (props changed) Modified: branches/2020Q3/security/bsmtrace/files/patch-bsmtrace.c ============================================================================== --- branches/2020Q3/security/bsmtrace/files/patch-bsmtrace.c Tue Aug 25 12:53:05 2020 (r546164) +++ branches/2020Q3/security/bsmtrace/files/patch-bsmtrace.c Tue Aug 25 12:54:23 2020 (r546165) @@ -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: branches/2020Q3/security/bsmtrace/files/patch-bsmtrace.h ============================================================================== --- branches/2020Q3/security/bsmtrace/files/patch-bsmtrace.h Tue Aug 25 12:53:05 2020 (r546164) +++ branches/2020Q3/security/bsmtrace/files/patch-bsmtrace.h Tue Aug 25 12:54:23 2020 (r546165) @@ -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); Copied: branches/2020Q3/security/bsmtrace/files/patch-conf.c (from r546029, head/security/bsmtrace/files/patch-conf.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/bsmtrace/files/patch-conf.c Tue Aug 25 12:54:23 2020 (r546165, copy of r546029, head/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 Copied: branches/2020Q3/security/bsmtrace/files/patch-log.c (from r546029, head/security/bsmtrace/files/patch-log.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/bsmtrace/files/patch-log.c Tue Aug 25 12:54:23 2020 (r546165, copy of r546029, head/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); Copied: branches/2020Q3/security/bsmtrace/files/patch-log.h (from r546029, head/security/bsmtrace/files/patch-log.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2020Q3/security/bsmtrace/files/patch-log.h Tue Aug 25 12:54:23 2020 (r546165, copy of r546029, head/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,