From owner-svn-ports-all@freebsd.org Fri Jun 12 15:34:57 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 E533633D572; Fri, 12 Jun 2020 15:34:57 +0000 (UTC) (envelope-from linimon@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 49k4Xx5l91z4fYq; Fri, 12 Jun 2020 15:34:57 +0000 (UTC) (envelope-from linimon@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 C06C2BD11; Fri, 12 Jun 2020 15:34:57 +0000 (UTC) (envelope-from linimon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05CFYv9X057127; Fri, 12 Jun 2020 15:34:57 GMT (envelope-from linimon@FreeBSD.org) Received: (from linimon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05CFYvQc057126; Fri, 12 Jun 2020 15:34:57 GMT (envelope-from linimon@FreeBSD.org) Message-Id: <202006121534.05CFYvQc057126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: linimon set sender to linimon@FreeBSD.org using -f From: Mark Linimon Date: Fri, 12 Jun 2020 15:34:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r538622 - branches/2020Q2/security/snortsam/files X-SVN-Group: ports-branches X-SVN-Commit-Author: linimon X-SVN-Commit-Paths: branches/2020Q2/security/snortsam/files X-SVN-Commit-Revision: 538622 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: Fri, 12 Jun 2020 15:34:58 -0000 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 + #include + #include + #include