From owner-svn-ports-head@freebsd.org Fri Apr 24 04:54:54 2020 Return-Path: Delivered-To: svn-ports-head@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 8529C2CF209; Fri, 24 Apr 2020 04:54:54 +0000 (UTC) (envelope-from tobik@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) server-signature RSA-PSS (4096 bits) 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 497hg13DzSz3KjQ; Fri, 24 Apr 2020 04:54:53 +0000 (UTC) (envelope-from tobik@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 18480187C2; Fri, 24 Apr 2020 04:54:53 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03O4sqFt062105; Fri, 24 Apr 2020 04:54:52 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03O4sqvk062104; Fri, 24 Apr 2020 04:54:52 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202004240454.03O4sqvk062104@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 24 Apr 2020 04:54:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r532735 - head/security/snortsam/files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/security/snortsam/files X-SVN-Commit-Revision: 532735 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 04:54:55 -0000 Author: tobik Date: Fri Apr 24 04:54:52 2020 New Revision: 532735 URL: https://svnweb.freebsd.org/changeset/ports/532735 Log: 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 Added: head/security/snortsam/files/patch-src_snortsam.h (contents, props changed) Added: head/security/snortsam/files/patch-src_snortsam.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/snortsam/files/patch-src_snortsam.h Fri Apr 24 04:54:52 2020 (r532735) @@ -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