Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 12 Jun 2020 15:34:57 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r538622 - branches/2020Q2/security/snortsam/files
Message-ID:  <202006121534.05CFYvQc057126@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Fri Jun 12 15:34:57 2020
New Revision: 538622
URL: https://svnweb.freebsd.org/changeset/ports/538622

Log:
  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)

Added:
  branches/2020Q2/security/snortsam/files/patch-src_snortsam.h
     - copied unchanged from r532735, head/security/snortsam/files/patch-src_snortsam.h
Modified:
Directory Properties:
  branches/2020Q2/   (props changed)

Copied: branches/2020Q2/security/snortsam/files/patch-src_snortsam.h (from r532735, head/security/snortsam/files/patch-src_snortsam.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/security/snortsam/files/patch-src_snortsam.h	Fri Jun 12 15:34:57 2020	(r538622, copy of r532735, head/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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006121534.05CFYvQc057126>