Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Nov 2019 18:34:55 +0000 (UTC)
From:      Xin LI <delphij@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r517220 - in head/security/sshguard: . files
Message-ID:  <201911101834.xAAIYtFL086026@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: delphij
Date: Sun Nov 10 18:34:54 2019
New Revision: 517220
URL: https://svnweb.freebsd.org/changeset/ports/517220

Log:
  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)
  MFH:		2019Q4

Added:
  head/security/sshguard/files/patch-src_sshguard.in   (contents, props changed)
Modified:
  head/security/sshguard/Makefile

Modified: head/security/sshguard/Makefile
==============================================================================
--- head/security/sshguard/Makefile	Sun Nov 10 17:06:13 2019	(r517219)
+++ head/security/sshguard/Makefile	Sun Nov 10 18:34:54 2019	(r517220)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sshguard
 PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	SF/sshguard/sshguard/${PORTVERSION}

Added: head/security/sshguard/files/patch-src_sshguard.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/sshguard/files/patch-src_sshguard.in	Sun Nov 10 18:34:54 2019	(r517220)
@@ -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?201911101834.xAAIYtFL086026>