Attachment #208906 for bug #241751

View | Details | Raw Unified | Return to bug 241751
Collapse All | Expand All

Lines 3-9 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME= sshguard	4	PORTNAME= sshguard
5	PORTVERSION= 2.4.0	5	PORTVERSION= 2.4.0
6	PORTREVISION= 1	6	PORTREVISION= 2
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= security	8	CATEGORIES= security
9	MASTER_SITES= SF/sshguard/sshguard/${PORTVERSION}	9	MASTER_SITES= SF/sshguard/sshguard/${PORTVERSION}




--- 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

Return to bug 241751

Line 0 Link Here

(-)files/patch-src_sshguard.in (+19 lines)
	1	--- src/sshguard.in.orig 2019-05-23 22:25:17 UTC
	2	+++ src/sshguard.in
	3	@@ -97,14 +97,8 @@ elif [ -z "$tailcmd" ]; then
	4	exit 1
	5	fi
	6
	7	-if [ ! -z "$PID_FILE" ]; then
	8	- if [ ! -e "$PID_FILE" ]; then
	9	- echo "$$" > $PID_FILE
	10	- else
	11	- err "$PID_FILE already exists; is SSHGuard already running?"
	12	- exit 1
	13	- fi
	14	-fi
	15	+# Already checked by rc(8)
	16	+echo "$$" > $PID_FILE
	17
	18	# Make sure to kill entire process group (subshell) on exit/interrupts.
	19	trap "clean_and_exit" INT TERM