From owner-svn-ports-all@freebsd.org Mon Nov 27 20:36:12 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB790DE74CA; Mon, 27 Nov 2017 20:36:12 +0000 (UTC) (envelope-from zeising@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 mx1.freebsd.org (Postfix) with ESMTPS id A37233EBE; Mon, 27 Nov 2017 20:36:12 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vARKaBFS057263; Mon, 27 Nov 2017 20:36:11 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vARKaBCr057260; Mon, 27 Nov 2017 20:36:11 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201711272036.vARKaBCr057260@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Mon, 27 Nov 2017 20:36:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r454991 - in branches/2017Q4/security/suricata: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: in branches/2017Q4/security/suricata: . files X-SVN-Commit-Revision: 454991 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.25 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: Mon, 27 Nov 2017 20:36:12 -0000 Author: zeising Date: Mon Nov 27 20:36:11 2017 New Revision: 454991 URL: https://svnweb.freebsd.org/changeset/ports/454991 Log: MFH: r454649 Fix suricata failing to start if there is a stale pid file laying around. This can happen if suricata is ungracefully shut down. PR: 223052, 223322 Submitted by: Reshad Patuck, Franco Fichtner Approved by: Franco Fichtner (maintainer) Approved by: ports-secteam (swills) Modified: branches/2017Q4/security/suricata/Makefile branches/2017Q4/security/suricata/files/suricata.in Directory Properties: branches/2017Q4/ (props changed) Modified: branches/2017Q4/security/suricata/Makefile ============================================================================== --- branches/2017Q4/security/suricata/Makefile Mon Nov 27 20:11:39 2017 (r454990) +++ branches/2017Q4/security/suricata/Makefile Mon Nov 27 20:36:11 2017 (r454991) @@ -3,6 +3,7 @@ PORTNAME= suricata PORTVERSION= 4.0.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.openinfosecfoundation.org/download/ Modified: branches/2017Q4/security/suricata/files/suricata.in ============================================================================== --- branches/2017Q4/security/suricata/files/suricata.in Mon Nov 27 20:11:39 2017 (r454990) +++ branches/2017Q4/security/suricata/files/suricata.in Mon Nov 27 20:36:11 2017 (r454991) @@ -19,13 +19,17 @@ # Default: 8000 # suricata_netmap (str): Set to YES to enable netmap (Inline Mode) # Default: NO +# suricata_user (str): Set the user to run suricata as +# Default: root +# suricata_pidfile (str): Pidfile to store pid of suricata process +# Default: /var/run/suricata.pid - . /etc/rc.subr name="suricata" rcvar=suricata_enable +start_precmd="suricata_prestart" command="%%PREFIX%%/bin/suricata" load_rc_config $name @@ -35,6 +39,8 @@ load_rc_config $name [ -z "$suricata_flags" ] && suricata_flags="-D" [ -z "$suricata_divertport" ] && suricata_divertport="8000" [ -z "$suricata_netmap" ] && suricata_netmap="NO" +[ -z "$suricata_user" ] && suricata_user="root" +[ -z "$suricata_pidfile" ] && suricata_pidfile="/var/run/suricata.pid" if [ -n "$suricata_interface" ]; then for interface in $suricata_interface; do @@ -47,9 +53,16 @@ else info "Inline Mode on divert port $suricata_divertport (suricata_interface not defined)" fi -pidfile="/var/run/suricata.pid" +pidfile=$suricata_pidfile suricata_flags="$suricata_flags --pidfile $pidfile" [ -n "$suricata_conf" ] && suricata_flags="$suricata_flags -c $suricata_conf" + +suricata_prestart() +{ + if ! run_rc_command status > /dev/null; then + rm -f "$pidfile" + fi +} run_rc_command "$1"