From owner-svn-ports-all@freebsd.org Sun Nov 10 18:35:56 2019 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 9892B1BB483; Sun, 10 Nov 2019 18:35:56 +0000 (UTC) (envelope-from delphij@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 47B2l03Y4bz4FvJ; Sun, 10 Nov 2019 18:35:56 +0000 (UTC) (envelope-from delphij@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 4329C30C7; Sun, 10 Nov 2019 18:35:56 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xAAIZuVg086264; Sun, 10 Nov 2019 18:35:56 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xAAIZtmo086263; Sun, 10 Nov 2019 18:35:55 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <201911101835.xAAIZtmo086263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Sun, 10 Nov 2019 18:35:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r517221 - in branches/2019Q4/security/sshguard: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: in branches/2019Q4/security/sshguard: . files X-SVN-Commit-Revision: 517221 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.29 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: Sun, 10 Nov 2019 18:35:56 -0000 Author: delphij Date: Sun Nov 10 18:35:55 2019 New Revision: 517221 URL: https://svnweb.freebsd.org/changeset/ports/517221 Log: MFH: r517220 Remove redundant pidfile check. This fixes an issue that SSHguard won't start after an incompelete shutdown. PR: ports/241751 Approved by: portmgr (bugfix blanket) Approved by: ports-secteam (bugfix blanket) Added: branches/2019Q4/security/sshguard/files/patch-src_sshguard.in - copied unchanged from r517220, head/security/sshguard/files/patch-src_sshguard.in Modified: branches/2019Q4/security/sshguard/Makefile Directory Properties: branches/2019Q4/ (props changed) Modified: branches/2019Q4/security/sshguard/Makefile ============================================================================== --- branches/2019Q4/security/sshguard/Makefile Sun Nov 10 18:34:54 2019 (r517220) +++ branches/2019Q4/security/sshguard/Makefile Sun Nov 10 18:35:55 2019 (r517221) @@ -3,7 +3,7 @@ PORTNAME= sshguard PORTVERSION= 2.4.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= security MASTER_SITES= SF/sshguard/sshguard/${PORTVERSION} Copied: branches/2019Q4/security/sshguard/files/patch-src_sshguard.in (from r517220, head/security/sshguard/files/patch-src_sshguard.in) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q4/security/sshguard/files/patch-src_sshguard.in Sun Nov 10 18:35:55 2019 (r517221, copy of r517220, head/security/sshguard/files/patch-src_sshguard.in) @@ -0,0 +1,19 @@ +--- src/sshguard.in.orig 2019-05-23 22:25:17 UTC ++++ src/sshguard.in +@@ -97,14 +97,8 @@ elif [ -z "$tailcmd" ]; then + exit 1 + fi + +-if [ ! -z "$PID_FILE" ]; then +- if [ ! -e "$PID_FILE" ]; then +- echo "$$" > $PID_FILE +- else +- err "$PID_FILE already exists; is SSHGuard already running?" +- exit 1 +- fi +-fi ++# Already checked by rc(8) ++echo "$$" > $PID_FILE + + # Make sure to kill entire process group (subshell) on exit/interrupts. + trap "clean_and_exit" INT TERM