Date: Sun, 10 Nov 2019 18:35:55 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> 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 Message-ID: <201911101835.xAAIZtmo086263@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911101835.xAAIZtmo086263>